Update to 2.3.4, requested by phone. Changes since 2.2.6:

* new setting ftp:bind-data-socket (bool) to disable binding of local end
  of data connection in passive mode.
* https and ftps protocols support (openssl library is needed for that).
* completion now appends a slash to remote directories (finally!).
* new mirror option --parallel=[N] to download several files in parallel.
* ask for password for ftp:proxy if not supplied.
* now if you set ftp:proxy to http://proxy.host:port, hftp will be used
  automatically instead of ftp, but pwd will still show ftp://.
* large file (>2G) support added.
* full http keep-alive support.
* new settings http:put-method (PUT or POST), http:put-content-type,
  http:post-content-type.
* new setting xfer:max-redirections for http redirections following.
* automatic cookie accepting (off by default). New setting http:set-cookies.
* two http specific quote commands: `quote set-cookie' and `quote post'.
  (e.g. `quote set-cookie var=value' or `quote post /cgi-bin/script.cgi
  var=value > output'.
* send encoded path in http protocol as it was entered by user in URL.
  (e.g. `get http://www.server.net/abc.cgi?arg=cba -o cba')
* new settings http:accept, http:accept-charset, http:accept-language.
* new setting cmd:move-background to disable automatic moving to background;
  `exit bg' forces moving to background.
* `wait all' waits for termination of all jobs.
* show QUIT reply in debug output.
* new setting ftp:use-quit.
* new setting net:persist-retries (ignore this number of hard errors).
* new setting ftp:auto-sync-mode (extended regex) to match first server reply.
* try to connect to original IP when PASV returns address from private
  network and original IP is not in private network.
* add workarounds for hftp over apache proxy.
* use getipnodebyname or getaddrinfo when gethostbyname2 is unavailable.
and a lot of bugfixes.

5 files changed, 42 insertions, 5 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 7e8f14c0241..ebd2b6524ee 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/09/24 14:15:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/11/05 17:18:15 wiz Exp $
 #
 
-DISTNAME=	lftp-2.2.6
+DISTNAME=	lftp-2.3.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/\
 		${MASTER_SITE_SUNSITE:=system/network/file-transfer/}
@@ -10,6 +10,17 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://ftp.yars.free.net/projects/lftp/
 
+DEPENDS+=	readline>=4.1:../../devel/readline
+
 GNU_CONFIGURE=	YES
+USE_SSL=	YES
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+
+USE_LIBINTL=	YES
+CPPFLAGS+=	-I${LOCALBASE}/include			# for libintl.h
+# if we have /usr/lib/libintl.a, we don't really need -L
+INTLLIBS=	-L${LOCALBASE}/lib -lintl
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="${INTLLIBS}"
+CONFIGURE_ARGS+=	--without-included-gettext
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/files/md5 b/net/lftp/files/md5
index faf5a120dee..109cb81bd93 100644
--- a/net/lftp/files/md5
+++ b/net/lftp/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/09/24 14:15:30 hubertf Exp $
+$NetBSD: md5,v 1.4 2000/11/05 17:18:15 wiz Exp $
 
-MD5 (lftp-2.2.6.tar.bz2) = c0c642c00b3939d7b551b4e42b076ee3
+MD5 (lftp-2.3.4.tar.bz2) = b86442b6a61818cf526bb06707aa51e4
diff --git a/net/lftp/files/patch-sum b/net/lftp/files/patch-sum
new file mode 100644
index 00000000000..82962ccc876
--- /dev/null
+++ b/net/lftp/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 2000/11/05 17:18:15 wiz Exp $
+
+MD5 (patch-aa) = 10572bfabafe3b5869df49f2d3044df6
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
new file mode 100644
index 00000000000..74689ec19ff
--- /dev/null
+++ b/net/lftp/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2000/11/05 17:18:16 wiz Exp $
+
+--- configure.orig	Fri Oct 13 17:13:45 2000
++++ configure
+@@ -3031,6 +3031,8 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++  ac_save_LIBS="$LIBS"
++LIBS="-lintl $LIBS"
+ 		cat > conftest.$ac_ext <<EOF
+ #line 3036 "configure"
+ #include "confdefs.h"
+@@ -3059,6 +3061,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
++  LIBS="$ac_save_LIBS"
+ 
+ 
+         if test "$CATOBJEXT" = "NONE"; then
diff --git a/net/lftp/pkg/PLIST b/net/lftp/pkg/PLIST
index 45fa169a1dc..fad7355cb8e 100644
--- a/net/lftp/pkg/PLIST
+++ b/net/lftp/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2000/09/03 14:54:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/11/05 17:18:16 wiz Exp $
 bin/lftp
 bin/lftpget
 etc/lftp.conf
 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/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