diff options
| author | gdt <gdt@pkgsrc.org> | 2007-09-21 15:13:55 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2007-09-21 15:13:55 +0000 |
| commit | 398104408b9e30c7814203962a1772c005680844 (patch) | |
| tree | 87b87c0ce906378359e2194b1c9477364c792463 /mk/flavor/pkg | |
| parent | 5950600b9cc8d7ad82b13d64d2ba851b236e7f59 (diff) | |
| download | pkgsrc-398104408b9e30c7814203962a1772c005680844.tar.gz | |
When replacing, use the oldname as found in work/.replace_oldname to
tar up, instead of PKGBASE.
This enables modifying that file to have a package that isn't
automatically found be the replace target, e.g., "echo libglade2-2.6.2
> work/.replace_oldname" after make replace fails to find a package to
tar up when doing make replace in libglade.
Diffstat (limited to 'mk/flavor/pkg')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 447f17e1f12..0435396d7a4 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.18 2007/08/13 14:18:23 gdt Exp $ +# $NetBSD: replace.mk,v 1.19 2007/09/21 15:13:55 gdt Exp $ # # _flavor-replace: @@ -74,11 +74,12 @@ undo-replace-check: .PHONY ### package using pkg_tarup. ### replace-tarup: .PHONY - ${RUN} [ -x ${_PKG_TARUP_CMD:Q} ] \ - || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found."; + ${RUN} ${_REPLACE_OLDNAME_CMD}; \ + [ -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} ${PKGBASE} + ${_PKG_TARUP_CMD} $${oldname} ###################################################################### ### undo-replace-install (PRIVATE) |