Remove traling spaces.

11 files changed, 27 insertions, 27 deletions

diff --git a/Tools/portbuild/scripts/allgohans b/Tools/portbuild/scripts/allgohans
index 2caa379809a6..aa851b729e7c 100755
--- a/Tools/portbuild/scripts/allgohans
+++ b/Tools/portbuild/scripts/allgohans
@@ -10,9 +10,9 @@ doarch() {
 	echo "Invalid arch"
 	exit 1
     fi
-    
+
     machines=$(awk '{print $1}' ${pb}/${arch}/mlist)
-    
+
     for i in ${machines}; do
 	. ${pb}/${arch}/portbuild.conf
 	if [ -f "${pb}/${arch}/portbuild.${i}" ]; then
@@ -26,7 +26,7 @@ doarch() {
 }
 
 id=$(whoami)
-if [ "${id}" = "root" ]; then 
+if [ "${id}" = "root" ]; then
 	arch=$1
 	shift
 	root=1
diff --git a/Tools/portbuild/scripts/buildfailure b/Tools/portbuild/scripts/buildfailure
index 8194e080fc29..e15d8de0c975 100755
--- a/Tools/portbuild/scripts/buildfailure
+++ b/Tools/portbuild/scripts/buildfailure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# buildfailure <arch> <branch> <pkgname> 
+# buildfailure <arch> <branch> <pkgname>
 
 cleanup() {
     echo "Problem writing new failure file!"
diff --git a/Tools/portbuild/scripts/checkmachines b/Tools/portbuild/scripts/checkmachines
index c6108d63b0a4..fe3ac9ff8d22 100755
--- a/Tools/portbuild/scripts/checkmachines
+++ b/Tools/portbuild/scripts/checkmachines
@@ -8,7 +8,7 @@
 # information has been updated in the last 15 seconds (should be updated by
 # the reportload script every 5 seconds).  If so, then divide the number of
 # running jobs on the client by its weighting in mlist, and output the
-# machine(s) with the minimum value to ${buildroot}/ulist. 
+# machine(s) with the minimum value to ${buildroot}/ulist.
 #
 # Dividing by the weight has the effect of grouping machines with similar
 # job load (e.g. a weight of 5 will rank machines with job loads 0, 1, 2, 3, 4
@@ -23,7 +23,7 @@ arches=$*
 while true; do
   for i in ${arches}; do
     mlist=${buildroot}/${i}/mlist
-  
+
     set $(cat $mlist)
     while [ $# -gt 0 ]; do
       m=$1
diff --git a/Tools/portbuild/scripts/clean-chroot b/Tools/portbuild/scripts/clean-chroot
index bb9a89925e1c..3911470fd284 100755
--- a/Tools/portbuild/scripts/clean-chroot
+++ b/Tools/portbuild/scripts/clean-chroot
@@ -18,7 +18,7 @@ fi
 if [ ${arch} = "i386" ]; then
   chroot ${chroot} umount -f /compat/linux/proc
 fi
-  
+
 umount -f ${chroot}/a/ports 2> /dev/null
 umount -f ${chroot}/usr/opt/doc 2> /dev/null
 umount -f ${chroot}/usr/src 2> /dev/null
diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index f33f3b71e40d..1f3e475cef64 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -99,7 +99,7 @@ restrictedlist () {
   echo "restricted list generation ended at $(date)"
   echo $(grep -c '^#' ${pb}/${arch}/${branch}/restricted.sh) "ports in ${pb}/${arch}/${branch}/restricted.sh"
 }
-  
+
 # usage: cdromlist pb scripts branch
 cdromlist () {
   pb=$1
@@ -316,7 +316,7 @@ if [ "$skipstart" = 0 ]; then
     cvs -qR update -PdA
     # XXX Check for conflicts
   fi
-  
+
   if [ "$nocvs" = 0 ]; then
     echo "================================================"
     echo "running cvs update on ${SRCBASE}"
@@ -330,8 +330,8 @@ if [ "$skipstart" = 0 ]; then
   echo "running make checksubdirs"
   echo "================================================"
   cd ${PORTSDIR}
-  make checksubdirs 
-  
+  make checksubdirs
+
   # this one not run in background to check return status
   if [ "$noduds" = 0 ]; then
     makeduds ${pb} ${arch} ${scripts} ${branch}
@@ -362,13 +362,13 @@ if [ "$skipstart" = 0 ]; then
   if [ "$norestr" = 0 ]; then
     restrictedlist ${pb} ${arch} ${scripts} ${branch} &
   fi
-  
+
   if [ "$cdrom" = 1 ]; then
     cdromlist ${pb} ${arch} ${scripts} ${branch} &
   fi
 
   ${scripts}/makeparallel ${arch} ${branch}
-  
+
   if [ "$nodummy" = 0 ]; then
     dummypkgs=""
     for i in ${dummyports}; do
@@ -379,7 +379,7 @@ if [ "$skipstart" = 0 ]; then
       fi
     done
   fi
-  
+
   cd ${pb}/${arch}
   mkdir -p ${pb}/${arch}/${branch}/bak
   cd ${pb}/${arch}/${branch}/bak
@@ -405,7 +405,7 @@ if [ "$skipstart" = 0 ]; then
 
     echo "Removing $(wc -l ${pb}/${arch}/${branch}/.oldports) packages in preparation for incremental build"
     rm ${INDEXFILE}.old1 ${INDEXFILE}.1
-  
+
     cd ${PACKAGES}/All
     sed "s,$,${PKGSUFFIX}," ${pb}/${arch}/${branch}/.oldports | xargs rm -f
     ${scripts}/prunepkgs ${PORTSDIR}/${INDEXFILE} ${PACKAGES}
@@ -464,7 +464,7 @@ wait
 if [ "$nobuild" = 0 ]; then
   cd ${pb}/${arch}/${branch}
 
-  if [ "$cont" = 1 ]; then 
+  if [ "$cont" = 1 ]; then
     find errors/ -name \*.log | sed -e 's,\.log$,,' -e 's,^errors/,,' >> duds.errors
     cat duds duds.errors | sort -u > duds.new
     mv duds.new duds
@@ -497,7 +497,7 @@ if [ "$nobuild" = 0 ]; then
   cd ${pb}/${arch}/${branch}
   if grep -qE '(ptimeout|pnohang): killing' make.0; then
     echo "The following port(s) timed out:"
-    grep -E '(ptimeout|pnohang): killing' make.0 | sed -e 's/^.*ptimeout:/ptimeout:/' -e 's/^.*pnohang:/pnohang:/' 
+    grep -E '(ptimeout|pnohang): killing' make.0 | sed -e 's/^.*ptimeout:/ptimeout:/' -e 's/^.*pnohang:/pnohang:/'
   fi
 
   ls -asFlrt ${pb}/${arch}/${branch}/packages/All > ${pb}/${arch}/${branch}/logs/ls-lrt-1
@@ -547,7 +547,7 @@ if grep -qE '(ptimeout|pnohang): killing' make.1; then
 fi
 
 # Clean up temporary duds file
-if [ "$cont" = 1 ]; then                                               
+if [ "$cont" = 1 ]; then
   cp duds.orig duds
 fi
 
diff --git a/Tools/portbuild/scripts/makeduds b/Tools/portbuild/scripts/makeduds
index e52326d0cd21..a394f7b5acf9 100755
--- a/Tools/portbuild/scripts/makeduds
+++ b/Tools/portbuild/scripts/makeduds
@@ -37,4 +37,4 @@ sort ${duds} > ${duds}.tmp
 mv -f ${duds}.tmp ${duds}
 
 cp ${duds} ${duds}.orig
-grep -Ff ${duds}.orig ${index} | cut -f 1 -d \| > ${duds}.full 
+grep -Ff ${duds}.orig ${index} | cut -f 1 -d \| > ${duds}.full
diff --git a/Tools/portbuild/scripts/makeworld b/Tools/portbuild/scripts/makeworld
index 7ad01f86d6af..9b50c2d3907d 100755
--- a/Tools/portbuild/scripts/makeworld
+++ b/Tools/portbuild/scripts/makeworld
@@ -44,7 +44,7 @@ fi
 
 if [ "$nocvs" = "0" ]; then
 	echo "==> Updating source tree"
-	cvs -Rq update -Pd 
+	cvs -Rq update -Pd
 	error=$?
 	if [ "$error" != "0" ]; then
 		exit 1
@@ -60,7 +60,7 @@ if [ "$error" != "0" ]; then
 	exit $?
 fi
 
-echo "==> Cleaning up chroot" 
+echo "==> Cleaning up chroot"
 rm -rf /var/chroot/
 chflags -R noschg /var/chroot/
 rm -rf /var/chroot/
diff --git a/Tools/portbuild/scripts/pnohang.c b/Tools/portbuild/scripts/pnohang.c
index a85b7b5181af..664020a61aed 100644
--- a/Tools/portbuild/scripts/pnohang.c
+++ b/Tools/portbuild/scripts/pnohang.c
@@ -65,7 +65,7 @@ main(int argc, char *argv[])
 		    sigemptyset(&sv.sa_mask);
 		    sv.sa_flags = 0;
 		    sigaction(SIGTERM, &sv, 0);
-		    
+
 		    /* parent */
 		    child = wait(&status);
 		    /*printf("exited child is %d, status is %d\n", child, status);*/
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 50effd8234ad..5b3df12fc56f 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -8,7 +8,7 @@ mount_fs()
     mntpt=$2
     master=$3
 
-    if [ ${disconnected} = 1 ]; then 
+    if [ ${disconnected} = 1 ]; then
 	mount -t nullfs -r ${fs} ${mntpt}
     else
 	mount -o nfsv3,intr -r ${master}:${fs} ${mntpt}
@@ -43,12 +43,12 @@ cleanup()
   pkgname=$5
 
   #umount ${chroot}/proc
-  
+
   echo ARCH=${arch}
   if [ ${arch} = "i386" ]; then
     umount -f ${chroot}/compat/linux/proc
   fi
-    
+
   umount -f ${chroot}/a/ports
   umount -f ${chroot}/usr/opt/doc
   umount -f ${chroot}/usr/src
diff --git a/Tools/portbuild/scripts/prunepkgs b/Tools/portbuild/scripts/prunepkgs
index f46eaafe9426..30521eee558c 100755
--- a/Tools/portbuild/scripts/prunepkgs
+++ b/Tools/portbuild/scripts/prunepkgs
@@ -17,7 +17,7 @@ testprunelink() {
   if [ ! -e $1/ ]; then
     dest=$(readlink $1)
     echo "$1 -> $dest pruned."
-    if [ "${dummy}" = "0" ]; then 
+    if [ "${dummy}" = "0" ]; then
       rm -f $1
     fi
   fi
diff --git a/Tools/portbuild/scripts/setupnode b/Tools/portbuild/scripts/setupnode
index a61c4edebfd3..a16d98ed389f 100755
--- a/Tools/portbuild/scripts/setupnode
+++ b/Tools/portbuild/scripts/setupnode
@@ -36,7 +36,7 @@ if [ "$nocopy" = 0 ]; then
     echo "not copying bindist to $(hostname) since it is already up to date"
   else
     echo "copying bindist to $(hostname)"
-    if [ ${disconnected} = 0 ]; then  
+    if [ ${disconnected} = 0 ]; then
       cp -p ${pb}/${arch}/${branch}/tarballs/bindist.tar ${tmpdir}/${branch}/tarballs
     fi
   fi