Drop trailing whitespace. Ok'ed by wiz.

15 files changed, 133 insertions, 133 deletions

diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index debb40ed16f..fc2a5205acb 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.83 2003/05/02 08:32:26 agc Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.84 2003/05/06 17:42:02 jmmv Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -388,7 +388,7 @@ _BLNK_CHECK_IS_TEXT_FILE?= \
 #
 # BUILDLINK_SUBST_MESSAGE.<package>	message to display, noting what is
 #					being substituted
-#                                       
+#                                      
 # BUILDLINK_SUBST_FILES.<package>	files on which to run the substitution;
 #					these are relative to ${WRKSRC}
 #
@@ -496,7 +496,7 @@ pkglocaledir-buildlink-subst: _BUILDLINK_SUBST_USE
 BUILDLINK_FAKE_LA=	${TRUE}
 .else
 #
-# Create a fake libtool archive $$lafile that uses the shared libraries 
+# Create a fake libtool archive $$lafile that uses the shared libraries
 # named in $$libpattern.
 #
 BUILDLINK_FAKE_LA=							\
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 6662d0573bb..a39b47a37a1 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.43 2003/02/13 22:51:03 dmcmahill Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.44 2003/05/06 17:42:03 jmmv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -67,7 +67,7 @@ BULK_ID?=       .${_HOSTNAME:C|\..*||}
 .elif defined(OBJMACHINE)
 BULK_ID?=       .${MACHINE_ARCH}
 .else
-BULK_ID?=      
+BULK_ID?=     
 .endif
 
 # This file exists to mark a package as broken
@@ -198,7 +198,7 @@ bulk-package:
 		${ECHO_MSG} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} ^d | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
 		${ECHO_MSG} '###' ; \
 	fi \
-	) 2>&1 | tee -a ${BUILDLOG} 
+	) 2>&1 | tee -a ${BUILDLOG}
 	@uptodate=`${MAKE} ${MAKEFLAGS} bulk-check-uptodate REF=${PKGFILE}` ; \
 	if ${PKG_INFO} -qe "${PKGNAME:C/-[^-]*$/-[0-9]*/}" ; then \
 		installed=1; \
@@ -371,7 +371,7 @@ bulk-package:
 	fi
 
 # Install pkg - if possible from binary pkg (i.e. available & upto date)
-# else revert to the old recompiling. 
+# else revert to the old recompiling.
 # Don't rely upon pkg_add to snarf in depending pkgs as they may have
 # been modified and need rebuilding.
 bulk-install:
diff --git a/mk/bulk/build b/mk/bulk/build
index f8e48eaac2a..4b5c897b59b 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.27 2002/12/31 12:42:37 cjep Exp $
+# $NetBSD: build,v 1.28 2003/05/06 17:42:03 jmmv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -201,20 +201,20 @@ echo "Build finished.  Removing all installed packages left over from build..."
 
 for pkgname in `pkg_info -e \*`
 do
-	if `pkg_info -qe $pkgname`; then 
+	if `pkg_info -qe $pkgname`; then
 		pkgdir=`grep " $pkgname " $INDEXFILE | awk '{print $1}'`	
-		case "${BULK_PREREQ}" in 
-			*$pkgdir* ) 
+		case "${BULK_PREREQ}" in
+			*$pkgdir* )
 				echo "Keeping BULK_PREREQ: $pkgname ($pkgdir)" ;
-				;; 
-			* ) 
+				;;
+			* )
 				echo pkg_delete -r $pkgname
 				pkg_delete -r $pkgname
 				if `pkg_info -qe $pkgname` ; then
 					echo "$pkgname ($pkgdir) did not deinstall nicely.  Forcing the deinstall"
-					pkg_delete -f $pkgname || true 
-				fi 
-				;; 
+					pkg_delete -f $pkgname || true
+				fi
+				;;
 		esac
 	fi
 done
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index 2566f0ef0a2..c77cd78a815 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.19 2003/04/13 11:28:01 cjep Exp $
+# $NetBSD: mksandbox,v 1.20 2003/05/06 17:42:03 jmmv Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -35,7 +35,7 @@
 #
 
 # Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--verbose] sandbox-dir
