CVS commit: pkgsrc/mk/pkgformat/pkg

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

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jan 17 20:18:42 UTC 2021

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

Log Message:
Remove "mismatch" flag also in the other place.

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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 pkgsrc/mk/pkgformat/pkg/replace.mk:1.8
--- pkgsrc/mk/pkgformat/pkg/replace.mk:1.7      Sat Jan  9 19:10:05 2021
+++ pkgsrc/mk/pkgformat/pkg/replace.mk  Sun Jan 17 20:18:42 2021
@@ -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 @@ replace-fixup-required-by: .PHONY
 
 # 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 @@ replace-destdir: .PHONY
                        ${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