Update to version 3.3.5

Changes:
- prefer ssl over gnutls by default, by popular demand
- refresh MASTER_SITES list
- add perl option, installs optional additional perl scripts

3.3.5:
======
- added mirror --older-than, --size-range and --max-errors options.
- improved CCC support - allowed protected transfers after CCC.
- added support for sftp v5 and v6 (experimental).
- added configure option --with-pager.
- fixed file uploading via protected ftp with openssl.
- fixed compilation on cygwin.
- fixed compilation with sun c++.

3.3.4:
======
- added support for CCC command and ftp:ssl-use-ccc setting.
- remove password from URLs when showing them on status line.
- fixed `open -u' with an URL.
- fixed a rare spinning.
- fixed compilation on HP-UX.
- fixed handling of 334 reply to AUTH command.

3.3.3:
======
- added support for LFTP_HOME environment variable.
- added workaround for proftpd's empty directories.
- fixed `open file:/path'.
- fixed some bugs introduced in 3.3.2.

3.3.2:
======
- fixed a coredump caused by double-free.

3.3.1:
======
- new setting xfer:destination-directory (default for -O option of get, mget).
- fixed path+file combination in http - avoid double slash.
- fixed url composition in hftp, a slash was missed.
- fixed `open ftp.example.com/path'.
- fixed a coredump when a bookmark contained lots of quotable characters.
- fixed a coredump when an error happened while loading CA or CRL
  certificates.
- fixed uploading of empty files via ftp with ftp:ssl-protect-data on.
- fixed exit code of slot command.
- fixed a coredump with `kill all'.
- fixed path extraction from html files (broken in 3.3.0).

3.3.0:
======
- now plain files can be current location in http protocol.
- report total bytes transferred and transfer rate in mirror.
- included a script for file verification (verify-file). It can check crc32,
  md5sum, gzip, bzip2, rpm, unzip and other things.
- new settings xfer:verify, xfer:verify-command. When xfer:verify is on,
  verify-command is launched after successful file transfer (to local disk)
  to check the file consistency.
- fixed `source -e' to allow subprocess reading from the terminal.
- fixed `source' to return error exit code if the file is unreadable.
- fixed `source' on large command files - some commands were truncated.

6 files changed, 47 insertions, 22 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index a36ce55abe5..bf4c99d38a1 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2005/09/06 15:28:09 adam Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/04 22:12:07 salo Exp $
 
-DISTNAME=		lftp-3.2.1
-PKGREVISION=		1
+DISTNAME=		lftp-3.3.5
 CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
-			ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/ \
-			http://tactical.wiretapped.net/mirrors/lftp/ \
-			ftp://ftp.130th.net/pub/mirror/lftp/ \
-			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/
+MASTER_SITES=		http://ftp.yars.free.net/pub/source/lftp/ \
+			ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/ \
+			http://ftp.yars.free.net/pub/source/lftp/old/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		salo@NetBSD.org
@@ -28,6 +24,8 @@ SHLIBTOOL_OVERRIDE=	libtool
 
 .include "options.mk"
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-modules
 
@@ -38,7 +36,7 @@ CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
 
 INSTALLATION_DIRS=	bin lib/lftp man/man1 share/examples/lftp share/lftp
 
-post-install:
+post-install: post-install-perl
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${EGDIR}/lftp.conf.default
 
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index c8919f7057b..3ca202d5cd9 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/16 02:57:48 salo Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/12/04 22:12:07 salo Exp $
 bin/lftp
 bin/lftpget
 lib/lftp/${PKGVERSION}/cmd-mirror.so
diff --git a/net/lftp/PLIST.perl b/net/lftp/PLIST.perl
new file mode 100644
index 00000000000..333fd5fe7cc
--- /dev/null
+++ b/net/lftp/PLIST.perl
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.perl,v 1.1 2005/12/04 22:12:07 salo Exp $
+share/lftp/convert-netscape-cookies
+share/lftp/verify-file
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 138e42dae45..351ca2f189e 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2005/05/30 16:01:40 salo Exp $
+$NetBSD: distinfo,v 1.33 2005/12/04 22:12:07 salo Exp $
 
-SHA1 (lftp-3.2.1.tar.bz2) = 7bd0ecca43e97887d9b0cd80c269ecd313f5e3f0
-RMD160 (lftp-3.2.1.tar.bz2) = cfad943ff48a718a9bb759590157ea0d3faf6ffc
-Size (lftp-3.2.1.tar.bz2) = 1238136 bytes
-SHA1 (patch-aa) = 07b287f211e1fa87ce319ccc5f9746ebc07da632
+SHA1 (lftp-3.3.5.tar.bz2) = 02fbcdebcc2fccf7a4c57d9f00b356fd30d3c402
+RMD160 (lftp-3.3.5.tar.bz2) = 779306413c2c40bd2a1ffdec5b4254cbb1c16a98
+Size (lftp-3.3.5.tar.bz2) = 1271946 bytes
+SHA1 (patch-aa) = f9582bab773be9e6156f5506434a3f0614f36f83
 SHA1 (patch-ab) = d230522c60786a2bcbce346419d8dfce412578d3
 SHA1 (patch-ac) = 8000bf8b44b39b7f87e9d7c89bcb513aa5150753
diff --git a/net/lftp/options.mk b/net/lftp/options.mk
index b8e668b444c..1dfb270806f 100644
--- a/net/lftp/options.mk
+++ b/net/lftp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/08/31 18:36:19 tv Exp $
+# $NetBSD: options.mk,v 1.6 2005/12/04 22:12:07 salo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lftp
@@ -6,7 +6,8 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.lftp
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 
-PKG_SUGGESTED_OPTIONS=	gnutls
+PKG_SUPPORTED_OPTIONS=	perl
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,3 +25,17 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--without-gnutls
 CONFIGURE_ARGS+=	--without-openssl
 .endif
+
+.if !empty(PKG_OPTIONS:Mperl)
+USE_TOOLS+=		perl:run
+DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+=		p5-String-CRC32-[0-9]*:../../textproc/p5-String-CRC32
+REPLACE_PERL=		src/convert-netscape-cookies src/verify-file
+PLIST_SRC+=		${PKGDIR}/PLIST.perl
+
+post-install-perl:
+	${INSTALL_SCRIPT} ${WRKSRC}/src/convert-netscape-cookies \
+		${WRKSRC}/src/verify-file ${PREFIX}/share/lftp
+.else
+post-install-perl:
+.endif
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
index b4ac2f5701a..677947704b7 100644
--- a/net/lftp/patches/patch-aa
+++ b/net/lftp/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2004/05/27 14:37:16 salo Exp $
+$NetBSD: patch-aa,v 1.8 2005/12/04 22:12:07 salo Exp $
 
---- src/Makefile.in.orig	2004-05-21 14:32:31.000000000 +0200
-+++ src/Makefile.in	2004-05-27 15:08:32.000000000 +0200
-@@ -833,7 +833,7 @@
+--- src/Makefile.in.orig	2005-12-01 12:45:18.000000000 +0100
++++ src/Makefile.in	2005-12-04 22:12:02.000000000 +0100
+@@ -304,7 +304,7 @@
+ localedir = $(datadir)/locale
+ pkgverlibdir = $(pkglibdir)/$(VERSION)
+ bin_SCRIPTS = lftpget
+-pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-netscape-cookies
++pkgdata_SCRIPTS = import-ncftp import-netscape
+ noinst_SCRIPTS = ftpget
+ EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS) \
+ 	example1.cc example2.cc
+@@ -793,7 +793,7 @@
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
  installdirs: