Remove trailing tabs.

23 files changed, 83 insertions, 83 deletions

diff --git a/mk/buildlink3/scan-libtool b/mk/buildlink3/scan-libtool
index c6ad997001d..1623d7b66c9 100644
--- a/mk/buildlink3/scan-libtool
+++ b/mk/buildlink3/scan-libtool
@@ -1,4 +1,4 @@
-# $NetBSD: scan-libtool,v 1.3 2004/09/24 20:44:28 jlam Exp $
+# $NetBSD: scan-libtool,v 1.4 2006/12/15 13:15:06 martti Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -76,7 +76,7 @@ for arg do
 		fi
 		;;
 	*)
-		if $test -z "$nonopt"; then	
+		if $test -z "$nonopt"; then
 			nonopt="$arg"
 			case $nonopt in
 			*cc|*++|gcc*|*-gcc*|xlc*|*CC)
diff --git a/mk/bulk/environment.txt b/mk/bulk/environment.txt
index 14a601e0c83..de67e877ed8 100644
--- a/mk/bulk/environment.txt
+++ b/mk/bulk/environment.txt
@@ -1,4 +1,4 @@
-# $NetBSD: environment.txt,v 1.4 2005/12/03 01:00:37 rillig Exp $
+# $NetBSD: environment.txt,v 1.5 2006/12/15 13:15:06 martti Exp $
 #
 
 ===> Environment variables used by the bulk build scripts
@@ -35,7 +35,7 @@ which they are used.
 	STARTFILE
 
 	BULK_PREREQ
-	
+
 	=> Set by the script
 
 	BATCH=1
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index e85afb24d73..a346c6fdf12 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.44 2006/12/14 14:29:22 dmcmahill Exp $
+# $NetBSD: mksandbox,v 1.45 2006/12/15 13:15:06 martti Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -255,7 +255,7 @@ SunOS)
 esac
 
 echo "Make empty dirs upon which to mount the null mounts"
-for d in $sandboxMountDirs; do	
+for d in $sandboxMountDirs; do
 	test -d $d || continue;
 	$mkdirprog $sandbox$d;
 	$mountprog $mountflags -r $d $sandbox$d;
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index 6ecff16995b..1d6e6a317d7 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.65 2006/12/13 16:05:25 dmcmahill Exp $
+# $NetBSD: post-build,v 1.66 2006/12/15 13:15:06 martti Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -84,7 +84,7 @@ sub get_build_conf_vars(@) {
 			"echo \"\${${varname}+set}\"",
 			"echo \"\${${varname}-}\""
 		));
-		
+
 		open(CMD, "${cmd} |")
 			or pb_die($BULK_BUILD_CONF, "Could not evaluate configuration file.");
 
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index 6ad7d9e56f9..c9714723d23 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.63 2006/11/06 21:45:18 tv Exp $
+# $NetBSD: pre-build,v 1.64 2006/12/15 13:15:06 martti Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -135,7 +135,7 @@ for dbdir in "${PKG_DBDIR}" "${DEPOTBASE}"; do
 				${PKG_TOOLS_BIN}/pkg_delete -K "$dbdir" -f "$pkg"
 			fi
 		done
-	
+
 		# We've tried our best to get rid of the pkgs, now do it
 		# the hard way.  If it wasn't for stuff in $X11BASE, I
 		# wouldn't have hard feelings about this!
diff --git a/mk/bulk/upload b/mk/bulk/upload
index e91a6f83177..f11eb95ad63 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.36 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: upload,v 1.37 2006/12/15 13:15:06 martti Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -277,7 +277,7 @@ if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then
 	[ "${BSDSUM}" = "echo" ] && rm BSDSUM
 	[ "${CKSUM}" = "echo" ] && rm CKSUM
 	[ "${SYSVSUM}" = "echo" ] && rm SYSVSUM
-	
+
 	if [ "${SIGN_AS-}" != "" ]; then
 		for i in ${SUMFILES}; do
 			if [ -s $i ]; then
