Commentary cleanup:

- If it's a full sentence, start capitalize first letter and end with a
  period.
- Break comments at ~80 chars so it fits into a terminal.[*]

(* This should be done for the code as well, but then it'll need testing.
   I'll do this at another point in time.)

6 files changed, 79 insertions, 70 deletions

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index d1914172650..ba11e287a95 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.58 2004/04/07 22:56:34 dmcmahill Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.59 2004/04/09 18:43:14 jschauma Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -76,46 +76,50 @@ BROKENFILE?=	.broken${BULK_ID}.html
 # This file is where the log of the build goes
 BUILDLOG?=	.make${BULK_ID}
 
-# This is a top level file which lists the entire pkgsrc depends tree in the format:
+# This is a top level file which lists the entire pkgsrc depends tree in the
+# format:
 # foo/bar devel/libfoo
 # meaning 'foo/bar' is requied to build 'devel/libfoo'
 # this is in the format needed by tsort(1)
 DEPENDSTREEFILE?=	${_PKGSRCDIR}/.dependstree${BULK_ID}
 
-# This is a top level file which lists the entire pkgsrc depends tree in the format:
+# This is a top level file which lists the entire pkgsrc depends tree in the
+# format:
 # foo/bar depends on: devel/libfoo devel/libbar devel/baz .....
 # ie, to build foo/bar we need devel/libfoo devel/libbar devel/baz ... installed
 DEPENDSFILE?=	${_PKGSRCDIR}/.depends${BULK_ID}
 
-# This is a top level file which lists the entire pkgsrc depends tree in the format:
+# This is a top level file which lists the entire pkgsrc depends tree in the
+# format:
 # devel/libfoo is depended upon by: foo/bar graphics/gtkfoo ...
 # ie, to build foo/bar we need devel/libfoo to be installed.
 #     to build graphics/gtkfoo we need devel/libfoo to be installed
 SUPPORTSFILE?=	${_PKGSRCDIR}/.supports${BULK_ID}
 
-# This is a top level file which cross-references each package name and pkg directory
-# in the format:
+# This is a top level file which cross-references each package name and pkg
+# directory in the format:
 # devel/libfoo libfoo-1.3
 INDEXFILE?=	${_PKGSRCDIR}/.index${BULK_ID}
 
-# file containing a list of all the packages in the correct order for a bulk build.
-# the correct order is one where packages that are required by others are built
-# before the packages which require them.
+# File containing a list of all the packages in the correct order for a bulk
+# build.  The correct order is one where packages that are required by others
+# are built before the packages which require them.
 ORDERFILE?=	${_PKGSRCDIR}/.order${BULK_ID}
 
-# file which is used as a timestamp for when the build started.  This is used eventually
-# for looking for leftover files (files not properly deinstalled)
+# File which is used as a timestamp for when the build started.  This is used
+# eventually for looking for leftover files (files not properly deinstalled)
 STARTFILE?=	${_PKGSRCDIR}/.start${BULK_ID}
 
-# file which is used as a database for bulk builds in which SPECIFIC_PKGS is
-# defined.  This database is used to hold all the dependency and index information
-# for the specific packages as well as their dependencies.  In a SPECIFIC_PKGS
-# bulk build, this file is created and then used to create the INDEXFILE and
-# DEPENDSTREEFILE.
+# File which is used as a database for bulk builds in which SPECIFIC_PKGS is
+# defined.  This database is used to hold all the dependency and index
+# information for the specific packages as well as their dependencies.  In a
+# SPECIFIC_PKGS bulk build, this file is created and then used to create the
+# INDEXFILE and DEPENDSTREEFILE.
 BULK_DBFILE?=	${_PKGSRCDIR}/.bulk_db${BULK_ID}
 
-# a list of pkgs which we should _never_ delete during a build.  The primary use is for digest
-# and also for xpkgwedge.  Add pkgtools/xpkgwedge in /etc/mk.conf to do an xpkgwedged bulk build.
+# A list of pkgs which we should _never_ delete during a build.  The primary
+# use is for digest and also for xpkgwedge.  Add pkgtools/xpkgwedge in
+# /etc/mk.conf to do an xpkgwedged bulk build.
 BULK_PREREQ+=		pkgtools/digest
 
 # by default, clean up any broken packages
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index 113c8f2279b..2ff7d9447a4 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
 # build.conf
-# $NetBSD: build.conf-example,v 1.18 2004/03/16 13:55:51 hubertf Exp $
+# $NetBSD: build.conf-example,v 1.19 2004/04/09 18:43:14 jschauma Exp $
 #
 # config file in /bin/sh syntax for {,pre,post}-build
 #
@@ -50,12 +50,12 @@ PRUNEDISTFILES=no
 # can be set to 'yes' or 'no'.
 UPDATE_VULNERABILITY_LIST=yes
 
-# destination for packages with the OSVERSION_SPECIFIC flag set.  Needs major.minor.patch
-# version.
+# Destination for packages with the OSVERSION_SPECIFIC flag set.  Needs
+# major.minor.patch version.
 RSYNC_DST_SPECIFIC=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/x.y.z/arch
 
-# destination for packages without the OSVERSION_SPECIFIC flag set.  Needs major.minor
-# version.
+# destination for packages without the OSVERSION_SPECIFIC flag set.  Needs
+# major.minor version.
 RSYNC_DST_OTHER=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/x.y/arch
 RSYNC_OPTS='-e ssh'
 
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index f6c35195b99..32fa5de8a8d 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.42 2004/04/07 22:56:34 dmcmahill Exp $
+# $NetBSD: post-build,v 1.43 2004/04/09 18:43:14 jschauma Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -42,12 +42,13 @@ $reportf=basename($REPORT);
 
 chomp($os=`uname -s`);
 
-# extract the name of the files used for the build log and broken build log.
-# these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf
+# Extract the name of the files used for the build log and broken build log.
+# These have defaults set by bsd.bulk-pkg.mk and may be overridden in
+# /etc/mk.conf
 chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`);
 
-# also extract the names of the cache files used during the bulk build.  We'll save a copy of
-# those to help debug if the build messed up.
+# Also extract the names of the cache files used during the bulk build.  We'll
+# save a copy of those to help debug if the build messed up.
 chomp($BULK_DBFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BULK_DBFILE )`);
 chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSTREEFILE )`);
 chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSFILE )`);
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 26c455186b8..d0d49b390da 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.37 2004/04/09 18:29:37 jschauma Exp $
+# $NetBSD: pre-build,v 1.38 2004/04/09 18:43:14 jschauma Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -21,8 +21,9 @@ PRUNELINKS=${PRUNEPACKAGES:-"no"}
 
 PKGLINT_PKG_DIR=${USR_PKGSRC}/pkgtools/pkglint
 
