Update to version 3.5.4

Changes:

Version 3.5.4 - 2006-08-09

    - new setting mirror:include-regex.
    - load ssl keys for protected data connection as well; use new option
    - ftp:ssl-data-use-keys to disable it.
    - fixed human-readable options of du and cls.
    - fixed compilation on certain systems.

Version 3.5.3 - 2006-08-04

    - fixed a core dump in ftps with gnu tls.
    - fixed random queue duplication.
    - fixed compilation with modules and socks.
    - fixed installation with modules.
    - added configure --enable-packager-mode option (Daniel Black).

Version 3.5.2 - 2006-07-28
 Several bugs fixed.

    - strip CRs from ls output, as before.
    - updated help for pget.
    - fixed mirror -c and get -c hang.
    - fixed mirror timestamps for hftp and http.
    - fixed mirror for files starting with a tilde.
    - fixed use of PROPFIND when http:use-propfind is no.
    - fixed directory listing and globbing for ftp over http proxy.
    - updated gnulib sources (Nix).

6 files changed, 43 insertions, 15 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index df6098887da..9d5baaa623c 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2006/07/16 22:25:56 salo Exp $
+# $NetBSD: Makefile,v 1.73 2006/08/11 15:19:35 salo Exp $
 
-DISTNAME=		lftp-3.5.1
+DISTNAME=		lftp-3.5.4
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.yars.free.net/pub/source/lftp/ \
 			ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/ \
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 5dcbbf22f2d..fbe146269ff 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/08/11 15:19:35 salo Exp $
 bin/lftp
 bin/lftpget
 lib/lftp/${PKGVERSION}/cmd-mirror.so
 lib/lftp/${PKGVERSION}/cmd-sleep.so
+lib/lftp/${PKGVERSION}/liblftp-getdate.so
 lib/lftp/${PKGVERSION}/liblftp-network.so
 lib/lftp/${PKGVERSION}/liblftp-pty.so
 lib/lftp/${PKGVERSION}/proto-file.so
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index a21ebc15cde..b022fba6196 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.37 2006/07/16 22:25:56 salo Exp $
+$NetBSD: distinfo,v 1.38 2006/08/11 15:19:35 salo Exp $
 
-SHA1 (lftp-3.5.1.tar.bz2) = e32783edfd2661907ae4c2cb13db61aa5b9c628d
-RMD160 (lftp-3.5.1.tar.bz2) = c31dfab18e233238f8304489155e02e843e737f5
-Size (lftp-3.5.1.tar.bz2) = 1275924 bytes
-SHA1 (patch-aa) = ca8957b1f3535faaaf5780866857a8a853eed115
+SHA1 (lftp-3.5.4.tar.bz2) = 19de42de97c7737cb7a169224b3778601902afc3
+RMD160 (lftp-3.5.4.tar.bz2) = bfa694c29623f4519f1f11b6137cefc703f3f7b4
+Size (lftp-3.5.4.tar.bz2) = 1320471 bytes
+SHA1 (patch-aa) = 6e3e8410994c7de84c5e42ad658cb72dec0f3426
 SHA1 (patch-ab) = d230522c60786a2bcbce346419d8dfce412578d3
 SHA1 (patch-ac) = 8000bf8b44b39b7f87e9d7c89bcb513aa5150753
+SHA1 (patch-ad) = 23f8250be519e7c2721adf27f094282d261061f5
+SHA1 (patch-ae) = 8816a1c9194ed3c3da7572f9b4cf9e685108aaca
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
index 84fd80c1134..98041df310b 100644
--- a/net/lftp/patches/patch-aa
+++ b/net/lftp/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.10 2006/05/01 18:53:31 salo Exp $
+$NetBSD: patch-aa,v 1.11 2006/08/11 15:19:35 salo Exp $
 
---- src/Makefile.in.orig	2006-04-25 08:20:34.000000000 +0200
-+++ src/Makefile.in	2006-05-01 19:52:34.000000000 +0200
-@@ -392,7 +392,7 @@
- localedir = $(datadir)/locale
+--- src/Makefile.in.orig	2006-07-28 16:12:23.000000000 +0200
++++ src/Makefile.in	2006-08-02 23:21:16.000000000 +0200
+@@ -356,7 +356,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  pkgverlibdir = $(pkglibdir)/$(VERSION)
  bin_SCRIPTS = lftpget
 -pkgdata_SCRIPTS = import-ncftp import-netscape verify-file convert-netscape-cookies
@@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.10 2006/05/01 18:53:31 salo Exp $
  noinst_SCRIPTS = ftpget
  EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)
  lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h
-@@ -955,7 +955,7 @@
+@@ -907,7 +907,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
  install-binPROGRAMS: install-libLTLIBRARIES
  
  installdirs:
 -	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgverlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-am
diff --git a/net/lftp/patches/patch-ad b/net/lftp/patches/patch-ad
new file mode 100644
index 00000000000..d81083c6d45
--- /dev/null
+++ b/net/lftp/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2006/08/11 15:19:35 salo Exp $
+
+--- src/ChmodJob.cc.orig	2006-07-24 08:50:18.000000000 +0000
++++ src/ChmodJob.cc	2006-08-11 14:08:34.000000000 +0000
+@@ -22,6 +22,7 @@
+ 
+ #include <config.h>
+ #include <assert.h>
++#include <unistd.h>
+ #include "ChmodJob.h"
+ #include "url.h"
+ 
diff --git a/net/lftp/patches/patch-ae b/net/lftp/patches/patch-ae
new file mode 100644
index 00000000000..4dbf3ee4e54
--- /dev/null
+++ b/net/lftp/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/08/11 15:19:35 salo Exp $
+
+--- po/Makefile.in.in.orig	2006-07-25 12:39:26.000000000 +0000
++++ po/Makefile.in.in	2006-08-11 15:03:12.000000000 +0000
+@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-mkinstalldirs = $(SHELL) @install_sh@ -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ mkdir_p = @mkdir_p@
+ 
+ GMSGFMT_ = @GMSGFMT@