Add and enable nbgrep.

Remove bsdgrep (obsoleted by nbgrep).
This commit is contained in:
cjep 2003-08-24 18:27:35 +00:00
parent 19e93c9de6
commit 011e14e558
7 changed files with 2 additions and 186 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.203 2003/08/18 17:35:56 agc Exp $
# $NetBSD: Makefile,v 1.204 2003/08/24 18:27:35 cjep Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@ -34,7 +34,6 @@ SUBDIR+= aspell-welsh
SUBDIR+= bibclean
SUBDIR+= biblook
SUBDIR+= bibparse
SUBDIR+= bsdgrep
SUBDIR+= btparse
SUBDIR+= catdoc
SUBDIR+= cdif
@ -108,6 +107,7 @@ SUBDIR+= lq-sp
SUBDIR+= makeztxt
SUBDIR+= namazu1
SUBDIR+= namazu2
SUBDIR+= nbgrep
SUBDIR+= nbsed
SUBDIR+= ndtpd
SUBDIR+= openjade

View file

@ -1 +0,0 @@
This is the BSD-licensed grep(1) replacement by Jamie Howard.

View file

@ -1,16 +0,0 @@
# $NetBSD: Makefile,v 1.4 2003/07/17 22:54:10 grant Exp $
DISTNAME= grep-0.16
PKGNAME= bsdgrep-0.16
CATEGORIES= sysutils
MASTER_SITES= http://www.vocito.com/downloads/software/grep/ \
ftp://ftp.vocito.com/pub/vocito.com/software/grep/
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.vocito.com/downloads/software/grep/
COMMENT= BSD version of grep
post-patch:
@${CP} ${WRKSRC}/grep.1 ${WRKSRC}/bgrep.1
.include "../../mk/bsd.pkg.mk"

View file

@ -1,9 +0,0 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/19 07:15:14 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

View file

@ -1,6 +0,0 @@
$NetBSD: distinfo,v 1.2 2002/11/23 16:15:20 cjep Exp $
SHA1 (grep-0.16.tar.gz) = 37fe06c5601fadc7d062292b66f95098d5d4bc47
Size (grep-0.16.tar.gz) = 9712 bytes
SHA1 (patch-aa) = 359b9379f4ffd5a9fac86f6032e49479ab98fbf8
SHA1 (patch-ab) = b4e51b9092160f08dab69847806d899417eeed76

View file

@ -1,36 +0,0 @@
$NetBSD: patch-aa,v 1.2 2002/11/23 16:15:21 cjep Exp $
--- Makefile.orig Fri Nov 5 15:28:02 1999
+++ Makefile
@@ -2,14 +2,22 @@
-PROG= grep
+PREFIX?=/usr/local
+
+PROG= bgrep
+MAN= bgrep.1
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
-MLINKS= grep.1 egrep.1 \
- grep.1 fgrep.1 \
- grep.1 zgrep.1
+LINKS= ${BINDIR}/bgrep ${BINDIR}/ebgrep \
+ ${BINDIR}/bgrep ${BINDIR}/fbgrep \
+ ${BINDIR}/bgrep ${BINDIR}/zbgrep
+MLINKS= bgrep.1 ebgrep.1 \
+ bgrep.1 fbgrep.1 \
+ bgrep.1 zbgrep.1
+
+#CFLAGS+= -I/usr/local/include -Wall -pedantic
-CFLAGS+= -I/usr/local/include -Wall -pedantic
+#LDADD= -lz -L/usr/local/lib/ -liberty
+LDADD= -lz
-LDADD= -lz -L/usr/local/lib/ -liberty
+MANDIR=${PREFIX}/man
+BINDIR=${PREFIX}/bin
+MKCATPAGES=no

View file

@ -1,116 +0,0 @@
$NetBSD: patch-ab,v 1.2 2002/11/23 16:15:21 cjep Exp $
--- grep.1.orig Fri Oct 29 17:02:36 1999
+++ grep.1
@@ -35,18 +35,18 @@
.Dt GREP 1
.Os
.Sh NAME
-.Nm grep, egrep, fgrep. zgrep
+.Nm bgrep, egrep, fgrep, zgrep
.Nd file pattern searcher
.Sh SYNOPSIS
-.Nm grep
+.Nm bgrep
.Op Fl AB Ar num
-.Op Fl CEFGHLPRSVZabchilnoqsvwx
+.Op Fl CEFGHLPRSVZabchilnoqrsvwx
.Op Fl e Ar pattern
.Op Fl f Ar file
.Op Ar
.Sh DESCRIPTION
The
-.Nm grep
+.Nm bgrep
utilities search the given input files selecting lines that match one
or more patterns.
By default, a pattern matches an input line if any regular expression
@@ -57,7 +57,7 @@
to the standard output.
.Pp
The
-.Nm grep
+.Nm bgrep
utility is used for simple patterns and
.Xr ex 1
or
@@ -74,7 +74,7 @@
the input.
The
.Nm zgrep
-utility acts like grep, but accepts input files compressed with the
+utility acts like bgrep, but accepts input files compressed with the
.Xr compress 1
or
.Xr gzip 1
@@ -99,19 +99,19 @@
.Ar 2 .
.It Fl E
Force
-.Nm grep
+.Nm bgrep
to behave as
.Nm egrep.
.It Fl F
Force
-.Nm grep
+.Nm bgrep
to behave as
.Nm fgrep.
.It Fl G
Force
-.Nm grep
+.Nm bgrep
to behave as
-.Nm grep.
+.Nm bgrep.
.It Fl H
If
.Fl R
@@ -138,7 +138,7 @@
Display version information.
.It Fl Z
Force
-.Nm grep
+.Nm bgrep
to behave as
.Nm zgrep .
.It Fl a
@@ -185,6 +185,8 @@
Always print filename headers with output lines.
.It Fl q
Suppress normal output.
+.It Fl r
+Read all files under each directory recursively.
.It Fl s
Silent mode. Nonexistent and unreadable files are ignored.
.It Fl v
@@ -204,7 +206,7 @@
If no file arguments are specified, the standard input is used.
.Pp
The
-.Nm grep
+.Nm bgrep
utility exits with one of the following values:
.Pp
.Bl -tag -width flag -compact
@@ -243,16 +245,16 @@
.Sh EXAMPLES
To find all occurrences of the word patricia in a file:
.Pp
-.Dl grep patricia myfile
+.Dl bgrep patricia myfile
.Pp
To find all occurrences of the pattern
.Ql \&.Pp
at the beginning of a line:
.Pp
-.Dl grep '^\e.Pp'
+.Dl bgrep '^\e.Pp'
.Pp
The apostrophes assure the entire expression is evaluated by
-.Nm grep
+.Nm bgrep
instead of by the
user's shell.
The caret