From da0161733f959d9c4f4735d47cd976bbb994e788 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 1 Apr 2007 21:18:45 +0000 Subject: Remove net/ncftp2 -- old version of net/ncftp3. No disagreement on pkgsrc-users. --- net/Makefile | 3 +-- net/ncftp2/DESCR | 5 ----- net/ncftp2/Makefile | 28 --------------------------- net/ncftp2/PLIST | 3 --- net/ncftp2/distinfo | 8 -------- net/ncftp2/options.mk | 16 --------------- net/ncftp2/patches/patch-aa | 24 ----------------------- net/ncftp2/patches/patch-ab | 16 --------------- net/ncftp2/patches/patch-ac | 47 --------------------------------------------- 9 files changed, 1 insertion(+), 149 deletions(-) delete mode 100644 net/ncftp2/DESCR delete mode 100644 net/ncftp2/Makefile delete mode 100644 net/ncftp2/PLIST delete mode 100644 net/ncftp2/distinfo delete mode 100644 net/ncftp2/options.mk delete mode 100644 net/ncftp2/patches/patch-aa delete mode 100644 net/ncftp2/patches/patch-ab delete mode 100644 net/ncftp2/patches/patch-ac diff --git a/net/Makefile b/net/Makefile index 8c5af90e744..a5a97a6d551 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.662 2007/03/24 14:11:41 markd Exp $ +# $NetBSD: Makefile,v 1.663 2007/04/01 21:18:45 wiz Exp $ # COMMENT= Networking tools @@ -224,7 +224,6 @@ SUBDIR+= nap SUBDIR+= napshare SUBDIR+= nasd SUBDIR+= nbtscan -SUBDIR+= ncftp2 SUBDIR+= ncftp3 SUBDIR+= neat SUBDIR+= nemesis diff --git a/net/ncftp2/DESCR b/net/ncftp2/DESCR deleted file mode 100644 index f57dd5cbd42..00000000000 --- a/net/ncftp2/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/net/ncftp2/Makefile b/net/ncftp2/Makefile deleted file mode 100644 index 859b5c39f14..00000000000 --- a/net/ncftp2/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile,v 1.42 2007/01/07 09:14:04 rillig Exp $ - -DISTNAME= ncftp-2.4.3 -PKGREVISION= 2 -CATEGORIES= net -MASTER_SITES= ftp://ftp.ncftp.com/ncftp/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.ncftp.com/ncftp/ -COMMENT= FTP replacement with advanced user interface - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-extra-dirs -CONFIGURE_ARGS+= --disable-ncurses -CONFIGURE_ENV+= ac_cv_lib_intl_strftime=no -CONFIGURE_ENV+= GZCAT=${GZCAT:Q} -USE_TOOLS+= gzcat - -.include "options.mk" - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 - ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/${PKGMANDIR}/man1/ncftp2.1 - -.include "../../devel/readline/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/ncftp2/PLIST b/net/ncftp2/PLIST deleted file mode 100644 index 50ed716de2c..00000000000 --- a/net/ncftp2/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:26 zuntum Exp $ -bin/ncftp2 -man/man1/ncftp2.1.gz diff --git a/net/ncftp2/distinfo b/net/ncftp2/distinfo deleted file mode 100644 index 77f4885fef7..00000000000 --- a/net/ncftp2/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:13:54 agc Exp $ - -SHA1 (ncftp-2.4.3.tar.gz) = 467476420e16e14f09213e834bea9d2a37596a3e -RMD160 (ncftp-2.4.3.tar.gz) = f310d24502a05f79fd2896e919325b3cf297a444 -Size (ncftp-2.4.3.tar.gz) = 192937 bytes -SHA1 (patch-aa) = 792be48d48a53cfc2fe1f2a14b47d0488ba78b3c -SHA1 (patch-ab) = 4525161f649415fb44d3896899ffa0068127586e -SHA1 (patch-ac) = 39ae65bcae18308e35c5590262360982672dbfef diff --git a/net/ncftp2/options.mk b/net/ncftp2/options.mk deleted file mode 100644 index 3b6befa6f38..00000000000 --- a/net/ncftp2/options.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.ncftp2 -PKG_OPTIONS_OPTIONAL_GROUPS+= socks -PKG_OPTIONS_GROUP.socks= socks4 socks5 - -.include "../../mk/bsd.options.mk" - -# Include SOCKS firewall support -.if !empty(PKG_OPTIONS:Msocks4) -CONFIGURE_ARGS+= --enable-socks -.include "../../net/socks4/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Msocks5) -CONFIGURE_ARGS+= --enable-socks5 -.include "../../net/socks5/buildlink3.mk" -.endif diff --git a/net/ncftp2/patches/patch-aa b/net/ncftp2/patches/patch-aa deleted file mode 100644 index d247be0f4d3..00000000000 --- a/net/ncftp2/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 11:10:47 agc Exp $ - ---- Main.c.orig Fri Oct 18 07:01:58 1996 -+++ Main.c Fri Feb 20 14:46:28 1998 -@@ -22,6 +22,9 @@ - #include - #include - #include -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+#include -+#endif - #include - #include - #include -@@ -866,6 +869,9 @@ - int opt, result; - OpenOptions openopt; - -+#ifdef __FreeBSD__ -+ setlocale(LC_ALL, ""); -+#endif - Init(); - RunStartupScript(); - diff --git a/net/ncftp2/patches/patch-ab b/net/ncftp2/patches/patch-ab deleted file mode 100644 index 09ab536204b..00000000000 --- a/net/ncftp2/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2001/05/16 20:27:23 jlam Exp $ - ---- Complete.c.orig Fri Oct 18 01:10:31 1996 -+++ Complete.c Thu Jul 8 15:33:42 1999 -@@ -241,7 +241,11 @@ - static int - CompareStrings(char **a, char **b) - { -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+ return strcoll(*a, *b); -+#else - return strcmp(*a, *b); -+#endif - } - - static void diff --git a/net/ncftp2/patches/patch-ac b/net/ncftp2/patches/patch-ac deleted file mode 100644 index e50c232cc18..00000000000 --- a/net/ncftp2/patches/patch-ac +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ac,v 1.5 1999/07/13 01:34:42 jlam Exp $ - ---- configure.orig Sun Jun 8 01:25:04 1997 -+++ configure Wed Jul 7 00:05:26 1999 -@@ -1069,6 +1069,7 @@ - - - # See if we should add -I/usr/local/include -L/usr/local/lib, etc. -+if test "$nc_cv_extra_dirs" = yes ; then - echo "checking for extra include and lib directories..." 1>&6 - b1=`cd .. ; pwd` - b2=`cd ../.. ; pwd` -@@ -1128,6 +1129,7 @@ - fi - done - done -+fi - - - # Look for SunOS' /usr/5lib and 5include directories, because -@@ -1766,7 +1768,7 @@ - echo "$ac_t""no" 1>&6 - fi - -- if test "$ac_cv_lib_socks5" = yes ; then -+ if test "$ac_cv_lib_socks5_SOCKSinit" = yes ; then - nc_cv_socks=no - else - LIBS="$savelibs" -@@ -2345,7 +2347,7 @@ - - # See if we should add -I/usr/local/ncurses - --incdir="/usr/local/ncurses" -+incdir="$prefix/ncurses" - if test -r $incdir ; then - case "$CPPFLAGS" in - *${incdir}*) -@@ -2366,7 +2368,7 @@ - # Some people (me) have two versions of ncurses on - # the system. Use the one in /usr/local first. - case "$CPPFLAGS" in -- */usr/local/include/ncurses*/usr/include/ncurses*) -+ *$prefix/include/ncurses*/usr/include/ncurses*) - CPPFLAGS=`echo "$CPPFLAGS" | sed 's@-I/usr/include/ncurses@@g'` - esac - fi -- cgit v1.2.3