From fb024a6b97e65c1e757be5c3b66349d42dcd594f Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 9 Feb 2010 23:02:13 +0000
Subject: Start removal of PKG_SUFX as option by making selection of
 compression format a separate new option (PKG_COMPRESSION).

---
 mk/defaults/mk.conf      | 11 ++++++-----
 mk/flavor/pkg/package.mk | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 9dfc783c483..9b1acefdd30 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.186 2009/09/13 13:28:46 tron Exp $
+# $NetBSD: mk.conf,v 1.187 2010/02/09 23:02:13 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -79,10 +79,11 @@ GZIP?=	-9
 # Possible: defined, not defined
 # Default: not defined
 
-#PKG_SUFX= .tbz
-# Create binary packages with bzip2(1) or gzip(1).
-# Possible: .tbz, .tgz
-# Default: .tgz
+PKG_COMPRESSION?=	gzip
+# Compression algorithm for binary packages.
+# Possible: gzip, bzip2, none
+# Default: gzip
+# Supersedes the PKG_SUFX option and keeps the name consistent.
 
 PKGSRC_LOCKTYPE?= none
 #	The type of locking that will be done if competing processes
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk
index 144ae8734c8..80e6e748d3b 100644
--- a/mk/flavor/pkg/package.mk
+++ b/mk/flavor/pkg/package.mk
@@ -1,5 +1,15 @@
-# $NetBSD: package.mk,v 1.19 2009/11/05 15:39:42 joerg Exp $
+# $NetBSD: package.mk,v 1.20 2010/02/09 23:02:13 joerg Exp $
 
+.if defined(PKG_SUFX)
+WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
+.  if ${PKG_SUFX} == ".tgz"
+PKG_COMPRESSION=	gzip
+.  elif ${PKG_SUFX} == ".tbz"
+PKG_COMPRESSION=	bzip2
+.  else
+WARNINGS+=		"Unsupported value for PKG_SUFX"
+.  endif
+.endif
 PKG_SUFX?=		.tgz
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
@@ -25,6 +35,7 @@ package-check-installed:
 package-create: package-remove ${PKGFILE} package-links
 
 _PKG_ARGS_PACKAGE+=	${_PKG_CREATE_ARGS}
+_PKG_ARGS_PACKAGE+=	-F ${PKG_COMPRESSION}
 .if ${_USE_DESTDIR} == "no"
 _PKG_ARGS_PACKAGE+=	-p ${PREFIX}
 .else
-- 
cgit v1.2.3