* Update NcFTP to 3.2.3.

* Add official mirror as backup master site.
* Don't depend on gtar if it happens to be installed at build time.
* Clean-up.

Approved by:	maintainer timeout (5 weeks)

4 files changed, 14 insertions, 27 deletions

diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 265a54cf856e..8f90cf65253e 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -7,15 +7,16 @@
 #
 
 PORTNAME=	ncftp
-PORTVERSION=	3.2.2
-PORTREVISION?=	1
+PORTVERSION=	3.2.3
+PORTREVISION?=	0
 CATEGORIES=	ftp ipv6
-MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
+MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/ \
+		ftp://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/
 DISTNAME=	ncftp-${PORTVERSION}-src
 
 .if !defined(WITHOUT_NCFTP_IPV6) && !defined(WITHOUT_IPV6)
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	ncftp-322-v6-20080821.diff.gz
+PATCHFILES=	ncftp-323-v6-20091109.diff.gz
 PATCH_DIST_STRIP=	-p1
 .endif
 
@@ -35,6 +36,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ncurses
+CONFIGURE_ENV=	TAR=/usr/bin/tar
 PLIST_SUB=	NCFTP=${LATEST_LINK}
 MAN1=		${LATEST_LINK}.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1 \
 		ncftpspooler.1
@@ -50,10 +52,6 @@ pre-fetch:
 	@${ECHO} ""
 
 pre-build:
-	${REINPLACE_CMD} -e 's|$$(CCDV)$$(CC)|$$(CCDV) $$(CC)|' \
-	    ${WRKSRC}/libncftp/Makefile
-	${REINPLACE_CMD} -e 's|$$(CCDV)$$(CC)|$$(CCDV) $$(CC)|' \
-	    ${WRKSRC}/sio/Makefile
 	cd ${WRKSRC}/Strn ; make so
 	cd ${WRKSRC}/libncftp ; make so
 	cd ${WRKSRC}/sio; make so
@@ -61,7 +59,7 @@ pre-build:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/ncftp ${PREFIX}/bin/${LATEST_LINK}
 	@cd ${WRKSRC}/bin ; ${INSTALL_PROGRAM} \
-		ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
+		ncftpbatch ncftpbookmarks ncftpget ncftpls ncftpput \
 		${PREFIX}/bin
 	@cd ${PREFIX}/bin && ${LN} -f ncftpbatch ncftpspooler
 	@cd ${WRKSRC} && ${INSTALL_DATA} \
diff --git a/ftp/ncftp3/distinfo b/ftp/ncftp3/distinfo
index c5e2afa0537d..4096015dea92 100644
--- a/ftp/ncftp3/distinfo
+++ b/ftp/ncftp3/distinfo
@@ -1,6 +1,6 @@
-MD5 (ncftp-3.2.2-src.tar.bz2) = c33da134e5e53b5a3b340e0de5456137
-SHA256 (ncftp-3.2.2-src.tar.bz2) = c369e913bc7e9f0b0794e12ace714d211d00f80a7011d4ec1b4f90a6195df260
-SIZE (ncftp-3.2.2-src.tar.bz2) = 422824
-MD5 (ncftp-322-v6-20080821.diff.gz) = 2fd87a9abe028aac265f8acb43edee45
-SHA256 (ncftp-322-v6-20080821.diff.gz) = e35028709f62eb4aa2cd7ae827b4134461f7ad995d6d360d5b78e3494df4e194
-SIZE (ncftp-322-v6-20080821.diff.gz) = 39856
+MD5 (ncftp-3.2.3-src.tar.bz2) = fac4aa169e1734e8d9617afd4a9b51e5
+SHA256 (ncftp-3.2.3-src.tar.bz2) = 46f4f2fbde40187a164bdd0fe3d37d2d85d36445e56f2bf08fc814ee8dcba510
+SIZE (ncftp-3.2.3-src.tar.bz2) = 425393
+MD5 (ncftp-323-v6-20091109.diff.gz) = 9120dcbb0fceacb5174d01024b0ba5a5
+SHA256 (ncftp-323-v6-20091109.diff.gz) = 140f4dae6f6544f1ebe4018c66ab5e97c8af3ab74a04eafb400daafd6bf7f780
+SIZE (ncftp-323-v6-20091109.diff.gz) = 41587
diff --git a/ftp/ncftp3/files/patch-SConnect.c b/ftp/ncftp3/files/patch-SConnect.c
deleted file mode 100644
index e3575b8faeef..000000000000
--- a/ftp/ncftp3/files/patch-SConnect.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sio/SConnect.c.orig	2007-10-27 11:14:05.000000000 -0700
-+++ sio/SConnect.c	2008-09-03 08:25:45.000000000 -0700
-@@ -154,7 +154,7 @@ _SConnect(const int sfd, const struct so
- 		tv.tv_sec = (tv_sec_t) tlen;
- 		tv.tv_usec = 0;
- 		result = select(sfd + 1, NULL, SELECT_TYPE_ARG234 &ss, SELECT_TYPE_ARG234 &xx, SELECT_TYPE_ARG5 &tv);
--		if (result == 1) {
-+		if (result >= 1) {
- 			/* ready */
- 			break;
- 		} else if (result == 0) {
diff --git a/ftp/ncftp3/pkg-plist b/ftp/ncftp3/pkg-plist
index 9986cc70b8f1..bc7d71790e60 100644
--- a/ftp/ncftp3/pkg-plist
+++ b/ftp/ncftp3/pkg-plist
@@ -7,8 +7,8 @@ lib/libsio.so
 lib/libsio.so.5
 bin/%%NCFTP%%
 bin/ncftpbatch
+bin/ncftpbookmarks
 bin/ncftpget
 bin/ncftpls
 bin/ncftpput
-bin/ncftpbookmarks
 bin/ncftpspooler