- Update to 3.6.3;

- Update MASTER_SITES;
- Respect PORTDOCS;
- Makefile cleanup;
- Fix and sort pkg-plist.

PR:		ports/120358
Submitted by:	Felippe de Meirelles Motta <lippemail@gmail.com>
Approved by:	maintainer timeout (two weeks)

3 files changed, 18 insertions, 20 deletions

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index e057ce19928d..70471c7877a8 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lftp
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.3
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
 		ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/ \
@@ -16,8 +16,9 @@ MASTER_SITES=	ftp://ftp.wiretapped.net/pub/mirrors/lftp/ \
 		ftp://ftp.iasi.roedu.net/pub/os/Linux/network/ftp/lftp/old/ \
 		ftp://ftp.yars.free.net/pub/source/lftp/ \
 		ftp://ftp.yars.free.net/pub/source/lftp/old/ \
-		ftp://lftp.yar.ru/lftp/ \
-		ftp://lftp.yar.ru/lftp/old/
+		ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/ \
+		http://lftp.cybermirror.org/ \
+		http://lftp.cybermirror.org/old/
 
 MAINTAINER=	fm@cross-road.org.ua
 COMMENT=	Shell-like command line ftp client
@@ -31,6 +32,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+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 \
 		NLS "With i18n support" on
@@ -64,11 +69,13 @@ MAN1=		lftp.1 lftpget.1
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/etc/lftp.conf.sample
+	@if [ ! -f ${PREFIX}/etc/lftp.conf ]; then \
+	${CP} -p ${PREFIX}/etc/lftp.conf.sample ${PREFIX}/etc/lftp.conf ; \
+	fi
+
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for ifile in COPYING FAQ NEWS README README.debug-levels README.modules THANKS TODO FEATURES
-	@${INSTALL_DATA} ${WRKSRC}/${ifile} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/lftp/distinfo b/ftp/lftp/distinfo
index c10d054620ae..fa027cf31b1b 100644
--- a/ftp/lftp/distinfo
+++ b/ftp/lftp/distinfo
@@ -1,3 +1,3 @@
-MD5 (lftp-3.6.1.tar.bz2) = 29e9e44474aa381029d6ae0fb79b2f2b
-SHA256 (lftp-3.6.1.tar.bz2) = 8e65e1602c08b44c955eda228876046f3f74519200db0cb54d1102a02a50b032
-SIZE (lftp-3.6.1.tar.bz2) = 1332560
+MD5 (lftp-3.6.3.tar.bz2) = 5952074c6042f2e4441d29fa1d0651f3
+SHA256 (lftp-3.6.3.tar.bz2) = 0cc820fe656d586f72e945d199cb7975f6aa7c9c9e4f9cd9dd7acde4033d2fe4
+SIZE (lftp-3.6.3.tar.bz2) = 1128690
diff --git a/ftp/lftp/pkg-plist b/ftp/lftp/pkg-plist
index 6d94b168c9fb..9f9aab9b0b75 100644
--- a/ftp/lftp/pkg-plist
+++ b/ftp/lftp/pkg-plist
@@ -5,15 +5,6 @@ etc/lftp.conf.sample
 @exec if [ ! -f %D/etc/lftp.conf ]; then cp %B/%f %D/etc/lftp.conf; fi
 lib/liblftp-jobs.a
 lib/liblftp-tasks.a
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.debug-levels
-%%PORTDOCS%%%%DOCSDIR%%/README.modules
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/convert-netscape-cookies
 %%DATADIR%%/import-ncftp
 %%DATADIR%%/import-netscape
@@ -30,4 +21,4 @@ lib/liblftp-tasks.a
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lftp.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lftp.mo
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+