Do not install zgrep, or links to zgrep, since zgrep is provided by

src/gnu/usr.bin/grep.

Reviewed by:	delphij
This commit is contained in:
Simon L. B. Nielsen 2007-02-10 13:49:39 +00:00
parent aad85353cc
commit fc8405c644
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=166621
3 changed files with 4 additions and 228 deletions

View File

@ -4,7 +4,7 @@
.include <bsd.own.mk>
PROG= gzip
MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
DPADD= ${LIBZ}
LDADD= -lz
@ -17,20 +17,16 @@ LDADD+= -lbz2
CFLAGS+= -DNO_BZIP2_SUPPORT
.endif
SCRIPTS= gzexe zdiff zforce zgrep zmore znew
SCRIPTS= gzexe zdiff zforce zmore znew
MLINKS+= gzip.1 gunzip.1 \
gzip.1 gzcat.1 \
gzip.1 zcat.1 \
zdiff.1 zcmp.1 \
zgrep.1 zegrep.1 \
zgrep.1 zfgrep.1
zdiff.1 zcmp.1
LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip \
${BINDIR}/gzip ${BINDIR}/gzcat \
${BINDIR}/gzip ${BINDIR}/zcat \
${BINDIR}/zdiff ${BINDIR}/zcmp \
${BINDIR}/zgrep ${BINDIR}/zegrep \
${BINDIR}/zgrep ${BINDIR}/zfgrep
${BINDIR}/zdiff ${BINDIR}/zcmp
.include <bsd.prog.mk>

View File

@ -1,122 +0,0 @@
#!/bin/sh
#
# $NetBSD: zgrep,v 1.5 2006/05/03 16:48:29 yamt Exp $
#
# Copyright (c) 2003 Thomas Klausner.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# $FreeBSD$
grep=/usr/bin/grep
zcat=/usr/bin/zcat
endofopts=0
pattern_found=0
grep_args=""
hyphen=0
prg=$0
# handle being called 'zegrep' or 'zfgrep'
case ${prg} in
*zegrep)
grep_args="-E";;
*zfgrep)
grep_args="-F";;
esac
# skip all options and pass them on to grep taking care of options
# with arguments, and if -e was supplied
while [ $# -gt 0 -a ${endofopts} -eq 0 ]
do
case $1 in
# from GNU grep-2.5.1 -- keep in sync!
-[ABCDXdefm])
if [ $# -lt 2 ]
then
echo "${prg}: missing argument for $1 flag" >&2
exit 1
fi
case $1 in
-e)
pattern="$2"
pattern_found=1
shift 2
break
;;
*)
;;
esac
grep_args="${grep_args} $1 $2"
shift 2
;;
--)
shift
endofopts=1
;;
-)
hyphen=1
shift
;;
-*)
grep_args="${grep_args} $1"
shift
;;
*)
# pattern to grep for
endofopts=1
;;
esac
done
# if no -e option was found, take next argument as grep-pattern
if [ ${pattern_found} -lt 1 ]
then
if [ $# -ge 1 ]; then
pattern="$1"
shift
elif [ ${hyphen} -gt 0 ]; then
pattern="-"
else
echo "${prg}: missing pattern" >&2
exit 1
fi
fi
# call grep ...
if [ $# -lt 1 ]
then
# ... on stdin
${zcat} -fq - | ${grep} ${grep_args} -- "${pattern}" -
else
# ... on all files given on the command line
while [ $# -gt 0 ]
do
${zcat} -fq -- "$1" | ${grep} -H --label="${1}" ${grep_args} -- "${pattern}" -
shift
done
fi
exit 0

View File

@ -1,98 +0,0 @@
.\" $NetBSD: zgrep.1,v 1.2 2005/09/11 23:30:20 wiz Exp $
.\"
.\" Copyright (c) 2003 Thomas Klausner.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. The name of the author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD$
.Dd January 26, 2007
.Dt ZGREP 1
.Os
.Sh NAME
.Nm zgrep ,
.Nm zegrep ,
.Nm zfgrep
.Nd print lines matching a pattern in gzip-compressed files
.Sh SYNOPSIS
.Nm
.Op Ar grep-flags
.Op Fl -
.Ar pattern
.Op Ar files ...
.Pp
.Nm zegrep
.Op Ar grep-flags
.Op Fl -
.Ar pattern
.Op Ar
.Pp
.Nm zfgrep
.Op Ar grep-flags
.Op Fl -
.Ar pattern
.Op Ar
.Sh DESCRIPTION
.Nm
runs
.Xr grep 1
on
.Ar files
or stdin, if no
.Ar files
argument is given, after decompressing them with
.Xr zcat 1 .
.Pp
The
.Ar grep-flags
and
.Ar pattern
arguments are passed on to
.Xr grep 1 .
If an
.Fl e
flag is found in the
.Ar grep-flags ,
.Nm
will not look for a
.Ar pattern
argument.
.Pp
.Nm zegrep
calls
.Xr egrep 1 ,
while
.Nm zfgrep
calls
.Xr fgrep 1 .
.Sh EXIT STATUS
In case of missing arguments or missing pattern,
1 will be returned, otherwise 0.
.Sh SEE ALSO
.Xr egrep 1 ,
.Xr fgrep 1 ,
.Xr grep 1 ,
.Xr gzip 1 ,
.Xr zcat 1
.Sh AUTHORS
.An Thomas Klausner
.Aq wiz@NetBSD.org