 @@ -666,31 +666,26 @@ CONFIGURATION
                      If using build.sh, the default is "yes".  This may be set
                      back to "no" by giving build.sh the -o option.
      MKUPDATE        Can be set to "yes" or "no".  If set, then in addition to
                      the effects described for MKUPDATE=yes above, this
                      implies the effects of NOCLEANDIR (i.e., "make cleandir"
                      is avoided).
                      Default: "no"
                      If using build.sh, this may be set by giving the -u
                      option.
      NBUILDJOBS      Now obsolete.  Use the make(1) option -j, instead.  See
                      below.
                      Default: Unset.
      NOCLEANDIR      If set, avoids the "make cleandir" phase of a full build.
                      This has the effect of allowing only changed files in a
                      source tree to be recompiled.  This can speed up builds
                      when updating only a few files in the tree.
                      Default: Unset.
                      See also MKUPDATE.
      NODISTRIBDIRS   If set, avoids the "make distrib-dirs" phase of a full
                      build.  This skips running mtree(8) on DESTDIR, useful on
                      systems where building as an unprivileged user, or where
                      it is known that the system-wide mtree files have not
 @@ -1283,37 +1278,37 @@ EXAMPLES
           Even though this is run as root, -U is required so that the
           permissions stored in DESTDIR/METALOG are correctly applied to the
           files as they're copied to /.
 .   % ./build.sh [OPTIONS] -U -u release
           Using unprivileged mode, build a complete release to DESTDIR and
           RELEASEDIR directories that build.sh selects (and will show).
           MKUPDATE=yes (-u) is set to prevent the "make cleandir", so that if
           this is run after example 2, it doesn't need to redo that portion of
           the release build.
 OBSOLETE VARIABLES
-     NBUILDJOBS  Use the make(1) option -j instead.
+     NBUILDJOBS  Use the build.sh and make(1) option -j instead.
      USE_NEW_TOOLCHAIN
                  The new toolchain is now the default.  To disable, use
                  TOOLCHAIN_MISSING=yes.
 SEE ALSO
      ar(1), config(1), ctags(1), cvs(1), cvslatest(1), ex(1), g++(1), gzip(1),
      ident(1), ld(1), lint(1), make(1), mkisofs(1), sh(1), uname(1), vi(1),
      options(4), mk.conf(5), atf(7), hier(7), release(7), sysctl(7),
      etcupdate(8), installboot(8), mount(8), mtree(8), postinstall(8),
      sysinst(8), pkgsrc/sysutils/cdrtools
 HISTORY
      The build.sh based build scheme was introduced for NetBSD 1.6 as
      USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that.
 CAVEATS
      After significant updates to third-party components in the source tree,
      the "make cleandir" operation may be insufficient to clean out old files
      in object directories.  Instead, one may have to manually remove the
      files.  Consult the UPDATING file for notices concerning this.
-NetBSD                           June 5, 2023                           NetBSD
+NetBSD                           June 10, 2023                          NetBSD

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
+#	$NetBSD: Makefile,v 1.337 2023/06/11 10:43:51 lukem Exp $
+#
 # This is the top-level makefile for building NetBSD. For an outline of
 # how to build a snapshot or release, as well as other release engineering
 # information, see http://www.NetBSD.org/developers/releng/index.html
+#
 # Not everything you can set or do is documented in this makefile. In
 # particular, you should review the files in /usr/share/mk (especially
 # bsd.README) for general information on building programs and writing
 # Makefiles within this structure, and see the comments in src/etc/Makefile
 # for further information on installation and release set options.
+#
 # Variables listed below can be set on the make command line (highest
 @@ -436,29 +436,26 @@ install-image: .PHONY
 	@printf "make ${.TARGET} finished at: " && date
+#
 # Special components of the "make build" process.
