CVS commit: pkgsrc/net/ncftp3

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jul  8 22:27:36 UTC 2017

Modified Files:
        pkgsrc/net/ncftp3: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/ncftp3/patches: patch-configure
Removed Files:
        pkgsrc/net/ncftp3/patches: patch-aa patch-ab

Log Message:
3.2.6:

If a recursive download operation is also requested with delete mode, attempt to remove empty directories after all files have completed successfully.

No longer trying to utime() after every single block on downloads, which could cause noticable performance degradation when the local filesystem was not local.

Changed behavior of resuming downloads where the timestamp wasn't preserved (because of the utime change, above). The new behavior is to resume the download when the local copy has a recent timestamp 
(less than a week).

You can now disable use of MFMT like you could similarly disable SITE UTIME (e.g., "-o noMFMT" and "-o noSITE_UTIME").

Now able to use sendfile() for uploads, on Linux/FreeBSD/Mac. Progress reports work too, with a small performance penalty. Ncftpput has a "-s" option to toggle whether it is used (defaults to on in 
ncftpput and ncftpbatch, off in ncftp).

Ncftpbatch/spooler now use larger buffers for pathnames, allowing for deeper directory trees.

Ncftpbatch/spooler now interpret a received SIGUSR1 as a hint to exit when the current file has finished.

Ncftpbatch/spooler now interpret a received SIGUSR2 to request it to stop sleeping and recheck the queue immediately.

Ncftpbatch/spooler's spool files now allow for you to specify that the local and/or remote file be renamed after a successful transfer.

Ncftpbatch/spooler now a little less chatty by reducing the number of PWD/CWD operations.

Ncftpbatch/spooler now log some xfer stats in its general log file, and ncftpspooler has a new "-x" option to specify a separate xfer log file.

Ncftpbatch/spooler now use a larger default maximum for its log file (10 MiB rather than 200 kB), and ncftpspooler has an -O command line option that can set this limit. Use "-O 0" for no maximum.

Ncftpbatch/spooler now try to present time in local timezone rather than UTC where possible.

Ncftpbatch/spooler now support multiple items per transaction (spool) file.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/ncftp3/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ncftp3/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/ncftp3/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/net/ncftp3/patches/patch-aa
cvs rdiff -u -r1.5 -r0 pkgsrc/net/ncftp3/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ncftp3/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ncftp3/Makefile
diff -u pkgsrc/net/ncftp3/Makefile:1.28 pkgsrc/net/ncftp3/Makefile:1.29
--- pkgsrc/net/ncftp3/Makefile:1.28     Wed Jan  4 20:01:39 2017
+++ pkgsrc/net/ncftp3/Makefile  Sat Jul  8 22:27:36 2017
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.28 2017/01/04 20:01:39 roy Exp $
+# $NetBSD: Makefile,v 1.29 2017/07/08 22:27:36 adam Exp $
 
