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.

6 files changed, 39 insertions, 112 deletions

diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index 011ddaa7881..3e032b0ddfe 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -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
 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"
diff --git a/net/ncftp3/PLIST b/net/ncftp3/PLIST
index 3ad9a383661..67e3203e111 100644
--- a/net/ncftp3/PLIST
+++ b/net/ncftp3/PLIST
@@ -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
diff --git a/net/ncftp3/distinfo b/net/ncftp3/distinfo
index 8e68a88e34f..bf176658818 100644
--- a/net/ncftp3/distinfo
+++ b/net/ncftp3/distinfo
@@ -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
diff --git a/net/ncftp3/patches/patch-aa b/net/ncftp3/patches/patch-aa
deleted file mode 100644
index 14ddb714a03..00000000000
--- a/net/ncftp3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/04/18 12:22:40 zafer Exp $
-
---- Makefile.in.orig	2010-04-18 11:42:44.000000000 +0000
-+++ Makefile.in
-@@ -46,7 +46,7 @@ install:
- 	-@test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)" 2>/dev/null
- 	-mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null
- 	-@echo '..... Installing the programs .....'
--	$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@"
-+	$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp3@EXEEXT@"
- 	$(INSTALL_PROGRAM) bin/ncftpget@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpget@EXEEXT@"
- 	$(INSTALL_PROGRAM) bin/ncftpput@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpput@EXEEXT@"
- 	$(INSTALL_PROGRAM) bin/ncftpls@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpls@EXEEXT@"
diff --git a/net/ncftp3/patches/patch-ab b/net/ncftp3/patches/patch-ab
deleted file mode 100644
index 075ef8f376f..00000000000
--- a/net/ncftp3/patches/patch-ab
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2010/04/18 12:22:40 zafer Exp $
-
---- configure.orig	2010-04-07 15:23:25.000000000 +0000
-+++ configure
-@@ -954,65 +954,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`
--		if [ "$os_v" = "" ] && [ -x "$HOME/bin/macosver" ] ; then
--			os_v=`"$HOME/bin/macosver" 2>/dev/null`
--		fi
--		if [ "$os_v" = "" ] ; then
--			cat > "$HOME/macosver.c" <<EOF
--/*
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
--<plist version="0.9">
--<dict>
--	<key>ProductBuildVersion</key>
--	<string>5S66</string>
--	<key>ProductName</key>
--	<string>Mac OS X</string>
--	<key>ProductVersion</key>
--	<string>10.1.5</string>
--</dict>
--</plist>
--*/
--
--#include <stdio.h>
--#include <string.h>
--#include <stdlib.h>
--#include <ctype.h>
--
--main()
--{
--	char line[256], *cp, *cp2; 
--	FILE *fp;
--
--	fp = fopen("/System/Library/CoreServices/SystemVersion.plist", "r");
--
--	if (fp != NULL) {
--		memset(line, 0, sizeof(line));
--		while (fgets(line, sizeof(line) - 1, fp) != NULL) {
--			cp = strstr(line, "<key>ProductVersion</key>");
--			if (cp != NULL) {
--				memset(line, 0, sizeof(line));
--				if (fgets(line, sizeof(line) - 2, fp) != NULL) {
--					for (cp = line; ((*cp != '\0') && (! isdigit(*cp))); ) cp++;
--					for (cp2 = cp; ((*cp2 != '\0') && (! isspace(*cp2)) && (*cp2 != '<') && (*cp2 != '>')); ) cp2++;
--					cp2[0] = '\0';
--					fclose(fp);
--					fprintf(stdout, "%s\n", cp);
--					exit(0);
--				}
--			}
--		}
--	}
--	fclose(fp);
--	exit(1);
--}
--EOF
--			${CC-cc} "$HOME/macosver.c" -o "$HOME/macosver" > /dev/null 2>&1
--			os_v=`"$HOME/macosver" 2>/dev/null`
--			mv "$HOME/macosver" "$HOME/bin/macosver" 2>/dev/null
--			rm -f "$HOME/macosver.c" "$HOME/macosver"
--		fi
-+		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" != "" ] ; then
- 			OS="macosx${os_v}"
- 			os_v1=`echo "$os_v" | cut -d. -f1`
-@@ -11335,7 +11277,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.
- 	#
diff --git a/net/ncftp3/patches/patch-configure b/net/ncftp3/patches/patch-configure
new file mode 100644
index 00000000000..fa283502beb
--- /dev/null
+++ b/net/ncftp3/patches/patch-configure
@@ -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.
+ 	#