-# extract the name of the files used for the build log and broken build log.
-# these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf
+# Extract the name of the files used for the build log and broken build log.
+# These have defaults set by bsd.bulk-pkg.mk and may be overridden in
+# /etc/mk.conf
 BROKENF=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=BROKENFILE )`;
 export BROKENF
 if [ "$BROKENF" = "" ]; then
@@ -45,29 +46,29 @@ X11BASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=X11BASE )`;
 
 # On non-NetBSD platforms we need to keep the bootstrap-files!
 if [ x"$BMAKE" = x"bmake" ]; then
-	( cd $LOCALBASE && tar cf /tmp/$$.tar \
-		sbin/mtree sbin/pkg_add sbin/pkg_admin sbin/pkg_create \
-		sbin/pkg_delete sbin/pkg_info sbin/pkg_view sbin/linkfarm \
-		share/mk/sys.mk share/mk/bsd.dep.mk share/mk/bsd.depall.mk \
-		share/mk/bsd.files.mk share/mk/bsd.hostprog.mk \
+	( cd $LOCALBASE && tar cf /tmp/$$.tar                                \
+		sbin/mtree sbin/pkg_add sbin/pkg_admin sbin/pkg_create       \
+		sbin/pkg_delete sbin/pkg_info sbin/pkg_view sbin/linkfarm    \
+		share/mk/sys.mk share/mk/bsd.dep.mk share/mk/bsd.depall.mk   \
+		share/mk/bsd.files.mk share/mk/bsd.hostprog.mk               \
 		share/mk/bsd.doc.mk share/mk/bsd.inc.mk share/mk/bsd.info.mk \
-		share/mk/bsd.kernobj.mk share/mk/bsd.kinc.mk \
-		share/mk/bsd.kmod.mk share/mk/bsd.lib.mk \
-		share/mk/bsd.links.mk share/mk/bsd.man.mk \
-		share/mk/bsd.nls.mk share/mk/bsd.obj.mk \
-		share/mk/bsd.prog.mk share/mk/bsd.subdir.mk \
-		share/mk/bsd.sys.mk share/mk/bsd.own.mk \
-		bin/bmake bin/ftp bin/digest bin/nbsed bin/install-sh \
-		bin/pax bin/tar bin/cpio man/cat1/ftp.1 man/cat1/pax.0 \
-		man/cat1/tar.0 man/cat1/cpio.0 man/cat1/pkg_add.0 \
-		man/cat1/pkg_admin.0 man/cat1/pkg_create.0 \
-		man/cat1/pkg_delete.0 man/cat1/pkg_info.0 \
-		man/cat1/pkg_view.0 man/cat1/linkfarm.0 \
-		man/man1/digest.1 man/man1/pax.1 man/man1/cpio.1 \
-		man/man1/tar.1 man/man1/nbsed.1 man/man1/pkg_add.1 \
-		man/man1/pkg_admin.1 man/man1/pkg_create.1 \
-		man/man1/pkg_delete.1 man/man1/pkg_info.1 \
-		man/man1/pkg_view.1 man/man1/linkfarm.1 man/cat8/mtree.0 \
+		share/mk/bsd.kernobj.mk share/mk/bsd.kinc.mk                 \
+		share/mk/bsd.kmod.mk share/mk/bsd.lib.mk                     \
+		share/mk/bsd.links.mk share/mk/bsd.man.mk                    \
+		share/mk/bsd.nls.mk share/mk/bsd.obj.mk                      \
+		share/mk/bsd.prog.mk share/mk/bsd.subdir.mk                  \
+		share/mk/bsd.sys.mk share/mk/bsd.own.mk                      \
+		bin/bmake bin/ftp bin/digest bin/nbsed bin/install-sh        \
+		bin/pax bin/tar bin/cpio man/cat1/ftp.1 man/cat1/pax.0       \
+		man/cat1/tar.0 man/cat1/cpio.0 man/cat1/pkg_add.0            \
+		man/cat1/pkg_admin.0 man/cat1/pkg_create.0                   \
+		man/cat1/pkg_delete.0 man/cat1/pkg_info.0                    \
+		man/cat1/pkg_view.0 man/cat1/linkfarm.0                      \
+		man/man1/digest.1 man/man1/pax.1 man/man1/cpio.1             \
+		man/man1/tar.1 man/man1/nbsed.1 man/man1/pkg_add.1           \
+		man/man1/pkg_admin.1 man/man1/pkg_create.1                   \
+		man/man1/pkg_delete.1 man/man1/pkg_info.1                    \
+		man/man1/pkg_view.1 man/man1/linkfarm.1 man/cat8/mtree.0     \
 		man/man8/mtree.8 man/cat7/packages.0 )
 fi
 
@@ -149,7 +150,8 @@ if [ "$CVS_USER" != "" ]; then
 		( cd ${USR_PKGSRC}/security/ssh ; ${BMAKE} bulk-install )
 	fi
 	echo Performing CVS update - this will take some time
-	su - ${CVS_USER} -c "stty sane ; cd ${USR_PKGSRC} ; env CVS_RSH=ssh cvs -q update -Pd ${CVS_FLAGS} || exit 0"
+	su - ${CVS_USER} -c "stty sane ; cd ${USR_PKGSRC} ;                  \
+		env CVS_RSH=ssh cvs -q update -Pd ${CVS_FLAGS} || exit 0"
         if [ $? != 0 ]
         then
                 echo CVS update not successful, aborting.
diff --git a/mk/bulk/printindex b/mk/bulk/printindex
index d3da6517974..81ba9a711a3 100644
--- a/mk/bulk/printindex
+++ b/mk/bulk/printindex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printindex,v 1.14 2004/01/30 10:54:36 grant Exp $
+# $NetBSD: printindex,v 1.15 2004/04/09 18:43:14 jschauma Exp $
 #
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@ do
 	cd $cwd
 done
 
-# get the list of packages which should always be installed during the build
+# Get the list of packages which should always be installed during the build.
 # Make sure these ended up in the index file.  For example, xpkgwedge, might
 # not be enabled for builds in pkgtools/xpkgwedge, but we may want to have
 # it listed in the index file.
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index 63b349e384d..8764b05d63c 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.12 2004/01/30 11:10:47 grant Exp $
+# $NetBSD: tflat,v 1.13 2004/04/09 18:43:14 jschauma Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,11 +67,12 @@ BEGIN {
 				topdepends[$1] = " " $2 " ";
 			}
 
