Update to 4.7.2

Changelog:
Version 4.7.2 - 2016-05-18

* ftp: fixed loss of 17th file from MLSD listing.
* new setting xfer:timeout.
* ssl: improved ssl performance for small read sizes.
* pget: allocate all needed disk space at once.
* http: new settings http:use-range and hftp:use-range.
* http: fixed setting http:authorization.
* http: resolve redirections when getting files information.
* http: include X-OC-MTime header in PUT requests for OwnCloud.
* mirror: changed --Move option to keep source dir if it ends with a slash.
* mirror: fixed timestamp mirroring when the source site sends redirections.
* mirror: don't report errors when the target does not support chmod.
* torrent: discard cached data after validating.
* torrent: fixed a coredump on a file read error.
* torrent: fixed closing oldest cached FD.
* torrent/DHT: fixed our external IP voting.
* torrent/DHT: black-list nodes which change node_id often.
* torrent/DHT: black-list nodes which report many bad nodes.
* torrent/DHT: ignore nodes with our own ID.
* torrent/DHT: made node search more robust.
* torrent/DHT: mark new nodes as questionable.
* translations updated (zh_TW, ru).

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.

Version 4.6.5 - 2015-12-10

* sftp: fixed handling of out-of-order replies.
* fixed futex_wait issue in SIGCHLD handler.
* ftp: fixed ls freezing with unstable server connection.
* torrent: show more correct ETA on the status line.
* fixed gnutls priority string.
* mirror: fixed excessive stack usage on large directories.
* documented some hard to fix bugs.
* improved man page on open command and cmd:prompt setting.
* translations updated (zh_TW).

Version 4.6.4 - 2015-08-20

* mirror: new option --transfer-all.
* torrent: new setting torrent:timeout to limit time without any progress.
* torrent: fixed handling of udp tracker without explicit port number.
* torrent: improved transfer start time after metadata download.
* improved sftp put -c to use a single FSETSTAT.
* mirror --skip-noaccess now uses user name to check for permissions.
* don't rename temporary file to the target name when transfer fails.
* new cmd:prompt escapes \l and \L for local working directory.
* translations updated (pl, ru, uk).
* new configure option --disable-ipv6.
* fixed compilation with an old gcc.

3 files changed, 15 insertions, 29 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 62eb04b7003..9d0985390db 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2016/03/05 11:29:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2016/05/29 11:25:29 ryoon Exp $
 
-DISTNAME=	lftp-4.6.3a
-PKGREVISION=	2
+DISTNAME=	lftp-4.7.2
 CATEGORIES=	net
 MASTER_SITES=	http://lftp.yar.ru/ftp/ \
 		ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
@@ -22,6 +21,13 @@ USE_TOOLS+=		autoconf bison
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-modules
+CONFIGURE_ENV+=		readline_prefix=${BUILDLINK_DIR}
+
+SUBST_CLASSES+=			readline
+SUBST_STAGE.readline=		pre-configure
+SUBST_MESSAGE.readline=		Detect pkgsrc readline
+SUBST_FILES.readline+=		configure
+SUBST_SED.readline+=		-e 's,/usr/local,${BUILDLINK_DIR},g'
 
 REPLACE_SH=		src/xdg-move
 SHLIBTOOL_OVERRIDE=	# empty
@@ -36,15 +42,12 @@ CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
 INSTALLATION_DIRS=	bin lib/lftp ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/examples/lftp share/lftp
 
-pre-configure:
-	cd ${WRKSRC} && autoconf
-
 post-install: post-install-perl
 	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${DESTDIR}${EGDIR}/lftp.conf.default
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-# uses _rl_mark_modified_lines
+# uses _rl_mark_modified_lines and GNU history(3) functions
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index f21598e2766..d56c18091fd 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.64 2015/11/04 00:35:08 agc Exp $
+$NetBSD: distinfo,v 1.65 2016/05/29 11:25:29 ryoon Exp $
 
-SHA1 (lftp-4.6.3a.tar.xz) = 25c743dc45dd494a2eafa57f2418c0e351973e10
-RMD160 (lftp-4.6.3a.tar.xz) = c6598c914093669c84ddfeeb07341cd0d073102e
-SHA512 (lftp-4.6.3a.tar.xz) = 1ecc1e71f73b9713c14cadf1792d56afa41b59e86219743076cf59310db2063335dbc69f58de00c34a1527c3be595959867f964bc7dba2f4989b3625899eac21
-Size (lftp-4.6.3a.tar.xz) = 1505164 bytes
+SHA1 (lftp-4.7.2.tar.xz) = 7988d45e4ab475aef72fbb0b39bef45c3c5434d3
+RMD160 (lftp-4.7.2.tar.xz) = 4b6e567ebf3cef682ff7c0069dd1f37776345efe
+SHA512 (lftp-4.7.2.tar.xz) = 6cd948835b320c14c58c7fe9b684aa3cd6281437ebebcb39091c96c55615d07ea8a4786fb82cd3818ddcf62b969d1db3f8927c6e43ab8a504991fa845dd57622
+Size (lftp-4.7.2.tar.xz) = 1542780 bytes
 SHA1 (patch-aa) = 988f4f2f5b9469d3c645ffa984d5449a219229bb
 SHA1 (patch-ab) = cbf428fb51c64431eb32d25160303333ce695b5a
 SHA1 (patch-ac) = 8aa2ddc582bbc87cd0a5e8662f328dd2ac8dea90
-SHA1 (patch-ad) = daf9867bf3d42d82c6abe9200f3e8db8f91319e9
 SHA1 (patch-ae) = 4e2506bbadbda97feeabb208cd43c0dff70ed7d3
-SHA1 (patch-configure.ac) = 36bec002fc0f97d0cb2cd2820fdb094c9694ab38
 SHA1 (patch-lib_inttypes.in.h) = 608380392b04f84db756fcd6bf8ef35d72cd35fd
-SHA1 (patch-src_SSH__Access.cc) = 77967fd8e64f6f1a58afef82b04fcf520c95d21f
 SHA1 (patch-src_module.cc) = 236fe2ce4ff215ddfe44fc86ed43ed00849280b8
diff --git a/net/lftp/patches/patch-ad b/net/lftp/patches/patch-ad
deleted file mode 100644
index a3399ece083..00000000000
--- a/net/lftp/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2013/05/18 20:23:03 adam Exp $
-
---- src/lftp_tinfo.cc.orig	2008-11-27 05:56:39.000000000 +0000
-+++ src/lftp_tinfo.cc
-@@ -34,7 +34,8 @@ extern "C" {
- # elif defined(HAVE_TERM_H)
- #  include <term.h>
- # endif
--#elif defined(HAVE_TERMCAP_H)
-+#endif
-+#if defined(HAVE_TERMCAP_H)
- # include <termcap.h>
- #endif
- }