diff options
| author | rhialto <rhialto@pkgsrc.org> | 2021-01-09 19:10:05 +0000 |
|---|---|---|
| committer | rhialto <rhialto@pkgsrc.org> | 2021-01-09 19:10:05 +0000 |
| commit | 0fb9b2fa4781ed4988379b801a911be1da1995e0 (patch) | |
| tree | ef1a8b38667de8031566cda2d748fd3b24756405 | |
| parent | 6b8828a68b76a532ef0806c8aaf4b6343ea81dd8 (diff) | |
| download | pkgsrc-0fb9b2fa4781ed4988379b801a911be1da1995e0.tar.gz | |
`make replace' now also unsets the `mismatch' variable.
This is for the benefit of pkg_rolling-replace 0.24.9.
ok gdt@.
| -rw-r--r-- | mk/pkgformat/pkg/replace.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/pkgformat/pkg/replace.mk b/mk/pkgformat/pkg/replace.mk index 91c064c3ad4..191f72dccef 100644 --- a/mk/pkgformat/pkg/replace.mk +++ b/mk/pkgformat/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.6 2019/01/22 14:29:44 roy Exp $ +# $NetBSD: replace.mk,v 1.7 2021/01/09 19:10:05 rhialto Exp $ # # _pkgformat-destdir-replace: @@ -163,7 +163,7 @@ replace-fixup-required-by: .PHONY done; \ ${MV} ${_REQUIRED_BY_FILE} ${_PKG_DBDIR}/$$newname/+REQUIRED_BY -# Removes unsafe_depends* and rebuild tags from this package. +# Removes unsafe_depends*, rebuild and mismatch tags from this package. # # XXX: pkg_admin should not complain on unset with no +INSTALLED_INFO. # @@ -172,7 +172,7 @@ replace-fixup-installed-info: .PHONY ${RUN} ${_REPLACE_NEWNAME_CMD}; \ [ ! -f ${_INSTALLED_INFO_FILE} ] || \ ${MV} ${_INSTALLED_INFO_FILE} ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO; \ - for var in unsafe_depends unsafe_depends_strict rebuild; do \ + for var in unsafe_depends unsafe_depends_strict rebuild mismatch; do \ ${TEST} ! -f ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO || \ ${PKG_ADMIN} unset $$var $$newname; \ done |