Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2FC7584D8B for ; Tue, 24 Oct 2023 10:30:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id o37J0gsEk9_X for ; Tue, 24 Oct 2023 10:30:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E28484D7A for ; Tue, 24 Oct 2023 10:30:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 773E5FADC; Tue, 24 Oct 2023 10:30:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169814345385610" MIME-Version: 1.0 Date: Tue, 24 Oct 2023 10:30:53 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20231024103053.773E5FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169814345385610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Oct 24 10:30:53 UTC 2023 Modified Files: pkgsrc/mk/pkgformat/pkg: metadata.mk Log Message: mk: Fix SUPERSEDES generation. Each SUPERSEDES entry must be listed on its own line so that pkg_summary(5) can be parsed correctly, similar to all other fields. This should fix pkgin being able to handle packages that have multiple SUPERSEDES entries. Reported and reviewed by wiz. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 pkgsrc/mk/pkgformat/pkg/metadata.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169814345385610 Content-Disposition: inline Content-Length: 982 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/metadata.mk diff -u pkgsrc/mk/pkgformat/pkg/metadata.mk:1.35 pkgsrc/mk/pkgformat/pkg/metadata.mk:1.36 --- pkgsrc/mk/pkgformat/pkg/metadata.mk:1.35 Thu Oct 12 13:31:10 2023 +++ pkgsrc/mk/pkgformat/pkg/metadata.mk Tue Oct 24 10:30:53 2023 @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.35 2023/10/12 13:31:10 riastradh Exp $ +# $NetBSD: metadata.mk,v 1.36 2023/10/24 10:30:53 jperkin Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -65,9 +65,7 @@ ${_BUILD_INFO_FILE}: ${_PLIST_NOKEYWORDS if [ -n "${PREV_PKGPATH}" ]; then \ ${ECHO} "PREV_PKGPATH=${PREV_PKGPATH}"; \ fi; \ - if [ -n "${SUPERSEDES}" ]; then \ - ${ECHO} "SUPERSEDES=${SUPERSEDES}"; \ - fi; \ + ${SUPERSEDES:@s@ ${ECHO} SUPERSEDES=${s:Q}; @} \ ${ECHO} "BUILD_DATE=${_BUILD_DATE_cmd:sh}"; \ ${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}"; \ } > ${.TARGET}.tmp --_----------=_169814345385610--