diff --git a/mk/check/check-files.mk b/mk/check/check-files.mk
index 3a9b1a68d27..a3c42c57d50 100644
--- a/mk/check/check-files.mk
+++ b/mk/check/check-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.11 2006/11/12 20:57:55 rillig Exp $
+# $NetBSD: check-files.mk,v 1.12 2006/12/15 13:15:06 martti Exp $
 #
 # This file checks that the list of installed files matches the PLIST.
 # For that purpose it records the file list of LOCALBASE before and
@@ -263,7 +263,7 @@ ${_CHECK_FILES_MISSING_SKIP}:						\
 		   ${_CHECK_FILES_MISSING_REAL} |			\
 	${GREP} '^-[^-]' | ${SED} "s|^-||"				\
 		> ${.TARGET}
-	
+
 ${_CHECK_FILES_EXTRA}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${DIFF} -u  ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED} |	\
diff --git a/mk/checksum/checksum b/mk/checksum/checksum
index 6b2b96c2946..eb40c498d27 100755
--- a/mk/checksum/checksum
+++ b/mk/checksum/checksum
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: checksum,v 1.9 2006/07/18 21:39:39 jlam Exp $
+# $NetBSD: checksum,v 1.10 2006/12/15 13:15:06 martti Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -138,7 +138,7 @@ fi
 	for file in $files; do
 		sfile="${file%$suffix}"
 		${TEST} "$d_file" = "($sfile)" || continue
-		
+
 		eval "tmp=\"\$_alg_${d_alg}\""
 		case "$tmp" in
 		"$file"|"$file "*)	tmp_pre= ;;
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index fb2947bd97d..0ac9edec140 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.138 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: mk.conf,v 1.139 2006/12/15 13:15:06 martti Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -88,7 +88,7 @@ PKGSRC_SLEEPSECS?= 5
 # The following values are used to manage the packages collection as a whole.
 #
 
-#ABI=	
+#ABI=
 # The ABI to be used, if supported by the Operating System and/or compiler.
 # Currently only used under IRIX and explicitly set during bootstrapping
 # Only change this if you really know what you're doing -- libraries of
diff --git a/mk/pkginstall/files b/mk/pkginstall/files
index 5ab7d98009e..8571577a4d8 100644
--- a/mk/pkginstall/files
+++ b/mk/pkginstall/files
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.2 2006/07/19 22:26:26 jlam Exp $
+# $NetBSD: files,v 1.3 2006/12/15 13:15:06 martti Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
@@ -396,7 +396,7 @@ CHECK-PERMS)
 			*:$f_user:$f_group)	continue ;;
 			esac
 			;;
-		[!:]*::)	
+		[!:]*::)
 			case "$perms" in
 			$longmode:*:*)	continue ;;
 			esac
diff --git a/mk/pkginstall/usergroupfuncs b/mk/pkginstall/usergroupfuncs
index 77e4f8b4e4b..c0bab9b31ee 100644
--- a/mk/pkginstall/usergroupfuncs
+++ b/mk/pkginstall/usergroupfuncs
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: usergroupfuncs,v 1.2 2006/12/15 13:15:06 martti Exp $
 #
 # Default implementations of user_exists() and group_exists() shell
 # functions for checking the existence of users and groups, and of
