4 files changed, 33 insertions, 41 deletions

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 06a09ac4c40d..7011b06ad1e9 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
 		ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \
@@ -24,7 +24,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	fm@cross-road.org.ua
 COMMENT=	Shell-like command line ftp client
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		readline.5:${PORTSDIR}/devel/readline
 
 USE_ICONV=	yes
 USE_BZIP2=	yes
@@ -59,6 +60,8 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+CONFIGURE_ARGS+=--mandir="${MAN1PREFIX}/man"
+
 MAN1=		lftp.1 lftpget.1
 
 post-install:
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 3c75fa246e07..71b2f82aa750 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1,6 +1,6 @@
-MD5 (lftp-3.5.1.tar.bz2) = c6d48782cdad4759000bf7cd24555723
-SHA256 (lftp-3.5.1.tar.bz2) = 463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
-SIZE (lftp-3.5.1.tar.bz2) = 1275924
-MD5 (lftp-3.5.1.tar.bz2.asc) = 9d100fb13104494146f07ac8722564bc
-SHA256 (lftp-3.5.1.tar.bz2.asc) = fc8939ac75e3f27aac77637a6e4a82ef5293cb78dad591272bc037279a31a6b3
-SIZE (lftp-3.5.1.tar.bz2.asc) = 185
+MD5 (lftp-3.5.2.tar.bz2) = 9f40e9963de53c111d676171b9f810cd
+SHA256 (lftp-3.5.2.tar.bz2) = d1a78ff2db55e91a40fe73b8016a3349702aba24f1a3805f2dc3bd8f4155717e
+SIZE (lftp-3.5.2.tar.bz2) = 1318784
+MD5 (lftp-3.5.2.tar.bz2.asc) = 2761b40ba66e1ec2eed0c2f570cc6f05
+SHA256 (lftp-3.5.2.tar.bz2.asc) = 4d872fc24a62a2c802442f7cc0638f1252f3412676961b141b9db8afb390bd7d
+SIZE (lftp-3.5.2.tar.bz2.asc) = 185
diff --git a/ftp/lftp/files/patch-post-config.h b/ftp/lftp/files/patch-post-config.h
deleted file mode 100644
index e0aac9451078..000000000000
--- a/ftp/lftp/files/patch-post-config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/post-config.h.orig	Thu Mar 24 18:41:45 2005
-+++ include/post-config.h	Mon Apr 18 17:52:16 2005
-@@ -142,4 +142,8 @@
- # include "trio.h"
- #endif
- 
-+#if __FreeBSD__ < 5
-+	#define atoll(n)	strtoll((n),NULL,10)
-+#endif
-+
- #endif /* POST_CONFIG_H */
diff --git a/ftp/lftp/pkg-plist b/ftp/lftp/pkg-plist
index e80b1cb0e524..eee90ebc50c6 100644
--- a/ftp/lftp/pkg-plist
+++ b/ftp/lftp/pkg-plist
@@ -3,31 +3,31 @@ bin/lftpget
 @unexec if cmp -s %D/etc/lftp.conf %D/etc/lftp.conf.sample; then rm -f %D/etc/lftp.conf; fi
 etc/lftp.conf.sample
 @exec if [ ! -f %D/etc/lftp.conf ]; then cp %B/%f %D/etc/lftp.conf; fi
-lib/liblftp-tasks.a
 lib/liblftp-jobs.a
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.debug-levels
-%%PORTDOCS%%%%DOCSDIR%%/README.modules
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
+lib/liblftp-tasks.a
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/FEATURES
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.debug-levels
+%%DOCSDIR%%/README.modules
+%%DOCSDIR%%/THANKS
+%%DOCSDIR%%/TODO
 %%DATADIR%%/convert-netscape-cookies
 %%DATADIR%%/import-ncftp
 %%DATADIR%%/import-netscape
 %%DATADIR%%/verify-file
-%%NLS%%share/locale/de/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/es/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/it/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+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/pt_BR/LC_MESSAGES/lftp.mo
+share/locale/ru/LC_MESSAGES/lftp.mo
+share/locale/zh_CN/LC_MESSAGES/lftp.mo
+share/locale/zh_TW/LC_MESSAGES/lftp.mo
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%