[pkgsrc/trunk]: pkgsrc/mk Back out part of a change from revision 1.756 of bs...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a36838f8fce
branches:  trunk
changeset: 493330:4a36838f8fce
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 03 15:10:59 2005 +0000

description:
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.

diffstat:

 mk/defaults/mk.conf      |  7 ++++++-
 mk/platform/AIX.mk       |  3 +--
 mk/platform/BSDOS.mk     |  3 +--
 mk/platform/Darwin.mk    |  3 +--
 mk/platform/DragonFly.mk |  3 +--
 mk/platform/FreeBSD.mk   |  3 +--
 mk/platform/IRIX.mk      |  3 +--
 mk/platform/Interix.mk   |  3 +--
 mk/platform/Linux.mk     |  3 +--
 mk/platform/NetBSD.mk    |  3 +--
 mk/platform/OSF1.mk      |  3 +--
 mk/platform/OpenBSD.mk   |  3 +--
 mk/platform/SunOS.mk     |  3 +--
 mk/platform/UnixWare.mk  |  3 +--
 14 files changed, 19 insertions(+), 27 deletions(-)

diffs (242 lines):

diff -r c5a21f723017 -r 4a36838f8fce mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Tue May 03 14:50:28 2005 +0000
+++ b/mk/defaults/mk.conf       Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 # 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 -r c5a21f723017 -r 4a36838f8fce mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/AIX.mk        Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk      Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/BSDOS.mk      Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/Darwin.mk     Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 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 -r c5a21f723017 -r 4a36838f8fce mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk  Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/DragonFly.mk  Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk    Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/FreeBSD.mk    Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/IRIX.mk       Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/Interix.mk    Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 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 -r c5a21f723017 -r 4a36838f8fce mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/Linux.mk      Tue May 03 15:10:59 2005 +0000
@@ -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?=     /bin/gzip -nf ${GZIP}
 .endif
 GZCAT?=                /bin/zcat
-GZIP?=         -9
 .if exists(/bin/head)
 HEAD?=         /bin/head
 .else
diff -r c5a21f723017 -r 4a36838f8fce mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/NetBSD.mk     Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/OSF1.mk
--- a/mk/platform/OSF1.mk       Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/OSF1.mk       Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk    Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/OpenBSD.mk    Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/SunOS.mk      Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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 -r c5a21f723017 -r 4a36838f8fce mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk   Tue May 03 14:50:28 2005 +0000
+++ b/mk/platform/UnixWare.mk   Tue May 03 15:10:59 2005 +0000
@@ -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 @@
 .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