Update to version 2.6.9.

Addresses PR pkg/23633 by Soren Jacobsen.

Changes:
- shorten DESCR
- style nits

2.6.9:
======
- New setting ftp:ssl-protect-list for encrypting file listings selectively.
- Don't use PRET again if it is not supported.
- Added cls --sort=time option (alias for sort=date).
- Don't set file modification time if it grew while downloading.
- New setting cmd:verify-path-cached.
- Added long options for `open' command.

4 files changed, 25 insertions, 44 deletions

diff --git a/net/lftp/DESCR b/net/lftp/DESCR
index 5b01d0395d5..dfc3db3374f 100644
--- a/net/lftp/DESCR
+++ b/net/lftp/DESCR
@@ -1,24 +1,4 @@
-lftp is quite a powerful ftp client. It uses GNU readline to read
-commands. It uses shell-like command syntax allowing you to launch
-several commands in parallel in background (&).
-
-Some commands allow redirecting its output (cat, ls) to file or via
-pipe to external command. Commands can be started conditionally based
-on termination status of previous command (&&, ||). Also, it is
-possible to group commands within () and execute them in background.
-All background jobs are executed in the same single process. You can
-bring a foreground job to background with ^Z and back with command
-`wait' (or `fg' which is alias to `wait').
-
-When you think you are done but some jobs are not yet finished, you
-can just exit and lftp will move itself to nohup mode in background.
-The same happens when you have a real hangup.
-
-lftp has reliable put, reput, mirror, and many other commands. Use
-command `help' or read documentation to learn more.
-
-Every operation in lftp is reliable, that is any not fatal error is
-ignored and the operation is repeated. So if downloading breaks, it
-will be restarted from the point automatically. Even if ftp server
-does not support REST command, lftp will try to retrieve the file from
-the very beginning until the file is transferred completely.
+lftp is quite a powerful ftp client. It uses GNU readline to read commands.
+It uses shell-like command syntax allowing you to launch several commands in
+parallel in background (&).  lftp has reliable put, reput, mirror, and many
+other commands.
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index ccb040427ee..f2e8a920137 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.28 2003/11/08 06:31:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2003/12/03 09:06:56 salo Exp $
 #
 
-DISTNAME=	lftp-2.6.8
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
-		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		lftp-2.6.9
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
+			ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	michal@pasternak.w.lub.pl
-HOMEPAGE=	http://lftp.yar.ru/
-COMMENT=	Powerful command line ftp client
+MAINTAINER=		michal@pasternak.w.lub.pl
+HOMEPAGE=		http://lftp.yar.ru/
+COMMENT=		Powerful command line ftp client
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
 GNU_CONFIGURE=		YES
+USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
+
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -25,12 +26,12 @@ CONFIGURE_ARGS+=	--with-modules
 
 CONFIGURE_ENV+=		F77=${FALSE}
 
-CONF_FILES=	${PREFIX}/share/examples/lftp/lftp.conf	\
-		${PKG_SYSCONFDIR}/lftp.conf
+EGDIR=			${PREFIX}/share/examples/lftp
+CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lftp
-	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/share/examples/lftp
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${EGDIR}/lftp.conf.default
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index dab22e2db1f..d8bd8a8f554 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/31 17:01:57 salo Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/03 09:06:56 salo Exp $
 bin/lftp
 bin/lftpget
 lib/lftp/${PKGVERSION}/cmd-mirror.la
@@ -16,7 +16,7 @@ lib/lftp/${PKGVERSION}/proto-ftp.so
 lib/lftp/${PKGVERSION}/proto-http.la
 lib/lftp/${PKGVERSION}/proto-http.so
 man/man1/lftp.1
-share/examples/lftp/lftp.conf
+share/examples/lftp/lftp.conf.default
 share/lftp/import-ncftp
 share/lftp/import-netscape
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lftp.mo
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 7020b43e382..c36c0fcb631 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2003/11/08 06:31:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2003/12/03 09:06:56 salo Exp $
 
-SHA1 (lftp-2.6.8.tar.bz2) = c9ce743b067c72ec539daca0c9c8125811502ef8
-Size (lftp-2.6.8.tar.bz2) = 1196767 bytes
+SHA1 (lftp-2.6.9.tar.bz2) = b271992454a57836134a5b3b36562769d918d256
+Size (lftp-2.6.9.tar.bz2) = 1197695 bytes
 SHA1 (patch-aa) = 007249b3b1235cc8b163f95324ad94ac75284915
 SHA1 (patch-ab) = 4312c2878b6e553bdadfab8528906f811cd9d381
 SHA1 (patch-ac) = 6df164610322c4dcfa82b8cb92e6a0845a75aee2