CVS commit: pkgsrc/mk/pkgformat/pkg

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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