pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg store +REQUIRED_BY and +INSTALLED_INFO i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5a3cf7132729
branches: trunk
changeset: 532051:5a3cf7132729
user: gdt <gdt%pkgsrc.org@localhost>
date: Fri Aug 10 17:57:28 2007 +0000
description:
store +REQUIRED_BY and +INSTALLED_INFO in work/.replace-FOO rather
than in work/.pkgdb, so as not to lose them in install-clean.
Because of this, put them back explicitly.
(Fixes 'make replace loses +REQUIRED_BY', and also the unreported
'make replace loses +INSTALLED_INFO'.)
diffstat:
mk/flavor/pkg/replace.mk | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diffs (55 lines):
diff -r 39b901408743 -r 5a3cf7132729 mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk Fri Aug 10 17:57:24 2007 +0000
+++ b/mk/flavor/pkg/replace.mk Fri Aug 10 17:57:28 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.14 2007/08/08 16:39:05 jlam Exp $
+# $NetBSD: replace.mk,v 1.15 2007/08/10 17:57:28 gdt Exp $
#
# _flavor-replace:
@@ -40,8 +40,8 @@
replace-clean \
.PHONY
-_INSTALLED_INFO_FILE= ${PKG_DB_TMPDIR}/+INSTALLED_INFO
-_REQUIRED_BY_FILE= ${PKG_DB_TMPDIR}/+REQUIRED_BY
+_INSTALLED_INFO_FILE= ${WRKDIR}/.replace-+INSTALLED_INFO
+_REQUIRED_BY_FILE= ${WRKDIR}/.replace-+REQUIRED_BY
_COOKIE.replace= ${WRKDIR}/.replace_done
_REPLACE_OLDNAME_FILE= ${WRKDIR}/.replace_oldname
@@ -138,9 +138,11 @@
### replace-fixup-required-by (PRIVATE)
######################################################################
### replace-fixup-required-by fixes the +CONTENTS files of dependent
-### packages to refer to the replacement package. It also sets the
+### packages to refer to the replacement package, and puts the
+### +REQUIRED_BY file back into place. It also sets the
### unsafe_depends_strict tag on each dependent package, and sets the
-### unsafe_depends tag if the replaced package has a different version.
+### unsafe_depends tag if the replaced package has a different
+### version.
### XXX Only set unsafe_depends if there is an ABI change.
replace-fixup-required-by: .PHONY
@${STEP_MSG} "Fixing @pkgdep entries in dependent packages."
@@ -170,7 +172,8 @@
if ${TEST} "$$oldname" != "$$newname"; then \
${PKG_ADMIN} set unsafe_depends=YES $$pkg; \
fi; \
- done
+ done; \
+ ${MV} ${_REQUIRED_BY_FILE} ${_PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY
######################################################################
### replace-fixup-installed-info (PRIVATE)
@@ -181,7 +184,9 @@
replace-fixup-installed-info: .PHONY
@${STEP_MSG} "Removing unsafe_depends tag."
${_PKG_SILENT}${_PKG_DEBUG} \
- for var in unsafe_depends unsafe_depends_strict rebuild; do \
+ ${TEST} ! -f ${_INSTALLED_INFO_FILE} ||
+ ${MV} ${_INSTALLED_INFO_FILE} ${_PKG_DBDIR}/${PKGNAME}/+INSTALLED_INFO; \
+ for var in unsafe_depends unsafe_depends_strict rebuild; do \
${TEST} ! -f ${_PKG_DBDIR}/${PKGNAME}/+INSTALLED_INFO || \
${PKG_ADMIN} unset $$var ${PKGBASE}; \
done
Home |
Main Index |
Thread Index |
Old Index