diff options
| author | jlam <jlam> | 2006-07-05 19:13:46 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-05 19:13:46 +0000 |
| commit | 98a43da2c0ec432cea61d4cb5c1c04453e7fbedf (patch) | |
| tree | c28c09c1b89b0a79c97a6772017bf1a75afdea40 /mk/flavor | |
| parent | 18cca6539372b7e0fb3308d24c13de91ca256e77 (diff) | |
| download | pkgsrc-98a43da2c0ec432cea61d4cb5c1c04453e7fbedf.tar.gz | |
Fix two bugs which prevent undo-replace from working.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 99c609519f6..a552478fcb7 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -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 @@ undo-replace-install: ${_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 @@ undo-replace-names: 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" || \ |