Add & enable whois3.

Remove package ripe-whois superseded by package whois3.

6 files changed, 2 insertions, 87 deletions

diff --git a/net/Makefile b/net/Makefile
index ab35fdaf091..a636fd0e6c6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.691 2007/11/04 12:36:14 rillig Exp $
+# $NetBSD: Makefile,v 1.692 2007/11/15 01:00:18 seb Exp $
 #
 
 COMMENT=	Networking tools
@@ -401,7 +401,6 @@ SUBDIR+=	rbldnsd
 SUBDIR+=	rdesktop
 SUBDIR+=	rdist6
 SUBDIR+=	rinetd
-SUBDIR+=	ripe-whois
 SUBDIR+=	ripe-whois-tools
 SUBDIR+=	rootprobe
 SUBDIR+=	rp-l2tp
@@ -501,6 +500,7 @@ SUBDIR+=	wap-utils
 SUBDIR+=	waste
 SUBDIR+=	wget
 SUBDIR+=	whatmask
+SUBDIR+=	whois3
 SUBDIR+=	whoson
 SUBDIR+=	wide-dhcpv6
 SUBDIR+=	wimon
diff --git a/net/ripe-whois/DESCR b/net/ripe-whois/DESCR
deleted file mode 100644
index 4b4e5dfab66..00000000000
--- a/net/ripe-whois/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-This is whois3, a very simple and generic whois client.
-
-This client, unlike the "classic" whois client,
-does not check for supported flags at the client side,
-except for -h (whois host) and -p (whois port).
-
-The syntax checks for flags are made at the server side.
-
-The default host and port of whois3 is whois.ripe.net
-at port 43 (or to be more exact, the tcp port specified
-for whois in /etc/services).
-
-Try whois3 help.
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
deleted file mode 100644
index 8e68e069bda..00000000000
--- a/net/ripe-whois/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/09/07 22:12:19 jlam Exp $
-#
-
-DISTNAME=	ripe-whois-3.1.1v6
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.ripe.net/tools/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASCII_DOC} ${PS_DOC}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ripe.net/ripencc/pub-services/db/
-COMMENT=	RIPE very simple and generic whois client
-
-WRKSRC=		${WRKDIR}/whois-3.1.1v6
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	perl
-MAKE_ENV+=	PERL5=${PERL5:Q}
-BUILD_DEFS+=	IPV6_READY
-
-ASCII_DOC=		ripe-223.txt
-PS_DOC=			ripe-223.ps
-DOCS=			${ASCII_DOC} ${PS_DOC}
-SITES.${ASCII_DOC}=	ftp://ftp.ripe.net/ripe/docs/
-SITES.${PS_DOC}=	ftp://ftp.ripe.net/ripe/docs/
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ripe-whois
-.for __file__ in ${DOCS}
-	${INSTALL_DATA} ${DISTDIR}/${__file__} ${PREFIX}/share/doc/ripe-whois
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ripe-whois/PLIST b/net/ripe-whois/PLIST
deleted file mode 100644
index aa99fd4020d..00000000000
--- a/net/ripe-whois/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/02/05 13:01:10 seb Exp $
-bin/whois3
-man/man1/whois3.1
-share/doc/ripe-whois/ripe-223.ps
-share/doc/ripe-whois/ripe-223.txt
-@dirrm share/doc/ripe-whois
diff --git a/net/ripe-whois/distinfo b/net/ripe-whois/distinfo
deleted file mode 100644
index f6fa87c7fc9..00000000000
--- a/net/ripe-whois/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:14:03 agc Exp $
-
-SHA1 (ripe-whois-3.1.1v6.tar.gz) = 6213c9cab9f9322d42a6d7f39473a67b6af9d520
-RMD160 (ripe-whois-3.1.1v6.tar.gz) = 8b14aa7054c1e7ac059ef136a8ac4e44614bb7d5
-Size (ripe-whois-3.1.1v6.tar.gz) = 40608 bytes
-SHA1 (ripe-223.txt) = 962bca7ddcb70863e2925d45f17b120a21bf605c
-RMD160 (ripe-223.txt) = b5aa1b529c7b02ef02acf4d1afde9f68019acada
-Size (ripe-223.txt) = 112854 bytes
-SHA1 (ripe-223.ps) = 9c25f2b92151a05f26844f51695fd40ea57aa7f2
-RMD160 (ripe-223.ps) = 49c2d7bd0094e5adb7f726eee6958830a508a3dc
-Size (ripe-223.ps) = 263983 bytes
-SHA1 (patch-aa) = 4b1532bba7eb4b120c601933bdcb40419c493666
diff --git a/net/ripe-whois/patches/patch-aa b/net/ripe-whois/patches/patch-aa
deleted file mode 100644
index 54c5057d69c..00000000000
--- a/net/ripe-whois/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/08/28 14:07:02 seb Exp $
-
---- Makefile.in.orig	Wed Apr 17 16:45:02 2002
-+++ Makefile.in
-@@ -65,7 +65,7 @@ $(TARGET): $(OBJS)
- 	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
- 
- flags.h: FLAGS.txt
--	perl flags2hdr.pl flags.h < FLAGS.txt > flags.h
-+	${PERL5} flags2hdr.pl flags.h < FLAGS.txt > flags.h
- 
- $(MAN): 
- 
-@@ -73,7 +73,7 @@ whois3.1: whois3.1.i whois3.1.ii whois3.
- 	cat whois3.1.i whois3.1.ii whois3.1.iii > whois3.1
- 
- whois3.1.ii: HELP.txt
--	perl help2nroff.pl < HELP.txt > whois3.1.ii
-+	${PERL5} help2nroff.pl < HELP.txt > whois3.1.ii
- 
- $(OBJS): $(SOURCES)
-