<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/13f095354aa324e2f115e88be5b6d4cbd6249db3">https://github.com/macports/macports-ports/commit/13f095354aa324e2f115e88be5b6d4cbd6249db3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 13f095354aa324e2f115e88be5b6d4cbd6249db3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 12 17:19:35 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> gnu-apl: Add deps and fix macOS 11+ libtool bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix license.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add deps on fftw-3, pcre2, sqlite3, and xorg-libxcb which are used
</span><span style='display:block; white-space:pre;color:#404040;'> opportunistically.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ensure that gtk3 is not used. It is also found opportunistically but
</span><span style='display:block; white-space:pre;color:#404040;'> causes the build to fail because the code uses a Linux-specific
</span><span style='display:block; white-space:pre;color:#404040;'> constant. --without-gtk3 did not work so I prevent finding pkg-config.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix the well-known libtool bug that caused build failure on macOS 11+.
</span><span style='display:block; white-space:pre;color:#404040;'> This configure script was old enough that it also had the Yosemite
</span><span style='display:block; white-space:pre;color:#404040;'> libtool bug which caused builds on macOS 10.10-10.15 to erroneously use
</span><span style='display:block; white-space:pre;color:#404040;'> the flat namespace.
</span>---
lang/gnu-apl/Portfile | 21 +++++++++++++++++++--
lang/gnu-apl/files/dynamic_lookup-11.patch | 25 +++++++++++++++++++++++++
2 files changed, 44 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gnu-apl/Portfile b/lang/gnu-apl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 85f45977d16..8a37f1f4383 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gnu-apl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gnu-apl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,10 @@ PortGroup select 1.0
</span>
name gnu-apl
version 1.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span> maintainers {@casouri gmail.com:casouri} openmaintainer
description GNU APL is a free interpreter for the programming language APL.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +19,13 @@ long_description GNU APL is a free interpreter for the programming language A
</span> homepage https://www.gnu.org/software/apl/
master_sites gnu:apl
distname apl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxcb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_run port:apl_select
select.group apl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +38,16 @@ checksums rmd160 e277ae100c8eccae32980b606401b04bfe65b0b1 \
</span> livecheck.type regex
livecheck.regex apl-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 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 --with-pcre=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-postgresql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't find gtk3. This project's gtk3-using code is not macOS-compatible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
file rename ${destroot}${prefix}/bin/apl ${destroot}${prefix}/bin/gnu-apl
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gnu-apl/files/dynamic_lookup-11.patch b/lang/gnu-apl/files/dynamic_lookup-11.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..acd8fcd9ee2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gnu-apl/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</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-12 17:17:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-01-12 17:17:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8608,16 +8608,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case $MACOSX_DEPLOYMENT_TARGET,$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012],*|,*powerpc*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</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;'>+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span></pre><pre style='margin:0'>
</pre>