<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ccf24258475c6586e93a5b591d527fdd2d96b882">https://github.com/macports/macports-ports/commit/ccf24258475c6586e93a5b591d527fdd2d96b882</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ccf24258475c6586e93a5b591d527fdd2d96b882
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 26 18:15:03 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> libtranslate: Fix build, flags, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch to remove intltool's erroneous checking of perl from
</span><span style='display:block; white-space:pre;color:#404040;'> configure script.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch to fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch to fix macOS 11+ libtool bug.
</span><span style='display:block; white-space:pre;color:#404040;'> * intltool is only needed at build time.
</span><span style='display:block; white-space:pre;color:#404040;'> * gettext is not needed; only gettext-runtime is needed.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use --disable-talkfilters and --disable-generic to prevent searching
</span><span style='display:block; white-space:pre;color:#404040;'> for opportunistic dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'> * Don't add -I${prefix}/include to CFLAGS since MacPorts already puts it
</span><span style='display:block; white-space:pre;color:#404040;'> in CPPFLAGS.
</span>---
textproc/libtranslate/Portfile | 19 ++++--
.../libtranslate/files/dynamic_lookup-11.patch | 40 ++++++++++++
textproc/libtranslate/files/implicit.patch | 12 ++++
.../files/remove-intltool-perl-hack.diff | 71 ++++++++++++++++++++++
4 files changed, 137 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libtranslate/Portfile b/textproc/libtranslate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ddd3c509a2c..0a2dab7ebb9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libtranslate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libtranslate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span>
name libtranslate
version 0.99
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 a6776a45b6e60b38a308809973676d6b7da44fbf \
sha256 4b2becb139e51663022d9531c430ebcc81d8b26edc73f6ddc05707ff9950eb34 \
size 532516
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +24,20 @@ long_description libtranslate is a library for translating text and web \
</span> homepage https://www.nongnu.org/libtranslate/
master_sites https://download.savannah.nongnu.org/releases/libtranslate/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:libiconv port:intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append "-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles remove-intltool-perl-hack.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-talkfilters \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-generic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man
</span>
platform darwin arm {
depends_build-append port:automake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libtranslate/files/dynamic_lookup-11.patch b/textproc/libtranslate/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f21957afe4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libtranslate/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 11 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-01-26 18:02:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-26 18:06:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7258,7 +7258,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
</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;'>+@@ -10187,7 +10187,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
</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;'>+@@ -14130,7 +14130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
</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;'>+@@ -16488,7 +16488,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.[012])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
</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;color:#808080;'>diff --git a/textproc/libtranslate/files/implicit.patch b/textproc/libtranslate/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ea4e5d072a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libtranslate/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conftest.c:28:7: error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-01-26 17:59:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-26 18:00:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4282,6 +4282,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ((' ' & 0x0FF) == 0x020)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libtranslate/files/remove-intltool-perl-hack.diff b/textproc/libtranslate/files/remove-intltool-perl-hack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e60d3a43beb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libtranslate/files/remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</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;'>+--- configure.orig 2005-01-28 06:35:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-26 17:57:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20710,67 +20710,6 @@
</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;'>+
</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;'>+-echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo $ECHO_N "(cached) $ECHO_C" >&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_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;'>+- echo "$as_me:$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;'>+-
</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;'>+-
</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;'>+- echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "${ECHO_T}$INTLTOOL_PERL" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$as_me:$LINENO: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "${ECHO_T}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;'>+-if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "$as_me: error: perl not found; required for intltool" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { (exit 1); exit 1; }; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { (exit 1); exit 1; }; }
</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;'>+- echo "$as_me:$LINENO: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&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;'>+- echo "$as_me:$LINENO: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "${ECHO_T}ok" >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { (exit 1); exit 1; }; }
</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;'>+ # Extract the first word of "iconv", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dummy iconv; ac_word=$2
</span></pre><pre style='margin:0'>
</pre>