[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Remove unsafe_depends and rebuild tags f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8ca98236fc8
branches:  trunk
changeset: 531861:b8ca98236fc8
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Tue Aug 07 22:27:12 2007 +0000

description:
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:

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

diffs (29 lines):

diff -r 78532797eb06 -r b8ca98236fc8 mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk  Tue Aug 07 21:59:11 2007 +0000
+++ b/mk/flavor/pkg/replace.mk  Tue Aug 07 22:27:12 2007 +0000
@@ -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-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}`;                      \