@@ -16,7 +16,7 @@
 #	Returns 1 if neither $group nor $groupid exist
 #	Returns 2 if $group or $groupid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 group_exists()
 {
 	_group="$1"; _groupid="$2"
@@ -56,7 +56,7 @@ group_exists()
 #	Returns 1 if neither $user nor $userid exist
 #	Returns 2 if $user or $userid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 user_exists()
 {
 	_user="$1"; _userid="$2"
diff --git a/mk/pkginstall/usergroupfuncs.DragonFly b/mk/pkginstall/usergroupfuncs.DragonFly
index 25ff3163103..39579bd49e2 100644
--- a/mk/pkginstall/usergroupfuncs.DragonFly
+++ b/mk/pkginstall/usergroupfuncs.DragonFly
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.DragonFly,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: usergroupfuncs.DragonFly,v 1.2 2006/12/15 13:15:06 martti Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
@@ -8,7 +8,7 @@
 #	Returns 1 if neither $group nor $groupid exist
 #	Returns 2 if $group or $groupid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 group_exists()
 {
 	_group="$1"; _groupid="$2"
@@ -48,7 +48,7 @@ group_exists()
 #	Returns 1 if neither $user nor $userid exist
 #	Returns 2 if $user or $userid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 user_exists()
 {
 	_user="$1"; _userid="$2"
diff --git a/mk/pkginstall/usergroupfuncs.FreeBSD b/mk/pkginstall/usergroupfuncs.FreeBSD
index 763e5b1e4b1..111c915c6f1 100644
--- a/mk/pkginstall/usergroupfuncs.FreeBSD
+++ b/mk/pkginstall/usergroupfuncs.FreeBSD
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.FreeBSD,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: usergroupfuncs.FreeBSD,v 1.2 2006/12/15 13:15:06 martti Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
@@ -8,7 +8,7 @@
 #	Returns 1 if neither $group nor $groupid exist
 #	Returns 2 if $group or $groupid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 group_exists()
 {
 	_group="$1"; _groupid="$2"
@@ -48,7 +48,7 @@ group_exists()
 #	Returns 1 if neither $user nor $userid exist
 #	Returns 2 if $user or $userid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 user_exists()
 {
 	_user="$1"; _userid="$2"
diff --git a/mk/pkginstall/usergroupfuncs.Linux b/mk/pkginstall/usergroupfuncs.Linux
index 3c86e4f2f46..bdbd3cfc3c6 100644
--- a/mk/pkginstall/usergroupfuncs.Linux
+++ b/mk/pkginstall/usergroupfuncs.Linux
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.Linux,v 1.1 2006/10/12 23:10:55 ben Exp $
+# $NetBSD: usergroupfuncs.Linux,v 1.2 2006/12/15 13:15:06 martti Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of shadow-utils.  (Not libuser)
@@ -8,7 +8,7 @@
 #	Returns 1 if neither $group nor $groupid exist
 #	Returns 2 if $group or $groupid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 group_exists()
 {
 	_group="$1"; _groupid="$2"
@@ -48,7 +48,7 @@ group_exists()
 #	Returns 1 if neither $user nor $userid exist
 #	Returns 2 if $user or $userid exist but don't match
 #	Returns 3 for all errors
-#	
+#
 user_exists()
 {
 	_user="$1"; _userid="$2"
diff --git a/mk/scripts/binpkg-cache b/mk/scripts/binpkg-cache
index 07951797b2f..86d65af83d7 100755
--- a/mk/scripts/binpkg-cache
+++ b/mk/scripts/binpkg-cache
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: binpkg-cache,v 1.14 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: binpkg-cache,v 1.15 2006/12/15 13:15:06 martti Exp $
 #
 # Script for generating a cache file with information about
 # all binary packages contained in a directory.
@@ -257,7 +257,7 @@ process_binpkg_dir(){
 			echo "********** WARNING **********"
 			return
 		fi
-		
+
 		if test "${build_summary}" = "yes" ; then
 			cat ${tmpd}/${summaryfile} | ${GZIP_CMD} > ${d}/${summaryfile}.gz
 			if test $? -ne 0 ; then
@@ -433,7 +433,7 @@ for d in `${AWK} '{print $1}' ${all_dirs}` ; do
 			echo "${prompt}no binary packages in ${d}"
 		fi
 	fi
-		
+
 done
 
 process_cache_files
diff --git a/mk/scripts/binpkg-scan b/mk/scripts/binpkg-scan
index db8c0a31b10..c80d8714543 100755
--- a/mk/scripts/binpkg-scan
+++ b/mk/scripts/binpkg-scan
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: binpkg-scan,v 1.2 2006/12/15 12:46:24 martti Exp $: genreadme.awk,v 1.22 2006/04/15 15:00:24 salo Exp $
+# $NetBSD: binpkg-scan,v 1.3 2006/12/15 13:15:06 martti Exp $: genreadme.awk,v 1.22 2006/04/15 15:00:24 salo Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -76,7 +76,7 @@ END {
 	  printf("**** ------- ****\n") > "/dev/stderr";
 	  exit(1);
 	}
-	
+
 	if (rc == 2) {
 	  printf("\n**** WARNING ****\n") > "/dev/stderr";
 	  printf("* No binary packages directory found\n") > "/dev/stderr";
diff --git a/mk/scripts/genindex.awk b/mk/scripts/genindex.awk
index 13f822a1943..f13a94d1ce8 100755
--- a/mk/scripts/genindex.awk
+++ b/mk/scripts/genindex.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genindex.awk,v 1.5 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: genindex.awk,v 1.6 2006/12/15 13:15:06 martti Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -76,7 +76,7 @@ BEGIN {
 	else {topdepends[pkg] = "";}
 	if (pkg in topbuilddepends) {}
 	else {topbuilddepends[pkg] = "";}
-	
+
 	for (i = 3; i <= NF; i++) {
 		split($i, a,":");
 		pkgpat = a[1];
@@ -96,14 +96,14 @@ BEGIN {
 			printf("\tpkgpat = %s\n", pkgpat);
 			printf("\tpkgdir = %s\n", pkgdir);
 		}
-		
-		
+
+
 #
 # store the package directory in a associative array with the wildcard
 # pattern as the index since we will need to be able to look this up later
 #
 		pat2dir[pkgpat] = pkgdir;
-		
+
 		if (deptype == "depends") {
 			topdepends[pkg] = topdepends[pkg] " " pkgpat " " ;
 			if (debug) {
@@ -119,7 +119,7 @@ BEGIN {
 			topbuilddepends[pkg] = topbuilddepends[pkg] " " pkgpat " " ;
 		}
 	}
-	
+
 	next;
 }
 
@@ -208,7 +208,7 @@ END {
         indexf = SORT " > INDEX";
 	if ( dependsfile == "" ) dependsfile = "/dev/null";
 	if ( builddependsfile == "" ) builddependsfile = "/dev/null";
-	
+
 	printf("Flattening dependencies\n");
 	printf("") > dependsfile;
 	for (toppkg in topdepends){
@@ -222,13 +222,13 @@ END {
 		flatdepends[toppkg] = alldepends[toppkg];
 	}
 	close(dependsfile);
-	
-	
+
+
 # clear out the flattened depends list and repeat for the build depends
 	for( pkg in alldepends) {
 		delete alldepends[pkg];
 	}
-	
+
 	printf("Flattening build dependencies\n");
 	printf("") > builddependsfile;
 	for (toppkg in topbuilddepends){
@@ -237,14 +237,14 @@ END {
 		       toppkg, alldepends[toppkg]) >> builddependsfile;
 	}
 	close(builddependsfile);
-	
+
 	printf("Generating INDEX file\n");
-	
+
 # Output format:
 #  package-name|package-path|installation-prefix|comment| \
 #  description-file|maintainer|categories|build deps|run deps|for arch| \
 #  not for opsys|homepage
-	
+
 	pkgcnt = 0;
 	for (toppkg in topdepends){
 		pkgcnt++;
@@ -327,16 +327,16 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 		  if (debug) printf("\t%s is already listed in %s\n",
 				    deps[i], alldepends[pkg]);
 		}
-		
+
 		i = i + 1;
 	} # while i
-	
+
 	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",
 			  pkg, alldepends[pkg]);
-	return(alldepends[pkg]);	
+	return(alldepends[pkg]);
 }
 
 #
diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk
index bb1fa43f960..fc34671208c 100755
--- a/mk/scripts/genreadme.awk
+++ b/mk/scripts/genreadme.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.24 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: genreadme.awk,v 1.25 2006/12/15 13:15:06 martti Exp $
 #
 # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -81,7 +81,7 @@ BEGIN {
 	else {topdepends[pkg] = "";}
 	if (pkg in topbuilddepends) {}
 	else {topbuilddepends[pkg] = "";}
-	
+
 	for (i = 3; i <= NF; i++) {
 		split($i, a,":");
 		pkgpat = a[1];
@@ -101,14 +101,14 @@ BEGIN {
 			printf("\tpkgpat = %s\n", pkgpat);
 			printf("\tpkgdir = %s\n", pkgdir);
 		}
-		
-		
+
+
 #
 # store the package directory in a associative array with the wildcard
 # pattern as the index since we will need to be able to look this up later
 #
 		pat2dir[pkgpat] = pkgdir;
-		
+
 		if (deptype == "depends") {
 			topdepends[pkg] = topdepends[pkg] " " pkgpat " " ;
 			if (debug) {
@@ -124,7 +124,7 @@ BEGIN {
 			topbuilddepends[pkg] = topbuilddepends[pkg] " " pkgpat " " ;
 		}
 	}
-	
+
 	next;
 }
 
@@ -212,7 +212,7 @@ END {
 	  printf("**** ------- ****\n") > "/dev/stderr";
 	  exit(1);
 	}
-	
+
 	if (rc == 2) {
 	  printf("\n**** WARNING ****\n") > "/dev/stderr";
 	  printf("* No binary packages directory found\n") > "/dev/stderr";
@@ -240,7 +240,7 @@ END {
 		flatdepends[toppkg] = alldepends[toppkg];
 	}
 	close(dependsfile);
-	
+
 
 # clear out the flattened depends list and repeat for the build depends
 	for( key in alldepends ) {
@@ -254,9 +254,9 @@ END {
 		       toppkg, alldepends[toppkg]) >> builddependsfile;
 	}
 	close(builddependsfile);
-	
+
 	vfile = DISTDIR "/pkg-vulnerabilities";
-	
+
 # extract date for vulnerabilities file
 	cmd = "ls -l " vfile;
 	if ((cmd | getline) > 0) {
@@ -306,7 +306,7 @@ END {
 		}
 		topdepends[SINGLEPKG] = "yes";
 	}
-	
+
 	printf("Generating README.html files\n");
 	pkgcnt = 0;
 	if (do_pkg_readme) {
@@ -316,7 +316,7 @@ END {
 			pkgcnt++;
 			pkgdir = PKGSRCDIR "/" toppkg;
 			readmenew=pkgdir  "/" readme_name;
-			
+
 			if (debug) printf("Creating %s for %s\n",
 					  readme, readmenew);
 			printf(".");
@@ -365,7 +365,7 @@ END {
 			close(htmldeps_file);
 			if (debug) printf("wrote = %d entries to \"%s\"\n",
 					  i-1, htmldeps_file);
-			
+
 			vul = "";
 			if (have_vfile) {
 				i = 1;
@@ -396,7 +396,7 @@ END {
 					vul="<I>(no vulnerabilities known)</I>";
 				}
 			}
-			
+
 
 			if (debug) {
 			  printf("Checking for binary package with lookup_cache( %s)\n",
@@ -404,7 +404,7 @@ END {
 			}
 # lookup_cache( wildcard ) will produce HTML for the packages which are found
 			lookup_cache( toppkg );
-			
+
 
 
 			if ( flatdepends[toppkg] ~ /^[ \t]*$/ ) {
@@ -412,7 +412,7 @@ END {
 			} else {
 				rundeps = flatdepends[toppkg];
 			}
-			
+
 			while((getline < templatefile) > 0){
 				gsub(/%%PORT%%/, toppkg);
 				gsub(/%%PKG%%/, pkgdir2name[toppkg]);
@@ -686,16 +686,16 @@ function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
 		  if (debug) printf("\t%s is already listed in %s\n",
 				    deps[i], alldepends[pkg]);
 		}
-		
+
 		i = i + 1;
 	} # while i
-	
+
 	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",
 			  pkg, alldepends[pkg]);
-	return(alldepends[pkg]);	
+	return(alldepends[pkg]);
 }
 
 #
diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme
index e6381abad11..bac2bf6803e 100755
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.12 2006/12/15 12:46:24 martti Exp $
+# $NetBSD: mkreadme,v 1.13 2006/12/15 13:15:07 martti Exp $
 #
 # Script for README.html generation
 #
@@ -162,7 +162,7 @@ do
 	shift
 	;;
 
-	
+
     # Help
     -h|--help)
 	usage
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index db41c00d056..c33f86d9eaf 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.13 2005/07/17 21:36:24 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.14 2006/12/15 13:15:07 martti Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -75,7 +75,7 @@ PKG_FAIL_REASON+=	"\`\`autoconf'' and \`\`autoconf213'' conflict in USE_TOOLS."
 # autoconf.
 #
 _TOOLS_AC_NAMES=	autoconf	autoconf-2.13
-_TOOLS_AC_NAMES+=	autoheader	autoheader-2.13	
+_TOOLS_AC_NAMES+=	autoheader	autoheader-2.13
 _TOOLS_AC_NAMES+=	autom4te
 _TOOLS_AC_NAMES+=	autoreconf	autoreconf-2.13
 _TOOLS_AC_NAMES+=	autoscan	autoscan-2.13
diff --git a/mk/tools/msgfmt.sh b/mk/tools/msgfmt.sh
index cc65489af77..ec388c2752b 100755
--- a/mk/tools/msgfmt.sh
+++ b/mk/tools/msgfmt.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: msgfmt.sh,v 1.25 2006/06/23 21:05:43 jlam Exp $
+# $NetBSD: msgfmt.sh,v 1.26 2006/12/15 13:15:07 martti Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -195,7 +195,7 @@ BEGIN {
 	obsolete = ""
 
 	while (result == 1) {
-	
+
 		# Buffer any "msgid" statements into the singular array.
 		# Strip all trailing empty strings that have no effect on
 		# the output.
diff --git a/mk/wrapper/cmd-sink-ld b/mk/wrapper/cmd-sink-ld
index fb00b81d324..3c0a884def7 100644
--- a/mk/wrapper/cmd-sink-ld
+++ b/mk/wrapper/cmd-sink-ld
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-ld,v 1.3 2006/09/17 22:52:45 rillig Exp $
+# $NetBSD: cmd-sink-ld,v 1.4 2006/12/15 13:15:07 martti Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -70,7 +70,7 @@ while ! queue_is_empty cmdbuf; do
                 $debug_log $wrapperlog "    (cmd-sink-ld) drop: $arg"
 		arg=
 		;;
-	*)		
+	*)
 		. $buildcmd
 		;;
 	esac
diff --git a/mk/wrapper/logic b/mk/wrapper/logic
index c7783de0a4d..b246646fd9b 100644
--- a/mk/wrapper/logic
+++ b/mk/wrapper/logic
@@ -1,4 +1,4 @@
-# $NetBSD: logic,v 1.13 2006/11/26 14:42:17 rillig Exp $
+# $NetBSD: logic,v 1.14 2006/12/15 13:15:07 martti Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -90,7 +90,7 @@ while ! queue_is_empty argbuf; do
 			addtocache=no
 			split_arg=no
 			case $skip_transform in
-			yes)	
+			yes)
 				$debug_log $wrapperlog "    (logic) to:   $arg [untransformed]"
 				;;
 			*)
@@ -99,7 +99,7 @@ while ! queue_is_empty argbuf; do
 				-*|/*)
 					case $transform_sed in
 					"")	;;
-					*)	
+					*)
 						arg=`$echo "X$arg" | $Xsed $transform_sed`
 						$debug_log $wrapperlog "    (logic) to:   $arg"
 						addtocache=yes