Update "lftp" package to version 2.5.1. This version includes numerous

enhancement and bug fixes made since the 2.4.4 release. A complete
list of change can be found here: http://lftp.yar.ru/news.html

The update is based on fixes provided by Michal Pasternak in PR pkg/16125.

4 files changed, 35 insertions, 15 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 33a7fe63f08..e63de1a67f3 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,27 +1,29 @@
-# $NetBSD: Makefile,v 1.13 2001/10/03 14:37:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2002/04/22 15:22:23 tron Exp $
 
-DISTNAME=	lftp-2.4.4
+DISTNAME=	lftp-2.5.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/\
 		${MASTER_SITE_SUNSITE:=system/network/file-transfer/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	michal@pasternak.w.lub.pl
 HOMEPAGE=	http://lftp.yar.ru/
 COMMENT=	powerful command line ftp client
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR} \
+			--sysconfdir=${PKG_SYSCONFDIR}
 USE_BUILDLINK_ONLY=	YES
 # uses GNU readline internal variables (_rl_mark_modified_lines)
 USE_GNU_READLINE=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-# package seems to create some unneeded empty directories
+PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
 post-install:
-	${RMDIR} ${PREFIX}/lib/lftp/2.4.4 ${PREFIX}/lib/lftp
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lftp
+	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/share/examples/lftp
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 5d954351ace..9e107939382 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/04/22 15:22:23 tron Exp $
 bin/lftp
 bin/lftpget
-etc/lftp.conf
 man/man1/lftp.1
+share/examples/lftp/lftp.conf
+@exec test -f ${PKG_SYSCONFDIR}/lftp.conf || cp -p %D/%F ${PKG_SYSCONFDIR}
+share/lftp/import-ncftp
+share/lftp/import-netscape
 share/locale/de/LC_MESSAGES/lftp.mo
 share/locale/es/LC_MESSAGES/lftp.mo
 share/locale/fr/LC_MESSAGES/lftp.mo
@@ -10,10 +13,12 @@ share/locale/it/LC_MESSAGES/lftp.mo
 share/locale/ja/LC_MESSAGES/lftp.mo
 share/locale/ko/LC_MESSAGES/lftp.mo
 share/locale/pl/LC_MESSAGES/lftp.mo
-share/locale/ru/LC_MESSAGES/lftp.mo
 share/locale/pt_BR/LC_MESSAGES/lftp.mo
+share/locale/ru/LC_MESSAGES/lftp.mo
 share/locale/zh_CN/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
-share/lftp/import-ncftp
-share/lftp/import-netscape
+@exec mkdir -p %D/lib/lftp/${PKGVERSION}
+@dirrm lib/lftp/${PKGVERSION}
+@dirrm lib/lftp
 @dirrm share/lftp
+@dirrm share/examples/lftp
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index f34d6772540..538d1db5d44 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/10/03 14:37:13 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/04/22 15:22:23 tron Exp $
 
-SHA1 (lftp-2.4.4.tar.bz2) = a874382efa86afa6ecde3de5ed69639815de1d1b
-Size (lftp-2.4.4.tar.bz2) = 1045884 bytes
+SHA1 (lftp-2.5.1.tar.bz2) = 9bb3f54c3b48d9eb5107a40d9dd034aaac42bbb9
+Size (lftp-2.5.1.tar.bz2) = 1124183 bytes
 SHA1 (patch-aa) = 727d216e32d66671e2c74e08e32c1f1017acc87e
+SHA1 (patch-ab) = 4312c2878b6e553bdadfab8528906f811cd9d381
diff --git a/net/lftp/patches/patch-ab b/net/lftp/patches/patch-ab
new file mode 100644
index 00000000000..b6c4047679b
--- /dev/null
+++ b/net/lftp/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2002/04/22 15:23:15 tron Exp $
+
+--- lib/fnmatch_loop.c.orig	Fri Oct 19 17:44:47 2001
++++ lib/fnmatch_loop.c	Sat Mar 30 08:45:33 2002
+@@ -250,7 +250,7 @@
+ 		    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
+ 		    size_t c1 = 0;
+ #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
+-		    wctype_t wt;
++		    wint_t wt;
+ #endif
+ 		    const CHAR *startp = p;