Update to 2.4.4, as provided in pkg/14062 by Hiramatsu Yoshifumi, with

some changes by me (strongly buildlinked now).

ATTENTION: If package compilation is failing for you on -current in the
linking step, make sure you have /usr/include/libintl.h v1.2 (2001/08/13)!
[Thanks for the tip, Johnny!]

Some of the changes since 2.3.9 (for a complete log see ${WRKSRC}/NEWS):
* sometimes lftp did not expand tilde in remote path - fixed.
* new setting ftp:home to specify starting directory explicitly. Set it
  to `/' to override RFC1738 ftp url semantics if you don't like the
  look of `ftp://host/%2Fpath'.
* improved abort sequence for passive mode, now wu-ftpd does not hang.
* fish protocol support (over plain ssh connection).
* use CONNECT method for https over http proxy.
* support for variable name completion (Nicolas Noble).
* queue editing support (Glenn F. Maynard).
* support http keep-alive in case of chunked transfer encoding.
* terminate some never-ending jobs before moving to background.
* support for HTTP/1.1 416 reply code.
* support for ftp ACCT command (ftp:acct variable) and for SITE GROUP command
  (ftp:site-group variable). E.g. `set ftp:acct/user@host account/password'.
* new setting ftp:port-ipv4 to specify explicitly IP address sent with PORT
  command (suggested by Julien Oster and Jonas Jensen with patches).
* new setting ftp:ssl-auth to specify AUTH argument to use (SSL, TLS, TLS-C
  or TLS-P).
* roxen directory listing support.
* new settings ftp:retry-530 and ftp:retry-530-anonymous. Retry on server
  reply 530 for PASS command if text matches these regular expressions.
  These settings should be useful to distinguish between overloaded server
  (temporary condition) and incorrect password (permanent condition).
* retry ftp login quickly on next address if the server has many (works
  well on ftp.redhat.com, for example).
* improved fuzzy variable name matching. Exact prefix and exact name after
  prefix are taken into account separately. E.g. http:pro is not ambigous
  now between http:proxy and https:proxy.
* implemented -c option for reverse mirror (mirror -R -c).
* allow open "" to switch to disconnected dummy session.
* allow adding bookmark for disconnected dummy session.
* new translation zh_TW (by R.I.P. Deaddog <maddog@linuxhall.org>).
* made `lftp@' the default ftp password.

As well as many bug fixes and translation updates.

4 files changed, 30 insertions, 9 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 0ebdd33df9e..33a7fe63f08 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/06/28 18:22:38 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/03 14:37:13 wiz Exp $
 #
 
-DISTNAME=	lftp-2.3.9
+DISTNAME=	lftp-2.4.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/\
 		${MASTER_SITE_SUNSITE:=system/network/file-transfer/}
@@ -12,12 +12,18 @@ HOMEPAGE=	http://lftp.yar.ru/
 COMMENT=	powerful command line ftp client
 
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+USE_BUILDLINK_ONLY=	YES
 # uses GNU readline internal variables (_rl_mark_modified_lines)
 USE_GNU_READLINE=	YES
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-USE_LIBINTL=		YES
+# package seems to create some unneeded empty directories
+post-install:
+	${RMDIR} ${PREFIX}/lib/lftp/2.4.4 ${PREFIX}/lib/lftp
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index f0e3e0937e0..f34d6772540 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/10/03 14:37:13 wiz Exp $
 
-SHA1 (lftp-2.3.9.tar.bz2) = 5bf4c7ed4ae59b735ff446b2dce792f331f9cf4c
-Size (lftp-2.3.9.tar.bz2) = 838319 bytes
+SHA1 (lftp-2.4.4.tar.bz2) = a874382efa86afa6ecde3de5ed69639815de1d1b
+Size (lftp-2.4.4.tar.bz2) = 1045884 bytes
+SHA1 (patch-aa) = 727d216e32d66671e2c74e08e32c1f1017acc87e
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
new file mode 100644
index 00000000000..c0ced02e0ce
--- /dev/null
+++ b/net/lftp/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2001/10/03 14:37:13 wiz Exp $
+
+--- src/Makefile.in.orig	Thu Sep 13 17:35:18 2001
++++ src/Makefile.in
+@@ -691,7 +691,7 @@
+ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
+ 
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(pkgverlibdir) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
+ 
+ install: install-am
+ install-exec: install-exec-am
diff --git a/net/lftp/pkg/PLIST b/net/lftp/pkg/PLIST
index fad7355cb8e..a851c529088 100644
--- a/net/lftp/pkg/PLIST
+++ b/net/lftp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/05 17:18:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/10/03 14:37:14 wiz Exp $
 bin/lftp
 bin/lftpget
 etc/lftp.conf
@@ -6,13 +6,14 @@ man/man1/lftp.1
 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/ru/LC_MESSAGES/lftp.mo
-share/locale/it/LC_MESSAGES/lftp.mo
 share/locale/pt_BR/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
 @dirrm share/lftp