<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8bda43a60de68d1d921fc3a652c8378d998355f">https://github.com/macports/macports-ports/commit/b8bda43a60de68d1d921fc3a652c8378d998355f</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 b8bda43 gpredict: remove erroneous INTLTOOL_PERL check
</span>b8bda43 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8bda43a60de68d1d921fc3a652c8378d998355f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 30 14:34:36 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> gpredict: remove erroneous INTLTOOL_PERL check
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58370
</span>---
science/gpredict/Portfile | 9 ++-
.../gpredict/files/configure-intltool_perl.patch | 72 ++++++++++++++++++++++
2 files changed, 76 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gpredict/Portfile b/science/gpredict/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15d493a..159a88e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gpredict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gpredict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup perl5 1.0
</span>
name gpredict
version 2.2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +29,15 @@ checksums rmd160 a9f99c6284a8f9facd16b53a98f12949020c7512 \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:intltool \
port:pkgconfig
depends_lib port:goocanvas2 \
port:librsvg \
port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INTLTOOL_PERL=${perl5.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.launchpad.net/intltool/+bug/1197875
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gpredict ships its own copy of the buggy intltool.m4, so just autoreconfing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# won't help. Have to patch something and configure is easiest.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure-intltool_perl.patch
</span>
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gpredict/files/configure-intltool_perl.patch b/science/gpredict/files/configure-intltool_perl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a2027bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gpredict/files/configure-intltool_perl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,72 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-01-21 22:41:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-04-30 14:25:28.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4914,69 +4914,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Extract the first word of "perl", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set dummy perl; ac_word=$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case $INTLTOOL_PERL in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
</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;'>+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -z "$as_dir" && as_dir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IFS=$as_save_IFS
</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;'>+-esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -n "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$INTLTOOL_PERL" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</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;'>+-if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "perl not found" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$IT_PERL_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x" != "xno-xml"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for XML::Parser... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "ok" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>