<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0f1fa09c0d09b98cb7c9bb40b94fdc46f4b8cdd0">https://github.com/macports/macports-ports/commit/0f1fa09c0d09b98cb7c9bb40b94fdc46f4b8cdd0</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 0f1fa09c0d0 lftp: patch needtrio.m4 rather than configure
</span>0f1fa09c0d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0f1fa09c0d09b98cb7c9bb40b94fdc46f4b8cdd0
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Aug 20 09:11:30 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> lftp: patch needtrio.m4 rather than configure
</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/61021
</span>---
net/lftp/Portfile | 3 +--
net/lftp/files/patch-configure.diff | 11 -----------
net/lftp/files/patch-m4-needtrio.m4.diff | 10 ++++++++++
3 files changed, 11 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/lftp/Portfile b/net/lftp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9794a52d08b..afd1fb69bd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/lftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/lftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,11 +42,10 @@ depends_lib port:expat \
</span> path:lib/libssl.dylib:openssl \
port:pkgconfig \
port:readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:trio \
</span> port:zlib
# look for ncurses first, fix 4.7.x build issues
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-m4-needtrio.m4.diff \
</span> patch-src.diff
use_autoconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/lftp/files/patch-configure.diff b/net/lftp/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fd7d906ee3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/lftp/files/patch-configure.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.orig 2013-11-11 21:09:02.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-11-13 16:18:19.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47910,7 +47910,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for ac_lib in '' tinfo curses ncurses; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for ac_lib in '' tinfo ncurses curses; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ac_lib"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_res="none required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/lftp/files/patch-m4-needtrio.m4.diff b/net/lftp/files/patch-m4-needtrio.m4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e7dfaee1a09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/lftp/files/patch-m4-needtrio.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/needtrio.m4.orig 2016-02-20 07:57:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/needtrio.m4 2020-08-20 09:03:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long long x=0,x1;
</span></pre><pre style='margin:0'>
</pre>