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/platform | |
| 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/platform')
| -rw-r--r-- | mk/platform/NetBSD.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index d264c9551dc..d4a6a814af5 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.29 2008/03/04 06:45:34 jlam Exp $ +# $NetBSD: NetBSD.mk,v 1.30 2008/04/03 14:07:51 joerg Exp $ # # Variable definitions for the NetBSD operating system. @@ -31,11 +31,9 @@ EXPORT_SYMBOLS_LDFLAGS?=-Wl,--export-dynamic .endif MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type NOLOGIN?= /sbin/nologin -.if exists(${LOCALBASE}/sbin/pkg_info) -PKG_TOOLS_BIN?= ${LOCALBASE}/sbin -.else -PKG_TOOLS_BIN?= /usr/sbin -.endif +# This must be lazy and using :? evaluation doesn't work due to a make bugs. +PKG_TOOLS_BIN_cmd= if [ -x ${LOCALBASE}/sbin/pkg_info ]; then echo ${LOCALBASE}/sbin; else echo /usr/sbin; fi +PKG_TOOLS_BIN?= ${PKG_TOOLS_BIN_cmd:sh} ROOT_CMD?= ${SU} - root -c ROOT_USER?= root ROOT_GROUP?= wheel |