CVS commit: pkgsrc/mk

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 26 12:42:02 UTC 2024

Modified Files:
        pkgsrc/mk/install: bin-install.mk
        pkgsrc/mk/pkgformat/pkg: replace.mk

Log Message:
mk: Update `pkg_add -m' syntax in two more places.

(Why is anything outside mk/pkgformat/pkg using pkg_add?)

Gated on USE_CROSS_COMPILE=yes, so no impact on native builds.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/install/bin-install.mk
cvs rdiff -u -r1.8 -r1.9 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/install/bin-install.mk
diff -u pkgsrc/mk/install/bin-install.mk:1.30 pkgsrc/mk/install/bin-install.mk:1.31
--- pkgsrc/mk/install/bin-install.mk:1.30       Wed Jul  6 18:53:58 2022
+++ pkgsrc/mk/install/bin-install.mk    Fri Jan 26 12:42:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.30 2022/07/06 18:53:58 rillig Exp $
+# $NetBSD: bin-install.mk,v 1.31 2024/01/26 12:42:01 riastradh Exp $
 #
 
 # This file provides the following targets:
@@ -94,7 +94,7 @@ locked-su-do-bin-install:
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
        ${RUN} ${_BIN_INSTALL_PREPARE_CMD}                              \
        ${STEP_MSG} "Installing ${PKGNAME} from $$pkg_path";            \
-       if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${_BIN_INSTALL_FLAGS} ${PKGNAME_REQD:Q}${PKG_SUFX}; then \
+       if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${PKG_ADD} -m ${OPSYS:Q}/${MACHINE_ARCH:Q}\ ${OS_VERSION:Q} -I -p ${_CROSS_DESTDIR}${PREFIX} ${_BIN_INSTALL_FLAGS} 
${PKGNAME_REQD:Q}${PKG_SUFX}; then \
                ${ECHO} "Fixing recorded cwd...";                       \
                ${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp; \
                ${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS; \

Index: pkgsrc/mk/pkgformat/pkg/replace.mk
diff -u pkgsrc/mk/pkgformat/pkg/replace.mk:1.8 pkgsrc/mk/pkgformat/pkg/replace.mk:1.9
--- pkgsrc/mk/pkgformat/pkg/replace.mk:1.8      Sun Jan 17 20:18:42 2021
+++ pkgsrc/mk/pkgformat/pkg/replace.mk  Fri Jan 26 12:42:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.8 2021/01/17 20:18:42 rhialto Exp $
+# $NetBSD: replace.mk,v 1.9 2024/01/26 12:42:01 riastradh Exp $
 #
 
 # _pkgformat-destdir-replace:
@@ -197,7 +197,7 @@ replace-destdir: .PHONY
        @${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q}
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
        @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
-       ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
+       ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D -m ${OPSYS:Q}/${MACHINE_ARCH:Q}\ ${OS_VERSION:Q} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
        @${ECHO} "Fixing recorded cwd..."
        @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
        @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS