various: Fix SlackBuild formatting and comment nit picks.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

46 files changed, 65 insertions, 110 deletions

diff --git a/office/abook/abook.SlackBuild b/office/abook/abook.SlackBuild
index 4489c3f55aae..4ead0ac8ae93 100644
--- a/office/abook/abook.SlackBuild
+++ b/office/abook/abook.SlackBuild
@@ -29,12 +29,10 @@ VERSION=0.5.6
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -58,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Exit on most errors.
+
 set -e
 
 
@@ -83,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --localstatedir=/var \
-  
+
 make
 make install-strip DESTDIR=$PKG
 
diff --git a/office/adobe-reader-fontpacks/adobe-reader-fontpacks.SlackBuild b/office/adobe-reader-fontpacks/adobe-reader-fontpacks.SlackBuild
index 14a1ce7c486d..828cb15b2de3 100644
--- a/office/adobe-reader-fontpacks/adobe-reader-fontpacks.SlackBuild
+++ b/office/adobe-reader-fontpacks/adobe-reader-fontpacks.SlackBuild
@@ -33,7 +33,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/adobe-reader/adobe-reader.SlackBuild b/office/adobe-reader/adobe-reader.SlackBuild
index 2923496c55a9..30b78dc45b9e 100644
--- a/office/adobe-reader/adobe-reader.SlackBuild
+++ b/office/adobe-reader/adobe-reader.SlackBuild
@@ -94,7 +94,7 @@ cd $PKG/usr/man/man1
   ln -sf ../../../opt/Adobe/Reader9/Resource/Shell/acroread.1.gz .
 cd -
 
-# Fix bug in bash completion script by redefining "_filedir" function 
+# Fix bug in bash completion script by redefining "_filedir" function
 # to "_acroread_filedir" as suggested on the adobe forum:
 # http://forums.adobe.com/thread/745833
 sed -i 's/_filedir/_acroread_filedir/g' $PKG/opt/Adobe/Reader9/Resource/Shell/acroread_tab
diff --git a/office/aigaion/aigaion.SlackBuild b/office/aigaion/aigaion.SlackBuild
index d8b8e2dd1db1..e5909cd2cae2 100644
--- a/office/aigaion/aigaion.SlackBuild
+++ b/office/aigaion/aigaion.SlackBuild
@@ -21,7 +21,7 @@ PHPUSER=${PHPUSER:-root}
 PHPGROUP=${PHPGROUP:-apache}
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}		
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -41,7 +41,7 @@ set -e
 rm -rf $PKG $TMP/$PRGNAM${MAJORVERSION}
 mkdir -p $TMP $PKG/$DOCROOT $OUTPUT
 cd $TMP
-unzip $CWD/$PRGNAM$VERSION.zip 
+unzip $CWD/$PRGNAM$VERSION.zip
 cd $PRGNAM${MAJORVERSION}
 
 chown -R root:root .
diff --git a/office/aiksaurus/aiksaurus.SlackBuild b/office/aiksaurus/aiksaurus.SlackBuild
index da817cc28dec..b1922c837e75 100644
--- a/office/aiksaurus/aiksaurus.SlackBuild
+++ b/office/aiksaurus/aiksaurus.SlackBuild
@@ -27,12 +27,10 @@ VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,7 +52,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/share/icons/gaiksaurus $OUTPUT $PKG/usr/share/applications
diff --git a/office/akonadi-googledata/akonadi-googledata.SlackBuild b/office/akonadi-googledata/akonadi-googledata.SlackBuild
index 11d197fd361d..5fee0daa5d94 100644
--- a/office/akonadi-googledata/akonadi-googledata.SlackBuild
+++ b/office/akonadi-googledata/akonadi-googledata.SlackBuild
@@ -83,7 +83,7 @@ cd build
    make
    make install DESTDIR=$PKG
 cd -
