summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/lftp/Makefile5
-rw-r--r--net/lftp/PLIST4
-rw-r--r--net/lftp/distinfo14
-rw-r--r--net/lftp/patches/patch-aa14
-rw-r--r--net/lftp/patches/patch-ab10
-rw-r--r--net/lftp/patches/patch-ac10
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