Update to 2.4.7

PR:		32005
Submitted by:	maintainer
Approved by:	lioux

4 files changed, 50 insertions, 15 deletions

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 7d552d3ef909..5f997f836bf5 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,11 +6,18 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	2.4.6
+PORTVERSION=	2.4.7
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/network/file-transfer
+		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/ \
+		ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/ \
+		ftp://ftp.phear.org/pub/linux/networking/ftp/client/lftp/old/ \
+		http://the.wiretapped.net/mirrors/lftp/ \
+		http://the.wiretapped.net/mirrors/lftp/old \
+		ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
+		ftp://ftp.wiretapped.net/pub/mirrors/lftp/old \
+		ftp://ftp.ayamura.org/pub/lftp/ \
+		ftp://ftp.ayamura.org/pub/lftp/old/
 
 MAINTAINER=	fm@astral.ntu-kpi.kiev.ua
 
@@ -19,24 +26,17 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		lftp.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/etc/lftp.conf.sample
-# remove some empty directories
-	${RMDIR} ${PREFIX}/lib/lftp/${PORTVERSION}
-	${RMDIR} ${PREFIX}/lib/lftp
+	@${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/etc/lftp.conf.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/lftp
+	@${MKDIR} ${DOCSDIR}
 .for file in COPYING FAQ NEWS README THANKS TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/lftp
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index 928eb1bf01b5..1079f240d9f6 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1 +1 @@
-MD5 (lftp-2.4.6.tar.bz2) = 9fcf7aa68ad1f50ce4309f495bf6e759
+MD5 (lftp-2.4.7.tar.bz2) = fa8c6e05f4c18ae37397d711eceb9a3e
diff --git a/ftp/lftp/files/patch-ltmain.sh b/ftp/lftp/files/patch-ltmain.sh
new file mode 100644
index 000000000000..e71718a9f08e
--- /dev/null
+++ b/ftp/lftp/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Sat Sep 22 20:10:52 2001
++++ ltmain.sh	Tue Nov 20 21:14:55 2001
+@@ -2444,6 +2444,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4213,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/ftp/lftp/files/patch-src::Makefile.in b/ftp/lftp/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..6138acb44843
--- /dev/null
+++ b/ftp/lftp/files/patch-src::Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Wed Nov 21 17:37:09 2001
++++ src/Makefile.in	Wed Nov 21 17:37:23 2001
+@@ -396,7 +396,6 @@
+ 	$(RANLIB) libtasks.a
+ install-pkgverlibLTLIBRARIES: $(pkgverlib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pkgverlibdir)
+ 	@list='$(pkgverlib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pkgverlibdir)/$$p"; \