- 
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/office/antiword/antiword.SlackBuild b/office/antiword/antiword.SlackBuild
index 0733d899862c..6241af3df003 100644
--- a/office/antiword/antiword.SlackBuild
+++ b/office/antiword/antiword.SlackBuild
@@ -28,12 +28,10 @@ VERSION=0.37
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index 6c6835fb1e4f..4572e60a36c3 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -56,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/auctex/auctex.SlackBuild b/office/auctex/auctex.SlackBuild
index 0db8835e3868..9c5514caabaa 100644
--- a/office/auctex/auctex.SlackBuild
+++ b/office/auctex/auctex.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-11.86}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/bookbinder/bookbinder.SlackBuild b/office/bookbinder/bookbinder.SlackBuild
index f36c8adc6d4a..ef76d6ba2376 100644
--- a/office/bookbinder/bookbinder.SlackBuild
+++ b/office/bookbinder/bookbinder.SlackBuild
@@ -12,7 +12,7 @@ TAG=${TAG:-_SBo}
 ARCH=noarch
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/office/broffice.org/broffice.org.SlackBuild b/office/broffice.org/broffice.org.SlackBuild
index 43f688441ab8..fc528db45896 100644
--- a/office/broffice.org/broffice.org.SlackBuild
+++ b/office/broffice.org/broffice.org.SlackBuild
@@ -27,12 +27,10 @@ VERSION=3.2.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -68,7 +66,7 @@ else
   PKGARCH="i586"
 fi
 
-# Ignore this - it's just to get the toplevel directory name of the 
+# Ignore this - it's just to get the toplevel directory name of the
 # extracted tarball archive
 if [ $WJRE != no ]; then
   SOURCEDIR=$(tar tzf $CWD/BrOOo_${VERSION}_Linux_${SRCARCH}_install-rpm-wJRE_${OOLANG}.tar.gz 2>/dev/null | head -n 1 | tr -d \/)
@@ -116,17 +114,17 @@ rm -f $PKG/usr/share/applications/broffice.org3-startcenter.desktop
 # Create symlinks in /usr/bin to actual binaries
 cd $PKG/usr/bin
   for FILE in \
-    sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do 
+    sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do
       rm -f $FILE
       ln -sf ../../opt/broffice.org3/program/$FILE $FILE ;
-  done 
+  done
 cd -
 
 # Remove DejaVu and Liberation fonts - these are included in other packages
 rm -f opt/openoffice.org/basis3.2/share/fonts/truetype/[DL]*.ttf
 
 # Fix Exec commands in the desktop files
-# See http://bugzilla.xfce.org/show_bug.cgi?id=2430 
+# See http://bugzilla.xfce.org/show_bug.cgi?id=2430
 cd $PKG/opt/broffice.org3/share/xdg/
   for APP in base calc draw impress math writer; do
     sed -i 's%Exec=broffice.org3 -%Exec=s%' $APP.desktop ;
diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild
index fa65b77a5fed..514c330661e3 100644
--- a/office/calcurse/calcurse.SlackBuild
+++ b/office/calcurse/calcurse.SlackBuild
@@ -56,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/catdoc/catdoc.SlackBuild b/office/catdoc/catdoc.SlackBuild
index 50412277e462..6ef8d10e029c 100644
--- a/office/catdoc/catdoc.SlackBuild
+++ b/office/catdoc/catdoc.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.94.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/devtodo/devtodo.SlackBuild b/office/devtodo/devtodo.SlackBuild
index d852bf85cdd8..7df49e5e140d 100644
--- a/office/devtodo/devtodo.SlackBuild
+++ b/office/devtodo/devtodo.SlackBuild
@@ -4,14 +4,14 @@
 # Copyright (c) 2007, Written by: Michiel van Wessem <michiel@slackbuilds.org>
 #
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
-# 
+#
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -24,17 +24,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=devtodo 
+PRGNAM=devtodo
 VERSION=${VERSION:-0.1.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -58,13 +56,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
+cd $TMP
 rm -rf $TMP/$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 find . \
diff --git a/office/dictd/dictd.SlackBuild b/office/dictd/dictd.SlackBuild
index 57e7f54ed522..aad5b8220735 100644
--- a/office/dictd/dictd.SlackBuild
+++ b/office/dictd/dictd.SlackBuild
@@ -8,12 +8,10 @@ VERSION=${VERSION:-1.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/focuswriter/focuswriter.SlackBuild b/office/focuswriter/focuswriter.SlackBuild
index 4df485d0eb50..7a1aa81b2a99 100644
--- a/office/focuswriter/focuswriter.SlackBuild
+++ b/office/focuswriter/focuswriter.SlackBuild
@@ -4,8 +4,8 @@
 
 # Written by Giuseppe Scalzi <snakeeater89[at]gmail[dot]com>
 
-PRGNAM=focuswriter			
-VERSION=${VERSION:-1.4.0}	
+PRGNAM=focuswriter
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -18,9 +18,9 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}		
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}		
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/ganttproject/ganttproject.SlackBuild b/office/ganttproject/ganttproject.SlackBuild
index 2bddee0c64d6..ede68a786cbb 100644
--- a/office/ganttproject/ganttproject.SlackBuild
+++ b/office/ganttproject/ganttproject.SlackBuild
@@ -35,7 +35,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p \
diff --git a/office/hevea/hevea.SlackBuild b/office/hevea/hevea.SlackBuild
index 3d127a4b7ee3..d5d8a804a263 100644
--- a/office/hevea/hevea.SlackBuild
+++ b/office/hevea/hevea.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-2.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -38,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -61,7 +59,7 @@ sed -i -e "\
   Makefile
 
 make
