Sun Sep 7 08:02:27 2008 UTC ()
Fix zgrep -h. PR 37528 from Rob Quinn.
PKGREVISION++


(dholland)
diff -r1.21 -r1.22 pkgsrc/archivers/gzip/Makefile
diff -r1.2 -r1.3 pkgsrc/archivers/gzip/distinfo
diff -r0 -r1.1 pkgsrc/archivers/gzip/patches/patch-af
cvs diff -r1.21 -r1.22 pkgsrc/archivers/gzip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/gzip/Makefile 2007/12/21 23:57:41 1.21
+++ pkgsrc/archivers/gzip/Makefile 2008/09/07 08:02:27 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2007/12/21 23:57:41 rillig Exp $ 1# $NetBSD: Makefile,v 1.22 2008/09/07 08:02:27 dholland Exp $
2# 2#
3 3
4DISTNAME= gzip-1.3.12 4DISTNAME= gzip-1.3.12
5PKGREVISION= 1 5PKGREVISION= 2
6SVR4_PKGNAME= gzip 6SVR4_PKGNAME= gzip
7CATEGORIES= archivers 7CATEGORIES= archivers
8MASTER_SITES= ${MASTER_SITE_GNU:=gzip/} 8MASTER_SITES= ${MASTER_SITE_GNU:=gzip/}
9EXTRACT_SUFX= .tar 9EXTRACT_SUFX= .tar
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html 12HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html
13COMMENT= Compress or expand files 13COMMENT= Compress or expand files
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18CONFLICTS+= gzip-base-[0-9]* gzip-info-[0-9]* 18CONFLICTS+= gzip-base-[0-9]* gzip-info-[0-9]*
cvs diff -r1.2 -r1.3 pkgsrc/archivers/gzip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/gzip/distinfo 2007/12/22 20:05:44 1.2
+++ pkgsrc/archivers/gzip/distinfo 2008/09/07 08:02:27 1.3
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.2 2007/12/22 20:05:44 minskim Exp $ 1$NetBSD: distinfo,v 1.3 2008/09/07 08:02:27 dholland Exp $
2 2
3SHA1 (gzip-1.3.12.tar) = 330eb5f1b3dfab13a491352cb00b6573e5b55a5f 3SHA1 (gzip-1.3.12.tar) = 330eb5f1b3dfab13a491352cb00b6573e5b55a5f
4RMD160 (gzip-1.3.12.tar) = 6845dfba2a275f4de488c3fb97e64405838a5005 4RMD160 (gzip-1.3.12.tar) = 6845dfba2a275f4de488c3fb97e64405838a5005
5Size (gzip-1.3.12.tar) = 1822720 bytes 5Size (gzip-1.3.12.tar) = 1822720 bytes
6SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4 6SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4
7SHA1 (patch-ab) = 42309926f601998b97051aadc31ad44413716029 7SHA1 (patch-ab) = 42309926f601998b97051aadc31ad44413716029
8SHA1 (patch-ac) = 8ef4b7105ca9b201079f5cf8799642e12184fda4 8SHA1 (patch-ac) = 8ef4b7105ca9b201079f5cf8799642e12184fda4
9SHA1 (patch-ad) = 082ced7d4a89a49b750525cc71bbf9a9abfc5b9e 9SHA1 (patch-ad) = 082ced7d4a89a49b750525cc71bbf9a9abfc5b9e
10SHA1 (patch-ae) = a1d245c5cf055e9bd35fb7e810d5183a71cbfc74 10SHA1 (patch-ae) = a1d245c5cf055e9bd35fb7e810d5183a71cbfc74
 11SHA1 (patch-af) = 28639dbe11ed8ce81bd1c29248b53af6cea55b88
File Added: pkgsrc/archivers/gzip/patches/Attic/patch-af
$NetBSD: patch-af,v 1.1 2008/09/07 08:02:27 dholland Exp $

--- zgrep.in~	2007-02-05 15:54:26.000000000 -0500
+++ zgrep.in	2008-09-07 03:58:59.000000000 -0400
@@ -105,7 +105,7 @@ while test $# -ne 0; do
     files_with_matches=1;;
   (-L | --files-witho*)
     files_without_matches=1;;
-  (--no-f*)
+  (-h | --no-f*)
     no_filename=1;;
   (-V | --v | --ve | --ver | --vers | --versi | --versio | --version)
     echo "$version" || exit 2