diff options
| author | joerg <joerg> | 2011-12-13 16:35:48 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2011-12-13 16:35:48 +0000 |
| commit | 2d21cda3e32361de01cf867c80bff5d52bb22169 (patch) | |
| tree | 5ce608d5537bed96fbd8db01116a89e2b01c6762 /mk/pkgformat/pkg | |
| parent | ee23855c24957065da8ad73136bdec57d6697ad9 (diff) | |
| download | pkgsrc-2d21cda3e32361de01cf867c80bff5d52bb22169.tar.gz | |
Be a bit less aggressive in the required version of pkg_install encoded
into binary packages.
Diffstat (limited to 'mk/pkgformat/pkg')
| -rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 4 | ||||
| -rw-r--r-- | mk/pkgformat/pkg/pkgformat-vars.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 923a94d53ea..566008a9290 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.1 2011/10/15 00:23:09 reed Exp $ +# $NetBSD: metadata.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -38,7 +38,7 @@ ${_BUILD_INFO_FILE}: plist .if !empty(USE_TOOLS:Mgmake) ${RUN}${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${.TARGET}.tmp .endif - ${RUN}${ECHO} "PKGTOOLS_VERSION=${PKGTOOLS_VERSION}" >> ${.TARGET}.tmp + ${RUN}${ECHO} "PKGTOOLS_VERSION=${PKGTOOLS_VERSION_REQD}" >> ${.TARGET}.tmp .if defined(HOMEPAGE) ${RUN}${ECHO} "HOMEPAGE=${HOMEPAGE}" >> ${.TARGET}.tmp .endif diff --git a/mk/pkgformat/pkg/pkgformat-vars.mk b/mk/pkgformat/pkg/pkgformat-vars.mk index dbcf7870bf7..246dcc33d8d 100644 --- a/mk/pkgformat/pkg/pkgformat-vars.mk +++ b/mk/pkgformat/pkg/pkgformat-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkgformat-vars.mk,v 1.1 2011/10/15 00:23:09 reed Exp $ +# $NetBSD: pkgformat-vars.mk,v 1.2 2011/12/13 16:35:48 joerg Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -42,6 +42,9 @@ PKGTOOLS_REQD= 20100914 PKGTOOLS_REQD= 20090528 .endif +# Latest version of pkg_install required to extract packages +PKGTOOLS_VERSION_REQD= 20091115 + .if !defined(PKGTOOLS_VERSION) PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302 MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION} |