-DESTDIR=$PKG make install 
+DESTDIR=$PKG make install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/office/juffed/juffed.SlackBuild b/office/juffed/juffed.SlackBuild
index 0106e3632464..75640eb9ce85 100644
--- a/office/juffed/juffed.SlackBuild
+++ b/office/juffed/juffed.SlackBuild
@@ -37,7 +37,7 @@ fi
 
 DOCS="COPYING ChangeLog README"
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/kbgoffice/kbgoffice.SlackBuild b/office/kbgoffice/kbgoffice.SlackBuild
index ef76bd45122c..54c49bde1078 100644
--- a/office/kbgoffice/kbgoffice.SlackBuild
+++ b/office/kbgoffice/kbgoffice.SlackBuild
@@ -56,7 +56,7 @@ cd src
   sed "s:/usr/local:/usr:" -i.orig $PRGNAM.pro
   sed "s:/usr/local:/usr:" -i.orig main.cpp
   qmake -config release
-  CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make 
+  CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
   make INSTALL_ROOT=$PKG install
 cd ..
 
diff --git a/office/kchmviewer/kchmviewer.SlackBuild b/office/kchmviewer/kchmviewer.SlackBuild
index 4038cc23e2d7..1a33557fdfb3 100644
--- a/office/kchmviewer/kchmviewer.SlackBuild
+++ b/office/kchmviewer/kchmviewer.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # SlackBuild script for KchmViewer.
 # Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kchmviewer
