This updates net/ncftp to 3.2.5.  The KAME people have stopped
updating the IPv6 patch and it now conflicts with the DNSSEC local
validation code.  Since we don't support the latter feature, I've
hammered the KAME patch in over the new code.

Seems to work for me, but ncftp users might want to test.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ncftp/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile    18 Oct 2010 18:36:50 -0000      1.41
+++ Makefile    16 Nov 2011 16:02:18 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=       ftp replacement with advanced user interface
 
-DISTNAME=      ncftp-3.2.3
+DISTNAME=      ncftp-3.2.5
 CATEGORIES=    net
 HOMEPAGE=      http://www.ncftp.com/ncftp/
 
@@ -19,18 +19,21 @@ WANTLIB=    c ncurses
 MASTER_SITES=  ftp://ftp.ncftp.com/ncftp/ \
                ftp://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/
 MASTER_SITES:= ${MASTER_SITES} ${MASTER_SITES:=older_versions/}
-MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
+MASTER_SITES0= http://shell.uugrn.org/~naddy/
 
 DISTFILES=     ${DISTNAME}-src.tar.bz2
-PATCHFILES=    ncftp-323-v6-20091109.diff.gz:0
+PATCHFILES=    ncftp-325-v6.diff.gz:0          # former KAME v6 patch
 PATCH_DIST_STRIP=-p1
 
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.13
+AUTOCONF=      autoconf -l autoconf_local
+AUTOHEADER=    autoheader -l autoconf_local
+
+CONFIGURE_STYLE=autoconf
 CONFIGURE_ARGS=        --disable-ccdv
 CONFIGURE_ENV= TAR=/bin/tar
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/sh
 
-USE_GROFF =    Yes
 NO_REGRESS=    Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ncftp/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo    9 Nov 2009 17:58:55 -0000       1.20
+++ distinfo    16 Nov 2011 16:02:18 -0000
@@ -1,10 +1,10 @@
-MD5 (ncftp-3.2.3-src.tar.bz2) = +sSqFp4XNOjZYXr9SptR5Q==
-MD5 (ncftp-323-v6-20091109.diff.gz) = kSDcuw/OrLUXTQECSwulpQ==
-RMD160 (ncftp-3.2.3-src.tar.bz2) = 5eB0NgmWUC79a8r2cCgFWNi8AAc=
-RMD160 (ncftp-323-v6-20091109.diff.gz) = AE7Ja4T0Q//AyqTG3auxfZsnHMY=
-SHA1 (ncftp-3.2.3-src.tar.bz2) = fVjOFWYqKu6wtWT5jCvuovblSgs=
-SHA1 (ncftp-323-v6-20091109.diff.gz) = /FJ/34fVvbL3YL1JCFw9IadeLdk=
-SHA256 (ncftp-3.2.3-src.tar.bz2) = RvTy+95AGHoWS90P49N9LYXTZEXlbyvwj8gU7o3LpRA=
-SHA256 (ncftp-323-v6-20091109.diff.gz) = 
FA9Nrm9lRPHr5AGMZqtel8ivOrdKBOr7QA2q/Wv394A=
-SIZE (ncftp-3.2.3-src.tar.bz2) = 425393
-SIZE (ncftp-323-v6-20091109.diff.gz) = 41587
+MD5 (ncftp-3.2.5-src.tar.bz2) = sFx6bVJpwEiR8C9D1DErMA==
+MD5 (ncftp-325-v6.diff.gz) = JeBa4oyvzsuKOpTyaPOztQ==
+RMD160 (ncftp-3.2.5-src.tar.bz2) = dSXD1Q8MzETz3bnfFDzDRhe7XY4=
+RMD160 (ncftp-325-v6.diff.gz) = lQJ2yHW7KN4uLP7x8EZ2M72fqZk=
+SHA1 (ncftp-3.2.5-src.tar.bz2) = uuFasx0Wxc7AKc5XN8EojBP9kLs=
+SHA1 (ncftp-325-v6.diff.gz) = l3mzckXrzyVruJO5xeCI2hzDq2I=
+SHA256 (ncftp-3.2.5-src.tar.bz2) = tOviQVdhpRN80dMTyPwTUvJtiWPMnp41TilyCqIInUI=
+SHA256 (ncftp-325-v6.diff.gz) = f7lSQMM67KZ+U75Y9gFqfh3NdTsSWUD1Odq3WV4NAro=
+SIZE (ncftp-3.2.5-src.tar.bz2) = 454682
+SIZE (ncftp-325-v6.diff.gz) = 23295
Index: patches/patch-doc_man_ncftpspooler_1
===================================================================
RCS file: patches/patch-doc_man_ncftpspooler_1
diff -N patches/patch-doc_man_ncftpspooler_1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_man_ncftpspooler_1        16 Nov 2011 16:02:18 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- doc/man/ncftpspooler.1.orig        Wed Nov 16 12:21:43 2011
++++ doc/man/ncftpspooler.1     Wed Nov 16 12:21:55 2011
+@@ -370,7 +370,8 @@ key-pairs), as well as additional data the spooler may
+ as a
+ .I result
+ key-pair with a textual description of the job's completion status.
+-.PP Here is a sample Perl script which demonstrates having a
++.PP
++Here is a sample Perl script which demonstrates having a
+ .I post\-shell\-command
+ update a log file named
+ /var/log/ncftp_spooler.
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to