After discussion with grant, reimport bgrep as bsdgrep-devel.

10 files changed, 2 insertions, 143 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 9006d28d19c..b9fd84ace4d 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2003/08/30 16:19:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.207 2003/08/31 09:43:49 cjep Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -31,10 +31,10 @@ SUBDIR+=	aspell-spanish
 SUBDIR+=	aspell-svenska
 SUBDIR+=	aspell-ukrainian
 SUBDIR+=	aspell-welsh
-SUBDIR+=	bgrep
 SUBDIR+=	bibclean
 SUBDIR+=	biblook
 SUBDIR+=	bibparse
+SUBDIR+=	bsdgrep-devel
 SUBDIR+=	btparse
 SUBDIR+=	catdoc
 SUBDIR+=	cdif
diff --git a/textproc/bgrep/DESCR b/textproc/bgrep/DESCR
deleted file mode 100644
index ef0d96c0c5c..00000000000
--- a/textproc/bgrep/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/bgrep/Makefile b/textproc/bgrep/Makefile
deleted file mode 100644
index bf86bb222ec..00000000000
--- a/textproc/bgrep/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/08/30 11:33:42 cjep Exp $
-#
-
-DISTNAME=	bgrep-20030825
-WRKSRC=		${WRKDIR}/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/bgrep/PLIST b/textproc/bgrep/PLIST
deleted file mode 100644
index c4bc36b1149..00000000000
--- a/textproc/bgrep/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/25 11:13:00 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/bgrep/distinfo b/textproc/bgrep/distinfo
deleted file mode 100644
index df0475c325c..00000000000
--- a/textproc/bgrep/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/08/27 18:32:47 jmc Exp $
-
-SHA1 (bgrep-20030825.tar.gz) = 847f81eb1530fb7372c91607270f5b77de661518
-Size (bgrep-20030825.tar.gz) = 12921 bytes
-SHA1 (patch-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c
-SHA1 (patch-ab) = c7fa54dedb0925d342549cbc56197bf2d8e4e47b
-SHA1 (patch-ac) = e5b3d3a2bc069f123a7f568f72ded291f3ac49ea
-SHA1 (patch-ad) = 8080d6fa8f5faa40055ad1f067c1669d682956d2
-SHA1 (patch-ae) = 360972fb9c9a759cce1ad726ad14647b8b140a4e
diff --git a/textproc/bgrep/patches/patch-aa b/textproc/bgrep/patches/patch-aa
deleted file mode 100644
index d5274c49c77..00000000000
--- a/textproc/bgrep/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/25 11:13:00 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
diff --git a/textproc/bgrep/patches/patch-ab b/textproc/bgrep/patches/patch-ab
deleted file mode 100644
index 280b6874e21..00000000000
--- a/textproc/bgrep/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- file.c.orig	Wed Aug 27 12:59:52 2003
-+++ file.c	Wed Aug 27 13:00:09 2003
-@@ -34,10 +34,10 @@
- 
- #include <sys/param.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <zlib.h>
- 
- #include "grep.h"
- 
diff --git a/textproc/bgrep/patches/patch-ac b/textproc/bgrep/patches/patch-ac
deleted file mode 100644
index c40ca4662a2..00000000000
--- a/textproc/bgrep/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- grep.c.orig	Wed Aug 27 13:00:48 2003
-+++ grep.c	Wed Aug 27 13:01:03 2003
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <errno.h>
- #include <getopt.h>
diff --git a/textproc/bgrep/patches/patch-ad b/textproc/bgrep/patches/patch-ad
deleted file mode 100644
index c6f49b1fdfc..00000000000
--- a/textproc/bgrep/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/27 18:32:48 jmc Exp $
-
---- mmfile.c.orig	Wed Aug 27 13:01:21 2003
-+++ mmfile.c	Wed Aug 27 13:01:42 2003
-@@ -36,6 +36,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- 
-+#include <zlib.h>
- #include <err.h>
- #include <fcntl.h>
- #include <stdlib.h>
diff --git a/textproc/bgrep/patches/patch-ae b/textproc/bgrep/patches/patch-ae
deleted file mode 100644
index 8b7d0e29344..00000000000
--- a/textproc/bgrep/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/08/27 18:32:49 jmc Exp $
-
---- util.c.orig	Wed Aug 27 13:01:54 2003
-+++ util.c	Wed Aug 27 13:02:02 2003
-@@ -36,6 +36,7 @@
- #include <sys/stat.h>
- 
- #include <ctype.h>
-+#include <zlib.h>
- #include <err.h>
- #include <errno.h>
- #include <fts.h>
-@@ -44,7 +45,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <zlib.h>
- 
- #include "grep.h"
-