diff options
| author | joerg <joerg@pkgsrc.org> | 2008-04-03 14:07:51 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-04-03 14:07:51 +0000 |
| commit | caa9b2eebfa0d1aedfcdc490b2eadebd6200274f (patch) | |
| tree | 68a4e35995a7f58f576b5e1e1b589becdf4ab2c0 /mk/bsd.pkg.mk | |
| parent | 597c8d129ddcbe0205bfdf4a5a01fa525d3bcbae (diff) | |
| download | pkgsrc-caa9b2eebfa0d1aedfcdc490b2eadebd6200274f.tar.gz | |
Move handling of pkg_install version into flavor. Add an explicit
phase pkg_install-depends before bootstrap-depends that just tries to
install a new pkg_install if the current version is too old. Still
keep it as bootstrap dependency for the bulk build code.
For NetBSD, PKG_TOOLS_BIN has to be computed in shell code due to a make
bug.
OK: jlam@
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e0a8d101839..1beff8002b0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1940 2008/03/08 14:28:05 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1941 2008/04/03 14:07:51 joerg Exp $ # # This file is in the public domain. # @@ -116,13 +116,6 @@ REAL_ROOT_GROUP?= ${ROOT_GROUP} _INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk) .endif -##### Non-overridable constants - -# Latest versions of tools required for correct pkgsrc operation. -PKGTOOLS_REQD= 20070802 -# Versions of tools that are good enough to handle dependencies -PKGTOOLS_BASE_REQD= 20051103 - ##### Transform USE_* into dependencies .include "bsd.pkg.use.mk" @@ -147,19 +140,6 @@ PKG_FAIL_REASON+= "PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite PKG_FAIL_REASON+= "This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}." .endif -# Check that we are using up-to-date pkg_* tools with this file. -.if !defined(NO_PKGTOOLS_REQD_CHECK) -. if ${PKGTOOLS_VERSION} < ${PKGTOOLS_BASE_REQD} -PKG_FAIL_REASON+='The package tools installed on this system are out of date.' -PKG_FAIL_REASON+='The installed package tools are dated ${PKGTOOLS_VERSION:C|(....)(..)(..)|\1/\2/\3|} and you must' -PKG_FAIL_REASON+='update them to at least ${PKGTOOLS_REQD:C|(....)(..)(..)|\1/\2/\3|} using the following command:' -PKG_FAIL_REASON+=' ' -PKG_FAIL_REASON+=' (cd ${PKGSRCDIR}/pkgtools/pkg_install && ${MAKE} clean && ${MAKE} update)' -. elif ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD} -BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install -. endif -.endif # !NO_PKGTOOLS_REQD_CHECK - .if defined(ALL_TARGET) PKG_FAIL_REASON+='ALL_TARGET is deprecated and must be replaced with BUILD_TARGET.' .endif |