<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/b11fd98321c3bc96aec3e322fabc122152b48684">https://github.com/macports/macports-ports/commit/b11fd98321c3bc96aec3e322fabc122152b48684</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 b11fd98 gimp2: build using perl5.26
</span>b11fd98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b11fd98321c3bc96aec3e322fabc122152b48684
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Dec 5 19:41:46 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gimp2: build using perl5.26
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This ensures that gimp2 uses perl5.26 for both its perl-based
</span><span style='display:block; white-space:pre;color:#404040;'> build scripts and the various intltool scripts independent of
</span><span style='display:block; white-space:pre;color:#404040;'> which variant of perl5 (if any) may be installed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No need to force rebuild if already installed.
</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/55208
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/55405
</span>---
graphics/gimp2/Portfile | 11 ++++++++---
graphics/gimp2/files/patch-set-perl-from-env.diff | 11 +++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
<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 2b28865..302277c 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;'>@@ -30,12 +30,15 @@ use_bzip2 yes
</span> checksums rmd160 67fb5ba3958c18725ff50ecb41df750c5476c80d \
sha256 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set perl_version 5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig \
port:intltool \
port:gtk-doc \
port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl_version}
</span>
depends_lib port:desktop-file-utils \
port:iso-codes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +79,7 @@ depends_lib port:desktop-file-utils \
</span> compiler.blacklist *gcc* {clang < 300}
patchfiles patch-etc-gimprc.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-set-perl-from-env.diff \
</span> patch-plug-ins-common-web-browser.c.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +103,7 @@ pre-configure {
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.perl ${prefix}/bin/perl${perl_version}
</span> configure.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
--enable-mp \
--with-pdbgen \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +117,8 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --without-alsa \
--without-gvfs \
--without-gudev \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-webkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-webkit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_INTLTOOL_PERL=${configure.perl}
</span>
# --without-mac-twain:
# Leopard's 64bit Carbon is missing QuitApplicationEventLoop
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-set-perl-from-env.diff b/graphics/gimp2/files/patch-set-perl-from-env.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..50ae539
</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/files/patch-set-perl-from-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2017-12-03 11:23:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2017-12-03 11:24:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1840,7 +1840,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PATH_PROGS(PERL,$PERL perl5 perl perl5.005 perl5.004,perl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH(pdbgen,
</span></pre><pre style='margin:0'>
</pre>