git: 7b95d2a40219 - stable/13 - pkgbase: Fix OSVERSION specification when creating a repo

The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b95d2a40219ddaf187dbc087e1f9a0615b70b60

commit 7b95d2a40219ddaf187dbc087e1f9a0615b70b60
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-01-19 23:25:09 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-01-23 13:58:36 +0000

    pkgbase: Fix OSVERSION specification when creating a repo
    
    -o OSVERSION= needs to appear before the "repo" verb, otherwise it has
    no effect.  In this case, recent pkg-devel fails to create the repo,
    saying that ABI cannot be specified without OSVERSION.
    
    Reviewed by:    kevans, manu
    MFC after:      2 weeks
    Fixes:          188fe88ec50e ("pkgbase: force OSVERSION")
    Differential Revision:  https://reviews.freebsd.org/D48518
    
    (cherry picked from commit f9097705fb1c8d9c1f8946d1c1897d606bdbd517)
---
 Makefile.inc1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c8b5fc856dd5..65a5aa203aa3 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2150,8 +2150,7 @@ sign-packages:	_pkgbootstrap .PHONY
 .endif
 	@[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest" ] && \
 		unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/latest ; \
-	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname repo \
-		-o OSVERSION="${SRCRELDATE}" \
+	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o OSVERSION="${SRCRELDATE}" repo \
 		-m ${WSTAGEDIR}/meta \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \
 		${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI)/${PKG_VERSION} \