diff options
| author | joerg <joerg> | 2010-01-30 21:07:29 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-01-30 21:07:29 +0000 |
| commit | 3c03ea562f1b3503f7eb7bb8615f731590130ed4 (patch) | |
| tree | f342475e96249e728a93f1149c73d6affa0e0745 /mk | |
| parent | f413520873d47c3d32425d6737810f371301e520 (diff) | |
| download | pkgsrc-3c03ea562f1b3503f7eb7bb8615f731590130ed4.tar.gz | |
Revamp the replace logic for the destdir case. Don't bother messing up
the +CONTENTS files, just set the various variables on the dependencies.
Tested by tnn@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index dbbaf412369..aa6b33d6395 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.27 2010/01/30 20:13:19 joerg Exp $ +# $NetBSD: replace.mk,v 1.28 2010/01/30 21:07:29 joerg Exp $ # # _flavor-replace: @@ -30,8 +30,6 @@ _flavor-replace: \ _flavor-destdir-replace: \ replace-names \ replace-destdir \ - replace-fixup-required-by \ - replace-fixup-installed-info \ .PHONY # _flavor-undo-replace: @@ -194,3 +192,14 @@ replace-destdir: .PHONY .else ${PKG_ADD} -U ${PKGFILE} .endif + ${RUN}${_REPLACE_OLDNAME_CMD}; \ + ${PKG_INFO} -qR ${PKGNAME:Q} | while read pkg; do \ + [ -n "$$pkg" ] || continue; \ + ${PKG_ADMIN} set unsafe_depends_strict=YES "$$pkg"; \ + if [ "$$oldname" != ${PKGNAME:Q} ]; then \ + ${PKG_ADMIN} set unsafe_depends=YES "$$pkg"; \ + fi; \ + done + ${RUN}${PKG_ADMIN} unset unsafe_depends ${PKGNAME:Q} + ${RUN}${PKG_ADMIN} unset unsafe_depends_strict ${PKGNAME:Q} + ${RUN}${PKG_ADMIN} unset rebuild ${PKGNAME:Q} |