From 671b98e3b31e6f668ee5c1c79a7dc8fa8788f0c3 Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Tue, 7 Aug 2007 22:27:12 +0000
Subject: 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@)
---
 mk/flavor/pkg/replace.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mk')

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}`;			\
-- 
cgit v1.2.3