From f9097705fb1c8d9c1f8946d1c1897d606bdbd517 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 19 Jan 2025 23:25:09 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index c8e6e63d2e3..efa1299b76a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2362,7 +2362,7 @@ real-sign-packages:	_pkgbootstrap .PHONY
 .if ${PKG_BIN_VERSION} < 11700
 	printf "packing_format = \"${PKG_FORMAT}\";\n" >> ${WSTAGEDIR}/meta
 .endif
-	@${PKG_CMD} -o ABI=${PKG_ABI} repo -o OSVERSION="${SRCRELDATE}" \
+	@${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" repo \
 		-m ${WSTAGEDIR}/meta \
 		-o ${REPODIR}/${PKG_ABI}/${PKG_VERSION} \
 		${REPODIR}/${PKG_ABI}/${PKG_VERSION} \