diff options
| author | gdt <gdt> | 2007-08-07 22:27:12 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2007-08-07 22:27:12 +0000 |
| commit | 81d0811371e6bc5db666ce0ee2d953ff567b7235 (patch) | |
| tree | ce60b674ac4b4aa9e20bf567b8a91724d2bbd6d3 /mk/flavor | |
| parent | 8fd384e1e2b5e3fbe09ed654da9bf4ceb5a6d12c (diff) | |
| download | pkgsrc-81d0811371e6bc5db666ce0ee2d953ff567b7235.tar.gz | |
Remove unsafe_depends and rebuild tags from a package just before
fixing up the required-by file. The invariant on unsafe_depends (on
which pkg_rolling-replace depends) is once again maintained, but now
cleanly, rather than assuming that all tags are cleared.
(proposed on tech-pkg with no objections, and concurrence from tnn@)
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index f06c15d2de6..02bb8bc5abd 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.9 2007/08/02 23:00:18 jlam Exp $ +# $NetBSD: replace.mk,v 1.10 2007/08/07 22:27:12 gdt Exp $ # # _flavor-replace: @@ -137,14 +137,17 @@ replace-preserve-required-by: .PHONY ### replace-fixup-required-by (PRIVATE) ###################################################################### ### replace-fixup-required-by fixes the +CONTENTS files of dependent -### packages to refer to the replacement package. -### +### packages to refer to the replacement package. It also removes +### unsafe_depends* and rebuild tags from this package. replace-fixup-required-by: .PHONY @${STEP_MSG} "Fixing @pkgdep entries in dependent packages." ${_PKG_SILENT}${_PKG_DEBUG} \ set -e; \ ${TEST} -f ${_REPLACE_OLDNAME_FILE} || exit 0; \ ${TEST} -f ${_REPLACE_NEWNAME_FILE} || exit 0; \ + for var in unsafe_depends rebuild; do \ + ${PKG_ADMIN} unset $$var ${PKGBASE}; \ + done; \ ${TEST} -f ${_REQUIRED_BY_FILE} || exit 0; \ oldname=`${CAT} ${_REPLACE_OLDNAME_FILE}`; \ newname=`${CAT} ${_REPLACE_NEWNAME_FILE}`; \ |