diff options
| author | rhialto <rhialto@pkgsrc.org> | 2021-01-17 20:18:42 +0000 |
|---|---|---|
| committer | rhialto <rhialto@pkgsrc.org> | 2021-01-17 20:18:42 +0000 |
| commit | 8de2e86ea1345d6ab505ed5838a652fc2585ea98 (patch) | |
| tree | deaaa08731384f76c7b7cacdcd4a1c25a7471bcd | |
| parent | e99d3e018d23aeec5e0adf678a4f0109904b3a25 (diff) | |
| download | pkgsrc-8de2e86ea1345d6ab505ed5838a652fc2585ea98.tar.gz | |
Remove "mismatch" flag also in the other place.
Also, remove check for empty +INSTALLED_INFO which seems no longer needed.
| -rw-r--r-- | mk/pkgformat/pkg/replace.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/pkgformat/pkg/replace.mk b/mk/pkgformat/pkg/replace.mk index 191f72dccef..1e66f4eba22 100644 --- a/mk/pkgformat/pkg/replace.mk +++ b/mk/pkgformat/pkg/replace.mk @@ -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 |