-DISTNAME=      ncftp-3.2.5-src
+DISTNAME=      ncftp-3.2.6-src
 PKGNAME=       ${DISTNAME:S/ncftp/ncftp3/:S/-src//}
-PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.ncftp.com/ncftp/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ncftp.com/
 COMMENT=       FTP replacement with advanced user interface
 LICENSE=       artistic
 
-INSTALL_MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
-
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
-GNU_CONFIGURE= yes
 
-post-patch:
-       ${MV} ${WRKSRC}/ncftp/pref.h ${WRKSRC}/ncftp/pref.h.in
-       ${SED} -e "s:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:" \
-               < ${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h
+USE_TOOLS+=            perl:build
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-universal
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ncftp3/PLIST
diff -u pkgsrc/net/ncftp3/PLIST:1.2 pkgsrc/net/ncftp3/PLIST:1.3
--- pkgsrc/net/ncftp3/PLIST:1.2 Sat Sep 27 22:57:32 2003
+++ pkgsrc/net/ncftp3/PLIST     Sat Jul  8 22:27:36 2017
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/27 22:57:32 wiz Exp $
-bin/ncftp3
+@comment $NetBSD: PLIST,v 1.3 2017/07/08 22:27:36 adam Exp $
+bin/ncftp
 bin/ncftpbatch
 bin/ncftpbookmarks
 bin/ncftpget

Index: pkgsrc/net/ncftp3/distinfo
diff -u pkgsrc/net/ncftp3/distinfo:1.12 pkgsrc/net/ncftp3/distinfo:1.13
--- pkgsrc/net/ncftp3/distinfo:1.12     Wed Nov  4 00:35:15 2015
+++ pkgsrc/net/ncftp3/distinfo  Sat Jul  8 22:27:36 2017
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/07/08 22:27:36 adam Exp $
 
-SHA1 (ncftp-3.2.5-src.tar.gz) = b1aafd9291e29c336fcad07ae212fe1b5b2a1c58
-RMD160 (ncftp-3.2.5-src.tar.gz) = 8768d7c942d71330ccf6619bea112435c93f2437
-SHA512 (ncftp-3.2.5-src.tar.gz) = f9faa9ee86ce1d906f828c4248308fbe5e244be5b341b485c6ab7100b6bf266e4df81d8773f192b606b70b75e9707c2d80ffd61c33cad4a116b6e4847b794199
-Size (ncftp-3.2.5-src.tar.gz) = 588625 bytes
-SHA1 (patch-aa) = bc19e2b7752aca0d00f9e483e0aa547bb1186716
-SHA1 (patch-ab) = 40ad90f10cb639d26587ddaea0f5e4201ce4f15e
+SHA1 (ncftp-3.2.6-src.tar.xz) = b431eee7738a2441309ce11fc632e1b696ee1053
+RMD160 (ncftp-3.2.6-src.tar.xz) = 105f59747ea98d756e610368ad96fb8481fc80f9
+SHA512 (ncftp-3.2.6-src.tar.xz) = 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
+Size (ncftp-3.2.6-src.tar.xz) = 420564 bytes
+SHA1 (patch-configure) = 2b5e18ecdc7ad2b6a7e056210c769ff5441cb04f

Added files:

Index: pkgsrc/net/ncftp3/patches/patch-configure
diff -u /dev/null pkgsrc/net/ncftp3/patches/patch-configure:1.1
--- /dev/null   Sat Jul  8 22:27:36 2017
+++ pkgsrc/net/ncftp3/patches/patch-configure   Sat Jul  8 22:27:36 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2017/07/08 22:27:36 adam Exp $
+
+On Darwin, properly detect system version.
+Do not try putting man-pages in better places.
+
+--- configure.orig     2016-12-04 18:54:11.000000000 +0000
++++ configure
+@@ -1232,7 +1232,7 @@ EOF
+       macos*|darwin|rhapsody)
+               OS="macosx"
+               SYS="macosx"
+-              os_v=`perl -e '{open(F, "< /System/Library/CoreServices/SystemVersion.plist") or exit(2); my ($doc) = ""; my ($line); while (defined($line = <F>)) { $doc .= $line; } close(F); $doc =~ 
s/\s+//gs; if ($doc =~ /<key>ProductVersion<\/key><string>([^<]+)<\/string>/) { print , "\n"; exit(0); } exit(1); }' 2>/dev/null`
++              os_v=`perl -e '{open(F, "< /System/Library/CoreServices/SystemVersion.plist") or exit(2); my ($doc) = ""; my ($line); while (defined($line = <F>)) { $doc .= $line; } close(F); $doc =~ 
s/\s+//gs; if ($doc =~ /<key>ProductVersion<\/key><string>([^<]+)<\/string>/) { print $1, "\n"; exit(0); } exit(1); }' 2>/dev/null`
+               if [ "$os_v" = "" ] && [ -x "$HOME/bin/macosver" ] ; then
+                       os_v=`"$HOME/bin/macosver" 2>/dev/null`
+               fi
+@@ -12036,7 +12036,7 @@ fi
+ fi
+ 
+ 
+-if test "x$mandir" = 'x${prefix}/man' ; then
++if false; then
+       # Mandir is at default value -- try to see
+       # if $prefix/share/man would be better.
+       #