<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/13f33d093b4b7dde9dd17a6a250c79a6e68ff207">https://github.com/macports/macports-ports/commit/13f33d093b4b7dde9dd17a6a250c79a6e68ff207</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 13f33d0 autogen: fix build against newer guile 2.2.2
</span>13f33d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13f33d093b4b7dde9dd17a6a250c79a6e68ff207
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Sep 12 18:19:39 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> autogen: fix build against newer guile 2.2.2
</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/54112
</span><span style='display:block; white-space:pre;color:#404040;'> use autoreconf as patch changes an m4 file
</span><span style='display:block; white-space:pre;color:#404040;'> revbump as builds against new library
</span>---
devel/autogen/Portfile | 13 +++++++
devel/autogen/files/patch-autogen-guile-2.2.diff | 48 ++++++++++++++++++++++++
2 files changed, 61 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/autogen/Portfile b/devel/autogen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2368a6f..d571e3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/autogen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/autogen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name autogen
version 5.18.12
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,13 @@ universal_variant no
</span> # Don't accidentally create flat-namespace dylibs on Yosemite (#44596).
patchfiles yosemite-libtool.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix build against guile-2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see <https://trac.macports.org/ticket/54112>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-autogen-guile-2.2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch changes m4 file, so need to autoreconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +53,8 @@ platform darwin 8 {
</span> livecheck.type regex
livecheck.url http://ftp.gnu.org/gnu/${name}/?C=M&O=D
livecheck.regex rel(\\d+(?:\\.\\d+)*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autogen has not been officially certified when built against guile-2.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If unexpected results appear, consider building against an earlier version of guile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/autogen/files/patch-autogen-guile-2.2.diff b/devel/autogen/files/patch-autogen-guile-2.2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..82bf4f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/autogen/files/patch-autogen-guile-2.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: autogen-5.18.12/agen5/guile-iface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- agen5/guile-iface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ agen5/guile-iface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,16 +9,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error AutoGen does not work with this version of Guile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ choke me.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif GUILE_VERSION < 201000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AG_SCM_TO_LONG(_v) scm_to_long(_v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error unknown GUILE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- choke me.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: autogen-5.18.12/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14198,7 +14198,7 @@ $as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _guile_versions_to_search="2.0 1.8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _guile_versions_to_search="2.2 2.0 1.8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$GUILE_EFFECTIVE_VERSION"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _guile_tmp=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for v in $_guile_versions_to_search; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: autogen-5.18.12/config/guile.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/guile.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/guile.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFUN([GUILE_PKG],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [PKG_PROG_PKG_CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$GUILE_EFFECTIVE_VERSION"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _guile_tmp=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for v in $_guile_versions_to_search; do
</span></pre><pre style='margin:0'>
</pre>