+#
 check-tools: .PHONY
 .if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN)
 	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'
 	@echo '*** May result in a failed build or corrupt binaries!'
 .elif defined(EXTERNAL_TOOLCHAIN)
 	@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
 .endif
 .if defined(NBUILDJOBS)
 	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif
 # Delete or sanitise a leftover METALOG from a previous build.
 clean_METALOG: .PHONY .MAKE
 .if ${MKUPDATE} != "no"
 	${MAKEDIRTARGET} distrib/sets clean_METALOG
 .endif
 do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""
 	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
 .else
 	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=${DESTDIR}
 .endif

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.141 2023/06/05 22:36:17 lukem Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.142 2023/06/11 10:43:51 lukem Exp $
 .\"
 .\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Todd Vierling and Luke Mewburn.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,27 +23,27 @@
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" NOTE: After changing this file, run "make regen" in the src/doc
 .\" directory, and check in both src/BUILDING and src/doc/BUILDING.mdoc.
 .\"
 .\" Toolchain prefix for commands
 .ds toolprefix nb
+.
-.Dd June 5, 2023
+.Dd June 10, 2023
 .Dt BUILDING 8
 .Os NetBSD
 .\" turn off hyphenation
 .hym 999
+.
 .\" if this file is processed with real roff (doc.tmac)
 .\" now that the tmac files have been lazily read,
 .\" we can override ``quotes'' with "quotes" for ascii output
 .ie '\*[Lq]'``' \{\
 .ds Lq \*q
 .ds Rq \*q
 .\}
 .\" and disable hyphenation
 @@ -1159,36 +1159,26 @@ If set, then in addition to the effects
 above, this implies the effects of
 .Sy NOCLEANDIR
 (i.e.,
 .Dq make cleandir
 is avoided).
 .DFLTn
 .Pp
 If using
 .Sy build.sh ,
 this may be set by giving the
 .Fl u
 option.
+.
 .It Sy NBUILDJOBS
 Now obsolete.
 Use the
 .Xr make 1
 option
 .Fl j ,
 instead.
 See below.
 .DFLTu
 .It Sy NOCLEANDIR
 If set, avoids the
 .Dq make cleandir
 phase of a full build.
 This has the effect of allowing only changed
 files in a source tree to be recompiled.
 This can speed up builds when updating only a few files in the tree.
 .DFLTu
 .Pp
 See also
 .Sy MKUPDATE .
+.
 .It Sy NODISTRIBDIRS
 @@ -2422,26 +2412,28 @@ selects (and will show).
 .Pq Fl u
 is set to prevent the
 .Dq make cleandir ,
 so that if this is run after example 2, it doesn't need to redo that
 portion of the release build.
 .El
+.
 .Sh OBSOLETE VARIABLES
+.
 .Bl -tag -width "NBUILDJOBS"
+.
 .It Sy NBUILDJOBS
 Use the
 .Nm build.sh
 and
 .Xr make 1
 option
 .Fl j
 instead.
+.
 .It Sy USE_NEW_TOOLCHAIN
 The new toolchain is now the default.
 To disable, use
 .Sy TOOLCHAIN_MISSING=yes .
 .El
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr config 1 ,

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.params,v 1.22 2021/02/14 18:45:44 pgoyette Exp $
+#	$NetBSD: Makefile.params,v 1.23 2023/06/11 10:43:51 lukem Exp $
+#
 # Makefile fragment for printing build parameters.
+#
 # Public variables:
 #	RELEASEVARS
 #		List of variables whose value should be printed.
+#
 #	PRINT_PARAMS
 #		A command to print the desired variables and values
 #		to stdout, without any additional debugging information.
 #		Values are printed as single-quoted strings, with
 #		embedded quotes and newlines escaped in a way that's
 #		acceptable to sh(1).  Undefined values are printed
 @@ -40,27 +40,27 @@
 RELEASEVARS=	DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
 		HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
 		MACHINE MACHINE_ARCH \
 		NETBSD_OFFICIAL_RELEASE NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
 		TOOLCHAIN_MISSING \
 		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
 		USE_PAM USE_SKEY USE_YP \
 		USETOOLS
 .if ${MKREPRO:Uno} != "yes"
 RELEASEVARS+= 	BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
 		DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR MAKE \
 		KERNEL_DIR MAKECONF MAKEFLAGS MAKEOBJDIR MAKEOBJDIRPREFIX \
-		MAKEVERBOSE NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+		MAKEVERBOSE NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
 		RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
 .endif
 RELEASEVARS+= ${_MKVARS.yes} ${_MKVARS.no}
+#
 # Duplicate the DISTRIBVER setting from src/etc/Makefile.
+#
 .ifndef DISTRIBVER
 DISTRIBVER!=	${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 .endif
+#