Back out part of a change from revision 1.756 of bsd.pkg.mk. It was

a mistake to include "GZIP" as an ${OPSYS}-specific variable as there
is nothing ${OPSYS}-specific there to tune.  Define GZIP in
defaults/mk.conf instead, and remove the definition from each of the
existing platform/${OPSYS}.mk files.

14 files changed, 19 insertions, 27 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 09f55abb6e4..b17c36913ad 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.37 2005/04/20 16:27:30 seb Exp $
+# $NetBSD: mk.conf,v 1.38 2005/05/03 15:10:59 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -26,6 +26,11 @@ MANINSTALL?= maninstall catinstall
 # Possible: defined, not defined
 # Default: not defined
 
+GZIP?=	-9
+# default compression level when compressing files with gzip
+# Possible: -[0-9], --fast, --best (see gzip(1))
+# Default: -9
+
 #MKCRYPTO= no
 # If not YES or yes, don't fetch, build or install crypto packages.
 # Possible: not defined, no
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 927ee102b49..1266e388ee2 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.13 2005/03/29 08:17:42 garbled Exp $
+# $NetBSD: AIX.mk,v 1.14 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -48,7 +48,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index c3788ce89e3..9d2a086964f 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.8 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -39,7 +39,6 @@ GTAR?=		/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
 GZCAT?=		/usr/contrib/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 194fb7f87b5..735df7beae7 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.8 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: Darwin.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -29,7 +29,6 @@ GREP?=		/usr/bin/grep
 GTAR?=		/usr/bin/gnutar	
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index ce2c086330e..bb30bfb4882 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.11 2005/03/22 15:40:06 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -31,7 +31,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index e7d9c74364f..47dbba8dbbe 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.8 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -31,7 +31,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index c5a1c7fb610..718ce6d06dc 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.11 2005/04/16 20:03:02 schwarz Exp $
+# $NetBSD: IRIX.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -36,7 +36,6 @@ GZCAT?=		/usr/sbin/gzcat
 .else
 GZCAT?=		/usr/bsd/zcat
 .endif
-GZIP?=		-9
 GZIP_CMD?=	/usr/sbin/gzip -nf ${GZIP}
 HEAD?=		/usr/bsd/head
 HOSTNAME_CMD?=	/usr/bsd/hostname
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index bef3ab5f281..0c8a11a443d 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.31 2005/04/20 21:40:30 tv Exp $
+# $NetBSD: Interix.mk,v 1.32 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -72,7 +72,6 @@ GREP?=		/bin/grep
 GTAR?=		${LOCALBASE}/bin/tar
 GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
 GZCAT?=		/usr/contrib/bin/gunzip -c
-GZIP?=		-9
 GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
 HEAD?=		/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index acf32f12095..0fd98c1d43d 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.11 2005/05/02 21:10:02 jlam Exp $
+# $NetBSD: Linux.mk,v 1.12 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -60,7 +60,6 @@ GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 GZIP_CMD?=	/bin/gzip -nf ${GZIP}
 .endif
 GZCAT?=		/bin/zcat
-GZIP?=		-9
 .if exists(/bin/head)
 HEAD?=		/bin/head
 .else
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index a5cf08857c1..bbe8c540e57 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.10 2005/03/22 19:15:04 tron Exp $
+# $NetBSD: NetBSD.mk,v 1.11 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -34,7 +34,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 3e8ed9e5a86..4bab45f05b0 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.3 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: OSF1.mk,v 1.4 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -39,7 +39,6 @@ GTAR?=/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index e21fa889ffe..05ca4cc855b 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.12 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.13 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -30,7 +30,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index d3abde5b5aa..b96518ebfc4 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.10 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: SunOS.mk,v 1.11 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -31,7 +31,6 @@ GTAR?=		${LOCALBASE}/bin/tar
 .if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 .elif exists(/usr/bin/gzip)
 GUNZIP_CMD?=	/usr/bin/gzip -df
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 667e86bc666..fd9dd0caf09 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.8 2005/03/18 18:16:35 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.9 2005/05/03 15:10:59 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -31,7 +31,6 @@ GTAR?=		${LOCALBASE}/bin/tar
 .if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 .elif exists(/usr/local/bin/gzip)
 GUNZIP_CMD?=	/usr/local/bin/gzip -df