Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 818CA1A9217 for ; Sun, 17 Jan 2021 20:18:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D7B4684D67; Sun, 17 Jan 2021 20:18:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1EEAE84D61 for ; Sun, 17 Jan 2021 20:18:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id TCjf0E6Jj7xL for ; Sun, 17 Jan 2021 20:18:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9BA8D84CE0 for ; Sun, 17 Jan 2021 20:18:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8F7F2FA9D; Sun, 17 Jan 2021 20:18:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610914722173900" MIME-Version: 1.0 Date: Sun, 17 Jan 2021 20:18:42 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20210117201842.8F7F2FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610914722173900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1610914722173900 Content-Disposition: inline Content-Length: 1513 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1610914722173900--