various: Fix SlackBuild formatting and comment nit picks.

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

92 files changed, 117 insertions, 219 deletions

diff --git a/desktop/Alphacube-GTK/Alphacube-GTK.SlackBuild b/desktop/Alphacube-GTK/Alphacube-GTK.SlackBuild
index 83c03679fbf4b..892a44c105bde 100644
--- a/desktop/Alphacube-GTK/Alphacube-GTK.SlackBuild
+++ b/desktop/Alphacube-GTK/Alphacube-GTK.SlackBuild
@@ -35,13 +35,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/29851-Alphacube\ GTK\ 0.5.tar.gz 
+tar xvf $CWD/29851-Alphacube\ GTK\ 0.5.tar.gz
 cd "Alphacube GTK "$VERSION
 chown -R root:root .
 find . \
diff --git a/desktop/AlsaMixer.app/AlsaMixer.app.SlackBuild b/desktop/AlsaMixer.app/AlsaMixer.app.SlackBuild
index 8d7e0c740da34..ad71b5d8e88e7 100644
--- a/desktop/AlsaMixer.app/AlsaMixer.app.SlackBuild
+++ b/desktop/AlsaMixer.app/AlsaMixer.app.SlackBuild
@@ -55,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/desktop/CurseTheWeather/CurseTheWeather.SlackBuild b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
index 97cd3b5d3bfab..8acd6ad8bc320 100644
--- a/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
+++ b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
@@ -29,12 +29,10 @@ VERSION=0.6
 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
@@ -55,7 +53,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Patch ctw to work with latest weather feed changes 
+# Patch ctw to work with latest weather feed changes
 # and display 10 day forecast
 patch -p1 < $CWD/$PRGNAM-$VERSION-patch
 
diff --git a/desktop/PyPanel/PyPanel.SlackBuild b/desktop/PyPanel/PyPanel.SlackBuild
index 8a1ab0fc5851e..3e0db7d005632 100644
--- a/desktop/PyPanel/PyPanel.SlackBuild
+++ b/desktop/PyPanel/PyPanel.SlackBuild
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
index 00c15c5b0b884..eec5263567930 100644
--- a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
+++ b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for QtCurve-Gtk2
 
 # Copyright 2008-2009 Michiel van Wessem, Manchester, United Kingdom
-# Copyright 2009-2010 Gregory J. L. Tourte, UK (artourter@gmail.com) 
+# Copyright 2009-2010 Gregory J. L. Tourte, UK (artourter@gmail.com)
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild b/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
index b244ea3cf1978..fb74a98baf110 100644
--- a/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
+++ b/desktop/QtCurve-KDE4/QtCurve-KDE4.SlackBuild
@@ -57,7 +57,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -72,7 +72,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir build 
+mkdir build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -92,7 +92,7 @@ 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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/anki/anki.SlackBuild b/desktop/anki/anki.SlackBuild
index f88df3847ee66..0e71e7653686d 100644
--- a/desktop/anki/anki.SlackBuild
+++ b/desktop/anki/anki.SlackBuild
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -53,7 +53,7 @@ find . \
 
 # Fix sqlite table problem (without this anki isn't able to create new decks)
  sed -i 's/\"sqlite_stat1\"/\"sqlite_stat1\",\"sqlite_stat2\"/' libanki/anki/deck.py
- 
+
 cd libanki
 python setup.py install --root=$PKG
 cd ..
