Update to 3.7.14. Upstream changes:

Version 3.7.14 - 2009-05-15
 use line buffering for mirror log file.
 fixed `chmod' command mode calculation.
 fixed status line of `repeat' command.
 fixed sftp charset translation in file listings.
 fixed output ordering by flushing stdout before calling external programs.
 fixed coredump in sftp when ssh process gets killed.

Version 3.7.13 - 2009-04-30
 fixed a coredump in some commands printing to screen.

Version 3.7.12 - 2009-04-28
 fixed core dump on `mput -d' command.
 fixed a core dump on `kill' command.
 fixed mkdir -p for sftp protocol.
 fixed some signed/unsigned conversion bugs.

Version 3.7.11 - 2009-03-20
 add dynamic commands in abc order (as output by help).
 fixed eta display (broken in 3.7.10).

Version 3.7.10 - 2009-03-18
 fixed pget -c.
 fixed `exit kill' command.
 show sleep time left in status.
 make ftp:prefer-epsv off by default.
 recognize a specific error message and turn off REST command.

Version 3.7.9 - 2009-03-03
 new setting ftp:prefer-epsv.
 add support for IPv6 scope for link-local addresses (Arkadiusz Miskiewicz).
 fixed compilation on OpenBSD (Kevin Lo).
 fixed parsing of NT unix-like listings where hour is one digit.
 gnulib sources updated, vsnprintf-posix module imported.

Version 3.7.8 - 2009-01-23
 fixed upload via ftps in encrypted mode.
 gnulib sources updated.

Version 3.7.7 - 2008-12-12
 new ftp proxy auth type: proxy-user@host.
 new setting ftp:trust-feat (default no).
 changed GPL version to 3 (as gnulib modules require it).

Version 3.7.6 - 2008-11-17
 fixed memory corruption in zmore.
 fixed compilation on some systems.

Version 3.7.5 - 2008-11-07
 new setting cmd:move-background-detach.
 added support for number suffixes in settings (k - kibi, m - mebi, etc).
 shutdown SSL connection before closing the socket on upload.
 fixed mirror -RP.
 fixed another problem with `kill all'.
 updated gnulib.

Version 3.7.4 - 2008-08-06
 fixed a coredump in `kill all'.
 fixed compilation problems on some systems.
 used getdate from gnulib.

Version 3.7.3 - 2008-05-23
 added support for 2-argument SITE UTIME and MFMT commands.
 added a workaround for paramiko sftp server.
 included newer gnulib sources using gnulib-tool.
 Polish translation updated (Jakub Bogusz).
 fixed German translation encoding.

Version 3.7.2 - 2008-05-07
 fixed core dump when sending http cookies.
 fixed assertion failure for ftp over http proxy (CONNECT mode).
 fixed cwd tracking for ftps.

Version 3.7.1 - 2008-04-18
 use time 12:00:00 instead of 12:00:30 when the time is unknown.
 make sftp:use-full-path on by default.
 fixed sftp du on non-existent files.
 GNU Lib sources updated (Nix).
 fixed compilation on cygwin (Arkady Sherman).
 French translation updated (Alain PORTAL).
 German translation updated (Moritz Moeller-Herrmann).

Version 3.7.0 - 2008-03-07
 new setting ftp:proxy-auth-type and two new ftp proxy modes (joined-acct,
 open) (partly based on patch from David Wolfe).
 don't add the same network address multiple times; report resolved addresses.
 added new open -s option; help for "slot" command (Laurent MONIN).
 added a workaround for proftpd NLST bug.
 added a workaround for servers sending single NL.
 handle host key verification error in fish and sftp.
 handle http codes 307 and 303.
 fixed a core dump when doing "open host>file".
 fixed CCC handling in secure ftp.
 fixed spinning when cmd:fail-exit is true in a script.
 included zh_HK translation (Abel Cheung).

Version 3.6.3 - 2008-01-28
 new setting sftp:use-full-path to send full path instead of home-relative.
 don't use sftp FSETSTAT when not needed.
 fixed core dump on kill all with mirror.
 fixed sftp:charset setting.
 fixed debug printing of sftp file handle.
 fixed unsetting of fish:charset setting.
 fixed compilation on systems lacking wcwidth.

Version 3.6.2 - 2008-01-03
 added a workaround for ftp servers which don't open data connection in certain
 conditions.
 don't decode URL escapes in get/put when no URL schema used.
 fixed counting of file removal errors in mirror.
 fixed a 2-byte buffer overflow when showing transfer percents.
 fixed a problem with incorrect port/host name in http requests.
 fixed coredump in du command with long paths on some systems.
 fixed coredump in html parser on empty links.
 fixed compilation on some systems.

Version 3.6.1 - 2007-11-09
 repeat --weak option to terminate the loop automatically when exiting lftp.
 ftp:use-stat-for-list is off by default.
 slot command fixed.
 fixed timeout handling in ftp.
 french and polish translations updated.

Version 3.6.0 - 2007-10-19
 major code cleanup.
 new setting ftp:use-stat-for-list allows faster directory listing.
 new command `eval' with -f option allows complex aliases.
 send encoded parts of ftp URLs untranslated to ftp server.
 new mirror options --on-change, --depth-first, --no-empty-dirs, --ascii.
 new mirror option --only-existing (Damon Harper).
 new setting xfer:log, log successful transfers if true to
 ~/.lftp/tarnsfer_log.
 new setting ssl:check-hostname.
 fixed cls exit code in case of an error.

Version 3.5.15 - 2007-10-19
 fixed timeout handling when waiting for 150 or 125 ftp reply.
 fixed a bug occuring when turning off proxy server setting.

