Remove trailing spaces.

11 files changed, 27 insertions, 27 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 655aeff87a4..e8531490bd6 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1926 2007/09/29 16:03:28 rillig Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1927 2007/10/09 19:19:11 martti Exp $
 #
 # This file is in the public domain.
 #
@@ -622,7 +622,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}:
 #
 # MAKEFLAGS.su-${.TARGET}
 #	The additional flags that are passed to the make process.
-# 
+#
 
 # XXX: Shouldn't the $${PATH} be ${PATH} here? This may be related to
 # PR 34470.
diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk
index 40c6eef1811..8c7ab0a8749 100644
--- a/mk/bsd.pkg.readme.mk
+++ b/mk/bsd.pkg.readme.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.13 2007/08/29 23:26:30 adrianp Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.14 2007/10/09 19:19:12 martti Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -232,7 +232,7 @@ SED_HOMEPAGE_EXPR=	-e 's|%%HOMEPAGE%%||'
 
 # XXX: The code for the pkg_install<20070714 vulnerability checks are
 # XXX: broken.  It will not find vulnerabilities in any packages that
-# XXX: have complex names in the pkg-vulnerabilties file. 
+# XXX: have complex names in the pkg-vulnerabilties file.
 # XXX: e.g. php{4,5}-perl and sun-{jdk,jre}15
 # XXX: Post pkg_install-20070714 only currently known vulnerabilities are
 # XXX: shown in the generated README.html files for packages.
@@ -259,7 +259,7 @@ show-vulnerabilities-html:
 				gsub("\&", "\\&amp;", printurl);	\
 				printf("<LI><STRONG>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", $$2, $$5, $$8, printurl) }'; \
 		fi;							\
-	fi	
+	fi
 
 # If PACKAGES is set to the default (../../packages), the current
 # ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
diff --git a/mk/bulk/sort-packages b/mk/bulk/sort-packages
index 6592d927293..4dbc343de67 100644
--- a/mk/bulk/sort-packages
+++ b/mk/bulk/sort-packages
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: sort-packages,v 1.10 2007/08/27 15:38:08 adrianp Exp $
+# $NetBSD: sort-packages,v 1.11 2007/10/09 19:19:13 martti Exp $
 
 # This program scans all binary packages in the current directory and
 # creates three lists of files in OUTDIR:
@@ -71,7 +71,7 @@ for pkg in *${PKG_SUFX}; do
 		_INFO_VER=`${PKG_INFO} -V`;
 		if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then
 			# XXX: The egrep command is only needed here because
-			# audit-packages before pkg_install-20070714 is so 
+			# audit-packages before pkg_install-20070714 is so
 			# awfully slow.
 			if egrep "^({.*${pkg_prefix}.*}|${pkg_prefix}|{.*}${pkg_prefix})" ${PKGVULNDIR}/pkg-vulnerabilities >/dev/null 4>&1; then
 				vuln=`${AUDIT_PACKAGES} -p "${pkg}"`
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 256d51c777e..8fe064ad903 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.40 2007/07/25 12:00:21 adrianp Exp $
+# $NetBSD: upload,v 1.41 2007/10/09 19:19:13 martti Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -27,8 +27,8 @@ Usage:  $prog [-c|--config <file>] [-n|--no-upload] [-d|--debug] [-v|--verbose]
 	$prog -h|--help
         $prog -V|--version
 
-    -c | --config <file>               
-			Load the following configuration file instead of 
+    -c | --config <file>
+			Load the following configuration file instead of
 			the default one.
 
     -d|--debug          Preserves some intermediate files to help
