Hi @ports,
here is an update to the last stable lftp version.
lftp changelog:
Version 4.7.1 - 2016-04-04
http: fixed authentication for proxy, transient errors, max-retries=1.
http: fixed put with authentication not to use HEAD request.
translations updated (cs, ru).
Version 4.7.0 - 2016-03-28
ftp: add MODE Z support.
ftp: new settings ftp:use-mode-z, ftp:compressed-re, ftp:mode-z-level.
ftp: add MFF support for chmod.
ftp: prefer EPSV by default.
ftp: prefer CWD-relative paths.
ftp: enable MLSD by default (when supported).
ftp: assume AUTH is supported based on other newer features.
http: add support for digest authentication.
http: fixed webdav directory listing.
http: fixed a coredump when using a proxy for https.
sftp: fixed mirror to sftp with xfer:use-temp-file set.
ssl: optimized ssl for speed and lower syscall count.
ssl: log server's certificate fingerprint.
ssl: allow disabling certificate verification by its fingerprint.
get: rename backup file back if new file cannot be retrieved.
get: new settings xfer:backup-suffix and xfer:keep-backup.
get/put/mget/mput/pget/get1: add -q (quiet) option.
edit: allow creating a new file.
new debug option -T (truncate output file).
new mirror options: --{in,ex}clude-{rx,glob}-from.
new mirror options: --Remove-source-dirs, --Move.
ports changelog:
- remove gettext as MODULE and add as RUN_DEPENDS.
- new patch to pick up correct (e)readline includes.
Tested @amd64. Okay? Comments?
Best regards,
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/lftp/Makefile,v
retrieving revision 1.108
diff -u -p -u -p -r1.108 Makefile
--- Makefile 11 Dec 2015 18:27:18 -0000 1.108
+++ Makefile 10 Apr 2016 10:27:28 -0000
@@ -2,7 +2,7 @@
COMMENT= shell-like command line ftp and sftp client
-DISTNAME= lftp-4.6.5
+DISTNAME= lftp-4.7.1
CATEGORIES= net
HOMEPAGE= http://lftp.yar.ru/
@@ -27,10 +27,11 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-openssl \
--without-gnutls \
--disable-shared
+
+RUN_DEPENDS= devel/gettext
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ereadline
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
-MODULES= devel/gettext
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/lftp/distinfo,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 distinfo
--- distinfo 11 Dec 2015 18:27:18 -0000 1.67
+++ distinfo 10 Apr 2016 10:27:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (lftp-4.6.5.tar.gz) = KdHILWEIA9XAF2V9dmPgX6Ab1Y8OBhgPMG5DDweBYpk=
-SIZE (lftp-4.6.5.tar.gz) = 2666338
+SHA256 (lftp-4.7.1.tar.gz) = mDNdbwBihrOQDKzyFfY0F3f5IbotQS+oixZyeVTa7lg=
+SIZE (lftp-4.7.1.tar.gz) = 2692192
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/lftp/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-configure
--- patches/patch-configure 11 Dec 2015 18:27:18 -0000 1.12
+++ patches/patch-configure 10 Apr 2016 10:27:28 -0000
@@ -2,23 +2,14 @@ $OpenBSD: patch-configure,v 1.12 2015/12
Use GNU readline as our base readline lacks add_history_time().
---- configure.orig Thu Dec 10 14:20:13 2015
-+++ configure Fri Dec 11 00:08:40 2015
-@@ -48137,7 +48137,7 @@ if ${lftp_cv_precompiled_readline+:} false; then :
- else
-
- old_LIBS="$LIBS"
-- LIBS="-lreadline $READLINE_SUPPLIB $LIBS"
-+ LIBS="-lereadline $READLINE_SUPPLIB $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- extern int (*rl_getc_function)();
-@@ -48177,7 +48177,7 @@ if test $lftp_cv_precompiled_readline = yes; then
- READLINE_DIR=''
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- READLINE='-lreadline'
-+ READLINE='-lereadline'
- READLINE_DEPEND=''
- COMPILE_READLINE=no
- else
+--- configure.orig Mon Apr 4 10:46:29 2016
++++ configure Sun Apr 10 12:23:56 2016
+@@ -48313,7 +48313,7 @@ fi
+ readline_include_dir="$readline_include_dir/readline"
+ fi
+ readline_ld_flags="-L$readline_prefix/lib"
+- readline_lib_flags="-lreadline"
++ readline_lib_flags="-lereadline"
+ run_readline_test="yes"
+ elif test "$readline_requested" = "yes"; then
+ if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/net/lftp/patches/patch-src_Makefile_in,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Dec 2015 18:27:18 -0000 1.11
+++ patches/patch-src_Makefile_in 10 Apr 2016 10:27:28 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.11 2015/12/11 18:27:18 sthen Exp $
---- src/Makefile.in.orig Thu Dec 10 14:20:12 2015
-+++ src/Makefile.in Fri Dec 11 00:08:40 2015
-@@ -236,7 +236,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
+--- src/Makefile.in.orig Fri Mar 25 13:52:32 2016
++++ src/Makefile.in Mon Mar 28 20:40:32 2016
+@@ -237,7 +237,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(p
"$(DESTDIR)$(pkgdatadir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
$(pkgverlib_LTLIBRARIES)
Index: patches/patch-src_lftp_rl_c
===================================================================
RCS file: patches/patch-src_lftp_rl_c
diff -N patches/patch-src_lftp_rl_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lftp_rl_c 10 Apr 2016 10:27:28 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/lftp_rl.c.orig Sat Apr 2 23:35:10 2016
++++ src/lftp_rl.c Sat Apr 2 23:35:33 2016
+@@ -19,8 +19,8 @@
+
+ #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"