-VERSION=${VERSION:-6.0} 
+VERSION=${VERSION:-6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/keepassx/keepassx.SlackBuild b/office/keepassx/keepassx.SlackBuild
index 313c7943fafd..cc70e08f171f 100644
--- a/office/keepassx/keepassx.SlackBuild
+++ b/office/keepassx/keepassx.SlackBuild
@@ -27,12 +27,10 @@ VERSION=0.4.3
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other # archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/keepnote/keepnote.SlackBuild b/office/keepnote/keepnote.SlackBuild
index 4b6adccefbd1..28b2ab30dcb5 100644
--- a/office/keepnote/keepnote.SlackBuild
+++ b/office/keepnote/keepnote.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for keepnote
 # Home Page http://rasm.ods.org/keepnote/
 
-# (C) 2010 mcc <mccnews@free.fr> 
+# (C) 2010 mcc <mccnews@free.fr>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
 PRGNAM=keepnote
 VERSION=${VERSION:-0.6.2}
 BUILD=${BUILD:-1}
diff --git a/office/lout/lout.SlackBuild b/office/lout/lout.SlackBuild
index 173cf82e1f63..bcd88aa52729 100644
--- a/office/lout/lout.SlackBuild
+++ b/office/lout/lout.SlackBuild
@@ -28,12 +28,10 @@ VERSION=${VERSION:-3.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -57,7 +55,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/mairix/mairix.SlackBuild b/office/mairix/mairix.SlackBuild
index 138a332cbf8c..86875d1147c4 100644
--- a/office/mairix/mairix.SlackBuild
+++ b/office/mairix/mairix.SlackBuild
@@ -3,9 +3,9 @@
 # Slackware build script for mairix
 
 # Written by Jostein Berntsen <jbernts@broadpark.no>
- 
 
-PRGNAM=mairix		
+
+PRGNAM=mairix
 VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -37,7 +37,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -57,8 +57,8 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr
 
-make 
-make install DESTDIR=$PKG 
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/office/mdbtools/mdbtools.SlackBuild b/office/mdbtools/mdbtools.SlackBuild
index 852bcc487aac..ccc73d7422e8 100644
--- a/office/mdbtools/mdbtools.SlackBuild
+++ b/office/mdbtools/mdbtools.SlackBuild
@@ -29,12 +29,10 @@ VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -58,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/notmuch/notmuch.SlackBuild b/office/notmuch/notmuch.SlackBuild
index b57ef9621ac8..c44082f32b5e 100644
--- a/office/notmuch/notmuch.SlackBuild
+++ b/office/notmuch/notmuch.SlackBuild
@@ -4,7 +4,7 @@
 
 # Written by Jostein Berntsen <jbernts@broadpark.no>
 
-PRGNAM=notmuch		
+PRGNAM=notmuch
 VERSION=${VERSION:-0.15.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,7 +18,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -60,8 +60,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make 
-make install DESTDIR=$PKG 
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
 	  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/office/odt2txt/odt2txt.SlackBuild b/office/odt2txt/odt2txt.SlackBuild
index 74d9df07db6d..5781d903f5cc 100644
--- a/office/odt2txt/odt2txt.SlackBuild
+++ b/office/odt2txt/odt2txt.SlackBuild
@@ -8,12 +8,10 @@ VERSION=0.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -50,7 +48,7 @@ chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make 
+make
 
 make install DESTDIR=$PKG/usr/
 
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 41363c084d85..ddf488f3ed77 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -34,7 +34,6 @@ TAG=${TAG:-_SBo}
 SRCVERSION=$VERSION
 SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) #"3.3"
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
diff --git a/office/org-mode/org-mode.SlackBuild b/office/org-mode/org-mode.SlackBuild
index 0121cc754d7f..429af118d1d5 100644
--- a/office/org-mode/org-mode.SlackBuild
+++ b/office/org-mode/org-mode.SlackBuild
@@ -35,8 +35,8 @@ patch Makefile $CWD/Makefile.patch
 DESTDIR=/usr make all html
 mv doc/{org,org-$pkgver}
 DESTDIR=$PKG/usr make install
-DESTDIR=$PKG/usr make install-info 
-#DESTDIR=$PKG/usr PKG=$PKG make install-info 
+DESTDIR=$PKG/usr make install-info
+#DESTDIR=$PKG/usr PKG=$PKG make install-info
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/office/osmo/osmo.SlackBuild b/office/osmo/osmo.SlackBuild
index 39bf6dd922bc..bde52d7b1764 100644
--- a/office/osmo/osmo.SlackBuild
+++ b/office/osmo/osmo.SlackBuild
@@ -27,12 +27,10 @@ VERSION=${VERSION:-r928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/pdfshuffler/pdfshuffler.SlackBuild b/office/pdfshuffler/pdfshuffler.SlackBuild
index 18e45b42bd65..681280cc0c59 100644
--- a/office/pdfshuffler/pdfshuffler.SlackBuild
+++ b/office/pdfshuffler/pdfshuffler.SlackBuild
@@ -46,7 +46,7 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
+cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
diff --git a/office/ps2eps/ps2eps.SlackBuild b/office/ps2eps/ps2eps.SlackBuild
index 95f96882ae61..dc6bf95c61fc 100644
--- a/office/ps2eps/ps2eps.SlackBuild
+++ b/office/ps2eps/ps2eps.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.64}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/pstoedit/pstoedit.SlackBuild b/office/pstoedit/pstoedit.SlackBuild
index 8d05eec01ead..9a5c35aa8324 100644
--- a/office/pstoedit/pstoedit.SlackBuild
+++ b/office/pstoedit/pstoedit.SlackBuild
@@ -27,12 +27,10 @@ VERSION=3.50
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/pstotext/pstotext.SlackBuild b/office/pstotext/pstotext.SlackBuild
index 44b8a919dc8b..bb7162b97ceb 100644
--- a/office/pstotext/pstotext.SlackBuild
+++ b/office/pstotext/pstotext.SlackBuild
@@ -11,12 +11,10 @@ VERSION=1.9
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/qamus/qamus.SlackBuild b/office/qamus/qamus.SlackBuild
index a5b60c889bdf..66abbd0bf2a0 100644
--- a/office/qamus/qamus.SlackBuild
+++ b/office/qamus/qamus.SlackBuild
@@ -54,7 +54,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod 644 *
 
-qmake $QMAKEARGS 
+qmake $QMAKEARGS
 
 #use our CFLAGS
 sed -i "/C[X]*FLAGS/s|\ =\ |\ +=\ |" Makefile.Release
diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild
index 7fe2d7296a97..33e4a6183670 100644
--- a/office/qpdfview/qpdfview.SlackBuild
+++ b/office/qpdfview/qpdfview.SlackBuild
@@ -21,19 +21,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated by Donald Cooley 
+# Updated by Donald Cooley
 
 PRGNAM=qpdfview
 VERSION=${VERSION:-0.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -73,7 +71,7 @@ find . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
- 
+
 #Configure qpdfview. Installation paths are correctly set in qpdfview.pri
 qmake QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS" qpdfview.pro
 
diff --git a/office/rastertospp/rastertospp.SlackBuild b/office/rastertospp/rastertospp.SlackBuild
index 6adf09c60adc..6d3269135f4f 100644
--- a/office/rastertospp/rastertospp.SlackBuild
+++ b/office/rastertospp/rastertospp.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for rastertospp
-# 
+#
 # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # All rights reserved.
 #
@@ -27,12 +27,10 @@ VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/tellico/tellico.SlackBuild b/office/tellico/tellico.SlackBuild
index 6bf3cc8ec0c7..7a3f196de168 100644
--- a/office/tellico/tellico.SlackBuild
+++ b/office/tellico/tellico.SlackBuild
@@ -81,10 +81,10 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DENABLE_WEBCAM=true \
-    -DCMAKE_BUILD_TYPE=Release .. 
+    -DCMAKE_BUILD_TYPE=Release ..
 
-  make VERBOSE=1 
-  make install VERBOSE=1 DESTDIR=$PKG 
+  make VERBOSE=1
+  make install VERBOSE=1 DESTDIR=$PKG
 cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index c566daff0df2..1c3f327a715c 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -164,7 +164,7 @@ find . \
 # Fix up some paths
 patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
 
-# Thanks to David Woodfall for this patch 
+# Thanks to David Woodfall for this patch
 patch -p1 < $CWD/patches/texcount-scalar-fixup.diff
 
 # Move manual pages to the correct place
diff --git a/office/texmacs/texmacs.SlackBuild b/office/texmacs/texmacs.SlackBuild
index a3184ce8b857..ae2a5290925f 100644
--- a/office/texmacs/texmacs.SlackBuild
+++ b/office/texmacs/texmacs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for Texmacs 
+# Slackware build script for Texmacs
 
 # Copyright 2013 Zhu Qun-Ying
 # All rights reserved.
@@ -29,12 +29,10 @@ TAG=${TAG:-_SBo}
 
 SRCNAM=TeXmacs
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/texworks/texworks.SlackBuild b/office/texworks/texworks.SlackBuild
index 4cb937444a6d..550727303f7d 100644
--- a/office/texworks/texworks.SlackBuild
+++ b/office/texworks/texworks.SlackBuild
@@ -11,12 +11,10 @@ VERSION=${VERSION:-0.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -59,7 +57,7 @@ qmake -unix PREFIX=/usr \
   QMAKE_CFLAGS_RELEASE="$SLKCFLAGS" \
   QMAKE_CXXFLAGS_RELEASE="$SLKCFLAGS"
 
-make || exit 1 
+make || exit 1
 
 mkdir -pv $PKG/usr/bin
 mkdir -pv $PKG/usr/share/pixmaps
diff --git a/office/traduisons/traduisons.SlackBuild b/office/traduisons/traduisons.SlackBuild
index e7986e8ea9b8..7543230968c8 100644
--- a/office/traduisons/traduisons.SlackBuild
+++ b/office/traduisons/traduisons.SlackBuild
@@ -22,7 +22,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/office/treesheets/treesheets.SlackBuild b/office/treesheets/treesheets.SlackBuild
index c990c1c3357f..ee9635ae1ecd 100644
--- a/office/treesheets/treesheets.SlackBuild
+++ b/office/treesheets/treesheets.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Slackware build script for TreeSheets
-# Builds a Slackware package from the TreeSheets binary tarball. 
+# Builds a Slackware package from the TreeSheets binary tarball.
 #
 # Written by Luke Williams ( xocel@iquidus.org )
 # license: WTFPL <http://sam.zoy.org/wtfpl/COPYING>
diff --git a/office/wink/wink.SlackBuild b/office/wink/wink.SlackBuild
index d8d2175b8663..87f45548cec0 100644
--- a/office/wink/wink.SlackBuild
+++ b/office/wink/wink.SlackBuild
@@ -4,12 +4,10 @@ VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/office/wordgrinder/wordgrinder.SlackBuild b/office/wordgrinder/wordgrinder.SlackBuild
index 302ce6370f92..484caece6049 100644
--- a/office/wordgrinder/wordgrinder.SlackBuild
+++ b/office/wordgrinder/wordgrinder.SlackBuild
@@ -55,7 +55,7 @@ fi
 
 DOCS="COPYING README.Unix README.wg"
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT