diff options
| author | joerg <joerg> | 2010-01-30 20:13:19 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-01-30 20:13:19 +0000 |
| commit | f413520873d47c3d32425d6737810f371301e520 (patch) | |
| tree | d54e9e7cb498a3f7efa05bdff8256ab7839a5eab /mk | |
| parent | 0a80b8bd3667f8cba2ba57aa4fa93268f1448b05 (diff) | |
| download | pkgsrc-f413520873d47c3d32425d6737810f371301e520.tar.gz | |
Use new pkg_add -U for replace in the destdir case.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 6 | ||||
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index 8b76a263ff7..67b66819fc7 100644 --- a/mk/flavor/pkg/flavor-vars.mk +++ b/mk/flavor/pkg/flavor-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: flavor-vars.mk,v 1.13 2009/06/14 15:12:56 joerg Exp $ +# $NetBSD: flavor-vars.mk,v 1.14 2010/01/30 20:13:19 joerg Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -36,7 +36,11 @@ PKG_VIEW_CMD?= ${PKG_TOOLS_BIN}/pkg_view LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm # Latest versions of tools required for correct pkgsrc operation. +.if make(replace) && ${_USE_DESTDIR} != "no" +PKGTOOLS_REQD= 20100130 +.else PKGTOOLS_REQD= 20090528 +.endif .if !defined(PKGTOOLS_VERSION) PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302 diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 71a2f7f3f9b..dbbaf412369 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.26 2009/10/02 12:35:54 obache Exp $ +# $NetBSD: replace.mk,v 1.27 2010/01/30 20:13:19 joerg Exp $ # # _flavor-replace: @@ -187,10 +187,10 @@ replace-destdir: .PHONY @${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q} .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} - ${PKG_ADD} -u -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} + ${PKG_ADD} -U -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} @${ECHO} "Fixing recorded cwd..." @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS .else - ${PKG_ADD} -u ${PKGFILE} + ${PKG_ADD} -U ${PKGFILE} .endif |