Fri Jan 26 12:42:02 2024 UTC (118d)
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.


(riastradh)
diff -r1.30 -r1.31 pkgsrc/mk/install/bin-install.mk
diff -r1.8 -r1.9 pkgsrc/mk/pkgformat/pkg/replace.mk
cvs diff -r1.30 -r1.31 pkgsrc/mk/install/bin-install.mk (expand / switch to unified diff)

--- pkgsrc/mk/install/bin-install.mk 2022/07/06 18:53:58 1.30
+++ pkgsrc/mk/install/bin-install.mk 2024/01/26 12:42:01 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bin-install.mk,v 1.30 2022/07/06 18:53:58 rillig Exp $ 1# $NetBSD: bin-install.mk,v 1.31 2024/01/26 12:42:01 riastradh Exp $
2# 2#
3 3
4# This file provides the following targets: 4# This file provides the following targets:
5# 5#
6# bin-install: 6# bin-install:
7# Tries to install a package from a prebuilt binary package, and 7# Tries to install a package from a prebuilt binary package, and
8# if that doesn't work, builds the package from source. 8# if that doesn't work, builds the package from source.
9# 9#
10# User-settable variables: 10# User-settable variables:
11# 11#
12# PACKAGES 12# PACKAGES
13# This directory is searched before BINPKG_SITES when trying to 13# This directory is searched before BINPKG_SITES when trying to
14# install binary packages. 14# install binary packages.
@@ -84,27 +84,27 @@ _BIN_INSTALL_PREPARE_CMD= \ @@ -84,27 +84,27 @@ _BIN_INSTALL_PREPARE_CMD= \
84 fi; \ 84 fi; \
85 rel=${_SHORT_UNAME_R:Q}; \ 85 rel=${_SHORT_UNAME_R:Q}; \
86 arch=${MACHINE_ARCH:Q}; \ 86 arch=${MACHINE_ARCH:Q}; \
87 pkg_path=${PKGREPOSITORY:Q}; \ 87 pkg_path=${PKGREPOSITORY:Q}; \
88 set args ${BINPKG_SITES}; shift; \ 88 set args ${BINPKG_SITES}; shift; \
89 for i in "$$@"; do \ 89 for i in "$$@"; do \
90 pkg_path="$$pkg_path;$$i/All"; \ 90 pkg_path="$$pkg_path;$$i/All"; \
91 done; 91 done;
92 92
93locked-su-do-bin-install: 93locked-su-do-bin-install:
94.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 94.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
95 ${RUN} ${_BIN_INSTALL_PREPARE_CMD} \ 95 ${RUN} ${_BIN_INSTALL_PREPARE_CMD} \
96 ${STEP_MSG} "Installing ${PKGNAME} from $$pkg_path"; \ 96 ${STEP_MSG} "Installing ${PKGNAME} from $$pkg_path"; \
97 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 \ 97 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 \
98 ${ECHO} "Fixing recorded cwd..."; \ 98 ${ECHO} "Fixing recorded cwd..."; \
99 ${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp; \ 99 ${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp; \
100 ${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS; \ 100 ${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS; \
101 ${ECHO} "`${PKG_INFO} -e ${PKGNAME_REQD:Q}` successfully installed."; \ 101 ${ECHO} "`${PKG_INFO} -e ${PKGNAME_REQD:Q}` successfully installed."; \
102 fi 102 fi
103.else 103.else
104 ${RUN} ${_BIN_INSTALL_PREPARE_CMD} \ 104 ${RUN} ${_BIN_INSTALL_PREPARE_CMD} \
105 pkgpattern=${PKGNAME_REQD:Q}; \ 105 pkgpattern=${PKGNAME_REQD:Q}; \
106 ${STEP_MSG} "Installing $$pkgpattern from $$pkg_path"; \ 106 ${STEP_MSG} "Installing $$pkgpattern from $$pkg_path"; \
107 if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \ 107 if ${PKGSRC_SETENV} PKG_PATH="$$pkg_path" ${PKGTOOLS_ENV} ${PKG_ADD} ${_BIN_INSTALL_FLAGS} "$$pkgpattern"; then \
108 installed=`${PKG_INFO} -e "$$pkgpattern"`; \ 108 installed=`${PKG_INFO} -e "$$pkgpattern"`; \
109 ${ECHO} "$$installed successfully installed."; \ 109 ${ECHO} "$$installed successfully installed."; \
110 fi 110 fi
cvs diff -r1.8 -r1.9 pkgsrc/mk/pkgformat/pkg/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/replace.mk 2021/01/17 20:18:42 1.8
+++ pkgsrc/mk/pkgformat/pkg/replace.mk 2024/01/26 12:42:01 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.8 2021/01/17 20:18:42 rhialto Exp $ 1# $NetBSD: replace.mk,v 1.9 2024/01/26 12:42:01 riastradh Exp $
2# 2#
3 3
4# _pkgformat-destdir-replace: 4# _pkgformat-destdir-replace:
5# Updates a package in-place on the system. 5# Updates a package in-place on the system.
6# 6#
7# See also: 7# See also:
8# replace 8# replace
9# 9#
10# XXX: The whole replacement, from deinstalling the old package up 10# XXX: The whole replacement, from deinstalling the old package up
11# to installing the new package, should be one transaction. 11# to installing the new package, should be one transaction.
12# 12#
13_pkgformat-replace: \ 13_pkgformat-replace: \
14 replace-tarup \ 14 replace-tarup \
@@ -187,27 +187,27 @@ replace-clean: .PHONY @@ -187,27 +187,27 @@ replace-clean: .PHONY
187# Logically we would like to do a "pkg_add -U". However, that fails 187# Logically we would like to do a "pkg_add -U". However, that fails
188# if there is a depending package that exactly depends on the package 188# if there is a depending package that exactly depends on the package
189# being replaced, so we override that check with -D. Historically, 189# being replaced, so we override that check with -D. Historically,
190# 'make replace' would replace a package regardless of whether that 190# 'make replace' would replace a package regardless of whether that
191# broke depending packages (typically due to shlib ABI changes, 191# broke depending packages (typically due to shlib ABI changes,
192# especially major version bumps). Therefore, make replace in DESTDIR 192# especially major version bumps). Therefore, make replace in DESTDIR
193# mode should behave the same way. unsafe_depends will be set on 193# mode should behave the same way. unsafe_depends will be set on
194# depending packages, and then those may be rebuilt via a manual 194# depending packages, and then those may be rebuilt via a manual
195# process or by pkg_rolling-replace. 195# process or by pkg_rolling-replace.
196replace-destdir: .PHONY 196replace-destdir: .PHONY
197 @${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q} 197 @${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q}
198.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 198.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
199 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} 199 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
200 ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE} 200 ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D -m ${OPSYS:Q}/${MACHINE_ARCH:Q}\ ${OS_VERSION:Q} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
201 @${ECHO} "Fixing recorded cwd..." 201 @${ECHO} "Fixing recorded cwd..."
202 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp 202 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
203 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS 203 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
204.else 204.else
205 ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D ${STAGE_PKGFILE} 205 ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -U -D ${STAGE_PKGFILE}
206.endif 206.endif
207 ${RUN}${_REPLACE_OLDNAME_CMD}; \ 207 ${RUN}${_REPLACE_OLDNAME_CMD}; \
208 ${PKG_INFO} -qR ${PKGNAME:Q} | while read pkg; do \ 208 ${PKG_INFO} -qR ${PKGNAME:Q} | while read pkg; do \
209 [ -n "$$pkg" ] || continue; \ 209 [ -n "$$pkg" ] || continue; \
210 ${PKG_ADMIN} set unsafe_depends_strict=YES "$$pkg"; \ 210 ${PKG_ADMIN} set unsafe_depends_strict=YES "$$pkg"; \
211 if [ "$$oldname" != ${PKGNAME:Q} ]; then \ 211 if [ "$$oldname" != ${PKGNAME:Q} ]; then \
212 ${PKG_ADMIN} set unsafe_depends=YES "$$pkg"; \ 212 ${PKG_ADMIN} set unsafe_depends=YES "$$pkg"; \
213 fi; \ 213 fi; \