emacs|emas-devel|emacs-app|emacs-app-devel: bump revisions and fix va…

…riants * set emacs-devel and emacs-app-devel to use HEAD * move dbus variant under emacs and emacs-devel * hide inline variant from emacs-app-devel * only patch src/dbusbind.c when building dbus variant * update git.url * bump revisions for emacs and emacs-app * remove emacs-devel src/dbusbind.c patch cos it's the same as emacs' References: https://trac.macports.org/ticket/56423 #1936 #1948
macports · Jun 7, 2018 · e52ab5a · e52ab5a
1 parent e2b0b15
commit e52ab5a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 35 deletions.
diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
@@ -38,7 +38,7 @@ depends_build-append port:autoconf port:automake port:libtool
 
 if {$subport eq $name || $subport eq "emacs-app"} {
     version         26.1
-    revision        0
+    revision        1
 
     checksums       rmd160  f13fe104345738c853bcce2e3e061dbfb8692bc5 \
                     sha256  760382d5e8cdc5d0d079e8f754bce1136fbe1473be24bb885669b0e38fc56aa3 \
@@ -52,18 +52,10 @@ if {$subport eq $name || $subport eq "emacs-app"} {
 }
 
 if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
-    version         20170918
-    revision        1
+    version         HEAD
 
     fetch.type      git
-    #git.url         git://git.savannah.gnu.org/emacs.git
-    git.url         http://git.savannah.gnu.org/r/emacs.git
-    git.branch      0bddbbc5aae621d5875880ac3e63f68d481df7c3
-
-    # our dbus is autolaunched by launchd, so disable the check that it's running
-    # this patchfile is slightly different for emacs-devel
-    patchfiles      patch-devel-src_dbusbind.c.diff
-
+    git.url         git://git.sv.gnu.org/emacs.git
 
     pre-configure {
         system -W ${worksrcpath} "sh ./autogen.sh"
@@ -169,20 +161,21 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
         configure.args-append --with-imagemagick
     }
 
+    variant dbus description {Builds emacs with D-Bus support} {
+        # our dbus is autolaunched by launchd, so disable the check that it's running
+        patchfiles-append        patch-src_dbusbind.c.diff
+        configure.args-delete    --without-dbus
+        configure.args-append    --with-dbus
+        depends_lib-append       port:dbus
+    }
+
     post-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/include/emacs
         xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
                         ${destroot}${prefix}/include/emacs
     }
 }
 
-variant dbus description {Builds emacs with D-Bus support} {
-    configure.args-delete   --without-dbus
-    configure.args-append   --with-dbus
-    depends_lib-append      port:dbus
-}
-
-
 if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
     categories-append   aqua
 
@@ -204,10 +197,14 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
             ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
     }
 
-    variant inline description {Apply inline patch} {
-        # https://gist.github.com/takaxp/5294b6c52782d0be0b25342be62e4a77
-        patchfiles-append    patch-inline-25.2-20170426.diff
-        build.target         bootstrap
+    if {$subport eq "emacs-app"} {
+        variant inline description {Apply inline patch} {
+            # https://gist.github.com/takaxp/5294b6c52782d0be0b25342be62e4a77
+            patchfiles-append    patch-inline-25.2-20170426.diff
+            build.target         bootstrap
+        }
+
+        default_variants +inline
     }
 
     variant multicolor_font description {Apply multicolor font patch} {
@@ -220,6 +217,4 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
         depends_lib-append  port:ImageMagick
         configure.args-append --with-imagemagick
     }
-
-    default_variants +inline
 }
diff --git a/editors/emacs/files/patch-devel-src_dbusbind.c.diff b/editors/emacs/files/patch-devel-src_dbusbind.c.diff