 @@ -1,16 +1,16 @@
 #! /bin/sh
+#
-# $NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $
+#
 # Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Alistair Crooks (agc@NetBSD.org)
+#
 # 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
 @@ -593,56 +593,52 @@ register_syspkg()
 	if [ x"${BUILD_INFO_CACHE}" = x ]; then
+		{
 		# These variables describe the build
 		# environment, not the target.
 		echo "OPSYS=$(${UNAME} -s)"
 		echo "OS_VERSION=$(${UNAME} -r)"
 		${MAKE} -B -f- all <<EOF
 .include <bsd.own.mk>
 all:
 	@echo OBJECT_FMT=${OBJECT_FMT}
 	@echo MACHINE_ARCH=${MACHINE_ARCH}
 	@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
 EOF
 		# XXX: what's the point of reporting _PKGTOOLS_VER
 		# when we roll everything by hand without using
 		# the pkg tools?
 		echo "_PKGTOOLS_VER=$(${PKG_CREATE} -V)"
 		} > "${SYSPKG_DB_SUBDIR}/+BUILD_INFO"
 	else
 		cp "${BUILD_INFO_CACHE}" "${SYSPKG_DB_SUBDIR}/+BUILD_INFO"
 	fi
 	# test for attributes
 	args=""
 	attrs="$(${AWK} '$1 ~ '/"${pkg}"/' { \
 			print substr($0, length($1) + 2) }' \
 		"${rundir}/attrs")"
 	for a in "${attrs}"; do
 		case "${attrs}" in
 		"")	;;
 		preserve)
 			echo "${pkg}-${t}" >"${SYSPKG_DB_SUBDIR}/+PRESERVE"
 			args="${args} -n ${SYSPKG_DB_SUBDIR}/+PRESERVE"
 			;;
 		esac
 	done
+	#
 	# Create ${SYSPKGSIR}/+CONTENTS from ${PLIST}, by adding an
 	# "@name" line and a lot of "@comment MD5:" lines.
+	#
+	{
-		rcsid='$NetBSD: regpkg,v 1.17 2009/10/17 23:43:22 agc Exp $'
+		rcsid='$NetBSD: regpkg,v 1.18 2009/12/01 15:49:21 apb Exp $'
 		utcdate="$(${ENV_CMD} TZ=UTC LOCALE=C \
 			${DATE} '+%Y-%m-%d %H:%M')"
 		user="${USER:-root}"
 		host="$(${HOSTNAME})"
 		echo "@name ${pkg}-${t}"
 		echo "@comment Packaged at ${utcdate} UTC by ${user}@${host}"
 		echo "@comment Packaged using ${prog} ${rcsid}"
 		# XXX: "option extract-in-place" might help to get
 		#	pkg_add to create directories.
 		# XXX: no, it doesn't work.  Yet another pkg_add bug.
 		## echo "@option extract-in-place"
 		# Move the @pkgdep and @blddep lines up, so that
 		# they are easy to see when people do "less

 @@ -1,16 +1,16 @@
 #! /bin/sh
+#
-# $NetBSD: regpkgset,v 1.11 2009/10/17 23:43:22 agc Exp $
+# $NetBSD: regpkgset,v 1.12 2009/12/01 15:49:21 apb Exp $
+#
 # Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Alistair Crooks (agc@NetBSD.org)
+#
 # 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
 @@ -132,30 +132,26 @@ if ${cache}; then
 	export BUILD_INFO_CACHE
+	{
 	# These variables describe the build
 	# environment, not the target.
 	echo "OPSYS=$(${UNAME} -s)"
 	echo "OS_VERSION=$(${UNAME} -r)"
 	${MAKE} -B -f- all <<EOF
 .include <bsd.own.mk>
 all:
 	@echo OBJECT_FMT=${OBJECT_FMT}
 	@echo MACHINE_ARCH=${MACHINE_ARCH}
 	@echo MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
 EOF
 	# XXX: what's the point of reporting _PKGTOOLS_VER
 	# when we roll everything by hand without using
 	# the pkg tools?
 	echo "_PKGTOOLS_VER=$(${PKG_CREATE} -V)"
 	} > "${BUILD_INFO_CACHE}"
 fi
+#
 # For each pkgset mentioned in ${list}, get a list of all pkgs in the pkgset.
+#
 # Sort all the pkgs into dependency order (with prerequisite pkgs before
 # pkgs that depend on them).
+#
 # Invoke ${rundir}/regpkg for each pkg, taking care to do it in dependency
 # order.  If there were any pkgs for which we failed to find dependency
 # information, handle them at the end.
+#

 @@ -1,14 +1,14 @@
-#	$NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+#	$NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
+#
+#
 # The following variables contain defaults for sets.subr functions and callers:
 #	setsdir			path to src/distrib/sets
 #	nlists			list of base sets
 #	xlists			list of x11 sets
 #	extlists		list of extsrc sets
 #	obsolete		controls if obsolete files are selected instead
 #	module			if != "no", enable MODULE sets
 #	shlib			shared library format (a.out, elf, or "")
 #	stlib			static library format (a.out, elf)
+#
 @@ -91,27 +91,26 @@ MKVARS="\
 : ${FIND:=find}
 : ${GREP:=grep}
 : ${GZIP_CMD:=gzip}     # ${GZIP} is special to gzip(1)
 : ${HOSTNAME:=hostname}
 : ${HOST_SH:=sh}
 : ${IDENT:=ident}
 : ${JOIN:=join}
 : ${LS:=ls}
 : ${MAKE:=make}
 : ${MKTEMP:=mktemp}
 : ${MTREE:=mtree}
 : ${PASTE:=paste}
 : ${PAX:=pax}
 : ${PKG_CREATE:=pkg_create}
 : ${PRINTF:=printf}
 : ${SED:=sed}
 : ${SORT:=sort}
 : ${STAT:=stat}
 : ${TSORT:=tsort}
 : ${UNAME:=uname}
 : ${WC:=wc}
+#
 # If printf is a shell builtin command, then we can
 # implement cheaper versions of basename and dirname
 # that do not involve any fork/exec overhead.
 # If printf is not builtin, approximate it using echo,
 @@ -232,27 +231,27 @@ extlists="extbase extcomp extetc"
 OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
 MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
 SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
 SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
 SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
+#
 # list_set_files setfile [...]
+#
 # Produce a packing list for setfile(s).
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
+#
-# 	# $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+# 	# $NetBSD: sets.subr,v 1.93 2009/12/01 15:49:21 apb Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
 # 	./bin/[			base-util-root
 # 	./bin/cat		base-util-root
 #		[...]
+#
 # A # in the first column marks a comment.
+#
 # If ${obsolete} != 0, only entries with an "obsolete" keyword will
 # be printed.  All other keywords must be present.
+#
 # The third field is an optional comma separated list of keywords to