diff --git a/desktop/awesome/awesome.SlackBuild b/desktop/awesome/awesome.SlackBuild
index f72be9e402a5c..e52266f31f936 100644
--- a/desktop/awesome/awesome.SlackBuild
+++ b/desktop/awesome/awesome.SlackBuild
@@ -29,12 +29,10 @@ VERSION=${VERSION:-3.5.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
@@ -58,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -83,7 +81,7 @@ cd build
     -DAWESOME_DOC_PATH=/usr/doc/$PRGNAM-$VERSION \
     -DSYSCONFDIR=/etc \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/bmpanel2/bmpanel2.SlackBuild b/desktop/bmpanel2/bmpanel2.SlackBuild
index 6080534ab146b..a687810cfd778 100644
--- a/desktop/bmpanel2/bmpanel2.SlackBuild
+++ b/desktop/bmpanel2/bmpanel2.SlackBuild
@@ -85,7 +85,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/cellwriter/cellwriter.SlackBuild b/desktop/cellwriter/cellwriter.SlackBuild
index 018b8e25f143e..6a677fda4f465 100644
--- a/desktop/cellwriter/cellwriter.SlackBuild
+++ b/desktop/cellwriter/cellwriter.SlackBuild
@@ -35,7 +35,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/cmatrix/cmatrix.SlackBuild b/desktop/cmatrix/cmatrix.SlackBuild
index e29dae46c34d3..22331e01bfebb 100644
--- a/desktop/cmatrix/cmatrix.SlackBuild
+++ b/desktop/cmatrix/cmatrix.SlackBuild
@@ -8,12 +8,10 @@ VERSION=1.2a
 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/desktop/cryptkeeper/cryptkeeper.SlackBuild b/desktop/cryptkeeper/cryptkeeper.SlackBuild
index 85d6557a75054..196f63aabf4d5 100644
--- a/desktop/cryptkeeper/cryptkeeper.SlackBuild
+++ b/desktop/cryptkeeper/cryptkeeper.SlackBuild
@@ -57,7 +57,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/devilspie/devilspie.SlackBuild b/desktop/devilspie/devilspie.SlackBuild
index 65b702b9a0a97..1e0fad958cc18 100644
--- a/desktop/devilspie/devilspie.SlackBuild
+++ b/desktop/devilspie/devilspie.SlackBuild
@@ -8,12 +8,10 @@ VERSION=0.22
 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/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index 4b7e7c5b438e7..5fe57b80d6096 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -13,18 +13,18 @@
 #     * Redistributions in binary form must reproduce the above copyright
 #       notice, this list of conditions and the following disclaimer in the
 #       documentation and/or other materials provided with the distribution.
-#     * Neither the name of Tom Canich nor the names of other contributors 
+#     * Neither the name of Tom Canich nor the names of other contributors
 #       may be used to endorse or promote products derived from this
 #       software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN 
-# NO EVENT SHALL Tom Canich BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-# PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-# LIABILITY, WHETHER # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+# NO EVENT SHALL Tom Canich BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, 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.
 
@@ -60,7 +60,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/e16/e16.SlackBuild b/desktop/e16/e16.SlackBuild
index dfb1dc8de777b..c025275c99ec9 100644
--- a/desktop/e16/e16.SlackBuild
+++ b/desktop/e16/e16.SlackBuild
@@ -62,7 +62,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -150,7 +150,7 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Additionally, if themes and documentation are installed, copy their 
+# Additionally, if themes and documentation are installed, copy their
 # documenation as well.
 if [ $THEMES == "YES" ]; then
   cd $TMP/$TNAME-$TVERSION
diff --git a/desktop/ede/ede.SlackBuild b/desktop/ede/ede.SlackBuild
index d39548f0f7cb6..1c0a493cf33f6 100644
--- a/desktop/ede/ede.SlackBuild
+++ b/desktop/ede/ede.SlackBuild
@@ -116,10 +116,10 @@ get_config_files() {
 }
 
 # Finish the doinst.sh by adding the .new file handler.
-if [ -e $PKG/etc/pekwm ]; then 
+if [ -e $PKG/etc/pekwm ]; then
   get_config_files $PKG/etc/pekwm
 fi
-if [ -e $PKG/etc/xdg/ede ]; then 
+if [ -e $PKG/etc/xdg/ede ]; then
   get_config_files $PKG/etc/xdg/ede
 fi
 
diff --git a/desktop/fbpanel/fbpanel.SlackBuild b/desktop/fbpanel/fbpanel.SlackBuild
index ce0fbf5b217cb..31ebc9a8b52f1 100644
--- a/desktop/fbpanel/fbpanel.SlackBuild
+++ b/desktop/fbpanel/fbpanel.SlackBuild
@@ -16,12 +16,10 @@ VERSION=6.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/desktop/gntp-send/gntp-send.SlackBuild b/desktop/gntp-send/gntp-send.SlackBuild
index ee48a40c18e67..2050c92b90999 100644
--- a/desktop/gntp-send/gntp-send.SlackBuild
+++ b/desktop/gntp-send/gntp-send.SlackBuild
@@ -13,12 +13,10 @@ GITCOMMIT=8241d46903219cecca371f89ac6edf33a091eb03
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
diff --git a/desktop/gtk-chtheme/gtk-chtheme.SlackBuild b/desktop/gtk-chtheme/gtk-chtheme.SlackBuild
index 95eff4ec419e2..39c1aa0765f08 100644
--- a/desktop/gtk-chtheme/gtk-chtheme.SlackBuild
+++ b/desktop/gtk-chtheme/gtk-chtheme.SlackBuild
@@ -29,12 +29,10 @@ VERSION=0.3.1
 BUILD=${BUILD:-3}
 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
@@ -82,7 +80,7 @@ make install DESTDIR=$PKG MANDIR=usr/man
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;  
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/gtk-engines/gtk-engines.SlackBuild b/desktop/gtk-engines/gtk-engines.SlackBuild
index 1266b17880ac5..d3baff041a06b 100644
--- a/desktop/gtk-engines/gtk-engines.SlackBuild
+++ b/desktop/gtk-engines/gtk-engines.SlackBuild
@@ -65,7 +65,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Starting with glib 2.32 it is now mandatory to 
+# Starting with glib 2.32 it is now mandatory to
 # include glib.h instead of individual headers.
 patch -p1 -i $CWD/glib-single-include.patch
 
diff --git a/desktop/gtk-kde4/gtk-kde4.SlackBuild b/desktop/gtk-kde4/gtk-kde4.SlackBuild
index 998d412a276ae..e462ffbe8b196 100644
--- a/desktop/gtk-kde4/gtk-kde4.SlackBuild
+++ b/desktop/gtk-kde4/gtk-kde4.SlackBuild
@@ -28,12 +28,10 @@ VERSION=${VERSION:-0.9.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/desktop/hsetroot/hsetroot.SlackBuild b/desktop/hsetroot/hsetroot.SlackBuild
index 71faa56e8adfe..ef1ce565967f9 100644
--- a/desktop/hsetroot/hsetroot.SlackBuild
+++ b/desktop/hsetroot/hsetroot.SlackBuild
@@ -29,12 +29,10 @@ VERSION=${VERSION:-1.0.2}
 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/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index 11b1a00774091..2918b4aa7028e 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -84,7 +84,7 @@ mkdir -p $PKG/usr/man/man1
 cp man/*.1 $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html $PKG/usr/doc/$PRGNAM-$VERSION/txt 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html $PKG/usr/doc/$PRGNAM-$VERSION/txt
 cp -a DEPENDS LICENSE RELEASE-NOTES-* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/txt
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION/txt
diff --git a/desktop/ion/ion.SlackBuild b/desktop/ion/ion.SlackBuild
index 20c60f0818a39..dd4deb525b451 100644
--- a/desktop/ion/ion.SlackBuild
+++ b/desktop/ion/ion.SlackBuild
@@ -75,7 +75,7 @@ make install \
 install -D -m 0755 $CWD/xinitrc.ion $PKG/etc/X11/xinit/xinitrc.ion.new
 
 cd $PKG/etc/ion3
-  for f in * ; do mv $f $f.new ; done 
+  for f in * ; do mv $f $f.new ; done
 cd -
 
 # Add ion3 as a valid session in login managers
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
index 217f95e13b3be..41152bce04c47 100644
--- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
+++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild
@@ -67,7 +67,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install/strip DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/josm/josm.SlackBuild b/desktop/josm/josm.SlackBuild
index 13001c9764373..544c107c929e4 100644
--- a/desktop/josm/josm.SlackBuild
+++ b/desktop/josm/josm.SlackBuild
@@ -21,7 +21,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/desktop/kbdd/kbdd.SlackBuild b/desktop/kbdd/kbdd.SlackBuild
index f946ae862eafb..773227c121dea 100644
--- a/desktop/kbdd/kbdd.SlackBuild
+++ b/desktop/kbdd/kbdd.SlackBuild
@@ -40,7 +40,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/kover/kover.SlackBuild b/desktop/kover/kover.SlackBuild
index 6ac5e07940707..7dca423655d89 100644
--- a/desktop/kover/kover.SlackBuild
+++ b/desktop/kover/kover.SlackBuild
@@ -7,18 +7,16 @@ VERSION=${VERSION:-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
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/desktop/lxpanel-xmms2/lxpanel-xmms2.SlackBuild b/desktop/lxpanel-xmms2/lxpanel-xmms2.SlackBuild
index 6204a2d19b4c1..86d8a72418c90 100644
--- a/desktop/lxpanel-xmms2/lxpanel-xmms2.SlackBuild
+++ b/desktop/lxpanel-xmms2/lxpanel-xmms2.SlackBuild
@@ -11,12 +11,10 @@ VERSION=${VERSION:-20100405_43aced1}
 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/desktop/macopix/macopix.SlackBuild b/desktop/macopix/macopix.SlackBuild
index 91901c21d3da8..b645a61c4b12d 100644
--- a/desktop/macopix/macopix.SlackBuild
+++ b/desktop/macopix/macopix.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.7.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
@@ -38,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/maitreya/maitreya.SlackBuild b/desktop/maitreya/maitreya.SlackBuild
index f187558c1db2e..1582b6c1a13f5 100644
--- a/desktop/maitreya/maitreya.SlackBuild
+++ b/desktop/maitreya/maitreya.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+#
 # Didier Charles 2011.05.22
 # dcharles@alumni.concordia.ca
 # written with the grateful assistance of the tutorial
diff --git a/desktop/musca/musca.SlackBuild b/desktop/musca/musca.SlackBuild
index 5a124c9a98fc3..e3147d7119a22 100644
--- a/desktop/musca/musca.SlackBuild
+++ b/desktop/musca/musca.SlackBuild
@@ -11,8 +11,8 @@
 #   * Redistributions of source code must retain the above copyright
 #     notice, this list of conditions and the following disclaimer.
 #   * Redistributions in binary form must reproduce the above
-#     copyright notice, this list of conditions and the following 
-#     disclaimer in the documentation and/or other materials 
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials
 #     provided with the distribution.
 #   * Neither the name of Jim Bottino nor the names of other contributors
 #     may be used to endorse or promote products derived from this
@@ -20,14 +20,14 @@
 #
 # THIS SOFTWARE IS PROVIDED BY Jim Bottino ''AS IS'' AND ANY
 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jim Bottino BE LIABLE FOR 
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Jim Bottino BE LIABLE FOR
 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN 
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 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=musca
@@ -102,7 +102,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $CWD/README gpl.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/install 
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/desktop/nitrogen/nitrogen.SlackBuild b/desktop/nitrogen/nitrogen.SlackBuild
index 0902fd8519a2c..70c83bd36130f 100644
--- a/desktop/nitrogen/nitrogen.SlackBuild
+++ b/desktop/nitrogen/nitrogen.SlackBuild
@@ -39,7 +39,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -54,7 +54,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./bootstrap 
+./bootstrap
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild
index 012c3ad138eae..13bb5c5a988b4 100644
--- a/desktop/obconf/obconf.SlackBuild
+++ b/desktop/obconf/obconf.SlackBuild
@@ -29,12 +29,10 @@ VERSION=git_85e3e6ef
 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/desktop/parcellite/parcellite.SlackBuild b/desktop/parcellite/parcellite.SlackBuild
index 1f1e7e9d7d218..ce9e915a3295e 100644
--- a/desktop/parcellite/parcellite.SlackBuild
+++ b/desktop/parcellite/parcellite.SlackBuild
@@ -55,7 +55,7 @@ if [ "$NOICON" = "YES" ]; then
   sed -i "s/PARCELLITE_ICON/GTK_STOCK_PASTE/" src/main.c
   sed -i "s/#define GTK_STOCK_PASTE \"parcellite\"//" src/main.c
 fi
-# Starting with glib 2.32 it is now mandatory to 
+# Starting with glib 2.32 it is now mandatory to
 # include glib.h instead of individual headers.
 patch -p1 -i $CWD/glib-single-include.patch
 
diff --git a/desktop/pclock/pclock.SlackBuild b/desktop/pclock/pclock.SlackBuild
index 370c5d64f8b66..e14c96710d93e 100644
--- a/desktop/pclock/pclock.SlackBuild
+++ b/desktop/pclock/pclock.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.13.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/desktop/pekwm/pekwm.SlackBuild b/desktop/pekwm/pekwm.SlackBuild
index a7a7794022236..d26411a1c78ba 100644
--- a/desktop/pekwm/pekwm.SlackBuild
+++ b/desktop/pekwm/pekwm.SlackBuild
@@ -27,14 +27,12 @@
 PRGNAM=pekwm
 VERSION=${VERSION:-0.1.17}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo} 
+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/desktop/pidgin-guifications/pidgin-guifications.SlackBuild b/desktop/pidgin-guifications/pidgin-guifications.SlackBuild
index cd311d6d7a4b1..47228b638653d 100644
--- a/desktop/pidgin-guifications/pidgin-guifications.SlackBuild
+++ b/desktop/pidgin-guifications/pidgin-guifications.SlackBuild
@@ -8,12 +8,10 @@ VERSION=2.16
 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/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild b/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
index 4fa784c39fe40..841da8c94e45e 100644
--- a/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
+++ b/desktop/pidgin-libnotify/pidgin-libnotify.SlackBuild
@@ -27,12 +27,10 @@ VERSION=0.14
 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/desktop/plasma-applet-daisy/plasma-applet-daisy.SlackBuild b/desktop/plasma-applet-daisy/plasma-applet-daisy.SlackBuild
index 73a9896511b79..5c9869fce3621 100644
--- a/desktop/plasma-applet-daisy/plasma-applet-daisy.SlackBuild
+++ b/desktop/plasma-applet-daisy/plasma-applet-daisy.SlackBuild
@@ -8,12 +8,10 @@ VERSION=0.0.4.26
 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 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/polar-cursor-themes/polar-cursor-themes.SlackBuild b/desktop/polar-cursor-themes/polar-cursor-themes.SlackBuild
index ecf097c5787ee..23dae17a61ee9 100644
--- a/desktop/polar-cursor-themes/polar-cursor-themes.SlackBuild
+++ b/desktop/polar-cursor-themes/polar-cursor-themes.SlackBuild
@@ -22,10 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=polar-cursor-themes	
+PRGNAM=polar-cursor-themes
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 SRCNAM=PolarCursorThemes
 SRCVER=27913
@@ -63,7 +63,7 @@ rm -rf $PKG/usr/share/icons/PolarCursorTheme-Green/{COPYRIGHT~,index.theme~}
 # Geez, looks like upstream needs to know about "set nobackup" in vimrc...
 # I'm afraid to clean these up, because a few of them don't have a non-~'d
 # equivalent :/  Oh well, we can still fixup file permissions.  --rworkman
-find $PKG -type f -exec chmod 0644 {} \; 
+find $PKG -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp PolarCursorTheme/COPYRIGHT~ $PKG/usr/doc/$PRGNAM-$VERSION/COPYRIGHT
diff --git a/desktop/protozoa-cursor-themes/protozoa-cursor-themes.SlackBuild b/desktop/protozoa-cursor-themes/protozoa-cursor-themes.SlackBuild
index 755d3ceff0cb9..63552d14012a6 100644
--- a/desktop/protozoa-cursor-themes/protozoa-cursor-themes.SlackBuild
+++ b/desktop/protozoa-cursor-themes/protozoa-cursor-themes.SlackBuild
@@ -22,10 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=protozoa-cursor-themes	
-VERSION=${VERSION:-20120114}	
+PRGNAM=protozoa-cursor-themes
+VERSION=${VERSION:-20120114}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}		
+TAG=${TAG:-_SBo}
 
 ORIGINAL=protozoa_by_grynays-d2n7qil
 BLUGREY=protozoa_blu_and_grey_by_grynays-d2yy6sr
@@ -35,9 +35,9 @@ SRCNAM=Protozoa
 ARCH=noarch
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
diff --git a/desktop/ptbatterysystemtray/ptbatterysystemtray.SlackBuild b/desktop/ptbatterysystemtray/ptbatterysystemtray.SlackBuild
index a718e629e58a8..cbc2b0d0b0d1d 100644
--- a/desktop/ptbatterysystemtray/ptbatterysystemtray.SlackBuild
+++ b/desktop/ptbatterysystemtray/ptbatterysystemtray.SlackBuild
@@ -37,7 +37,7 @@ fi
 
 DOCS="AUTHORS ChangeLog LICENCE NEWS README"
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/qlandkartegt/qlandkartegt.SlackBuild b/desktop/qlandkartegt/qlandkartegt.SlackBuild
index 7b5e7897dd8e5..75ed219ef7bb7 100644
--- a/desktop/qlandkartegt/qlandkartegt.SlackBuild
+++ b/desktop/qlandkartegt/qlandkartegt.SlackBuild
@@ -7,7 +7,7 @@
 # the extent permitted by applicable law. You can redistribute it
 # and/or modify it under the terms of the Do What The Fuck You Want
 # To Public License, Version 2, as published by Sam Hocevar. See
-# http://sam.zoy.org/wtfpl/COPYING for more details. 
+# http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=qlandkartegt
 VERSION=${VERSION:-1.7.5}
diff --git a/desktop/qlipper/qlipper.SlackBuild b/desktop/qlipper/qlipper.SlackBuild
index 527ab6b15af96..b84c7f7fff50e 100644
--- a/desktop/qlipper/qlipper.SlackBuild
+++ b/desktop/qlipper/qlipper.SlackBuild
@@ -55,7 +55,7 @@ fi
 
 DOCS="COPYING README"
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -78,7 +78,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DUSE_SYSTEM_QTSA=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/qt-recordmydesktop/qt-recordmydesktop.SlackBuild b/desktop/qt-recordmydesktop/qt-recordmydesktop.SlackBuild
index 58ef496d48fbc..7aad2fbd015d0 100644
--- a/desktop/qt-recordmydesktop/qt-recordmydesktop.SlackBuild
+++ b/desktop/qt-recordmydesktop/qt-recordmydesktop.SlackBuild
@@ -7,18 +7,16 @@ VERSION=${VERSION:-0.3.8}
 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
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/desktop/quadkonsole4/quadkonsole4.SlackBuild b/desktop/quadkonsole4/quadkonsole4.SlackBuild
index e9426b5acc683..feea72616a365 100644
--- a/desktop/quadkonsole4/quadkonsole4.SlackBuild
+++ b/desktop/quadkonsole4/quadkonsole4.SlackBuild
@@ -66,7 +66,7 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DQT_PLUGINS_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins \
     ..
-   make 
+   make
    make install DESTDIR=$PKG
 cd -
 
diff --git a/desktop/quickaccess/quickaccess.SlackBuild b/desktop/quickaccess/quickaccess.SlackBuild
index 290030fbddb14..96df54dddf564 100644
--- a/desktop/quickaccess/quickaccess.SlackBuild
+++ b/desktop/quickaccess/quickaccess.SlackBuild
@@ -10,12 +10,10 @@ TAG=${TAG:-_SBo}
 
 SRCVERSION="$(echo $VERSION | tr '_' '-')"
 
-# 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/desktop/recoll/recoll.SlackBuild b/desktop/recoll/recoll.SlackBuild
index f838a90b33e44..a09d116609a52 100644
--- a/desktop/recoll/recoll.SlackBuild
+++ b/desktop/recoll/recoll.SlackBuild
@@ -31,11 +31,11 @@ TAG=${TAG:-_SBo}
 
 # from the official online documenatation:
 #
-# --enable-camelcase will enable splitting camelCase words. This is not enabled 
-# by default as it has the unfortunate side-effect of making some phrase searches 
-# quite confusing: ie, "MySQL manual" would be matched by "MySQL manual" and 
+# --enable-camelcase will enable splitting camelCase words. This is not enabled
+# by default as it has the unfortunate side-effect of making some phrase searches
+# quite confusing: ie, "MySQL manual" would be matched by "MySQL manual" and
 # "my sql manual" but not "mysql manual" (only inside phrase searches).
-# 
+#
 # to use this feature, set ENABLE_CAMELCASE to YES (default is to let it disabled)
 ENABLE_CAMELCASE=${ENABLE_CAMELCASE:-"NO"}
 
diff --git a/desktop/recorditnow/recorditnow.SlackBuild b/desktop/recorditnow/recorditnow.SlackBuild
index d3e61399334d4..1e1b15270f0a3 100644
--- a/desktop/recorditnow/recorditnow.SlackBuild
+++ b/desktop/recorditnow/recorditnow.SlackBuild
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -78,7 +78,7 @@ cmake \
   -DCMAKE_EXE_LINKER_FLAGS="-lX11 -lXext -lXfixes -lrecorditnow_plugin" \
   -DCMAKE_BUILD_TYPE=Release .
 
-make 
+make
 make install DESTDIR=$PKG
 
 # Hopefully KDE will eventually figure out that KDE's config dir is
diff --git a/desktop/recordmydesktop/recordmydesktop.SlackBuild b/desktop/recordmydesktop/recordmydesktop.SlackBuild
index 9158a25d7340c..53bc7a1d8bd25 100644
--- a/desktop/recordmydesktop/recordmydesktop.SlackBuild
+++ b/desktop/recordmydesktop/recordmydesktop.SlackBuild
@@ -12,12 +12,10 @@ VERSION=0.3.8.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/desktop/redshift/redshift.SlackBuild b/desktop/redshift/redshift.SlackBuild
index c54f27dd27208..fbd23a34d5636 100644
--- a/desktop/redshift/redshift.SlackBuild
+++ b/desktop/redshift/redshift.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.2}
 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
diff --git a/desktop/rss-glx/rss-glx.SlackBuild b/desktop/rss-glx/rss-glx.SlackBuild
index 68ef80096bd12..e011c645e48de 100644
--- a/desktop/rss-glx/rss-glx.SlackBuild
+++ b/desktop/rss-glx/rss-glx.SlackBuild
@@ -27,12 +27,10 @@ VERSION=0.9.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/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild
index 91d69186a48c9..ec92390af17b3 100644
--- a/desktop/rss-guard/rss-guard.SlackBuild
+++ b/desktop/rss-guard/rss-guard.SlackBuild
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -77,7 +77,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/screenfetch/screenfetch.SlackBuild b/desktop/screenfetch/screenfetch.SlackBuild
index 50d540c7d062a..f9f7d67963876 100644
--- a/desktop/screenfetch/screenfetch.SlackBuild
+++ b/desktop/screenfetch/screenfetch.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for Screenfetch 
+# Slackware build script for Screenfetch
 # Copyright 2012, Bojan Popovic, Belgrade, Serbia, <bocke@slackware-srbija.org>
 
 # Copyright 2012, Slackware Srbija (http://www.slackware-srbija.org/)
diff --git a/desktop/skulpture/skulpture.SlackBuild b/desktop/skulpture/skulpture.SlackBuild
index 1f250d6d966d0..9b15a4903c82a 100644
--- a/desktop/skulpture/skulpture.SlackBuild
+++ b/desktop/skulpture/skulpture.SlackBuild
@@ -37,7 +37,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -61,7 +61,7 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
-  make 
+  make
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/desktop/sync-engine/sync-engine.SlackBuild b/desktop/sync-engine/sync-engine.SlackBuild
index 54a4f9db6624f..225d6675708dd 100644
--- a/desktop/sync-engine/sync-engine.SlackBuild
+++ b/desktop/sync-engine/sync-engine.SlackBuild
@@ -2,27 +2,25 @@
 # Slackware build script for sync-engine
 # Written by Lionel Young (redtricycle@gmail.com)
 
-PRGNAM=sync-engine	
+PRGNAM=sync-engine
 VERSION=${VERSION:-0.13}
 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
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+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/desktop/synce-kpm/synce-kpm.SlackBuild b/desktop/synce-kpm/synce-kpm.SlackBuild
index 5e737ba98ff68..84b71014aec48 100644
--- a/desktop/synce-kpm/synce-kpm.SlackBuild
+++ b/desktop/synce-kpm/synce-kpm.SlackBuild
@@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
diff --git a/desktop/thunar-thumbnailers/thunar-thumbnailers.SlackBuild b/desktop/thunar-thumbnailers/thunar-thumbnailers.SlackBuild
index a38fb0df4409d..e1eb03c976ee1 100644
--- a/desktop/thunar-thumbnailers/thunar-thumbnailers.SlackBuild
+++ b/desktop/thunar-thumbnailers/thunar-thumbnailers.SlackBuild
@@ -27,12 +27,10 @@ VERSION=0.4.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
@@ -81,8 +79,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-debug=no \
   --enable-tex \
   --disable-update-mime-database \
-  --build=$ARCH-slackware-linux 
-#  --enable-raw		# Raw image support, requires dcraw 
+  --build=$ARCH-slackware-linux
+#  --enable-raw		# Raw image support, requires dcraw
 #  --enable-ffmpeg	# video file support, requires ffmpegthumbnailer
 #  --enable-grace 	# .agr file support, requires grace (not at SBo)
 
diff --git a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
index ac8c5e4936762..be3a95bda620f 100644
--- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
+++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild
@@ -27,12 +27,10 @@ VERSION=${VERSION:-0.1.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
diff --git a/desktop/trayer-srg/trayer-srg.SlackBuild b/desktop/trayer-srg/trayer-srg.SlackBuild
index 3dedf3dace89c..fb61de62ed673 100644
--- a/desktop/trayer-srg/trayer-srg.SlackBuild
+++ b/desktop/trayer-srg/trayer-srg.SlackBuild
@@ -77,7 +77,7 @@ mkdir -p $PKG/usr/bin
 install -m 0755 trayer $PKG/usr/bin
 
 mkdir -p $PKG/usr/man/man1
-gzip -c man/trayer.1 > $PKG/usr/man/man1/trayer.1.gz 
+gzip -c man/trayer.1 > $PKG/usr/man/man1/trayer.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/desktop/vwm/vwm.SlackBuild b/desktop/vwm/vwm.SlackBuild
index 54211f842f1ec..9eb9df174468c 100644
--- a/desktop/vwm/vwm.SlackBuild
+++ b/desktop/vwm/vwm.SlackBuild
@@ -27,12 +27,10 @@ VERSION=2.0.2
 BUILD=${BUILD:-3}
 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
@@ -76,7 +74,7 @@ patch -p0 < $CWD/patches/vwm-2.0.2-Makefile.patch
 patch -p1 < $CWD/patches/vwm-2.0.2-Makefile-vwmterm2.patch
 patch -p0 < $CWD/patches/vwm-2.0.2-Makefile-sysmon.patch
 
-# hack to fix the hardcoded path in vwm.h. Not the prettiest, but there you 
+# hack to fix the hardcoded path in vwm.h. Not the prettiest, but there you
 # have it.
 if [ $ARCH == "x86_64" ]; then
    sed -i '26s|/usr/lib/vwm/modules|/usr/lib64/vwm/modules|' ./vwm.h
@@ -85,17 +83,17 @@ fi
 make -j1 CFLAGS="$SLKCFLAGS"
 make install prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
 
-# build and install the sysmon module (the vmwterm2 one is done with 
+# build and install the sysmon module (the vmwterm2 one is done with
 # the main installation)
 cd modules/sysmon
    make -j1 CFLAGS="$SLKCFLAGS -I$PKG/usr/include"
    make install prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX}
 cd -
 
-# build and install the keycodes tool to determine codes for remapping 
+# build and install the keycodes tool to determine codes for remapping
 # keystrokes in ~/.vwm/vwmrc
 make -j1 keycode_tool
-cp -a keycodes/keycodes $PKG/usr/bin/ 
+cp -a keycodes/keycodes $PKG/usr/bin/
 
 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/desktop/whaw/whaw.SlackBuild b/desktop/whaw/whaw.SlackBuild
index 13b3dc757e88d..16ba1722900c8 100644
--- a/desktop/whaw/whaw.SlackBuild
+++ b/desktop/whaw/whaw.SlackBuild
@@ -8,12 +8,10 @@ VERSION=0.1.2
 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
@@ -56,9 +54,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Compress the man page
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
-# Include a .desktop file so it will be convenient for KDE users 
+# Include a .desktop file so it will be convenient for KDE users
 # to have one to place in ~/.kde/Autostart
-# The program is mouse-driven, so it makes sense to be able to 
+# The program is mouse-driven, so it makes sense to be able to
 # launch it with the mouse.
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index b6b0e17be9745..57c1c7cebe841 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-1.25}
 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/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild
index a1d9b95d06780..726f7ce964987 100644
--- a/desktop/wmMoonClock/wmMoonClock.SlackBuild
+++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-1.27}
 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
@@ -60,7 +58,7 @@ cd Src
   make \
     CFLAGS="$SLKCFLAGS" \
     INCDIR="-I/usr/include/X11" \
-    LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" 
+    LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
   make install DESTDIR=$PKG/usr
 cd -
 
diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild
index fd9dd541b131f..ed5dab51f3c3d 100644
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ b/desktop/wmakerconf/wmakerconf.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-2.12}
 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/desktop/wmbiff/wmbiff.SlackBuild b/desktop/wmbiff/wmbiff.SlackBuild
index a09577a10f227..cbbc6726acdbd 100644
--- a/desktop/wmbiff/wmbiff.SlackBuild
+++ b/desktop/wmbiff/wmbiff.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.4.27}
 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/desktop/wmcliphist/wmcliphist.SlackBuild b/desktop/wmcliphist/wmcliphist.SlackBuild
index 4d1df49cd3660..8b1dabbc50ca7 100644
--- a/desktop/wmcliphist/wmcliphist.SlackBuild
+++ b/desktop/wmcliphist/wmcliphist.SlackBuild
@@ -49,7 +49,7 @@ cd $PRGNAM
 chmod -R u+w,go+r-w,a-s .
 chown -R root:root .
 
-make CFLAGS="$SLKCFLAGS \$(INCLUDES)" LDFLAGS="-lX11" 
+make CFLAGS="$SLKCFLAGS \$(INCLUDES)" LDFLAGS="-lX11"
 mkdir -p $PKG/usr/bin
 install -m 0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM
 
diff --git a/desktop/wmctrl/wmctrl.SlackBuild b/desktop/wmctrl/wmctrl.SlackBuild
index a2fe190402ac7..399755394034c 100644
--- a/desktop/wmctrl/wmctrl.SlackBuild
+++ b/desktop/wmctrl/wmctrl.SlackBuild
@@ -10,12 +10,10 @@ VERSION=1.07
 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 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc/X11/WindowMaker \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux 
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
diff --git a/desktop/wmdate/wmdate.SlackBuild b/desktop/wmdate/wmdate.SlackBuild
index d77425bc155b8..d3d460bdd5dee 100644
--- a/desktop/wmdate/wmdate.SlackBuild
+++ b/desktop/wmdate/wmdate.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.7}
 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/desktop/wmdl/wmdl.SlackBuild b/desktop/wmdl/wmdl.SlackBuild
index 9146aab1e3d29..473b30e907295 100644
--- a/desktop/wmdl/wmdl.SlackBuild
+++ b/desktop/wmdl/wmdl.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.4.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
@@ -38,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/wmdrawer/wmdrawer.SlackBuild b/desktop/wmdrawer/wmdrawer.SlackBuild
index 5068b5f6eb67d..abc5ec0ec61ae 100644
--- a/desktop/wmdrawer/wmdrawer.SlackBuild
+++ b/desktop/wmdrawer/wmdrawer.SlackBuild
@@ -8,12 +8,10 @@ VERSION=${VERSION:-0.10.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
@@ -59,7 +57,7 @@ make \
   EXTRA_CFLAGS="$SLKCFLAGS" \
   USE_GDKPIXBUF=0 \
   USE_GDKPIXBUF2=1
-  
+
 # We'll install everything manually because the Makefile is non-optimal :)
 mkdir -p $PKG/usr/bin
 cp -a wmdrawer $PKG/usr/bin
diff --git a/desktop/wmfs/wmfs.SlackBuild b/desktop/wmfs/wmfs.SlackBuild
index b4ec9dca14c26..d50afd0d7b897 100644
--- a/desktop/wmfs/wmfs.SlackBuild
+++ b/desktop/wmfs/wmfs.SlackBuild
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/wmmon/wmmon.SlackBuild b/desktop/wmmon/wmmon.SlackBuild
index ab994d50c6546..4976ac29f6c35 100644
--- a/desktop/wmmon/wmmon.SlackBuild
+++ b/desktop/wmmon/wmmon.SlackBuild
@@ -14,12 +14,10 @@ TAG=${TAG:-_SBo}
 SRCVER=$(echo $VERSION | cut -d_ -f1)
 PATCHVER=$(echo $VERSION | cut -d_ -f2)
 
-# 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/desktop/wmnet/wmnet.SlackBuild b/desktop/wmnet/wmnet.SlackBuild
index 6b128d4fad03f..08013bb80be47 100644
--- a/desktop/wmnet/wmnet.SlackBuild
+++ b/desktop/wmnet/wmnet.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-1.06}
 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/desktop/wmsm.app/wmsm.app.SlackBuild b/desktop/wmsm.app/wmsm.app.SlackBuild
index e71e4b93907a5..f18e40d2ae17d 100644
--- a/desktop/wmsm.app/wmsm.app.SlackBuild
+++ b/desktop/wmsm.app/wmsm.app.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.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
diff --git a/desktop/wmsystemtray/wmsystemtray.SlackBuild b/desktop/wmsystemtray/wmsystemtray.SlackBuild
index be60e9b3cfa6c..7e3d072e3c68e 100644
--- a/desktop/wmsystemtray/wmsystemtray.SlackBuild
+++ b/desktop/wmsystemtray/wmsystemtray.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.2}
 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 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -63,7 +61,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make 
+make
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild
index 76df13788b29e..0a22ec555da7b 100644
--- a/desktop/wmtime/wmtime.SlackBuild
+++ b/desktop/wmtime/wmtime.SlackBuild
@@ -9,12 +9,10 @@ VERSION=${VERSION:-1.0b2}
 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 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/wmtop/wmtop.SlackBuild b/desktop/wmtop/wmtop.SlackBuild
index 59aa879f03e50..824ec352d7113 100644
--- a/desktop/wmtop/wmtop.SlackBuild
+++ b/desktop/wmtop/wmtop.SlackBuild
@@ -10,12 +10,10 @@ VERSION=${VERSION:-0.84}
 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/desktop/x-tile/x-tile.SlackBuild b/desktop/x-tile/x-tile.SlackBuild
index 396bd07234016..ab022fde4ec3d 100644
--- a/desktop/x-tile/x-tile.SlackBuild
+++ b/desktop/x-tile/x-tile.SlackBuild
@@ -34,7 +34,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/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild
index 210d4f19adbf8..c07c0e9dabc50 100644
--- a/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild
+++ b/desktop/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin.SlackBuild
@@ -76,7 +76,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/xfce \
   --build=$ARCH-slackware-linux
 
-make 
+make
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild
index ee401ed1e7bec..724c65cff27ee 100644
--- a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild
+++ b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild
@@ -27,12 +27,10 @@ VERSION=${VERSION:-0.6.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/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
index eafc7442d001f..eb53ef56eac26 100644
--- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
+++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild
@@ -27,12 +27,10 @@ VERSION=${VERSION:-2.5.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
diff --git a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
index e915a7353780e..1ea403f3145fb 100644
--- a/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
+++ b/desktop/xfce4-genmon-plugin/xfce4-genmon-plugin.SlackBuild
@@ -28,12 +28,10 @@ TARVERS=3.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
diff --git a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
index 2e63da128ef91..eccfed6552bd8 100644
--- a/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
+++ b/desktop/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.SlackBuild
@@ -31,12 +31,10 @@ VERSION=${VERSION:-1.1.0}
 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
@@ -60,7 +58,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild
index db6347ef78801..dea28bf1887ef 100644
--- a/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild
+++ b/desktop/xfce4-mount-plugin/xfce4-mount-plugin.SlackBuild
@@ -27,17 +27,15 @@ VERSION=${VERSION:-0.6.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
 
-CWD=$(pwd)		
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
diff --git a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild
index c7cab8f00fc82..64bab342c1b6d 100644
--- a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild
+++ b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild
@@ -79,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --enable-debug=no \
   --build=$ARCH-slackware-linux
-  
+
 make
 make install DESTDIR=$PKG
 
diff --git a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
index 2fa7836c8be11..19c3e4071d39d 100644
--- a/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
+++ b/desktop/xfce4-xmms-plugin/xfce4-xmms-plugin.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
- 
-# Slackware build script for xfce4-xmms-plugin 
 
-# (C) 2007 Michael Wagner <lapinours@web.de> 
+# Slackware build script for xfce4-xmms-plugin
+
+# (C) 2007 Michael Wagner <lapinours@web.de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,12 +27,10 @@ VERSION=0.5.3
 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
@@ -74,7 +72,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/xfce \
   --disable-static \
   --build=$ARCH-slackware-linux
-  
+
 make
 make install-strip DESTDIR=$PKG
 
diff --git a/desktop/xpenguins/xpenguins.SlackBuild b/desktop/xpenguins/xpenguins.SlackBuild
index c7d3cac73d37a..0bbb4a6f57f60 100644
--- a/desktop/xpenguins/xpenguins.SlackBuild
+++ b/desktop/xpenguins/xpenguins.SlackBuild
@@ -8,12 +8,10 @@ VERSION=${VERSION:-2.2}
 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/desktop/xsession/xsession.SlackBuild b/desktop/xsession/xsession.SlackBuild
index 34514f970ccee..bc5a752caddad 100644
--- a/desktop/xsession/xsession.SlackBuild
+++ b/desktop/xsession/xsession.SlackBuild
@@ -6,17 +6,15 @@
 
 # Released into the public domain June 8, 2009
 
-PRGNAM=xsession	
+PRGNAM=xsession
 VERSION=${VERSION:-1.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
@@ -40,7 +38,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
diff --git a/desktop/xtrascreenhacks/xtrascreenhacks.SlackBuild b/desktop/xtrascreenhacks/xtrascreenhacks.SlackBuild
index 8cde71e234d3f..e22a8321e2814 100644
--- a/desktop/xtrascreenhacks/xtrascreenhacks.SlackBuild
+++ b/desktop/xtrascreenhacks/xtrascreenhacks.SlackBuild
@@ -27,12 +27,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
diff --git a/desktop/xxkb/xxkb.SlackBuild b/desktop/xxkb/xxkb.SlackBuild
index 08807b995a0f2..a588634b68811 100644
--- a/desktop/xxkb/xxkb.SlackBuild
+++ b/desktop/xxkb/xxkb.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=xxkb
 VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG $TMP
 mkdir -p $TMP $PKG $OUTPUT