<pre style='margin:0'>
drkp pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2db792fc387822dee2b1ec9a2ded54d77cb8109">https://github.com/macports/macports-ports/commit/d2db792fc387822dee2b1ec9a2ded54d77cb8109</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 d2db792 emacs: add emacs-devel subport tracking recent git branch
</span>d2db792 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d2db792fc387822dee2b1ec9a2ded54d77cb8109
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Mon Oct 31 02:38:31 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> emacs: add emacs-devel subport tracking recent git branch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/49520
</span>---
editors/emacs/Portfile | 37 ++++++++++++++++++----
.../emacs/files/patch-devel-src_dbusbind.c.diff | 11 +++++++
2 files changed, 42 insertions(+), 6 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 e8d1d79..8ff2d0f 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;'>@@ -6,8 +6,9 @@ PortGroup muniversal 1.0
</span> PortGroup active_variants 1.1
name emacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xemacs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 25.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xemacs emacs emacs-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts-delete $subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories editors
license GPL-3+
maintainers dports openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +25,35 @@ platforms darwin freebsd
</span> homepage http://www.gnu.org/software/emacs/emacs.html
master_sites gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d29ddba846024c7df3e1dc02ac32690f3650e7b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 763344b90db4d40e9fe90c5d14748a9dbd201ce544e2cf0835ab48a0aa4a1c67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 25.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d29ddba846024c7df3e1dc02ac32690f3650e7b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 763344b90db4d40e9fe90c5d14748a9dbd201ce544e2cf0835ab48a0aa4a1c67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 patch-src_dbusbind.c.diff
</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;'>+subport emacs-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20161031
</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;'>-patchfiles patch-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url git://git.savannah.gnu.org/emacs.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.url http://git.savannah.gnu.org/r/emacs.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 8e7b1af1d708dcf41695cf3fbeff9d35cdb8e5b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ # this patchfile is slightly different for emacs-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-devel-src_dbusbind.c.diff
</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;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "sh ./autogen.sh"
</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;'>+ worksrcdir emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --without-ns \
--without-x \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dee8972
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-devel-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dbusbind.c.orig 2016-10-31 01:50:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dbusbind.c 2016-10-31 02:00:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,8 +267,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* We do not want to have an autolaunch for the session bus. */ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (EQ (bus, QCsession) && session_bus_address == NULL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XD_SIGNAL2 (build_string ("No connection to bus"), bus); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } while (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>