[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg revert previous; it has trouble in two m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcabe6920a2f
branches:  trunk
changeset: 533641:fcabe6920a2f
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Sep 22 15:19:47 2007 +0000

description:
revert previous; it has trouble in two many places and 1) a fix isn't
obvious 2) we're in freeze, so restore to working as quickly as
possible.

diffstat:

 mk/flavor/pkg/replace.mk |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r c627878c7a2f -r fcabe6920a2f mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk  Sat Sep 22 11:39:59 2007 +0000
+++ b/mk/flavor/pkg/replace.mk  Sat Sep 22 15:19:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.19 2007/09/21 15:13:55 gdt Exp $
+# $NetBSD: replace.mk,v 1.20 2007/09/22 15:19:47 gdt Exp $
 #
 
 # _flavor-replace:
@@ -74,12 +74,11 @@
 ### package using pkg_tarup.
 ###
 replace-tarup: .PHONY
-       ${RUN} ${_REPLACE_OLDNAME_CMD};                                 \
-       [ -x ${_PKG_TARUP_CMD:Q} ]                                      \
-       || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found.";            \
+       ${RUN} [ -x ${_PKG_TARUP_CMD:Q} ] \
+       || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found.";
        ${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX}          \
                PKGREPOSITORY=${WRKDIR}                                 \
-               ${_PKG_TARUP_CMD} $${oldname}
+               ${_PKG_TARUP_CMD} ${PKGBASE}
 
 ######################################################################
 ### undo-replace-install (PRIVATE)