Tue Dec 13 16:35:49 2011 UTC ()
Be a bit less aggressive in the required version of pkg_install encoded
into binary packages.


(joerg)
diff -r1.1 -r1.2 pkgsrc/mk/pkgformat/pkg/metadata.mk
diff -r1.1 -r1.2 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk
cvs diff -r1.1 -r1.2 pkgsrc/mk/pkgformat/pkg/metadata.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/metadata.mk 2011/10/15 00:23:09 1.1
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk 2011/12/13 16:35:48 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: metadata.mk,v 1.1 2011/10/15 00:23:09 reed Exp $ 1# $NetBSD: metadata.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $
2 2
3###################################################################### 3######################################################################
4### The targets below are all PRIVATE. 4### The targets below are all PRIVATE.
5###################################################################### 5######################################################################
6 6
7###################################################################### 7######################################################################
8### 8###
9### Temporary package meta-data directory. The contents of this directory 9### Temporary package meta-data directory. The contents of this directory
10### are copied directly into the real package meta-data directory. 10### are copied directly into the real package meta-data directory.
11### 11###
12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb 12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb
13 13
14unprivileged-install-hook: ${PKG_DB_TMPDIR} 14unprivileged-install-hook: ${PKG_DB_TMPDIR}
@@ -28,27 +28,27 @@ ${_BUILD_INFO_FILE}: plist @@ -28,27 +28,27 @@ ${_BUILD_INFO_FILE}: plist
28 ${RUN}${MKDIR} ${.TARGET:H} 28 ${RUN}${MKDIR} ${.TARGET:H}
29 ${RUN}${RM} -f ${.TARGET}.tmp 29 ${RUN}${RM} -f ${.TARGET}.tmp
30 ${RUN} (${_BUILD_DEFS:NPATH:@v@${ECHO} ${v}=${${v}:Q} ;@}) \ 30 ${RUN} (${_BUILD_DEFS:NPATH:@v@${ECHO} ${v}=${${v}:Q} ;@}) \
31 > ${.TARGET}.tmp 31 > ${.TARGET}.tmp
32.if !empty(USE_LANGUAGES) 32.if !empty(USE_LANGUAGES)
33 ${RUN}${ECHO} "CC_VERSION=${CC_VERSION}" >> ${.TARGET}.tmp 33 ${RUN}${ECHO} "CC_VERSION=${CC_VERSION}" >> ${.TARGET}.tmp
34.endif 34.endif
35.if !empty(USE_TOOLS:Mperl\:run) 35.if !empty(USE_TOOLS:Mperl\:run)
36 ${RUN}${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${.TARGET}.tmp 36 ${RUN}${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${.TARGET}.tmp
37.endif 37.endif
38.if !empty(USE_TOOLS:Mgmake) 38.if !empty(USE_TOOLS:Mgmake)
39 ${RUN}${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${.TARGET}.tmp 39 ${RUN}${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${.TARGET}.tmp
40.endif 40.endif
41 ${RUN}${ECHO} "PKGTOOLS_VERSION=${PKGTOOLS_VERSION}" >> ${.TARGET}.tmp 41 ${RUN}${ECHO} "PKGTOOLS_VERSION=${PKGTOOLS_VERSION_REQD}" >> ${.TARGET}.tmp
42.if defined(HOMEPAGE) 42.if defined(HOMEPAGE)
43 ${RUN}${ECHO} "HOMEPAGE=${HOMEPAGE}" >> ${.TARGET}.tmp 43 ${RUN}${ECHO} "HOMEPAGE=${HOMEPAGE}" >> ${.TARGET}.tmp
44.endif 44.endif
45 ${RUN}${ECHO} "CATEGORIES=${CATEGORIES}" >> ${.TARGET}.tmp 45 ${RUN}${ECHO} "CATEGORIES=${CATEGORIES}" >> ${.TARGET}.tmp
46 ${RUN}${ECHO} "MAINTAINER=${MAINTAINER}" >> ${.TARGET}.tmp 46 ${RUN}${ECHO} "MAINTAINER=${MAINTAINER}" >> ${.TARGET}.tmp
47.if defined(OWNER) 47.if defined(OWNER)
48 ${RUN}${ECHO} "OWNER=${OWNER}" >> ${.TARGET}.tmp 48 ${RUN}${ECHO} "OWNER=${OWNER}" >> ${.TARGET}.tmp
49.endif  49.endif
50.if defined(PREV_PKGPATH) 50.if defined(PREV_PKGPATH)
51 ${RUN}${ECHO} "PREV_PKGPATH=${PREV_PKGPATH}" >> ${.TARGET}.tmp 51 ${RUN}${ECHO} "PREV_PKGPATH=${PREV_PKGPATH}" >> ${.TARGET}.tmp
52.endif 52.endif
53.if defined(SUPERSEDES) 53.if defined(SUPERSEDES)
54 ${RUN}${ECHO} "SUPERSEDES=${SUPERSEDES}" >> ${.TARGET}.tmp 54 ${RUN}${ECHO} "SUPERSEDES=${SUPERSEDES}" >> ${.TARGET}.tmp
cvs diff -r1.1 -r1.2 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2011/10/15 00:23:09 1.1
+++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2011/12/13 16:35:48 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pkgformat-vars.mk,v 1.1 2011/10/15 00:23:09 reed Exp $ 1# $NetBSD: pkgformat-vars.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $
2# 2#
3# This Makefile fragment is included indirectly by bsd.prefs.mk and 3# This Makefile fragment is included indirectly by bsd.prefs.mk and
4# defines some variables which must be defined earlier than where 4# defines some variables which must be defined earlier than where
5# pkgformat.mk is included. 5# pkgformat.mk is included.
6# 6#
7 7
8PKGSRC_MESSAGE_RECIPIENTS?= # empty 8PKGSRC_MESSAGE_RECIPIENTS?= # empty
9 9
10.if !empty(PKGSRC_MESSAGE_RECIPIENTS) 10.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
11USE_TOOLS+= mail 11USE_TOOLS+= mail
12.endif 12.endif
13 13
14.if defined(PKG_PRESERVE) 14.if defined(PKG_PRESERVE)
@@ -32,26 +32,29 @@ PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_ad @@ -32,26 +32,29 @@ PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_ad
32PKG_CREATE_CMD?= ${PKG_TOOLS_BIN}/pkg_create 32PKG_CREATE_CMD?= ${PKG_TOOLS_BIN}/pkg_create
33PKG_DELETE_CMD?= ${PKG_TOOLS_BIN}/pkg_delete 33PKG_DELETE_CMD?= ${PKG_TOOLS_BIN}/pkg_delete
34PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info 34PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info
35PKG_VIEW_CMD?= ${PKG_TOOLS_BIN}/pkg_view 35PKG_VIEW_CMD?= ${PKG_TOOLS_BIN}/pkg_view
36LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm 36LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm
37 37
38# Latest versions of tools required for correct pkgsrc operation. 38# Latest versions of tools required for correct pkgsrc operation.
39.if make(replace) && ${_USE_DESTDIR} != "no" 39.if make(replace) && ${_USE_DESTDIR} != "no"
40PKGTOOLS_REQD= 20100914 40PKGTOOLS_REQD= 20100914
41.else 41.else
42PKGTOOLS_REQD= 20090528 42PKGTOOLS_REQD= 20090528
43.endif 43.endif
44 44
 45# Latest version of pkg_install required to extract packages
 46PKGTOOLS_VERSION_REQD= 20091115
 47
45.if !defined(PKGTOOLS_VERSION) 48.if !defined(PKGTOOLS_VERSION)
46PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302 49PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302
47MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION} 50MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION}
48.endif 51.endif
49 52
50# Check that we are using up-to-date pkg_* tools with this file. 53# Check that we are using up-to-date pkg_* tools with this file.
51.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD} 54.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
52BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install 55BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install
53_PKG_INSTALL_DEPENDS= yes 56_PKG_INSTALL_DEPENDS= yes
54.endif 57.endif
55 58
56AUDIT_PACKAGES?= ${PKG_ADMIN} 59AUDIT_PACKAGES?= ${PKG_ADMIN}
57_AUDIT_PACKAGES_CMD?= audit-pkg 60_AUDIT_PACKAGES_CMD?= audit-pkg