 @@ -1,15 +1,15 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.375 2024/01/03 02:48:45 thorpej Exp $
+#	$NetBSD: build.sh,v 1.376 2024/04/20 12:25:46 rillig 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
 @@ -1081,50 +1081,50 @@ help()
     iso-image           Create CD-ROM image in RELEASEDIR/images.
     iso-image-source    Create CD-ROM image with source in RELEASEDIR/images.
     live-image          Create bootable live image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
     install-image       Create bootable installation image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
     disk-image=TARGET   Create bootable disk image in
                         RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/TARGET.img.gz.
     params              Create params file with various make(1) parameters.
     show-params         Show various make(1) parameters.
     list-arch           Show a list of valid MACHINE/MACHINE_ARCH values,
                         and exit.  The list may be narrowed by passing glob
                         patterns or exact values in MACHINE or MACHINE_ARCH.
-    mkrepro-timestamp   Show the latest source timestamp used for reproducable
+    mkrepro-timestamp   Show the latest source timestamp used for reproducible
                         builds and exit.  Requires -P or -V MKREPRO=yes.
  Options:
     -a ARCH        Set MACHINE_ARCH=ARCH.  [Default: deduced from MACHINE]
     -B BID         Set BUILDID=BID.
     -C EXTRAS      Append EXTRAS to CDEXTRA for inclusion on CD-ROM.
     -c COMPILER    Select compiler from COMPILER:
                        clang
                        gcc
                    [Default: gcc]
     -D DEST        Set DESTDIR=DEST.  [Default: destdir.\${MACHINE}]
     -E             Set "expert" mode; disables various safety checks.
                    Should not be used without expert knowledge of the build
                    system.
     -h             Show this help message, and exit.
     -j NJOB        Run up to NJOB jobs in parallel; see make(1) -j.
     -M MOBJ        Set obj root directory to MOBJ; sets MAKEOBJDIRPREFIX=MOBJ,
                    unsets MAKEOBJDIR.
     -m MACH        Set MACHINE=MACH.  Some MACH values are actually
                    aliases that set MACHINE/MACHINE_ARCH pairs.
                    [Default: deduced from the host system if the host
                    OS is NetBSD]
-    -N NOISY       Set the noisyness (MAKEVERBOSE) level of the build to NOISY:
+    -N NOISY       Set the noisiness (MAKEVERBOSE) level of the build to NOISY:
 Minimal output ("quiet").
 Describe what is occurring.
 Describe what is occurring and echo the actual
                            command.
 Ignore the effect of the "@" prefix in make
                            commands.
 Trace shell commands using the shell's -x flag.
                    [Default: 2]
     -n             Show commands that would be executed, but do not execute
                    them.
     -O OOBJ        Set obj root directory to OOBJ; sets a MAKEOBJDIR pattern
                    using OOBJ, unsets MAKEOBJDIRPREFIX.
     -o             Set MKOBJDIRS=no; do not create objdirs at start of build.
 @@ -2021,27 +2021,27 @@ createmakewrapper()
 	else
 		makewrapout=">>\${makewrapper}"
 	fi
 	case "${KSH_VERSION:-${SH_VERSION}}" in
 	*PD\ KSH*|*MIRBSD\ KSH*)
 		set +o braceexpand
 		;;
 	esac
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.375 2024/01/03 02:48:45 thorpej Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.376 2024/04/20 12:25:46 rillig Exp $
 # with these arguments: ${_args}
+#
 EOF
+	{
 		sorted_vars="$(for var in ${makeenv}; do echo "${var}" ; done \
 			| sort -u )"
 		for var in ${sorted_vars}; do
 			eval val=\"\${${var}}\"
 			eval is_set=\"\${${var}+set}\"
 			if [ -z "${is_set}" ]; then
 				echo "unset ${var}"
 			else