PKGREVISION++

- install scripts with executable bit set.
- style nits (DESCR has 80 columns, make PKGNAME version agnostic, move
  comment about info file where it belongs, ..).
Addresses PR pkg/21702 by Rob Quinn.

3 files changed, 26 insertions, 22 deletions

diff --git a/archivers/gzip-base/DESCR b/archivers/gzip-base/DESCR
index 216d400e861..954e456a6c3 100644
--- a/archivers/gzip-base/DESCR
+++ b/archivers/gzip-base/DESCR
@@ -1,8 +1,7 @@
-GZIP (GNU zip) is a popular data compression program written by
-Jean-Loup Gailly <gzip@gnu.org> for the GNU project.
+GZIP (GNU zip) is a popular data compression program written by Jean-Loup
+Gailly <gzip@gnu.org> for the GNU project.
 
-This program was developed as a replacement for compress because
-of the UNISYS and IBM patents covering the LZW algorithm used by
-compress. These patents made it impossible for us to use compress,
-and we needed a replacement. The superior compression ratio of
-GZIP is just a bonus.
+This program was developed as a replacement for compress because of the UNISYS
+and IBM patents covering the LZW algorithm used by compress.  These patents
+made it impossible for us to use compress, and we needed a replacement.  The
+superior compression ratio of GZIP is just a bonus.
diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile
index 105a7d33a48..a885a97f725 100644
--- a/archivers/gzip-base/Makefile
+++ b/archivers/gzip-base/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/28 20:37:09 salo Exp $
+#
 
 DISTNAME=	gzip-1.2.4a
-PKGNAME=	gzip-base-1.2.4a
+PKGNAME=	${DISTNAME:S/gzip-/gzip-base-/}
+PKGREVISION=	1
 SVR4_PKGNAME=	gzipb
 CATEGORIES=	archivers
 MASTER_SITES=   ${MASTER_SITE_GNU:=gzip/}
@@ -11,22 +13,23 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
 COMMENT=	Compress or expand files
 
-USE_BUILDLINK2=	yes
-GNU_CONFIGURE=	yes
+USE_BUILDLINK2=	YES
+GNU_CONFIGURE=	YES
+
 BUILD_TARGET=	all manlinks=so
 INSTALL_TARGET=	install manlinks=so
 
-# We avoid using a patch for disabling the install of the info
-# file.  The easu part is that "install-info" is not called so
-# we can simply remove the single installed info file.
-
 do-patch:
 	f=${WRKSRC}/Makefile.in ; \
 	[ -f $$f.orig ] || ${CP} $$f $$f.orig ; \
 	${SED} \
-		'/scriptdir/s/INSTALL_PROGRAM/INSTALL_DATA/' \
+		'/scriptdir/s/INSTALL_PROGRAM/BSD_INSTALL_SCRIPT/' \
 		< $$f.orig >$$f
 
+# We avoid using a patch for disabling the install of the info
+# file.  The easy part is that "install-info" is not called so
+# we can simply remove the single installed info file.
+
 post-install:
 	-${RM} -f ${PREFIX}/info/gzip.info
 
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index d4b067f3d1e..9cd64b29d09 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/28 21:14:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/28 20:37:08 salo Exp $
+#
 
 DISTNAME=	gzip-1.2.4a
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,15 +11,15 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
 COMMENT=	The "meta-package" for the GZIP compression utility
 
-DEPENDS+=	gzip-base-1.2.4a:../../archivers/gzip-base
+DEPENDS+=	gzip-base-1.2.4anb1:../../archivers/gzip-base
 DEPENDS+=	gzip-info-1.2.4a:../../archivers/gzip-info
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK2=	YES
 
 EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+NO_CHECKSUM=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
 do-install:	# empty