Version 3.5.14 - 2007-08-31
 handle ftp reply with code 125 same as code 150 (Craig Ruff).
 french translation updated (Alain PORTAL).

Version 3.5.13 - 2007-08-23
 fixed ftps not to access data socket before 150 reply.
 fixed sftp to send properly sized packets on upload.
 fixed infinite retrying on upload.
 fixed compilation without iconv.
 fixed buffering in ascii mode transfers.

Version 3.5.12 - 2007-07-26
 hex-encode all non-ascii characters in URLs.
 allow cross-compilation without iconv (Jakob Truelsen).
 french translation updated (Alain PORTAL).

6 files changed, 28 insertions, 29 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 12d7512b89b..9abacaed664 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2009/05/20 00:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2009/06/08 09:54:50 hasso Exp $
 
-DISTNAME=		lftp-3.5.11
-PKGREVISION=		2
+DISTNAME=		lftp-3.7.14
 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 fbe146269ff..1cfd3812d2c 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2006/08/11 15:19:35 salo Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/08 09:54:50 hasso 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
@@ -28,6 +27,7 @@ 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_HK/LC_MESSAGES/lftp.mo
 share/locale/zh_TW/LC_MESSAGES/lftp.mo
 @dirrm share/lftp
 @dirrm share/examples/lftp
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 52b94e774d7..63bbdde4bf2 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.42 2007/04/25 18:37:38 tnn Exp $
+$NetBSD: distinfo,v 1.43 2009/06/08 09:54:50 hasso Exp $
 
-SHA1 (lftp-3.5.11.tar.bz2) = d9a3add50667cbdf98ee765d521b77f628612c0d
-RMD160 (lftp-3.5.11.tar.bz2) = a8c905073fcf13d50af11357662271985abcd220
-Size (lftp-3.5.11.tar.bz2) = 1330090 bytes
-SHA1 (patch-aa) = 6e3e8410994c7de84c5e42ad658cb72dec0f3426
-SHA1 (patch-ab) = d230522c60786a2bcbce346419d8dfce412578d3
-SHA1 (patch-ac) = 8000bf8b44b39b7f87e9d7c89bcb513aa5150753
+SHA1 (lftp-3.7.14.tar.bz2) = b36819aa9624057f1c9067867579c2ac509c72e7
+RMD160 (lftp-3.7.14.tar.bz2) = b6c7bfc5d33b607203afa6784c2db5ece6d2716b
+Size (lftp-3.7.14.tar.bz2) = 1490470 bytes
+SHA1 (patch-aa) = 3b3a08589148d8ac38b6eb2373f9a88ce17cbcd0
+SHA1 (patch-ab) = 65c92b264873b45c69a0dfde2d2715dca0b6dc36
+SHA1 (patch-ac) = 21d2ae16a11a66f316433f0ff8983fe46b2a4b6e
 SHA1 (patch-ad) = 23f8250be519e7c2721adf27f094282d261061f5
 SHA1 (patch-ae) = 97f539b1e0d6dfb083aac5b17c29e9a0a60444e4
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
index 98041df310b..bdfa9136cfd 100644
--- a/net/lftp/patches/patch-aa
+++ b/net/lftp/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.11 2006/08/11 15:19:35 salo Exp $
+$NetBSD: patch-aa,v 1.12 2009/06/08 09:54:50 hasso Exp $
 
---- 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@
+--- src/Makefile.in.orig	2009-05-15 09:25:52 +0300
++++ src/Makefile.in	2009-06-08 12:21:53 +0300
+@@ -893,7 +893,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  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.11 2006/08/11 15:19:35 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
-@@ -907,7 +907,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+@@ -1416,7 +1416,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)$(pkgdatadir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
diff --git a/net/lftp/patches/patch-ab b/net/lftp/patches/patch-ab
index 7738a5cc1e9..52d2ee8077c 100644
--- a/net/lftp/patches/patch-ab
+++ b/net/lftp/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2004/06/14 08:42:17 salo Exp $
+$NetBSD: patch-ab,v 1.3 2009/06/08 09:54:50 hasso Exp $
 
---- lib/fnmatch_loop.c.orig	2004-06-09 16:00:18.000000000 +0200
-+++ lib/fnmatch_loop.c	2004-06-13 21:40:37.000000000 +0200
-@@ -250,7 +250,7 @@
+--- lib/fnmatch_loop.c.orig	2009-01-16 09:58:31 +0200
++++ lib/fnmatch_loop.c	2009-06-08 12:22:55 +0300
+@@ -242,7 +242,7 @@ FCT (const CHAR *pattern, const CHAR *st
  		    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
  		    size_t c1 = 0;
- #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_BTOWC)
+ #if defined _LIBC || WIDE_CHAR_SUPPORT
 -		    wctype_t wt;
 +		    wint_t wt;
  #endif
diff --git a/net/lftp/patches/patch-ac b/net/lftp/patches/patch-ac
index 0bea4e0f321..99de82d33b4 100644
--- a/net/lftp/patches/patch-ac
+++ b/net/lftp/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2004/06/02 12:20:13 adam Exp $
+$NetBSD: patch-ac,v 1.3 2009/06/08 09:54:50 hasso Exp $
 
---- Makefile.in.orig	2004-05-31 12:58:54.000000000 +0000
-+++ Makefile.in
-@@ -576,7 +576,7 @@ info: info-recursive
+--- Makefile.in.orig	2009-05-15 09:25:53 +0300
++++ Makefile.in	2009-06-08 12:23:32 +0300
+@@ -1138,7 +1138,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local
 +install-data-am:
  
- install-exec-am:
+ install-dvi: install-dvi-recursive