CVS commit: pkgsrc/mk/pkgformat/pkg

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 26 03:24:58 UTC 2024

Modified Files:
        pkgsrc/mk/pkgformat/pkg: package.mk pkgformat-vars.mk

Log Message:
mk/pkgformat/pkg: Use extended `-m "OS/ARCH VER"' syntax.

Requires pkg_install>=20240125.

No change to native builds, not even the pkg_install requirement,
because this is conditional on cross builds.

Proposed on tech-pkg:
https://mail-index.netbsd.org/tech-pkg/2024/01/13/msg028825.html


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/pkgformat/pkg/package.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.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/package.mk
diff -u pkgsrc/mk/pkgformat/pkg/package.mk:1.19 pkgsrc/mk/pkgformat/pkg/package.mk:1.20
--- pkgsrc/mk/pkgformat/pkg/package.mk:1.19     Tue Jun 27 10:27:21 2023
+++ pkgsrc/mk/pkgformat/pkg/package.mk  Fri Jan 26 03:24:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.19 2023/06/27 10:27:21 riastradh Exp $
+# $NetBSD: package.mk,v 1.20 2024/01/26 03:24:58 riastradh Exp $
 
 .if defined(PKG_SUFX)
 WARNINGS+=             "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -150,7 +150,7 @@ su-real-package-install:
        @${PHASE_MSG} "Installing binary package of "${PKGNAME:Q}
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
        @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
-       ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
+       ${SETENV} ${PKGTOOLS_ENV} ${PKG_ADD} -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

Index: pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk
diff -u pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.14 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.15
--- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.14      Tue Jun 27 14:36:29 2023
+++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk   Fri Jan 26 03:24:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: pkgformat-vars.mk,v 1.14 2023/06/27 14:36:29 riastradh Exp $
+# $NetBSD: pkgformat-vars.mk,v 1.15 2024/01/26 03:24:58 riastradh Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -40,7 +40,9 @@ NATIVE_PKG_INFO_CMD?=         ${NATIVE_PKG_TOOL
 NATIVE_LINKFARM_CMD?=          ${NATIVE_PKG_TOOLS_BIN}/linkfarm
 
 # Latest versions of tools required for correct pkgsrc operation.
-.if !empty(USE_PKG_ADMIN_DIGEST:M[Yy][Ee][Ss])
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+PKGTOOLS_REQD=         20240125
+.elif !empty(USE_PKG_ADMIN_DIGEST:M[Yy][Ee][Ss])
 PKGTOOLS_REQD=         20191008
 .else
 PKGTOOLS_REQD=         20100914