<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e52ab5a9443f0e7025dadbeb0e82db9c4c967ea9">https://github.com/macports/macports-ports/commit/e52ab5a9443f0e7025dadbeb0e82db9c4c967ea9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e52ab5a emacs|emas-devel|emacs-app|emacs-app-devel: bump revisions and fix variants
</span>e52ab5a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e52ab5a9443f0e7025dadbeb0e82db9c4c967ea9
</span>Author: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
AuthorDate: Tue Jun 5 17:26:30 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> emacs|emas-devel|emacs-app|emacs-app-devel: bump revisions and fix variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * set emacs-devel and emacs-app-devel to use HEAD
</span><span style='display:block; white-space:pre;color:#404040;'> * move dbus variant under emacs and emacs-devel
</span><span style='display:block; white-space:pre;color:#404040;'> * hide inline variant from emacs-app-devel
</span><span style='display:block; white-space:pre;color:#404040;'> * only patch src/dbusbind.c when building dbus variant
</span><span style='display:block; white-space:pre;color:#404040;'> * update git.url
</span><span style='display:block; white-space:pre;color:#404040;'> * bump revisions for emacs and emacs-app
</span><span style='display:block; white-space:pre;color:#404040;'> * remove emacs-devel src/dbusbind.c patch cos it's the same as emacs'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> References: https://trac.macports.org/ticket/56423
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/pull/1936
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/pull/1948
</span>---
editors/emacs/Portfile | 43 ++++++++++------------
.../emacs/files/patch-devel-src_dbusbind.c.diff | 11 ------
2 files changed, 19 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5798c4b..d94295c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ depends_build-append port:autoconf port:automake port:libtool
</span>
if {$subport eq $name || $subport eq "emacs-app"} {
version 26.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 f13fe104345738c853bcce2e3e061dbfb8692bc5 \
sha256 760382d5e8cdc5d0d079e8f754bce1136fbe1473be24bb885669b0e38fc56aa3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,18 +52,10 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span> }
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170918
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version HEAD
</span>
fetch.type git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #git.url git://git.savannah.gnu.org/emacs.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.url http://git.savannah.gnu.org/r/emacs.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 0bddbbc5aae621d5875880ac3e63f68d481df7c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # our dbus is autolaunched by launchd, so disable the check that it's running
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this patchfile is slightly different for emacs-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-devel-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url git://git.sv.gnu.org/emacs.git
</span>
pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +161,14 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> configure.args-append --with-imagemagick
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant dbus description {Builds emacs with D-Bus support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # our dbus is autolaunched by launchd, so disable the check that it's running
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/include/emacs
xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,13 +176,6 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant dbus description {Builds emacs with D-Bus support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
categories-append aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,10 +197,14 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> ${destroot}${applications_dir}/Emacs.app/Contents/Resources/site-lisp/site-start.el
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant inline description {Apply inline patch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gist.github.com/takaxp/5294b6c52782d0be0b25342be62e4a77
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-inline-25.2-20170426.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "emacs-app"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant inline description {Apply inline patch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gist.github.com/takaxp/5294b6c52782d0be0b25342be62e4a77
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-inline-25.2-20170426.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +inline
</span> }
variant multicolor_font description {Apply multicolor font patch} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,6 +217,4 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span> depends_lib-append port:ImageMagick
configure.args-append --with-imagemagick
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +inline
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-devel-src_dbusbind.c.diff b/editors/emacs/files/patch-devel-src_dbusbind.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dee8972..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-devel-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dbusbind.c.orig 2016-10-31 01:50:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dbusbind.c 2016-10-31 02:00:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,8 +267,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We do not want to have an autolaunch for the session bus. */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (EQ (bus, QCsession) && session_bus_address == NULL) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XD_SIGNAL2 (build_string ("No connection to bus"), bus); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while (0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>