-# 
+#
 # A small shell script to set up a sandbox (usually for a pkgsrc bulk
 # build), using null mounts.
 
diff --git a/mk/bulk/parallel.txt b/mk/bulk/parallel.txt
index 842b316810b..23794684524 100644
--- a/mk/bulk/parallel.txt
+++ b/mk/bulk/parallel.txt
@@ -1,8 +1,8 @@
-# $Id: parallel.txt,v 1.2 2003/04/16 09:55:53 wiz Exp $
+# $Id: parallel.txt,v 1.3 2003/05/06 17:42:03 jmmv Exp $
 #
 
 These are my thoughts on how one would want a parallel bulk build to
-work. 
+work.
 
 
 ====================================================================
@@ -72,7 +72,7 @@ Single Machine Build Comments
 ====================================================================
 
 There are several features of this approach that are worth mentioning
-explicitly.  
+explicitly. 
 
 1)  Packages are built in the correct order.  We don't want to rebuild
     the gnome meta-pkg and then rebuild gnome-libs for example.
@@ -100,7 +100,7 @@ explicitly.
     not needed before each build, we reduce the amount of installing
     and deinstalling needed during the build.  For example, it is
     quite common to build several packages in a row which all need GNU
-    make or perl.  
+    make or perl. 
 
 4)  Using the 'supportsfile' to mark all packages which depend upon a
     package which has just failed to build can greatly reduce the time
@@ -123,14 +123,14 @@ master   == master machine.  This machine is in charge of directing
 slave#x  == slave machine #x.  All slave machines are of the same
             MACHINE_ARCH and have the same operating system and access
             the same pkgsrc tree via NFS and access the same binary
-            packages directory.  
+            packages directory. 
 
             If the master machine is also to be used as a build
-            machine, then it is also considered a slave. 
+            machine, then it is also considered a slave.
 
 Prior to starting the build, the master directs one of the slaves to
 extract the dependency information per steps 1-3 in the single machine
-case. 
+case.
 
 The actually build should progress as follows:
 
@@ -182,7 +182,7 @@ network.
 
 -  maybe a hook could be put in place which rsync's the binary package
    tree between the binary package repository machine and the slave
-   machine before and after each package is built? 
+   machine before and after each package is built?
 
 -  security
 
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index c9e2cf5bd91..3538357423f 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.21 2002/08/22 08:21:30 jlam Exp $
+# $NetBSD: post-build,v 1.22 2003/05/06 17:42:03 jmmv Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -40,18 +40,18 @@ $reportf=basename($REPORT);
 
 # 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 )`); 
