[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Fix two bugs which prevent undo-replace ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31e17499064c
branches:  trunk
changeset: 515644:31e17499064c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 05 19:13:46 2006 +0000

description:
Fix two bugs which prevent undo-replace from working.

diffstat:

 mk/flavor/pkg/replace.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f2a4c791f5f4 -r 31e17499064c mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk  Wed Jul 05 19:02:21 2006 +0000
+++ b/mk/flavor/pkg/replace.mk  Wed Jul 05 19:13:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.2 2006/06/05 22:49:44 jlam Exp $
+# $NetBSD: replace.mk,v 1.3 2006/07/05 19:13:46 jlam Exp $
 
 ######################################################################
 ### replace-pkg (PRIVATE, pkgsrc/mk/install/replace.mk)
@@ -78,7 +78,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        ${TEST} -f ${_REPLACE_NEWNAME_FILE} || exit 0;                  \
        newname=`${CAT} ${_REPLACE_NEWNAME_FILE}`;                      \
-       ${ECHO} "Running "${PKG_ADD} ${WRKDIR}/$$newname${PKG_SUFX}";   \
+       ${ECHO} "Running ${PKG_ADD} ${WRKDIR}/$$newname${PKG_SUFX}";    \
        ${PKG_ADD} ${WRKDIR}/$$newname${PKG_SUFX}
 
 ######################################################################
@@ -114,7 +114,7 @@
 replace-preserve-required-by:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        ${TEST} -f ${_REPLACE_OLDNAME_FILE} || exit 0;                  \
-       ${STEP_MSG} "Preserving existing +REQUIRED_BY file.";
+       ${STEP_MSG} "Preserving existing +REQUIRED_BY file.";           \
        oldname=`${CAT} ${_REPLACE_OLDNAME_FILE}`;                      \
        required_by="${_PKG_DBDIR}/$$oldname/+REQUIRED_BY";             \
        ${TEST} ! -f "$$required_by" ||                                 \