emacs: Fix typo and clean up configure flags

Payne-X6 · Sep 14, 2020 · 7fcc300 · 7fcc300
1 parent ea6be57
commit 7fcc300
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
@@ -42,7 +42,7 @@ configure.args  --without-ns \
                 --without-gconf \
                 --without-libotf \
                 --without-m17n-flt \
-                --with-gpm \
+                --with-gmp \
                 --with-gnutls \
                 --with-json \
                 --with-xml2 \
@@ -82,7 +82,7 @@ platform darwin {
 
 if {$subport eq $name || $subport eq "emacs-app"} {
     version         27.1
-    revision        1
+    revision        2
 
     checksums       rmd160  9ddfd28ab54c4aee168eeecb783d13599e5b5288 \
                     sha256  ffbfa61dc951b92cf31ebe3efc86c5a9d4411a1222b8a4ae6716cfd0e2a584db \
@@ -92,7 +92,7 @@ if {$subport eq $name || $subport eq "emacs-app"} {
 if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
     epoch           1
     version         20200811
-    revision        1
+    revision        2
 
     fetch.type      git
     git.url         https://github.com/emacs-mirror/emacs.git
@@ -185,28 +185,19 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
 }
 
 if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
+    revision 2
     categories-append   aqua
 
     configure.args-append  --with-ns \
-        --with-gif \
-        --with-jpeg \
         --with-lcms2 \
-        --with-png \
-        --with-tiff \
-        --with-xpm \
         --without-harfbuzz \
         --without-imagemagick \
         --without-rsvg \
         --without-xaw3d \
 
     configure.args-delete  --without-ns  --without-x
 
-    depends_lib-append  port:giflib \
-        port:jpeg \
-        port:lcms2 \
-        port:libpng \
-        port:tiff \
-        port:xpm \
+    depends_lib-append  port:lcms2
 
     universal_variant   no
 
@@ -233,12 +224,14 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
     }
 
     variant imagemagick description {Use ImageMagick} {
-        depends_lib-append  port:ImageMagick
-        configure.args-append --with-imagemagick
+        depends_lib-append     port:ImageMagick
+        configure.args-delete  --without-imagemagick
+        configure.args-append  --with-imagemagick
     }
 
     variant rsvg description {Use librsvg} {
         depends_lib-append     port:librsvg
+        configure.args-delete  --without-rsvg
         configure.args-append  --with-rsvg
     }