git: 89b97931d6d4 - main - bsdinstall: Always use pkg.FreeBSD.org

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=89b97931d6d415d7a2504d8ea2c99beafd77cf24

commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-05-05 02:43:59 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-05-05 04:21:27 +0000

    bsdinstall: Always use pkg.FreeBSD.org
    
    The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for
    releases, so there is no need to point at pkgbase.FreeBSD.org.
    
    MFC after:      3 days
---
 usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +-
 usr.sbin/bsdinstall/Makefile             | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in
index 86ec8fabe253..13c94bbb8a64 100644
--- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in
+++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in
@@ -1,5 +1,5 @@
 FreeBSD-base: {
-  url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%",
+  url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/%%KEYSDIR%%",
diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index a576f2d0794e..f796a8710c5b 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -21,26 +21,22 @@ _REVISION!=	${MAKE} -C ${SRCTOP}/release -V REVISION
 REVISION?=	${_REVISION}
 
 .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE
-PKGHOST=	pkg
 KEYSDIR=	pkg
 SUBURL=		base_latest
 .elif ${BRANCH} == RELEASE
-PKGHOST=	pkgbase
 KEYSDIR=	pkgbase-${REVISION:C/\.[0-9]+//}
 SUBURL=		base_release_${REVISION:C/[0-9]+\.//}
 .elif ${BRANCH:C/[0-9]+$//} == BETA || \
     ${BRANCH:C/[0-9]+$//} == RC
-PKGHOST=	pkgbase
 KEYSDIR=	pkgbase-${REVISION:C/\.[0-9]+//}
 SUBURL= 	base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl}
 .else
 .warning Invalid branch "${BRANCH}"
-PKGHOST=	pkg
 KEYSDIR=	pkg
 SUBURL=		base_latest
 .endif
 
 FreeBSD-base.conf: FreeBSD-base.conf.in
-	sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET}
+	sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>