-			# Note that it is possible for a package "foo/bar" to never
-			# appear in $1.  In fact if foo/bar is not depended upon by
-			# anything and it has depends then it will not show up in $1
-			# however, we need to make sure we get a topdepends[foo/bar]
-			# entry so add it here if its not already there.
+			# Note that it is possible for a package "foo/bar" to
+			# never appear in $1.  In fact if foo/bar is not
+			# depended upon by anything and it has depends then it
+			# will not show up in $1 however, we need to make sure
+			# we get a topdepends[foo/bar] entry so add it here if
+			# its not already there.
 			if (!($2 in topdepends))
 				topdepends[$2] = "";
 		}
@@ -106,13 +107,13 @@ BEGIN {
 }
 
 function find_all_depends(pkg,pkgreg,i,deps){
-	# if we find the package already has been fully depended
-	# then return the depends list
+	# If we find the package already has been fully depended
+	# then return the depends list.
 	if (pkg in alldepends){
 		return(alldepends[pkg]);	
 	}
 
-	# if we find the package listed in its own depends list, then
+	# If we find the package listed in its own depends list, then
 	# return an empty list if we're going down the depends tree.
 	# When a package lists itself in the depends tree file, it simply
 	# is a place holder and means the package has no depends.  However
@@ -122,14 +123,15 @@ function find_all_depends(pkg,pkgreg,i,deps){
 		return(alldepends[pkg]);	
 	}
 
-	# otherwise recursively gather depends that each of the depends
-	# has
+	# Otherwise recursively gather depends that each of the depends
+	# has.
 	pkgreg=reg2str(pkg);
 	split(topdepends[pkg],deps);
 	i=1;
 	alldepends[pkg] = " ";
 	while ( i in deps ){
-		# don't add ourselves to the list (a possibility when going up the tree)
+		# Don't add ourselves to the list (a possibility when going up
+		# the tree).
 		if (" "deps[i]" "!~pkgreg){
 			alldepends[pkg] = alldepends[pkg] " " deps[i] " " find_all_depends(deps[i]);
 		}
@@ -140,7 +142,7 @@ function find_all_depends(pkg,pkgreg,i,deps){
 }
 
 #
-# take a string which has special characters like '+' in it and
+# Take a string which has special characters like '+' in it and
 # escape them.  Also put a space before and after since that's how
 # we'll distinguish things like gnome from gnome-libs
 #
@@ -151,7 +153,7 @@ function reg2str(reg){
 }
 
 #
-# take the depends lists and uniq them.
+# Take the depends lists and uniq them.
 #
 function uniq(list,deps,i,ulist){