ports/140427: ports/ftp/ncftp3: update to 3.2.3

[Christian Weisgerber]

>Number:         140427
>Category:       ports
>Synopsis:       ports/ftp/ncftp3: update to 3.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 09 18:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Christian Weisgerber
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD lorvorc.mips.inka.de 7.2-STABLE FreeBSD 7.2-STABLE #0: Sun Nov 1 13:55:21 CET 2009 naddy at lorvorc.mips.inka.de:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

* 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.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/ncftp3/Makefile,v
retrieving revision 1.112
diff -u -r1.112 Makefile
--- Makefile	3 Sep 2008 15:32:54 -0000	1.112
+++ Makefile	9 Nov 2009 18:16:08 -0000
@@ -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 @@
 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 @@
 	@${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 @@
 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} \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/ncftp3/distinfo,v
retrieving revision 1.66
diff -u -r1.66 distinfo
--- distinfo	26 Aug 2008 16:21:45 -0000	1.66
+++ distinfo	9 Nov 2009 18:16:08 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/ncftp3/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist	27 Aug 2008 14:31:01 -0000	1.15
+++ pkg-plist	9 Nov 2009 18:16:08 -0000
@@ -7,8 +7,8 @@
 lib/libsio.so.5
 bin/%%NCFTP%%
 bin/ncftpbatch
+bin/ncftpbookmarks
 bin/ncftpget
 bin/ncftpls
 bin/ncftpput
-bin/ncftpbookmarks
 bin/ncftpspooler
Index: files/patch-SConnect.c
===================================================================
RCS file: files/patch-SConnect.c
diff -N files/patch-SConnect.c
--- files/patch-SConnect.c	3 Sep 2008 15:32:54 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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) {
>Release-Note:
>Audit-Trail:
>Unformatted: