From d49e4f59e591849bed90d972d651ea819741edc4 Mon Sep 17 00:00:00 2001 From: YONETANI Tomokazu Date: Thu, 29 Sep 2011 09:00:41 +0900 Subject: [PATCH] Resurrect z*grep script to support gzip'ped files. --- Makefile_upgrade.inc | 9 --------- usr.bin/gzip/Makefile | 8 ++++++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index d43f64f41c..1a09924e85 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -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 diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 38e8d05ecd..9fe453a004 100644 --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -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 -- 2.41.0