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

9 files changed, 142 insertions, 0 deletions

diff --git a/textproc/bsdgrep-devel/DESCR b/textproc/bsdgrep-devel/DESCR
new file mode 100644
index 00000000000..ef0d96c0c5c
--- /dev/null
+++ b/textproc/bsdgrep-devel/DESCR
@@ -0,0 +1,2 @@
+This is a BSD-licensed grep(1) replacement. It is currently being
+developed in NetBSD's othersrc module.
diff --git a/textproc/bsdgrep-devel/Makefile b/textproc/bsdgrep-devel/Makefile
new file mode 100644
index 00000000000..6701b2d5f4b
--- /dev/null
+++ b/textproc/bsdgrep-devel/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/08/31 09:37:51 cjep Exp $
+#
+
+DISTNAME=	bgrep-20030825
+PKGNAME=	bsdgrep-devel-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/bsdgrep-devel/PLIST b/textproc/bsdgrep-devel/PLIST
new file mode 100644
index 00000000000..49378948e53
--- /dev/null
+++ b/textproc/bsdgrep-devel/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/31 09:37:51 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/bsdgrep-devel/distinfo b/textproc/bsdgrep-devel/distinfo
new file mode 100644
index 00000000000..ff89cd5669c
--- /dev/null
+++ b/textproc/bsdgrep-devel/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/08/31 09:37:51 cjep 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/bsdgrep-devel/patches/patch-aa b/textproc/bsdgrep-devel/patches/patch-aa
new file mode 100644
index 00000000000..95320a3ed47
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/08/31 09:37:51 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/bsdgrep-devel/patches/patch-ab b/textproc/bsdgrep-devel/patches/patch-ab
new file mode 100644
index 00000000000..37e562fcea2
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/08/31 09:37:51 cjep 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/bsdgrep-devel/patches/patch-ac b/textproc/bsdgrep-devel/patches/patch-ac
new file mode 100644
index 00000000000..4cc1a33bc2f
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/08/31 09:37:51 cjep 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/bsdgrep-devel/patches/patch-ad b/textproc/bsdgrep-devel/patches/patch-ad
new file mode 100644
index 00000000000..90dbd1500a2
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/08/31 09:37:51 cjep 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/bsdgrep-devel/patches/patch-ae b/textproc/bsdgrep-devel/patches/patch-ae
new file mode 100644
index 00000000000..12271f5c786
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/08/31 09:37:51 cjep 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"
+