diff options
| author | gdt <gdt@pkgsrc.org> | 2007-09-22 15:19:47 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2007-09-22 15:19:47 +0000 |
| commit | 41baa6d8fa1fc40d73912b4af11b95b82719da1b (patch) | |
| tree | 20c62e377ff604f9727f517d3a09a23acd888cbb /mk/flavor/pkg | |
| parent | 88934dbd295b3eb7d774a6a46db9490f00cbe33b (diff) | |
| download | pkgsrc-41baa6d8fa1fc40d73912b4af11b95b82719da1b.tar.gz | |
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 (limited to 'mk/flavor/pkg')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 0435396d7a4..37848966486 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -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 @@ undo-replace-check: .PHONY ### 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) |