Import of pkgsrc-2016Q3

net/lftp/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2015/09/07 12:02:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.118 2016/09/19 13:04:25 wiz Exp $
 
-DISTNAME=	lftp-4.6.3a
-PKGREVISION=	1
+DISTNAME=	lftp-4.7.2
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://lftp.yar.ru/ftp/ \
 		ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
@@ -22,6 +22,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 +43,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"

net/lftp/distinfo

@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.63 2015/07/25 03:29:57 ryoon 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
-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

net/lftp/patches/patch-ad

@@ -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
- }