<pre style='margin:0'>
Enrico Maria Crisostomo (emcrisostomo) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/46f24f45c2b924893a2a35e0d7ebcaa3a6a2762c">https://github.com/macports/macports-ports/commit/46f24f45c2b924893a2a35e0d7ebcaa3a6a2762c</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 46f24f4 emacs: Fix for automake 1.16
</span>46f24f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 46f24f45c2b924893a2a35e0d7ebcaa3a6a2762c
</span>Author: Enrico M. Crisostomo <enrico.m.crisostomo@gmail.com>
AuthorDate: Fri Apr 6 10:40:35 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> emacs: Fix for automake 1.16
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56236
</span>---
editors/emacs/Portfile | 18 +++++++++++-------
editors/emacs/files/patch-configure.diff | 6 +++---
2 files changed, 14 insertions(+), 10 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 c8da61e..5036eee 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;'>@@ -37,13 +37,17 @@ subport emacs-app-devel {
</span> if {$subport eq $name || $subport eq "emacs-app"} {
version 25.3
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 8740bb96aeab77cd35c6d4625f3676991281c7bc \
sha256 f72c6a1b48b6fbaca2b991eed801964a208a2f8686c70940013db26cd37983c9
# our dbus is autolaunched by launchd, so disable the check that it's running
patchfiles patch-src_dbusbind.c.diff \
patch-configure.diff
<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> }
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,11 +65,11 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
</span> # this patchfile is slightly different for emacs-devel
patchfiles patch-devel-src_dbusbind.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> worksrcdir emacs
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +114,7 @@ variant x11 description {Builds emacs as a X11 program with Lucid widgets} {
</span> --with-gif \
--with-png \
--without-rsvg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xft
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xft
</span> depends_lib-append port:xorg-libXmu \
port:xorg-libXaw \
port:xpm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +142,7 @@ platform darwin {
</span>
if {${subport} eq "emacs" || ${subport} eq "emacs-devel"} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
configure.args-delete --with-x-toolkit=lucid
configure.args-append --with-x-toolkit=motif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +178,7 @@ if {${subport} eq "emacs" || ${subport} eq "emacs-devel"} {
</span> ${destroot}${prefix}/include/emacs
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant dbus description {Builds emacs with D-Bus support} {
configure.args-delete --without-dbus
configure.args-append --with-dbus
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +188,7 @@ variant dbus description {Builds emacs with D-Bus support} {
</span>
if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
categories-append aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$subport eq "emacs-app"} {
patchfiles-append patch-src_emacs.c.diff
} elseif {$subport eq "emacs-app-devel"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-configure.diff b/editors/emacs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9aadd56..32bb69e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-09-11 10:28:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-18 04:03:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5262,7 +5262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-04-06 10:26:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-04-06 10:27:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -602,7 +602,7 @@
</span> ## Apple Darwin / macOS
*-apple-darwin* )
case "${canonical}" in
</pre><pre style='margin:0'>
</pre>