[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg Remove "mismatch" flag also in the ot...

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/481183e91538
branches:  trunk
changeset: 445198:481183e91538
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sun Jan 17 20:18:42 2021 +0000

description:
Remove "mismatch" flag also in the other place.

Also, remove check for empty +INSTALLED_INFO which seems no longer needed.

diffstat:

 mk/pkgformat/pkg/replace.mk |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r e9399ac5f6ca -r 481183e91538 mk/pkgformat/pkg/replace.mk
--- a/mk/pkgformat/pkg/replace.mk       Sun Jan 17 19:33:17 2021 +0000
+++ b/mk/pkgformat/pkg/replace.mk       Sun Jan 17 20:18:42 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.7 2021/01/09 19:10:05 rhialto Exp $
+# $NetBSD: replace.mk,v 1.8 2021/01/17 20:18:42 rhialto Exp $
 #
 
 # _pkgformat-destdir-replace:
@@ -165,15 +165,12 @@
 
 # Removes unsafe_depends*, rebuild and mismatch tags from this package.
 #
-# XXX: pkg_admin should not complain on unset with no +INSTALLED_INFO.
-#
 replace-fixup-installed-info: .PHONY
        @${STEP_MSG} "Removing unsafe_depends and rebuild tags."
        ${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 mismatch; do  \
-               ${TEST} ! -f ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO || \
                ${PKG_ADMIN} unset $$var $$newname;                     \
        done
 
@@ -215,6 +212,6 @@
                        ${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}
+       ${RUN}for var in unsafe_depends unsafe_depends_strict rebuild mismatch; do  \
+               ${PKG_ADMIN} unset $$var ${PKGNAME:Q}; \
+       done