[149342] trunk/dports/net/lftp

[mps at macports.org]

Revision: 149342
          https://trac.macports.org/changeset/149342
Author:   mps at macports.org
Date:     2016-06-13 16:58:37 -0700 (Mon, 13 Jun 2016)
Log Message:
-----------
lftp: version 4.7.2.

Modified Paths:
--------------
    trunk/dports/net/lftp/Portfile

Added Paths:
-----------
    trunk/dports/net/lftp/files/patch-src.diff

Modified: trunk/dports/net/lftp/Portfile
===================================================================
--- trunk/dports/net/lftp/Portfile	2016-06-13 21:14:03 UTC (rev 149341)
+++ trunk/dports/net/lftp/Portfile	2016-06-13 23:58:37 UTC (rev 149342)
@@ -5,11 +5,10 @@
 PortGroup           muniversal 1.0
 
 name                lftp
-version             4.6.5
-revision            1
+version             4.7.2
 categories          net
 platforms           darwin
-maintainers         gmail.com:mschamschula openmaintainer
+maintainers         mps openmaintainer
 license             GPL-3+
 
 description         Sophisticated file transfer program
@@ -27,9 +26,12 @@
 master_sites        ${homepage}ftp/
 use_xz              yes
 
-checksums           rmd160  8e6038beb4a87996eafa8e77996eabcd48e065c7 \
-                    sha256  1fd0920a1791ce0e9e39ffce77ae6619e5dc665f16e9380bafbfc69411eeb71e
+checksums           rmd160  4b6e567ebf3cef682ff7c0069dd1f37776345efe \
+                    sha256  475d7699b1390f951efee867ba1ad600f78329e13fd2a04d92f82bfffb70d872
 
+depends_build       port:autoconf \
+                    port:automake
+
 depends_lib         port:expat \
                     port:gettext \
                     port:libiconv \
@@ -38,13 +40,20 @@
                     port:readline \
                     port:zlib
 
-# look for ncurses first
-patchfiles          patch-configure.diff
+# look for ncurses first, fix 4.7.x build issues
+patchfiles          patch-configure.diff \
+                    patch-src.diff
 
 configure.args      --with-openssl \
                     --without-gnutls \
+                    --with-readline=${prefix} \
                     --enable-nls
 
+pre-patch {
+	# needed for 4.7.x build issues
+	move ${worksrcpath}/src/lftp_rl.c ${worksrcpath}/src/lftp_rl.cc
+}
+
 post-destroot {
     set docdir ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdir}

Added: trunk/dports/net/lftp/files/patch-src.diff
===================================================================
--- trunk/dports/net/lftp/files/patch-src.diff	                        (rev 0)
+++ trunk/dports/net/lftp/files/patch-src.diff	2016-06-13 23:58:37 UTC (rev 149342)
@@ -0,0 +1,94 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c562abd..e691023 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -7,7 +7,7 @@ noinst_SCRIPTS = ftpget
+
+ EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)
+
+-lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h attach.cc attach.h
++lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.cc lftp_rl.h attach.cc attach.h
+
+ TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la
+ JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la
+diff --git a/src/complete.cc b/src/complete.cc
+index bbfbfe9..1422e1c 100644
+--- src/complete.cc
++++ src/complete.cc
+@@ -857,7 +857,7 @@ static char **lftp_completion (const char *text,int start,int end)
+    return matches;
+ }
+
+-extern "C" void lftp_line_complete()
++void lftp_line_complete()
+ {
+    delete glob_res;
+    glob_res=0;
+@@ -1286,7 +1286,7 @@ void lftp_readline_init ()
+    }
+ }
+
+-extern "C" void completion_display_list (char **matches, int len)
++void completion_display_list (char **matches, int len)
+ {
+    JobRef<OutputJob> b(new OutputJob((FDStream *) NULL, "completion"));
+
+--- src/complete.h.orig	2013-03-19 07:48:47.000000000 -0500
++++ src/complete.h	2016-06-13 17:23:19.000000000 -0500
+@@ -26,6 +26,7 @@
+ extern CmdExec *completion_shell;
+ extern int remote_completion;
+ int   lftp_rl_getc(FILE *);
+-extern "C" void lftp_line_complete();
++void lftp_line_complete();
++void completion_display_list (char **matches, int len);
+ 	
+ #endif //COMPLETE_H
+--- src/lftp_rl.cc.orig	2016-02-20 07:57:53.000000000 -0600
++++ src/lftp_rl.cc	2016-06-13 17:29:08.000000000 -0500
+@@ -19,14 +19,13 @@
+ 
+ #include <config.h>
+ #include <stdio.h>
+-#include <readline.h>
+-#include <history.h>
++#include <readline/readline.h>
++#include <readline/history.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "lftp_rl.h"
+-
+-/* complete.cc */
+-void lftp_line_complete();
++#include "misc.h"
++#include "complete.h"
+ 
+ void lftp_add_history_nodups(const char *cmd_buf)
+ {
+@@ -142,8 +141,6 @@
+    return rl_completion_matches(text,compentry);
+ }
+ 
+-void completion_display_list (char **matches, int len);
+-
+ void lftp_rl_display_match_list (char **matches, int len, int max)
+ {
+    printf("\n"); /* get off the input line */
+@@ -184,7 +181,7 @@
+ }
+ void lftp_rl_bind(const char *key,const char *func)
+ {
+-   char *line=alloca(strlen(key)+2+strlen(func)+1);
++   char *line=(char*)alloca(strlen(key)+2+strlen(func)+1);
+    sprintf(line,"%s: %s",key,func);
+    rl_parse_and_bind(line);
+ }
+@@ -194,8 +191,6 @@
+    rl_set_prompt(p);
+ }
+ 
+-extern char *get_lftp_data_dir();
+-
+ static char *lftp_history_file;
+ void lftp_rl_read_history()
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160613/66a99326/attachment.html>