pkg: Enable FreeBSD-base by default

Enable the FreeBSD-base repository in all of the /etc/pkg/FreeBSD.conf
variants, and remove code from various install paths which enabled the
repository via /usr/local/etc/pkg/repos/FreeBSD.conf.

Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D60946

UPDATING

@@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20261018:
+	The FreeBSD-base repository is now enabled in /etc/pkg/FreeBSD.conf.
+	To disable it, edit that file or put "FreeBSD-base: { enabled: no }"
+	into /usr/local/etc/pkg/repos/FreeBSD.conf.
+
 20260919:
 	less(1) has been updated to version 710, which removes the obsolete
 	lesskey(1) utility.  It is no longer built or installed, and the

release/tools/oci-image-static.conf

@@ -26,12 +26,4 @@ oci_image_build() {
 	    TRUSTPATH=${srcdir}/secure/caroot/trusted \
 	    UNTRUSTPATH=${srcdir}/secure/caroot/untrusted \
 	    certctl -c rehash
-	# Generate a suitable repo config for pkgbase
-	mkdir -p $m/usr/local/etc/pkg/repos
-	cat > $m/usr/local/etc/pkg/repos/FreeBSD.conf <<EOF
-FreeBSD-base: {
-  enabled: yes
-}
-EOF
-
 }

release/tools/vmimage.subr

@@ -107,10 +107,6 @@ vm_install_base() {
 		selected=$(vm_base_packages_list | vm_extra_filter_base_packages)
 		$pkg_cmd install -U -r FreeBSD-base $selected
 		metalog_add_data ./var/db/pkg/local.sqlite
-		mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos
-		echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf
-		metalog_add_data ./usr/local/etc/pkg/repos
-		metalog_add_data ./usr/local/etc/pkg/repos/FreeBSD.conf
 	else
 		cd ${WORLDDIR} && \
 			make DESTDIR=${DESTDIR} ${INSTALLOPTS} \

usr.sbin/bsdinstall/scripts/pkgbase.in

@@ -368,10 +368,6 @@ local function pkgbase()
 	if not os.execute(pkg .. "install -U -y -r FreeBSD-base " .. packages) then
 		os.exit(1)
 	end
-
-	-- Enable the FreeBSD-base repository for this system.
-	assert(os.execute("mkdir -p " .. chroot .. "/usr/local/etc/pkg/repos"))
-	assert(os.execute("echo 'FreeBSD-base: { enabled: yes }' > " .. chroot .. "/usr/local/etc/pkg/repos/FreeBSD.conf"))
 end
 
 pkgbase()

usr.sbin/pkg/FreeBSD.conf.latest

@@ -5,8 +5,7 @@
 #   mkdir -p /usr/local/etc/pkg/repos
 #   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
-#
-# Note that the FreeBSD-base repository is disabled by default.
+#   echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 
 FreeBSD-ports: {
@@ -28,5 +27,5 @@ FreeBSD-base: {
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
-  enabled: no
+  enabled: yes
 }

usr.sbin/pkg/FreeBSD.conf.quarterly

@@ -6,8 +6,7 @@
 #   mkdir -p /usr/local/etc/pkg/repos
 #   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
-#
-# Note that the FreeBSD-base repository is disabled by default.
+#   echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 
 FreeBSD-ports: {
@@ -29,5 +28,5 @@ FreeBSD-base: {
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
-  enabled: no
+  enabled: yes
 }

usr.sbin/pkg/FreeBSD.conf.quarterly-release

@@ -5,8 +5,7 @@
 #   mkdir -p /usr/local/etc/pkg/repos
 #   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
-#
-# Note that the FreeBSD-base repository is disabled by default.
+#   echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 
 FreeBSD-ports: {
@@ -28,5 +27,5 @@ FreeBSD-base: {
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}",
-  enabled: no
+  enabled: yes
 }