- Update to 4.0.0

PR:		138937
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com>
Feature safe:	yes

4 files changed, 31 insertions, 14 deletions

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 6f5791e4d8fb..56dafafbc452 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	3.7.15
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
 		ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/old/ \
@@ -36,8 +35,8 @@ PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \
 		MIRRORS NEWS README README.debug-levels README.modules \
 		THANKS TODO
 
-OPTIONS=	GNUTLS "With GnutTLS support" off \
-		OPENSSL "With OpenSSL support" on \
+OPTIONS=	OPENSSL "With OpenSSL support" on \
+		GNUTLS "With GnutTLS support" off \
 		NLS "With i18n support" on
 
 .include <bsd.port.pre.mk>
@@ -47,13 +46,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline
 RUN_DEPENDS+=	${LOCALBASE}/lib/libreadline.so.6:${PORTSDIR}/devel/readline
 .endif
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-gnutls
-.else
-CONFIGURE_ARGS+=	--without-gnutls
-.endif
-
 .if !defined(WITHOUT_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-openssl
@@ -61,6 +53,13 @@ CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-gnutls
+.else
+CONFIGURE_ARGS+=	--without-gnutls
+.endif
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls
@@ -72,6 +71,13 @@ PLIST_SUB+=	NLS="@comment "
 
 MAN1=		lftp.1 lftpget.1
 
+pre-configure:
+.if !defined(WITHOUT_OPENSSL) && defined(WITH_GNUTLS)
+	@${ECHO_MSG} "========"
+	@${ECHO_MSG} "WARNING: both OPENSSL and GNUTLS have been selected, OPENSSL will be used"
+	@${ECHO_MSG} "========"
+.endif
+
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/etc/lftp.conf.sample
 	@if [ ! -f ${PREFIX}/etc/lftp.conf ]; then \
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 95c403022ce5..1711834354ea 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1,3 +1,3 @@
-MD5 (lftp-3.7.15.tar.bz2) = bb2e116d2fcf3544805efd4b6463316e
-SHA256 (lftp-3.7.15.tar.bz2) = c4cd5ee5fb17b1cceb7b2cf655b1cfc8f6aead69e2623d5d7ee6f3975d0e8769
-SIZE (lftp-3.7.15.tar.bz2) = 1499838
+MD5 (lftp-4.0.0.tar.bz2) = 3d06d2869d6715460756aedd50650352
+SHA256 (lftp-4.0.0.tar.bz2) = 6604eedf075ff056f4ee59f1f71a76b3a52b2bd1353b7a9b788cb4e335c1c422
+SIZE (lftp-4.0.0.tar.bz2) = 1580362
diff --git a/ftp/lftp/files/patch-src-Torrent.cc b/ftp/lftp/files/patch-src-Torrent.cc
new file mode 100644
index 000000000000..189ec742a3f7
--- /dev/null
+++ b/ftp/lftp/files/patch-src-Torrent.cc
@@ -0,0 +1,10 @@
+--- src/Torrent.cc.orig	2009-09-16 18:02:13.808225067 +0000
++++ src/Torrent.cc	2009-09-16 18:02:27.236576994 +0000
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <sys/socket.h>
++#include <sys/stat.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
diff --git a/ftp/lftp/pkg-plist b/ftp/lftp/pkg-plist
index a0e6ed3eadae..be9f69894d5d 100644
--- a/ftp/lftp/pkg-plist
+++ b/ftp/lftp/pkg-plist
@@ -10,6 +10,7 @@ lib/liblftp-tasks.a
 %%DATADIR%%/import-netscape
 %%DATADIR%%/verify-file
 @dirrm %%DATADIR%%
+%%NLS%%share/locale/cs/LC_MESSAGES/lftp.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lftp.mo
 %%NLS%%share/locale/es/LC_MESSAGES/lftp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lftp.mo