Upgrade to 3.0.4.

Also change the port name back to ncftp and use LATEST_LINK.

6 files changed, 6 insertions, 78 deletions

diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 8d10fc691455..de893ace67d6 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -6,19 +6,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ncftp3
-PORTVERSION=	3.0.3
+PORTNAME=	ncftp
+PORTVERSION=	3.0.4
 PORTREVISION=	0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 DISTNAME=	ncftp-${PORTVERSION}-src
 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	ncftp-303-v6-20010421.diff.gz
+PATCHFILES=	ncftp-304-v6-20011102.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	obrien@FreeBSD.org
 
+LATEST_LINK=	ncftp3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/ncftp3/distinfo b/ftp/ncftp3/distinfo
index 8ff861d71013..f109960fb4b1 100644
--- a/ftp/ncftp3/distinfo
+++ b/ftp/ncftp3/distinfo
@@ -1,2 +1,2 @@
-MD5 (ncftp-3.0.3-src.tar.gz) = 62c277a6f6f75883cfe9c4f2635a3871
-MD5 (ncftp-303-v6-20010421.diff.gz) = 37b28c68c6099c7ba99628fc26691f8d
+MD5 (ncftp-3.0.4-src.tar.gz) = d80a15982d163caaff42706b59acb3e4
+MD5 (ncftp-304-v6-20011102.diff.gz) = 918b4ca97718294a3a8416ebc91d8921
diff --git a/ftp/ncftp3/files/patch-ncftp-Makefile.in b/ftp/ncftp3/files/patch-ncftp-Makefile.in
deleted file mode 100644
index 275153033470..000000000000
--- a/ftp/ncftp3/files/patch-ncftp-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- ncftp/Makefile.in.orig	Fri Dec  8 23:11:08 2000
-+++ ncftp/Makefile.in	Tue May  8 13:42:15 2001
-@@ -13,6 +13,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- BINDIR=@bindir@
-+SYSCONFDIR=@sysconfdir@
- 
- LIBS=@LIBS@
- STRIP=strip
-@@ -20,7 +21,7 @@
- 
- # Any -D definitions:
- BETA=# -DBETA=20
--DEFS=-Dncftp $(BETA) -DBINDIR=\"$(BINDIR)\" @DEFS@
-+DEFS=-Dncftp $(BETA) -DBINDIR=\"$(BINDIR)\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" @DEFS@
- 
- OBJS=cmds.@OBJEXT@ cmdlist.@OBJEXT@ getopt.@OBJEXT@ ls.@OBJEXT@ main.@OBJEXT@ version.@OBJEXT@ shell.@OBJEXT@ util.@OBJEXT@ readln.@OBJEXT@ progress.@OBJEXT@ bookmark.@OBJEXT@ pref.@OBJEXT@ preffw.@OBJEXT@ trace.@OBJEXT@ spool.@OBJEXT@ log.@OBJEXT@ getline.@OBJEXT@
- 
diff --git a/ftp/ncftp3/files/patch-pref.h b/ftp/ncftp3/files/patch-pref.h
deleted file mode 100644
index eb9fc16a93eb..000000000000
--- a/ftp/ncftp3/files/patch-pref.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- ncftp/pref.h.orig	Sun Apr 15 19:36:00 2001
-+++ ncftp/pref.h	Tue May  8 13:42:15 2001
-@@ -16,10 +16,10 @@
- #	define kFirstFileName				"init_v3.txt"
- #else
- #	define kFirewallPrefFileName			"firewall"
--#	define kGlobalFirewallPrefFileName		"/etc/ncftp.firewall"
--#	define kGlobalFixedFirewallPrefFileName		"/etc/ncftp.firewall.fixed"
--#	define kGlobalPrefFileName			"/etc/ncftp.prefs_v3"
--#	define kGlobalFixedPrefFileName			"/etc/ncftp.prefs_v3.fixed"
-+#	define kGlobalFirewallPrefFileName		SYSCONFDIR "/ncftp.firewall"
-+#	define kGlobalFixedFirewallPrefFileName		SYSCONFDIR "/ncftp.firewall.fixed"
-+#	define kGlobalPrefFileName			SYSCONFDIR "/ncftp.prefs_v3"
-+#	define kGlobalFixedPrefFileName			SYSCONFDIR "/ncftp.prefs_v3.fixed"
- #	define kPrefFileName				"prefs_v3"
- #	define kPrefFileNameV2				"prefs"
- #	define kFirstFileName				"init_v3"
diff --git a/ftp/ncftp3/files/patch-sh_util-Makefile.in b/ftp/ncftp3/files/patch-sh_util-Makefile.in
deleted file mode 100644
index 3f8f7069db93..000000000000
--- a/ftp/ncftp3/files/patch-sh_util-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- sh_util/Makefile.in.orig	Fri Dec  8 23:11:25 2000
-+++ sh_util/Makefile.in	Tue May  8 13:42:15 2001
-@@ -11,13 +11,14 @@
- VPATH=@srcdir@
- CPPFLAGS=@CPPFLAGS@ -I. -I../libncftp -I../Strn -I../sio
- prefix=@prefix@
-+SYSCONFDIR=@sysconfdir@
- 
- LIBS=@LIBS@
- STRIP=strip
- LDFLAGS=-L../libncftp -L../Strn -L../sio @LDFLAGS@
- 
- # Any -D definitions:
--DEFS=-Dsh_util @DEFS@
-+DEFS=-Dsh_util -DSYSCONFDIR=\"$(SYSCONFDIR)\" @DEFS@
- 
- DPROGS=../bin/ncftpget@EXEEXT@ ../bin/ncftpput@EXEEXT@ ../bin/ncftpbatch@EXEEXT@ ../bin/ncftpls@EXEEXT@
- 
diff --git a/ftp/ncftp3/files/patch-vis-Makefile.in b/ftp/ncftp3/files/patch-vis-Makefile.in
deleted file mode 100644
index abf076a83b72..000000000000
--- a/ftp/ncftp3/files/patch-vis-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- vis/Makefile.in.orig	Wed Apr 11 17:30:13 2001
-+++ vis/Makefile.in	Tue May  8 13:42:15 2001
-@@ -13,6 +13,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- BINDIR=@bindir@
-+SYSCONFDIR=@sysconfdir@
- 
- CURSESLIBS=@LIBCURSES@
- LIBS=$(CURSESLIBS) @LIBS@
-@@ -20,7 +21,7 @@
- LDFLAGS=-L../libncftp -L../Strn -L../sio @LDFLAGS@
- 
- # Any -D definitions:
--DEFS=-Dvis -DNCFTPPATH=\"$(BINDIR)/ncftp\" @DEFS@
-+DEFS=-Dvis -DNCFTPPATH=\"$(BINDIR)/ncftp\" -DSYSCONFDIR=\"$(SYSCONFDIR)\" @DEFS@
- 
- DPROGS=@VIS_DPROGS@
-