From d6135c652cb26e58354351db62bbda3acf69a7b2 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Tue, 23 Jul 2024 00:17:38 -0500 Subject: [PATCH] gimp-gap: Use automake 1.17 if available See: https://trac.macports.org/ticket/70408 --- graphics/gimp-gap/Portfile | 9 ++++----- graphics/gimp-gap/files/autogen.sh | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/graphics/gimp-gap/Portfile b/graphics/gimp-gap/Portfile index 69a767c0984..433d1b43f1e 100644 --- a/graphics/gimp-gap/Portfile +++ b/graphics/gimp-gap/Portfile @@ -24,7 +24,6 @@ universal_variant no use_parallel_build no homepage http://www.gimp.org/ -platforms darwin master_sites gimp:gimp/plug-ins/v${branch}/gap/:gap \ http://www.ffmpeg.org/releases/:ffmpeg @@ -57,12 +56,12 @@ post-patch { reinplace "s|MP_FFMPEG_EXTRAS|${ffmpeg_extras}|" ${worksrcpath}/extern_libs/configure_options_ffmpeg.txt } -depends_build port:pkgconfig \ - port:intltool \ - port:gmake \ - port:autoconf \ +depends_build port:autoconf \ port:automake \ + port:gmake \ + port:intltool \ port:libtool \ + path:bin/pkg-config:pkgconfig \ port:yasm depends_lib path:lib/pkgconfig/gimp-2.0.pc:gimp2 \ diff --git a/graphics/gimp-gap/files/autogen.sh b/graphics/gimp-gap/files/autogen.sh index 6ba62fdf3c3..b1903f86dfb 100644 --- a/graphics/gimp-gap/files/autogen.sh +++ b/graphics/gimp-gap/files/autogen.sh @@ -88,7 +88,10 @@ fi echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then +if (automake-1.17 --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.17 + ACLOCAL=aclocal-1.17 +elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake-1.16 ACLOCAL=aclocal-1.16 elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then