CVS commit: pkgsrc/mk/pkgformat/pkg

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Jan  9 19:10:05 UTC 2021

Modified Files:
        pkgsrc/mk/pkgformat/pkg: replace.mk

Log Message:
`make replace' now also unsets the `mismatch' variable.

This is for the benefit of pkg_rolling-replace 0.24.9.
ok gdt@.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mk/pkgformat/pkg/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/replace.mk
diff -u pkgsrc/mk/pkgformat/pkg/replace.mk:1.6 pkgsrc/mk/pkgformat/pkg/replace.mk:1.7
--- pkgsrc/mk/pkgformat/pkg/replace.mk:1.6      Tue Jan 22 14:29:44 2019
+++ pkgsrc/mk/pkgformat/pkg/replace.mk  Sat Jan  9 19:10:05 2021
@@ -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