Tue Feb 9 23:02:13 2010 UTC ()
Start removal of PKG_SUFX as option by making selection of compression
format a separate new option (PKG_COMPRESSION).


(joerg)
diff -r1.186 -r1.187 pkgsrc/mk/defaults/mk.conf
diff -r1.19 -r1.20 pkgsrc/mk/flavor/pkg/package.mk
cvs diff -r1.186 -r1.187 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2009/09/13 13:28:46 1.186
+++ pkgsrc/mk/defaults/mk.conf 2010/02/09 23:02:13 1.187
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.186 2009/09/13 13:28:46 tron Exp $ 1# $NetBSD: mk.conf,v 1.187 2010/02/09 23:02:13 joerg Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -69,30 +69,31 @@ GZIP?= -9 @@ -69,30 +69,31 @@ GZIP?= -9
69# Default: yes 69# Default: yes
70 70
71#OBJHOSTNAME= 71#OBJHOSTNAME=
72# use hostname-specific object directories, e.g. work.amnesiac, work.localhost 72# use hostname-specific object directories, e.g. work.amnesiac, work.localhost
73# OBJHOSTNAME takes precedence over OBJMACHINE (see below). 73# OBJHOSTNAME takes precedence over OBJMACHINE (see below).
74# Possible: defined, not defined 74# Possible: defined, not defined
75# Default: not defined 75# Default: not defined
76 76
77#OBJMACHINE= 77#OBJMACHINE=
78# use machine-specific object directories, e.g. work.i386, work.sparc 78# use machine-specific object directories, e.g. work.i386, work.sparc
79# Possible: defined, not defined 79# Possible: defined, not defined
80# Default: not defined 80# Default: not defined
81 81
82#PKG_SUFX= .tbz 82PKG_COMPRESSION?= gzip
83# Create binary packages with bzip2(1) or gzip(1). 83# Compression algorithm for binary packages.
84# Possible: .tbz, .tgz 84# Possible: gzip, bzip2, none
85# Default: .tgz 85# Default: gzip
 86# Supersedes the PKG_SUFX option and keeps the name consistent.
86 87
87PKGSRC_LOCKTYPE?= none 88PKGSRC_LOCKTYPE?= none
88# The type of locking that will be done if competing processes 89# The type of locking that will be done if competing processes
89# attempt to do work on one package directory simultaneously. 90# attempt to do work on one package directory simultaneously.
90# 91#
91# Possible values: 92# Possible values:
92# * none: No locking takes place at all. 93# * none: No locking takes place at all.
93# * once: When the lock has already been aquired by another 94# * once: When the lock has already been aquired by another
94# process, the current process is terminated. 95# process, the current process is terminated.
95# * sleep: When the lock has already been acquired by another 96# * sleep: When the lock has already been acquired by another
96# process, the current process will sleep for PKGSRC_SLEEPSECS 97# process, the current process will sleep for PKGSRC_SLEEPSECS
97# seconds and then try again. 98# seconds and then try again.
98# 99#
cvs diff -r1.19 -r1.20 pkgsrc/mk/flavor/pkg/Attic/package.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/package.mk 2009/11/05 15:39:42 1.19
+++ pkgsrc/mk/flavor/pkg/Attic/package.mk 2010/02/09 23:02:13 1.20
@@ -1,40 +1,51 @@ @@ -1,40 +1,51 @@
1# $NetBSD: package.mk,v 1.19 2009/11/05 15:39:42 joerg Exp $ 1# $NetBSD: package.mk,v 1.20 2010/02/09 23:02:13 joerg Exp $
2 2
 3.if defined(PKG_SUFX)
 4WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
 5. if ${PKG_SUFX} == ".tgz"
 6PKG_COMPRESSION= gzip
 7. elif ${PKG_SUFX} == ".tbz"
 8PKG_COMPRESSION= bzip2
 9. else
 10WARNINGS+= "Unsupported value for PKG_SUFX"
 11. endif
 12.endif
3PKG_SUFX?= .tgz 13PKG_SUFX?= .tgz
4PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} 14PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
5PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR} 15PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR}
6PKGREPOSITORYSUBDIR?= All 16PKGREPOSITORYSUBDIR?= All
7 17
8###################################################################### 18######################################################################
9### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk) 19### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk)
10###################################################################### 20######################################################################
11### package-check-installed verifies that the package is installed on 21### package-check-installed verifies that the package is installed on
12### the system. 22### the system.
13### 23###
14.PHONY: package-check-installed 24.PHONY: package-check-installed
15package-check-installed: 25package-check-installed:
16 ${RUN} ${PKG_INFO} -qe ${PKGNAME} \ 26 ${RUN} ${PKG_INFO} -qe ${PKGNAME} \
17 || ${FAIL_MSG} "${PKGNAME} is not installed." 27 || ${FAIL_MSG} "${PKGNAME} is not installed."
18 28
19###################################################################### 29######################################################################
20### package-create (PRIVATE, pkgsrc/mk/package/package.mk) 30### package-create (PRIVATE, pkgsrc/mk/package/package.mk)
21###################################################################### 31######################################################################
22### package-create creates the binary package. 32### package-create creates the binary package.
23### 33###
24.PHONY: package-create 34.PHONY: package-create
25package-create: package-remove ${PKGFILE} package-links 35package-create: package-remove ${PKGFILE} package-links
26 36
27_PKG_ARGS_PACKAGE+= ${_PKG_CREATE_ARGS} 37_PKG_ARGS_PACKAGE+= ${_PKG_CREATE_ARGS}
 38_PKG_ARGS_PACKAGE+= -F ${PKG_COMPRESSION}
28.if ${_USE_DESTDIR} == "no" 39.if ${_USE_DESTDIR} == "no"
29_PKG_ARGS_PACKAGE+= -p ${PREFIX} 40_PKG_ARGS_PACKAGE+= -p ${PREFIX}
30.else 41.else
31_PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX} 42_PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
32. if ${_USE_DESTDIR} == "user-destdir" 43. if ${_USE_DESTDIR} == "user-destdir"
33_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP} 44_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
34. endif 45. endif
35.endif 46.endif
36.if ${PKG_INSTALLATION_TYPE} == "pkgviews" 47.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
37_PKG_ARGS_PACKAGE+= -E 48_PKG_ARGS_PACKAGE+= -E
38.endif 49.endif
39 50
40${PKGFILE}: ${_CONTENTS_TARGETS} 51${PKGFILE}: ${_CONTENTS_TARGETS}