8 files changed, 2 insertions, 101 deletions

diff --git a/ftp/Makefile b/ftp/Makefile
index f8141ee4c420..09f0ae73af2e 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -63,7 +63,7 @@
     SUBDIR += moftpd
     SUBDIR += muddleftpd
     SUBDIR += multiget
-    SUBDIR += ncftp
+    SUBDIR += ncftp1
     SUBDIR += ncftp2
     SUBDIR += ncftp3
     SUBDIR += ncftpd
diff --git a/ftp/ncftp/Makefile b/ftp/ncftp/Makefile
deleted file mode 100644
index 774dacdc0827..000000000000
--- a/ftp/ncftp/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:  ncftp
-# Date created:			  20 Jun 1996
-# Whom:				  jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ncftp1
-PORTVERSION=	1.9.5
-CATEGORIES=	ftp
-MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
-DISTNAME=	ncftp-${PORTVERSION}
-
-MAINTAINER=	obrien@FreeBSD.org
-COMMENT=	FTP replacement with advanced user interface
-
-.if defined(INSTALL_AS_NCFTP)
-LATEST_LINK=	ncftp
-.else
-LATEST_LINK=	ncftp1
-.endif
-PLIST_FILES=	bin/${LATEST_LINK}
-MAN1=		ncftp.1
-
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp1 as ${PREFIX}/bin/ncftp"
-	@${ECHO} ""
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/${LATEST_LINK}
-	cd ${WRKSRC}; ${INSTALL_MAN} ncftp.1 ${PREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/ftp/ncftp/distinfo b/ftp/ncftp/distinfo
deleted file mode 100644
index a315809f0a62..000000000000
--- a/ftp/ncftp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ncftp-1.9.5.tar.gz) = 302b24206852d727723ef8797ddb5164
-SHA256 (ncftp-1.9.5.tar.gz) = 00e35e8f1b59f5d9df7a4207faad14d51c60b4f9cda72158e49053eca85b4bfe
-SIZE (ncftp-1.9.5.tar.gz) = 95832
diff --git a/ftp/ncftp/files/patch-aa b/ftp/ncftp/files/patch-aa
deleted file mode 100644
index 7b5e57335254..000000000000
--- a/ftp/ncftp/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	Sun Oct  1 17:50:58 1995
-+++ Makefile	Sun Oct 19 02:18:45 2003
-@@ -13,7 +13,7 @@
- 
- # Program definitions.  See the README, part C.
- #--------------------------------------------------------------------------
--PDEFS =
-+PDEFS = -DREADLINE
- #PDEFS = -DGETLINE
- #PDEFS = -DREADLINE -DCURSES
- #PDEFS = -DSOCKS
-@@ -24,11 +24,12 @@
- # Choose your compiler and flags below.  Make sure you use an ANSI compiler
- # that handles new style function declarations and prototypes (gcc should).
- #--------------------------------------------------------------------------
--CC = cc
-+CC ?= cc
- #CC = gcc
- 
-+CFLAGS ?= -O -pipe
- #CFLAGS = $(TERM_INC) -O
--CFLAGS = $(TERM_INC) -O2
-+CFLAGS += $(TERM_INC)
- #CFLAGS = $(TERM_INC) -g
- 
- LFLAGS = -s
-@@ -53,7 +54,7 @@
- # You'll need to know where the Rconnect.o object file is if you want
- #   to use Socks.
- #--------------------------------------------------------------------------
--LIBS =
-+LIBS = -lreadline
- #LIBS = -ldbmalloc
- #LIBS = -lgetline
- #LIBS = -lreadline -lcurses
diff --git a/ftp/ncftp/files/patch-ab b/ftp/ncftp/files/patch-ab
deleted file mode 100644
index 05f6711e416e..000000000000
--- a/ftp/ncftp/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig	Sun Oct 29 19:17:55 1995
-+++ main.c	Tue Feb 18 19:11:56 1997
-@@ -200,7 +200,7 @@
- 	ansi_escapes = 0;
- 	if ((cp = getenv("TERM")) != NULL) {
- 		if ((*cp == 'v' && cp[1] == 't')		/* vt100, vt102, ... */
--			|| (strcmp(cp, "xterm") == 0))
-+			|| (strncmp(cp, "xterm", 5) == 0))
- 			ansi_escapes = 1;
- 	}
- #endif
diff --git a/ftp/ncftp/files/patch-sys.h b/ftp/ncftp/files/patch-sys.h
deleted file mode 100644
index 8d65c5ddc96c..000000000000
--- a/ftp/ncftp/files/patch-sys.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- sys.h.orig	Tue Jun  4 21:12:36 2002
-+++ sys.h	Tue Jun  4 21:12:44 2002
-@@ -423,7 +423,6 @@
- #       define HERROR 1
- #	define TERMIOS 1
- #       define HAS_GETCWD 1
--#       define U_WAIT 1
- #	define NO_CONST 1       /* avoid prototype conflict */
- #endif
- 
diff --git a/ftp/ncftp/pkg-descr b/ftp/ncftp/pkg-descr
deleted file mode 100644
index f57dd5cbd429..000000000000
--- a/ftp/ncftp/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-       NcFTP is a user interface to the  Internet  standard  File
-       Transfer Protocol.  This program allows a user to transfer
-       files to and from a remote network site, and offers  addi-
-       tional  features that are not found in the standard inter-
-       face, ftp.
diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile
index 774dacdc0827..b792a7768f55 100644
--- a/ftp/ncftp1/Makefile
+++ b/ftp/ncftp1/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ncftp1
+PORTNAME=	ncftp
 PORTVERSION=	1.9.5
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/