<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce491dfa415bfd5558d115754309b94a5a4ad9d1">https://github.com/macports/macports-ports/commit/ce491dfa415bfd5558d115754309b94a5a4ad9d1</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 ce491df gimp2-devel, gimp3-devel: fix build with automake 1.16
</span>ce491df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce491dfa415bfd5558d115754309b94a5a4ad9d1
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Mar 26 09:46:20 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2-devel, gimp3-devel: fix build with automake 1.16
</span>---
graphics/gimp2-devel/Portfile | 3 ++-
graphics/gimp2-devel/files/patch-autogen.sh.diff | 12 ++++++++++++
graphics/gimp3-devel/Portfile | 3 ++-
graphics/gimp3-devel/files/patch-autogen.sh.diff | 12 ++++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c54d04..438222e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,8 @@ use_parallel_build no
</span>
compiler.blacklist *gcc* {clang < 300}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-etc-gimprc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-etc-gimprc.diff \
</span> patch-plug-ins-common-web-browser.c.diff
pre-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-autogen.sh.diff b/graphics/gimp2-devel/files/patch-autogen.sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..67d648b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig 2018-03-25 20:52:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2018-03-25 20:53:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,6 +157,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=$AUTOMAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=$ACLOCAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AUTOMAKE=automake-1.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ACLOCAL=aclocal-1.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=automake-1.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=aclocal-1.15
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/Portfile b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7a0d33..bad0f00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,8 @@ depends_lib port:desktop-file-utils \
</span>
compiler.blacklist *gcc* {clang < 300}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-etc-gimprc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-etc-gimprc.diff \
</span> patch-plug-ins-common-web-browser.c.diff
pre-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-autogen.sh.diff b/graphics/gimp3-devel/files/patch-autogen.sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6ad2d6e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig 2018-03-25 21:02:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2018-03-25 21:02:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,6 +157,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=$AUTOMAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=$ACLOCAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AUTOMAKE=automake-1.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ACLOCAL=aclocal-1.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=automake-1.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=aclocal-1.15
</span></pre><pre style='margin:0'>
</pre>