Update to version 2.6.4.

Based on patches from Juan RP and Toru TAKAMIZU via PR pkg/19419.

Changes:

Version 2.6.4 - 2002-12-26
==========================
* new settings net:socket-bind-ipv4 and net:socket-bind-ipv6 to bind
  sockets to a specific address (useful to select a specific network
  interface to use).
* now reget does not start transfer if not needed.
* ssl:verify-certificate set to no by default.
* fixed ~ handling in find and mirror.

Version 2.6.3 - 2002-11-04
==========================
* fixed wrong eta calculation.
* fixed cls when redirected output file was not writable.
* fixed uploading of zero sized files over fish protocol.
* fixed timezone manipulation on linux.
* fixed a compilation problem on hp/ux.

Version 2.6.2 - 2002-09-10
==========================
* readline history is now stored in a file.
* handle full-disk condition as fatal if the file is removed.
* recursive deletion (rm -r) fixed. It used DELE instead of RMD.
* fixed a rare core dump, usually happening on completion.
* fixed compilation with modules.

Version 2.6.1 - 2002-08-10
==========================
* fixed core dump when handling Content-Disposition.
* fixed core dump when specifying zero queue position.
* fixed ETA rounding - it was possible to see 1h60m.
* a number of compile problems fixed.

Version 2.6.0 - 2002-08-02
==========================
* separated rate limitations for download and upload (set
  limit-rate 200:100).
* added SSL certificate support and several SSL related settings.
* connection slot support. Now you can switch sessions with
  Meta-[123...] or with command `slot <name>'. You can also use
  slot:<name> as a pseudo-URL.
* per-slot queues. Now you can have several queues for the same
  site using different slots.
* queue can be stopped now. Use `queue' with no args to create
  a stopped queue, `queue start' to run it, `queue stop' to stop
  it. When you exit lftp, the queue will start automatically.
* mirror now appends source base name to target if target ends
  with a slash.
* improved hftp:proxy setting. Now it defaults to http:proxy and
  is not needed if ftp:proxy is set to `http://...'.
* fixed mirror in case of server without MDTM command.
* mirror could start multiple transfers if it could not cd to
  a direcory, even without --parallel.
* fixed fd leak in `(commands)' structure.
* fixed memory leak in '(commands)'.

Version 2.5.4 - 2002-06-05
==========================
* fixed double free problem introduced in version 2.5.3.
* compilation fixes.

Version 2.5.3 - 2002-06-02
==========================
* security fix: long error message from ftp server could cause
  buffer overflow.
* fixed ftp:fix-pasv-address. Now the address should be fixed
  properly.
* handle HTTP `100 Continue' in any open mode.
* status line fixed: don't write a space to last screen column.
* security fix: check that addresses have proper length.
* migrated to gettext-0.11.2 and automake-1.6.1.

4 files changed, 56 insertions, 31 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index a80fe472787..1b1a0857a73 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:52 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/31 17:01:57 salo Exp $
+#
 
-DISTNAME=	lftp-2.5.2
+DISTNAME=	lftp-2.6.4
 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/
@@ -10,23 +11,20 @@ MAINTAINER=	michal@pasternak.w.lub.pl
 HOMEPAGE=	http://lftp.yar.ru/
 COMMENT=	powerful command line ftp client
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ssl=${SSLBASE} \
-			--sysconfdir=${PKG_SYSCONFDIR}
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-# uses GNU readline internal variables (_rl_mark_modified_lines)
-USE_GNU_READLINE=	YES
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
+GNU_CONFIGURE=		YES
 
-PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-modules
 
-EGDIR=		${PREFIX}/share/examples/lftp
-CONF_FILES=	${EGDIR}/lftp.conf ${PKG_SYSCONFDIR}/lftp.conf
-OWN_DIRS=	${PREFIX}/lib/lftp
-OWN_DIRS+=	${PREFIX}/lib/lftp/${PKG_VERSION}
+CONF_FILES=	${PREFIX}/share/examples/lftp/lftp.conf	\
+		${PKG_SYSCONFDIR}/lftp.conf
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lftp
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 0ef903187da..dab22e2db1f 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,23 +1,36 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/31 17:01:57 salo Exp $
 bin/lftp
 bin/lftpget
+lib/lftp/${PKGVERSION}/cmd-mirror.la
+lib/lftp/${PKGVERSION}/cmd-mirror.so
+lib/lftp/${PKGVERSION}/cmd-sleep.la
+lib/lftp/${PKGVERSION}/cmd-sleep.so
+lib/lftp/${PKGVERSION}/libnetwork.la
+lib/lftp/${PKGVERSION}/libnetwork.so
+lib/lftp/${PKGVERSION}/proto-file.la
+lib/lftp/${PKGVERSION}/proto-file.so
+lib/lftp/${PKGVERSION}/proto-fish.la
+lib/lftp/${PKGVERSION}/proto-fish.so
+lib/lftp/${PKGVERSION}/proto-ftp.la
+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/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
-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/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
-@dirrm share/examples/lftp
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/lftp.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/lftp.mo
 @dirrm share/lftp
-@exec ${MKDIR} %D/lib/lftp/${PKGVERSION}
+@dirrm share/examples/lftp
 @dirrm lib/lftp/${PKGVERSION}
 @dirrm lib/lftp
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 916384e0030..acd2a584187 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 21:50:01 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/01/31 17:01:57 salo Exp $
 
-SHA1 (lftp-2.5.2.tar.bz2) = c44ef018edd64ffbb4cf5ff16a2cc091fb2a914b
-Size (lftp-2.5.2.tar.bz2) = 1124212 bytes
+SHA1 (lftp-2.6.4.tar.bz2) = 5237e08132eabd4166f466e7f73db27bbe143716
+Size (lftp-2.6.4.tar.bz2) = 1129181 bytes
 SHA1 (patch-aa) = 727d216e32d66671e2c74e08e32c1f1017acc87e
 SHA1 (patch-ab) = 4312c2878b6e553bdadfab8528906f811cd9d381
+SHA1 (patch-ac) = 6df164610322c4dcfa82b8cb92e6a0845a75aee2
diff --git a/net/lftp/patches/patch-ac b/net/lftp/patches/patch-ac
new file mode 100644
index 00000000000..19d80ac9479
--- /dev/null
+++ b/net/lftp/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/01/31 17:01:58 salo Exp $
+
+--- Makefile.in.orig	Wed Dec 25 15:20:25 2002
++++ Makefile.in	Fri Jan 31 17:17:26 2003
+@@ -431,7 +431,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am:
+