Resurrect z*grep script to support gzip'ped files.
authorYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Thu, 29 Sep 2011 00:00:41 +0000 (09:00 +0900)
committerYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Thu, 29 Sep 2011 19:58:09 +0000 (04:58 +0900)
Makefile_upgrade.inc
usr.bin/gzip/Makefile

index d43f64f..1a09924 100644 (file)
@@ -1588,15 +1588,6 @@ TO_REMOVE+=/usr/share/man/cat9/memoryallocators.9.gz
 TO_REMOVE+=/usr/share/man/man9/memoryallocators.9.gz
 TO_REMOVE+=/usr/share/man/cat4/rc.4.gz
 TO_REMOVE+=/usr/share/man/man4/rc.4.gz
-TO_REMOVE+=/usr/bin/zegrep
-TO_REMOVE+=/usr/share/man/cat1/zegrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zegrep.1.gz
-TO_REMOVE+=/usr/bin/zfgrep
-TO_REMOVE+=/usr/share/man/cat1/zfgrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zfgrep.1.gz
-TO_REMOVE+=/usr/bin/zgrep
-TO_REMOVE+=/usr/share/man/cat1/zgrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zgrep.1.gz
 TO_REMOVE+=/usr/include/dev/disk/mpt/mpilib/fc_log.h
 TO_REMOVE+=/boot/kernel/ipl.ko
 TO_REMOVE+=/etc/periodic/security/510.ipfdenied
index 38e8d05..9fe453a 100644 (file)
@@ -2,7 +2,7 @@
 # $DragonFly: src/usr.bin/gzip/Makefile,v 1.5 2007/08/27 16:50:54 pavalos Exp $
 
 PROG=          gzip
-MAN=           gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
+MAN=           gzip.1 gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
 
 DPADD=         ${LIBZ}
 LDADD=         -lz
@@ -19,18 +19,22 @@ LDADD+=             -lbz2
 CFLAGS+=       -DNO_BZIP2_SUPPORT
 .endif
 
-SCRIPTS=       gzexe zdiff zforce zmore znew
+SCRIPTS=       gzexe zdiff zforce zgrep 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 \
                zmore.1 zless.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}/zmore ${BINDIR}/zless
 
 .include <bsd.prog.mk>