+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 
+# 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($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 )`); 
-chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`); 
-chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`); 
-chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`); 
-chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`); 
-chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`); 
-chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`); 
+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 )`);
+chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`);
+chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`);
+chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`);
+chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`);
+chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`);
+chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`);
 $dtfile=basename($DEPENDSTREEFILE);
 $depfile=basename($DEPENDSFILE);
 $supfile=basename($SUPPORTSFILE);
@@ -103,7 +103,7 @@ print HTML <<EOHTML
 
     Files not listed in PLISTs can be found in <A HREF="leftovers-${arch}.html">this list</A>.
     <P>
-    
+   
 <TABLE>
 <TR><TH> Package <TH> State <TH> Pkgs Broken by <TH> Last touched by <TH> File touched last <TH> Maintainer
 EOHTML
@@ -120,7 +120,7 @@ while (<BF>) {
 
 #    next
 #	if $pkg!~/^a/; # DEBUG! HF
-    
+   
     if ($nerrors > 0) {
 	$color = "red";
 	$state = "build broken";
@@ -145,10 +145,10 @@ while (<BF>) {
     # $maintainer=`( cd $USR_PKGSRC/$pkg ; ( echo '.include "Makefile"' ; echo 'bla: ; \@echo ${MAINTAINER}' ) | $ENV{"BMAKE"} -f - bla )`;
     $maintainer=`grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile | awk '{ print \$2\$3\$4\$5\$6}' | sed -e 's/\</&lt;/g' -e 's/\>/&gt;/g'`;
     chomp($maintainer);
-    
+   
     print HTML "<TR><TD><A HREF=\"$bf\">$pkg</A>";
     print HTML "    <TD><FONT COLOR=$color>$state</FONT>";
-    if ($nbrokenby > 0){ 
+    if ($nbrokenby > 0){
         print HTML "    <TD ALIGN=\"right\"><FONT COLOR=$color>$nbrokenby</FONT>";
     }
     else {
@@ -201,7 +201,7 @@ The following cache files were used during the build:
 </TABLE>
 
 <HR>
-<P>     
+<P>    
 <UL>
 <!-- <LI>View the <A HREF="$PROG">progress</A> of the build. -->
 <!-- <LI>See the list of <A HREF="../index.html">all log files</A>. -->
@@ -252,7 +252,7 @@ close(HTML);
 	system("tar plcf - `cat leftovers-${arch}.txt` | ( cd leftovers-${arch} ; tar plxf - )");
 
 	# Add links to leftover list:
-	open (IN, "< leftovers-${arch}.txt") 
+	open (IN, "< leftovers-${arch}.txt")
 		or die "can't read leftovers-${arch}.txt";
 	open (OUT, "> leftovers-${arch}.html")
 		or die "can't write leftovers-${arch}.html";
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index ff80db7ef3a..b8b30072272 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.25 2002/11/03 22:59:21 hubertf Exp $
+# $NetBSD: pre-build,v 1.26 2003/05/06 17:42:04 jmmv Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -44,7 +44,7 @@ fi
 #
 # Clean out everything and its mother
 #
-PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)` 
+PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)`
 
 echo Removing all installed packages in ${PKG_DBDIR}
 
@@ -52,7 +52,7 @@ if [ -d ${PKG_DBDIR} ]; then
 	cd ${PKG_DBDIR}
 	for pkg in *
 	do
-		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then 
+		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
 			echo pkg_delete -r $pkg
 			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -r $pkg
 		fi
@@ -61,7 +61,7 @@ if [ -d ${PKG_DBDIR} ]; then
 	# to deinstall
 	for pkg in *
 	do
-		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then 
+		if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
 			echo pkg_delete -f $pkg
 			env PKG_DBDIR=${PKG_DBDIR} pkg_delete -f $pkg
 		fi
@@ -153,7 +153,7 @@ case "$PRUNELINKS" in
 yes|YES)
 	echo "Checking for and removing orphaned packages links"
 	find $PACKAGES -type l -print |  \
-	while read f 
+	while read f
 	do
 		if [ ! -d $f -a ! -f $f ]; then
 			echo "Removing orphaned link:  \"$f\""
diff --git a/mk/bulk/printindex b/mk/bulk/printindex
index 0e2a7cfd5c5..06a832c3607 100644
--- a/mk/bulk/printindex
+++ b/mk/bulk/printindex
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $NetBSD: printindex,v 1.10 2002/08/22 08:21:31 jlam Exp $
+# $NetBSD: printindex,v 1.11 2003/05/06 17:42:04 jmmv Exp $
 #
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
-# by 
+# by
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@ do
 		fi
 		echo "$pkgdir          $pkgname "
 	fi
-	cd $cwd 
+	cd $cwd
 done
 
 # get the list of packages which should always be installed during the build
@@ -105,7 +105,7 @@ do
 				#exit 1
 			fi
 			echo "$pkgdir          $pkgname "
-			cd $cwd 
+			cd $cwd
 			;;
 	esac
 done
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index c8ff51c7a85..70ec50f89c7 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: tflat,v 1.7 2002/10/06 20:15:05 dmcmahill Exp $
+# $NetBSD: tflat,v 1.8 2003/05/06 17:42:04 jmmv Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -43,12 +43,12 @@ BEGIN {
 		exit(1);
 	}
 
-	if ( ARGV[1] == "-u" ) { 
+	if ( ARGV[1] == "-u" ) {
 		up=1;
 	}
 	else{
 		if ( ARGV[1] == "-d" ) { up=0; }
-		else{ 
+		else{
 			printf("tflat: unknown option  \"%s\"\n",ARGV[1]);
 			usage();
 			exit(1);
@@ -59,7 +59,7 @@ BEGIN {
 
 	#
 	# Read in the entire depends tree
-	# 
+	#
 	if (up){
         	while(getline < InFile > 0){
 			if ($1 in topdepends)
@@ -104,7 +104,7 @@ BEGIN {
 
 	printf("\n");
         exit 0
-} 
+}
 
 function find_all_depends(pkg,pkgreg,i,deps){
 	# if we find the package already has been fully depended
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 42d90e5eda3..5e7a054cdd8 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -41,7 +41,7 @@ if [ -z "$RSYNC_DST_SPECIFIC" -o -z "$RSYNC_DST_OTHER" ]; then
 	exit 1
 fi
 
-# 
+#
 # Some temp files
 #
 
diff --git a/mk/install/deinstall b/mk/install/deinstall
index 87ff7254e49..a0e041b7725 100644
--- a/mk/install/deinstall
+++ b/mk/install/deinstall
@@ -1,6 +1,6 @@
 # start of deinstall
 #
-# $NetBSD: deinstall,v 1.16 2002/11/21 10:11:57 jlam Exp $
+# $NetBSD: deinstall,v 1.17 2003/05/06 17:42:04 jmmv Exp $
 
 eval set -- ${PKG_USERS}
 for userset; do
@@ -37,7 +37,7 @@ fi
 eval set -- ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS}
 while [ $# -gt 0 ]; do
 	samplefile="$1"; file="$2"; owner="$3"; group="$4"; mode="$5"
-	shift; shift; shift; shift; shift 
+	shift; shift; shift; shift; shift
 	ALL_FILES="${ALL_FILES} \"${samplefile}\" \"${file}\""
 done
 
diff --git a/mk/scripts/chkdatabase.awk b/mk/scripts/chkdatabase.awk
index d07a2d22e03..c751f9201bc 100755
--- a/mk/scripts/chkdatabase.awk
+++ b/mk/scripts/chkdatabase.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: chkdatabase.awk,v 1.1 2003/01/04 21:03:08 dmcmahill Exp $
+# $NetBSD: chkdatabase.awk,v 1.2 2003/05/06 17:42:04 jmmv Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -60,10 +60,10 @@ BEGIN {
 #build_depends /usr/pkgsrc/math/scilab libtool-base>=1.4.20010614nb9:../../devel/libtool-base
 #
   pkg = $2;
-  
+ 
 # mark this package as having its depencencies listed
   depended_pkgs[pkg] = 1;
-  
+ 
 # now go through the dependency lists and pull out all pkg directories that
 # we will need to examine to ensure they have been depended.
   for(i=3; i<=NF; i++) {
@@ -82,10 +82,10 @@ BEGIN {
       printf("\tpkgpat = %s\n",pkgpat) > "/dev/stderr";
       printf("\tpkgdir = %s\n",pkgdir) > "/dev/stderr";
     }
-    
+   
 # mark this package directory as being one which is depended upon
     depended_on_pkgs[pkgdir] = 1;
-    
+   
   }
   next;
 }
@@ -103,13 +103,13 @@ END {
       i++;
     }
   }
-  
+ 
   i=0;
   while(i in not_depended) {
     printf("%s\n",not_depended[i]);
     i++;
   }
   close("/dev/stderr");
-  
+ 
   exit(0);
 }
diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk
index a8d2e866558..620a31b58c3 100755
--- a/mk/scripts/genreadme.awk
+++ b/mk/scripts/genreadme.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.9 2003/03/21 12:49:58 dmcmahill Exp $
+# $NetBSD: genreadme.awk,v 1.10 2003/05/06 17:42:04 jmmv Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -48,7 +48,7 @@
 #
 # alldepends[]  : index=pkgdir (math/scilab)
 #                 Flattened dependency list by name.
-#                 
+#                
 BEGIN {
 	do_pkg_readme=1;
 # set to 1 to use "README-new.html" as the name
@@ -57,7 +57,7 @@ BEGIN {
 	fflush("/dev/stdout");
 }
 
-#conflicts /usr/pkgsrc/math/scilab 
+#conflicts /usr/pkgsrc/math/scilab
 #depends /usr/pkgsrc/math/scilab xless-[0-9]*:../../x11/xless pvm-3.4.3:../../parallel/pvm3
 #
 
@@ -86,12 +86,12 @@ BEGIN {
 			pkgcat = pkg;
 			gsub(/\/.*/, "", pkgcat);
 			pkgdir=pkgcat "/" pkgdir;
-			if (debug) 
+			if (debug)
 				printf("Corrected missing category directory to get \"%s\"\n",
 				       pkgdir);
 		}
 		if (debug){
-			printf("package in directory %s %s on:\n", 
+			printf("package in directory %s %s on:\n",
 			       pkg, deptype);
 			printf("\tpkgpat = %s\n", pkgpat);
 			printf("\tpkgdir = %s\n", pkgdir);
@@ -107,7 +107,7 @@ BEGIN {
 		if (deptype == "depends") {
 			topdepends[pkg] = topdepends[pkg] " " pkgpat " " ;
 			if (debug) {
-			  printf("Appending %s to topdepends[%s] (%s)\n", 
+			  printf("Appending %s to topdepends[%s] (%s)\n",
 				 pkgpat, pkg, topdepends[pkg]);
 			}
 		}
@@ -159,7 +159,7 @@ BEGIN {
 /^index / {
 #
 # read lines like:
-#index /usr/pkgsrc/math/scilab scilab-2.6nb3 
+#index /usr/pkgsrc/math/scilab scilab-2.6nb3
 # and store the directory name in a associative array where the index
 # is the package name and in a associative array that lets us lookup
 # name from directory.  We use fuldir2pkgdir to get "math/scilab"
@@ -204,9 +204,9 @@ END {
 		if (debug) printf("calling find_all_depends(%s, run)\n", toppkg);
 		find_all_depends(toppkg, "run");
 		if (debug) printf("%s depends on: %s, topdepends on %s\n",
-				  toppkg, alldepends[toppkg], 
+				  toppkg, alldepends[toppkg],
 				  topdepends[toppkg]);
-		printf("%s depends on: %s\n", 
+		printf("%s depends on: %s\n",
 		       toppkg, alldepends[toppkg]) >> dependsfile;
 		flatdepends[toppkg] = alldepends[toppkg];
 	}
@@ -232,7 +232,7 @@ END {
 	if ((cmd | getline) > 0) {
 		vuldate = sprintf("at %s %s %s\n",$6,$7,$8);
 # read the vulnerabilities file
-		printf("Reading vulnerability file \"%s\"\n which was updated %s\n", 
+		printf("Reading vulnerability file \"%s\"\n which was updated %s\n",
 		       vfile, vuldate);
 		fflush("/dev/stdout");
 		i = 1;
@@ -272,7 +272,7 @@ END {
 			pkgdir = PKGSRCDIR "/" toppkg;
 			readmenew=pkgdir  "/" readme_name;
 			
-			if (debug) printf("Creating %s for %s\n", 
+			if (debug) printf("Creating %s for %s\n",
 					  readme, readmenew);
 			printf(".");
 			if ((pkgcnt % 100) == 0) {
@@ -286,9 +286,9 @@ END {
 			i = 1;
 			while(i in dpkgs){
 				if (debug) {
-				  printf("\tdpkg=%s, pat2dir[%s] = %s\n", 
-					 dpkgs[i], 
-					 dpkgs[i], 
+				  printf("\tdpkg=%s, pat2dir[%s] = %s\n",
+					 dpkgs[i],
+					 dpkgs[i],
 					 pat2dir[dpkgs[i]]);
 				}
 				nm=dpkgs[i];
@@ -300,9 +300,9 @@ END {
 				gsub(/&/, "\\\\\\&amp;", nm);
 				gsub(/</, "\\\\\\&lt;", nm);
 				gsub(/>/, "\\\\\\&gt;", nm);
-				htmldeps=sprintf("%s<a href=\"../../%s/%s\">%s</a>\n", 
-						 htmldeps, 
-						 pat2dir[dpkgs[i]], 
+				htmldeps=sprintf("%s<a href=\"../../%s/%s\">%s</a>\n",
+						 htmldeps,
+						 pat2dir[dpkgs[i]],
 						 readme_name, nm);
 				i = i + 1;
 			}
@@ -332,10 +332,10 @@ END {
 					gsub(/</, "\\\\\\&lt;", printurl);
 					gsub(/>/, "\\\\\\&gt;", printurl);
 					if (vulpkg[i] ~ "^" pkgbase"[-<>=]+[0-9]") {
-						vul =  sprintf("%s<LI><STRONG> %s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", 
-							  vul, nm, 
+						vul =  sprintf("%s<LI><STRONG> %s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n",
+							  vul, nm,
 							  vultype[i],
-							  url, printurl); 
+							  url, printurl);
 					}
 					i = i + 1;
 				}
@@ -357,12 +357,12 @@ END {
 					pkgnm = pkgfile;
 					gsub(/\.tgz$/, "", pkgnm);
 					binpkgs = sprintf("%s\n<TR><TD>%s:<TD><a href=\"%s/%s\">%s</a><TD>(%s %s)",
-							  binpkgs, 
-							  MACHINE_ARCH, 
+							  binpkgs,
+							  MACHINE_ARCH,
 							  PKG_URL,
-							  pkgfile, 
-							  pkgnm, 
-							  OPSYS, 
+							  pkgfile,
+							  pkgnm,
+							  OPSYS,
 							  OS_VERSION);
 				}
 				close(cmd);
@@ -381,16 +381,16 @@ END {
 						if (debug) {
 							printf("%s:%s:%s (%s)\n",
 							       release,
-							       arch, 
-							       pkg, 
+							       arch,
+							       pkg,
 							       pkgnm);
 						}
 					binpkgs = sprintf("%s\n<TR><TD>%s:<TD><a href=\"%s/%s/%s/%s/%s\">%s</a><TD>(%s-%s)",
-						  binpkgs, arch, 
+						  binpkgs, arch,
 						  PKG_URL, release,
-						  arch, 
-						  PKGREPOSITORYSUBDIR, 
-						  pkg, pkgnm, 
+						  arch,
+						  PKGREPOSITORYSUBDIR,
+						  pkg, pkgnm,
 						  OPSYS, release);
 				}
 				FS = oldfs;
@@ -424,13 +424,13 @@ END {
 				if (homepage[toppkg] == "") {
 					gsub(/%%HOMEPAGE%%/, "");
 				} else {
-					gsub(/%%HOMEPAGE%%/, 
+					gsub(/%%HOMEPAGE%%/,
 					     "<p>This package has a home page at <a HREF=\"" homepage[toppkg] "\">" homepage[toppkg] "</a>.</p>");
 				}
 				if (license[toppkg] == "") {
 					gsub(/%%LICENSE%%/, "");
 				} else {
-					gsub(/%%LICENSE%%/, 
+					gsub(/%%LICENSE%%/,
 					     "<p>Please note that this package has a " license[toppkg] " license.</p>");
 				}
 				gsub(/%%VULNERABILITIES%%/, ""vul"");
@@ -489,36 +489,36 @@ END {
 			while((getline < cat_make) > 0){
 				if ($0 ~ /^[ \t]*SUBDIR.*=[^\$]*$/) {
 					pkg = $0;
-					gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "", 
+					gsub(/^[ \t]*SUBDIR.*=[ \t]*/, "",
 					     pkg);
 					dir = category"/"pkg;
 					numpkg++;
 					tot_numpkg++;
 					if (debug) {
-					  printf("\tAdding %s (%s : %s)\n", 
+					  printf("\tAdding %s (%s : %s)\n",
 						 dir,
-						 pkgdir2name[dir], 
+						 pkgdir2name[dir],
 						 comment[dir]);
 					}
 					pkgs =  sprintf("%s<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n",
 							pkgs, pkg, readme_name,
-							pkgdir2name[dir], 
+							pkgdir2name[dir],
 							comment[dir]);
 					allpkg[tot_numpkg] =  sprintf("<!-- %s (for sorting) --><TR VALIGN=TOP><TD><a href=\"%s/%s/%s\">%s</a>: <TD>(<a href=\"%s/%s\">%s</a>) <td>%s\n",
 								      pkgdir2name[dir],
-								      category, pkg, 
+								      category, pkg,
 								      readme_name,
-								      pkgdir2name[dir], 
+								      pkgdir2name[dir],
 								      category,
-								      readme_name, 
+								      readme_name,
 								      category,
 								      comment[dir]);
-# we need slightly fewer escapes here since we are not gsub()-ing 
+# we need slightly fewer escapes here since we are not gsub()-ing
 # allpkg[] into the output files but just printf()-ing it.
 					gsub(/\\&/, "\\&", allpkg[tot_numpkg]);
 				} else if ($0 ~ /^[ \t]*COMMENT/) {
 					descr = $0;
-					gsub(/^[ \t]*COMMENT.*=[ \t]*/, "", 
+					gsub(/^[ \t]*COMMENT.*=[ \t]*/, "",
 					     descr);
 				}
 			}
@@ -533,10 +533,10 @@ END {
 			close(readme);
 			close(templatefile);
 			copy_readme(readmenew, readme);
-   
+  
 			gsub(/href=\"/, "href=\""category"/", pkgs);
 			allcat = sprintf("%s<TR><TD VALIGN=TOP><a href=\"%s/%s\">%s</a>: %s<TD>\n",
-					 allcat, category, readme_name, 
+					 allcat, category, readme_name,
 					 category, descr);
 			close(cat_make);
 		}
@@ -595,7 +595,7 @@ END {
 
 	close("/dev/stderr");
 	exit 0;
-} 
+}
 
 function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 # pkg is the package directory, like math/scilab
@@ -624,7 +624,7 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 				  pkg, topdep, alldepends[pkg]);
 		return(alldepends[pkg]);
 	}
-    
+   
 # recursively gather depends that each of the depends has
 	pkgreg = reg2str(pkg);
 	split(topdep, deps);
@@ -648,7 +648,7 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 # deps[i].
 		if (alldepends[pkg] !~ reg2str(deps[i])){
 		  alldepends[pkg] = alldepends[pkg] " " deps[i] " " find_all_depends(depdir, type);
-		} 
+		}
 		else {
 		  if (debug) printf("\t%s is already listed in %s\n",
 				    deps[i], alldepends[pkg]);
@@ -660,7 +660,7 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 	if (debug) printf("\tcalling uniq() on alldepends[%s] = %s\n",
 			  pkg, alldepends[pkg]);
 	alldepends[pkg] = uniq(alldepends[pkg]);
-	if (debug) printf("\tuniq() output alldepends[%s] = %s\n", 
+	if (debug) printf("\tuniq() output alldepends[%s] = %s\n",
 			  pkg, alldepends[pkg]);
 	return(alldepends[pkg]);	
 }
@@ -694,10 +694,10 @@ function fulldir2pkgdir(d, i){
 # take the depends lists and uniq them.
 #
 function uniq(list, deps, i, ulist){
-    
+   
 # split out the depends
 	split(list, deps);
-    
+   
 	i = 1;
 	ulist = " ";
 	while (i in deps){
@@ -744,7 +744,7 @@ function copy_readme(old, new, cmd, rc) {
 		printf("**** ------- ****\n") > "/dev/stderr";
 	}
 
-#	Compare the existing README.html file to the one we created.  If they are 
+#	Compare the existing README.html file to the one we created.  If they are
 #	not the same, then copy over the one we created
 
 	cmd = " if ! cmp -s "new" "old" ; then mv -f " new " " old " ; fi";
diff --git a/mk/scripts/mkdatabase b/mk/scripts/mkdatabase
index 3cbfa6846da..739464e8e7b 100755
--- a/mk/scripts/mkdatabase
+++ b/mk/scripts/mkdatabase
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkdatabase,v 1.3 2003/01/05 15:17:24 dmcmahill Exp $
+# $NetBSD: mkdatabase,v 1.4 2003/05/06 17:42:05 jmmv Exp $
 #
 # Script for generating a database with complete dependency information
 # for a particular package
@@ -121,7 +121,7 @@ do
 	;;
 
     # Version
-    -v|--version) 
+    -v|--version)
 	${AWK} '/^#[ \t]*\$NetBSD/ {gsub(/,v/,"",$3);printf("%s:  Version %s, %s\n",$3,$4,$5); exit 0;}' $prog
 	exit 0
         ;;
@@ -131,7 +131,7 @@ do
 	clean_and_exit
 	;;
 
-    *)  
+    *) 
 	break
 	;;
 
@@ -148,7 +148,7 @@ fi
 
 prompt="----> "
 
-case ${DATABASE} in 
+case ${DATABASE} in
     /*)
 	# we already have the absolute path to the database file
 	# so do nothing
@@ -188,10 +188,10 @@ else
 fi
 here=`pwd`
 echo "$prompt Depending in $here (pass #1)"
-dirs=`${AWK} -f ../../mk/scripts/chkdatabase.awk debug=${DEBUG} ${DATABASE}` 
+dirs=`${AWK} -f ../../mk/scripts/chkdatabase.awk debug=${DEBUG} ${DATABASE}`
 pass=2
-while [ ! -z "$dirs" -a $pass -lt ${MAX_PASS} ]; do 
-	for d in $dirs ; do 
+while [ ! -z "$dirs" -a $pass -lt ${MAX_PASS} ]; do
+	for d in $dirs ; do
 		echo "$prompt Depending in ../../$d (pass #$pass)" ;\
 		cd ../../$d && ${BMAKE} print-summary-data >> ${DATABASE} || exit 1
 		cd $here
diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme
index bd83a38b804..e74442485f9 100755
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.2 2003/01/04 22:28:33 dmcmahill Exp $
+# $NetBSD: mkreadme,v 1.3 2003/05/06 17:42:05 jmmv Exp $
 #
 # Script for README.html generation
 #
@@ -126,7 +126,7 @@ do
     case "$1"
     in
 
-    # We're generating README.html's for a CD-ROM 
+    # We're generating README.html's for a CD-ROM
     -c|--cdrom)
 	ftp_readme=no
 	shift
@@ -144,7 +144,7 @@ do
 	shift
 	;;
 
-    # We're generating README.html's for a CD-ROM 
+    # We're generating README.html's for a CD-ROM
     -f|--ftp)
 	ftp_readme=yes
 	shift
@@ -194,7 +194,7 @@ do
 	;;
 
     # Version
-    -v|--version) 
+    -v|--version)
 	${AWK} '/^#[ \t]*\$NetBSD/ {gsub(/,v/,"",$3);printf("%s:  Version %s, %s\n",$3,$4,$5); exit 0;}' $prog
 	exit 0
         ;;
@@ -204,7 +204,7 @@ do
 	clean_and_exit
 	;;
 
-    *)  
+    *) 
 	break
 	;;
 
@@ -251,7 +251,7 @@ echo " "
 echo "Extracting configuration variables:"
 echo " "
 if [ -d ${PKGSRCDIR}/pkgtools/pkglint ]; then
-    cd ${PKGSRCDIR}/pkgtools/pkglint 
+    cd ${PKGSRCDIR}/pkgtools/pkglint
 
     for v in DISTDIR PACKAGES PKGREPOSITORYSUBDIR PKG_SUFX MACHINE_ARCH PKG_URL OPSYS OS_VERSION FTP_PKG_URL_HOST FTP_PKG_URL_DIR CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR
     do
@@ -345,7 +345,7 @@ if [ "x$restart" = "xno" ] ; then
     # make sure we don't have an old database lying around
     rm -fr $DATABASEFILE
 
-    cd ${PKGSRCDIR} 
+    cd ${PKGSRCDIR}
     list=`grep '^[[:space:]]*'SUBDIR */Makefile | sed 's,/Makefile.*=[[:space:]]*,/,'`
     for pkgdir in $list
     do
@@ -372,7 +372,7 @@ if [ "x$restart" = "xno" ] ; then
 	    if [ `${EXPR} $npkg % 100 = 0` -eq 1 ]; then
 		echo " "
 		echo "$npkg"
-	    fi 
+	    fi
 	    npkg=`${EXPR} $npkg + 1`
 	    cd $PKGSRCDIR
     done