<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/162089cefe65d58c03d275983e063fac4d0dd2f5">https://github.com/macports/macports-ports/commit/162089cefe65d58c03d275983e063fac4d0dd2f5</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 162089c gimp2, gimp2-devel: standardize perl config using perl5 PG
</span>162089c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 162089cefe65d58c03d275983e063fac4d0dd2f5
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Feb 24 16:32:41 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> gimp2, gimp2-devel: standardize perl config using perl5 PG
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Removes need to patch configure.ac.
</span>---
graphics/gimp2-devel/Portfile | 13 ++++++-------
graphics/gimp2-devel/files/patch-configure.ac.diff | 11 -----------
graphics/gimp2/Portfile | 13 ++++++-------
graphics/gimp2/files/patch-configure.ac.diff | 11 -----------
4 files changed, 12 insertions(+), 36 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 0fea708..2c01e3d 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;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span>
name gimp2-devel
conflicts gimp2 gimp3-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +33,6 @@ checksums rmd160 cbf1d9fe9d007acd638ee0e77506ab7f1439e95a \
</span> sha256 5cb0e01b1288ae9d5fc9c96b70ef4e4d3b393c4cbc40b1ae93aecdeee421cc9d \
size 82811146
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_version 5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:appstream-glib \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +40,7 @@ depends_build port:pkgconfig \
</span> port:libtool \
port:intltool \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major}
</span>
depends_lib port:desktop-file-utils \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,8 +94,7 @@ use_parallel_build no
</span> compiler.cxx_standard 2014
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-etc-gimprc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-etc-gimprc.in.diff \
</span> patch-quartz-32bit.diff
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +119,7 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${perl5.bin}
</span>
configure.env CC_FOR_BUILD=${configure.cc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +146,8 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --without-alsa \
--without-gudev \
--without-webkit \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_INTLTOOL_PERL=${configure.perl} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PERL=${configure.perl}
</span>
# keep empty GIMP font directory
# silences warning message on startup:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-configure.ac.diff b/graphics/gimp2-devel/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d1a9543..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2020-02-23 10:21:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2020-02-23 13:19:29.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2268,7 +2268,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROGS(PERL,perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROGS(PERL,perl5.28)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_PROG_PERL_VERSION([perl_required_version],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [add_deps_error([perl >= perl_required_version])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a2c689..c29f441 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span>
name gimp2
conflicts gimp2-devel gimp3-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,13 +31,11 @@ checksums rmd160 52045f0f163a74ef154ac936f637be4a999bbbcf \
</span> sha256 65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716 \
size 32946467
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_version 5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:appstream-glib \
port:intltool \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major}
</span>
depends_lib port:desktop-file-utils \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +89,7 @@ use_parallel_build no
</span> compiler.cxx_standard 2014
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-etc-gimprc.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-etc-gimprc.in.diff \
</span> patch-quartz-32bit.diff
if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +117,7 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${perl5.bin}
</span>
configure.env CC_FOR_BUILD=${configure.cc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +148,8 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --without-alsa \
--without-gudev \
--without-webkit \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_INTLTOOL_PERL=${configure.perl} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PERL=${configure.perl}
</span>
# keep empty GIMP font directory
# silences warning message on startup:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-configure.ac.diff b/graphics/gimp2/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61cf1ed..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2020-02-16 06:58:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2020-02-22 17:04:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2268,7 +2268,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROGS(PERL,perl5 perl,perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROGS(PERL,perl5.28)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_PROG_PERL_VERSION([perl_required_version],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [add_deps_error([perl >= perl_required_version])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>