[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Use new pkg_add -U for replace in the de...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3743864c4d1
branches:  trunk
changeset: 570519:d3743864c4d1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 30 20:13:19 2010 +0000

description:
Use new pkg_add -U for replace in the destdir case.

diffstat:

 mk/flavor/pkg/flavor-vars.mk |  6 +++++-
 mk/flavor/pkg/replace.mk     |  6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 4c24150f1c0d -r d3743864c4d1 mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Sat Jan 30 20:10:04 2010 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Sat Jan 30 20:13:19 2010 +0000
@@ -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 @@
 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 -r 4c24150f1c0d -r d3743864c4d1 mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk  Sat Jan 30 20:10:04 2010 +0000
+++ b/mk/flavor/pkg/replace.mk  Sat Jan 30 20:13:19 2010 +0000
@@ -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 @@
        @${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