<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d6135c652cb26e58354351db62bbda3acf69a7b2">https://github.com/macports/macports-ports/commit/d6135c652cb26e58354351db62bbda3acf69a7b2</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 d6135c652cb gimp-gap: Use automake 1.17 if available
</span>d6135c652cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d6135c652cb26e58354351db62bbda3acf69a7b2
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 23 00:17:38 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> gimp-gap: Use automake 1.17 if available
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/70408
</span>---
graphics/gimp-gap/Portfile | 9 ++++-----
graphics/gimp-gap/files/autogen.sh | 5 ++++-
2 files changed, 8 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp-gap/Portfile b/graphics/gimp-gap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69a767c0984..433d1b43f1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp-gap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp-gap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,6 @@ universal_variant no
</span> use_parallel_build no
homepage http://www.gimp.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> master_sites gimp:gimp/plug-ins/v${branch}/gap/:gap \
http://www.ffmpeg.org/releases/:ffmpeg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,12 +56,12 @@ post-patch {
</span> reinplace "s|MP_FFMPEG_EXTRAS|${ffmpeg_extras}|" ${worksrcpath}/extern_libs/configure_options_ffmpeg.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span> port:automake \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool \
</span> port:libtool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:yasm
depends_lib path:lib/pkgconfig/gimp-2.0.pc:gimp2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp-gap/files/autogen.sh b/graphics/gimp-gap/files/autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ba62fdf3c3..b1903f86dfb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp-gap/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp-gap/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,10 @@ fi
</span>
echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if (automake-1.17 --version) < /dev/null > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=automake-1.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=aclocal-1.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then
</span> AUTOMAKE=automake-1.16
ACLOCAL=aclocal-1.16
elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
</pre><pre style='margin:0'>
</pre>