@@ -64,8 +64,8 @@ EOF
 
 # print out error message and exit 1
 die () {
-	echo "$0: error:" 1>&2 
-	for i in "$@"; do 
+	echo "$0: error:" 1>&2
+	for i in "$@"; do
 		echo "    $i" 1>&2
 	done
 	exit 1
diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk
index 6e950103a49..5b6ec75e06e 100644
--- a/mk/checksum/checksum.mk
+++ b/mk/checksum/checksum.mk
@@ -1,4 +1,4 @@
-# $NetBSD: checksum.mk,v 1.11 2007/08/31 16:30:11 jlam Exp $
+# $NetBSD: checksum.mk,v 1.12 2007/10/09 19:19:13 martti Exp $
 #
 # See bsd.checksum.mk for helpful comments.
 #
@@ -32,7 +32,7 @@ _CHECKSUM_CMD=								\
 		TEST=${TOOLS_TEST:Q}					\
 	${SH} ${PKGSRCDIR}/mk/checksum/checksum				\
 
-checksum checksum-phase: 
+checksum checksum-phase:
 	${RUN} set -e;							\
 	case ${.TARGET:Q} in						\
 	*-phase)	${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;;	\
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index d0f762af1fc..da4381d7e53 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.162 2007/10/09 14:31:31 rillig Exp $
+# $NetBSD: mk.conf,v 1.163 2007/10/09 19:19:13 martti Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1727,7 +1727,7 @@ USERPPP_GROUP?=	network
 UUCP_GROUP?=	daemon
 # System group for uucp-related programs.
 # Possible: any group name
-# Default: daemon 
+# Default: daemon
 
 UUCP_USER?=	uucp
 # System user for uucp-related programs.
diff --git a/mk/emulator/emulator.mk b/mk/emulator/emulator.mk
index b9952c3fee3..e1d13359697 100644
--- a/mk/emulator/emulator.mk
+++ b/mk/emulator/emulator.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.8 2007/08/23 18:20:36 jlam Exp $
+# $NetBSD: emulator.mk,v 1.9 2007/10/09 19:19:13 martti Exp $
 #
 # This file is included by bsd.pkg.mk.
 #
@@ -79,7 +79,7 @@ OPSYS_EMULDIR?=		# empty
 # package's binaries, libraries and scripts won't necessarily match the
 # actual paths on the file system, so skip some path checks that are
 # likely to fail.
-# 
+#
 .if empty(EMUL_DISTRO:Mnative-*)
 CHECK_SHLIBS_SUPPORTED?=	no
 CHECK_INTERPRETER_SKIP=		*
diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk
index 493badc15e5..7e7c203ff6d 100644
--- a/mk/emulator/pkg-rpm.mk
+++ b/mk/emulator/pkg-rpm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-rpm.mk,v 1.1 2007/07/29 05:19:43 jlam Exp $
+# $NetBSD: pkg-rpm.mk,v 1.2 2007/10/09 19:19:13 martti Exp $
 #
 # RPM package format
 #
@@ -10,7 +10,7 @@
 #	this is empty, then no PLIST is created.
 #
 #	Default value: ${WRKDIR}/.PLIST.rpm2pkg
-#	
+#
 # RPM2PKG_PREFIX
 #	This is the directory under which the contents of the RPMs will
 #	be extracted.  This directory is stripped from the paths which
@@ -32,7 +32,7 @@
 #	component of ``./''.
 #
 #	Default value: 1
-#	
+#
 # RPM2PKG_STAGE
 #	Stage at which to run the ``extract-rpm'' target.
 #
diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme
index cb823b4adbb..6f043948a9f 100755
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.18 2007/09/07 22:12:16 jlam Exp $
+# $NetBSD: mkreadme,v 1.19 2007/10/09 19:19:13 martti Exp $
 #
 # Script for README.html generation
 #
@@ -303,7 +303,7 @@ else
     exit 1
 fi
 
-# this needs to happen here as the variables referenced have not been 
+# this needs to happen here as the variables referenced have not been
 # populated until this stage (see above)
 #
 if [ "$pv" = "default" ]; then
diff --git a/mk/wrapper/cmd-sink-cross-gcc b/mk/wrapper/cmd-sink-cross-gcc
index d9e91aa539c..1b0996f951a 100644
--- a/mk/wrapper/cmd-sink-cross-gcc
+++ b/mk/wrapper/cmd-sink-cross-gcc
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-cross-gcc,v 1.1 2007/08/02 18:19:33 joerg Exp $
+# $NetBSD: cmd-sink-cross-gcc,v 1.2 2007/10/09 19:19:13 martti Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -35,7 +35,7 @@ if [ "${dont_link}" != yes ]; then
 	$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
 	. $buildcmd
 
-	# All normal library locations should be checked for 
+	# All normal library locations should be checked for
 	for libdir in /usr/lib @PREFIX@/lib; do
 		arg="-Wl,-rpath-link,@CROSS_DESTDIR@${libdir}"
 		$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk
index beb709853d7..6a7d02a884c 100644
--- a/mk/x11.buildlink3.mk
+++ b/mk/x11.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.9 2007/10/01 07:21:44 rillig Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.10 2007/10/09 19:19:12 martti Exp $
 #
 # This file should only be included from the buildlink3.mk files from
 # the modular Xorg packages and only in the case that the native X11
@@ -18,7 +18,7 @@ USE_X11=	yes
 # Sanity checks.
 #
 
-.  if ${X11_TYPE} != "native" 
+.  if ${X11_TYPE} != "native"
 _WRONG_X11_TYPE:=	${X11_TYPE}
 PKG_FAIL_REASON+=	"Do not include x11.version.mk for X11_TYPE != \"native\"."
 X11_TYPE:=		native