Remove nbgrep (obsoleted by bgrep). Add and enable grep.

6 files changed, 2 insertions, 78 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 89e47ff002c..b1d159bb092 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2003/08/24 18:27:35 cjep Exp $
+# $NetBSD: Makefile,v 1.205 2003/08/25 11:17:49 cjep Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -31,6 +31,7 @@ SUBDIR+=	aspell-spanish
 SUBDIR+=	aspell-svenska
 SUBDIR+=	aspell-ukrainian
 SUBDIR+=	aspell-welsh
+SUBDIR+=	bgrep
 SUBDIR+=	bibclean
 SUBDIR+=	biblook
 SUBDIR+=	bibparse
@@ -107,7 +108,6 @@ SUBDIR+=	lq-sp
 SUBDIR+=	makeztxt
 SUBDIR+=	namazu1
 SUBDIR+=	namazu2
-SUBDIR+=	nbgrep
 SUBDIR+=	nbsed
 SUBDIR+=	ndtpd
 SUBDIR+=	openjade
diff --git a/textproc/nbgrep/DESCR b/textproc/nbgrep/DESCR
deleted file mode 100644
index ef0d96c0c5c..00000000000
--- a/textproc/nbgrep/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a BSD-licensed grep(1) replacement. It is currently being
-developed in NetBSD's othersrc module.
diff --git a/textproc/nbgrep/Makefile b/textproc/nbgrep/Makefile
deleted file mode 100644
index 9060dda96e7..00000000000
--- a/textproc/nbgrep/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/08/24 23:22:09 cjep Exp $
-#
-
-DISTNAME=	nbgrep-20030825
-CATEGORIES=	sysutils textproc
-MASTER_SITES=	http://www.fawlty.net/software/
-
-MAINTAINER=	cjep@netbsd.org
-HOMEPAGE=	# none
-COMMENT=	BSD version of grep as in NetBSD othersrc
-
-CONFLICTS+=		bsdgrep-*
-#ONLY_FOR_PLATFORM=	NetBSD-1.6*-*
-
-post-patch:
-	@${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/nbgrep/PLIST b/textproc/nbgrep/PLIST
deleted file mode 100644
index cf5c54f7ce7..00000000000
--- a/textproc/nbgrep/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/24 18:23:46 cjep Exp $
-bin/bgrep
-bin/ebgrep
-bin/fbgrep
-bin/zbgrep
-man/man1/bgrep.1
-man/man1/ebgrep.1
-man/man1/fbgrep.1
-man/man1/zbgrep.1
diff --git a/textproc/nbgrep/distinfo b/textproc/nbgrep/distinfo
deleted file mode 100644
index 57cdd68e31c..00000000000
--- a/textproc/nbgrep/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/08/24 23:27:28 cjep Exp $
-
-SHA1 (nbgrep-20030825.tar.gz) = 847f81eb1530fb7372c91607270f5b77de661518
-Size (nbgrep-20030825.tar.gz) = 12921 bytes
-SHA1 (patch-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c
diff --git a/textproc/nbgrep/patches/patch-aa b/textproc/nbgrep/patches/patch-aa
deleted file mode 100644
index 2c41b4aa163..00000000000
--- a/textproc/nbgrep/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/24 18:23:46 cjep Exp $
-
---- Makefile.orig	2003-07-20 14:45:41.000000000 +0100
-+++ Makefile
-@@ -2,16 +2,18 @@
- 
--PROG=	grep
-+PROG=	bgrep
- SRCS=	binary.c file.c grep.c mmfile.c queue.c util.c
- 
--LINKS=  ${BINDIR}/grep ${BINDIR}/egrep	\
--	${BINDIR}/grep ${BINDIR}/fgrep	\
--	${BINDIR}/grep ${BINDIR}/zgrep	\
--	${BINDIR}/grep ${BINDIR}/zegrep	\
--	${BINDIR}/grep ${BINDIR}/zfgrep
--
--MLINKS= grep.1 egrep.1	\
--	grep.1 fgrep.1	\
--	grep.1 zgrep.1	\
--	grep.1 zegrep.1	\
--	grep.1 zfgrep.1
-+PREFIX?=	/usr/local
-+
-+LINKS=  ${BINDIR}/bgrep ${BINDIR}/ebgrep	\
-+	${BINDIR}/bgrep ${BINDIR}/fbgrep	\
-+	${BINDIR}/bgrep ${BINDIR}/zbgrep	\
-+	${BINDIR}/bgrep ${BINDIR}/zebgrep	\
-+	${BINDIR}/bgrep ${BINDIR}/zfbgrep
-+
-+MLINKS= bgrep.1 ebgrep.1	\
-+	bgrep.1 fbgrep.1	\
-+	bgrep.1 zbgrep.1	\
-+	bgrep.1 zebgrep.1	\
-+	bgrep.1 zfbgrep.1
- 
-@@ -19,2 +21,6 @@ LDADD=  -lz
- 
-+MANDIR=${PREFIX}/man
-+BINDIR=${PREFIX}/bin
-+MKCATPAGES=no
-+
- WARNS=2