From: fsLeg <fsleg@t-rg.ws>
Date: Sun, 14 Jul 2024 16:45:34 +0000 (+0300)
Subject: Further cleanups
X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=8597f88f1913d6758ddf28835822b3e4d4d9da0d;p=slackbuilds.git

Further cleanups
---

diff --git a/dart-sass/dart-sass.SlackBuild b/dart-sass/dart-sass.SlackBuild
index 3690023..e3d461c 100755
--- a/dart-sass/dart-sass.SlackBuild
+++ b/dart-sass/dart-sass.SlackBuild
@@ -30,12 +30,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH="ia32" ;;
     x86_64*) ARCH="x64" ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -60,7 +58,7 @@ fi
 
 # This is just a repackaging of a pre-built binary, no compilation is needed
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -86,9 +84,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a src/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/dart-sass/slack-desc b/dart-sass/slack-desc
index 4f9cf5b..59beac7 100644
--- a/dart-sass/slack-desc
+++ b/dart-sass/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
          |-----handy-ruler------------------------------------------------------|
 dart-sass: dart-sass (A Dart implementation of Sass)
 dart-sass:
@@ -9,3 +16,4 @@ dart-sass:
 dart-sass:
 dart-sass:
 dart-sass:
+dart-sass:
diff --git a/dumptorrent/dumptorrent.SlackBuild b/dumptorrent/dumptorrent.SlackBuild
index 68e8113..51b6bce 100755
--- a/dumptorrent/dumptorrent.SlackBuild
+++ b/dumptorrent/dumptorrent.SlackBuild
@@ -35,12 +35,10 @@ if [ -z "$NUMJOBS" ]; then
   NUMJOBS=$(nproc)
 fi
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -57,8 +55,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -67,7 +65,7 @@ else
   SLKCFLAGS="-O2"
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -82,7 +80,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make -j${NUMJOBS} dumptorrent CFLAGS="${SLKFLAGS}"
+make -j${NUMJOBS} dumptorrent CFLAGS="${SLKCFLAGS}"
 
 # There's no 'install' target and no documentation, so we just copy the binary
 # to a correct location and package it.
@@ -94,7 +92,6 @@ install -Dm755 ./dumptorrent ${PKG}/usr/bin/
 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
 
-# Copy the SlackBuild into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -104,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Make the package
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/dumptorrent/slack-desc b/dumptorrent/slack-desc
index e775196..72f2e51 100644
--- a/dumptorrent/slack-desc
+++ b/dumptorrent/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
            |-----handy-ruler------------------------------------------------------|
 dumptorrent: dumptorrent (get torrent metadata)
 dumptorrent:
@@ -9,3 +16,4 @@ dumptorrent:
 dumptorrent: Website: http://sourceforge.net/projects/dumptorrent/
 dumptorrent:
 dumptorrent:
+dumptorrent:
diff --git a/fdpowermon/fdpowermon.SlackBuild b/fdpowermon/fdpowermon.SlackBuild
index 4d26a36..2eddc3e 100755
--- a/fdpowermon/fdpowermon.SlackBuild
+++ b/fdpowermon/fdpowermon.SlackBuild
@@ -47,7 +47,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # This is just a repackaging of a script, no compilation is needed
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -82,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/fdpowermon/slack-desc b/fdpowermon/slack-desc
index caa7893..00619d2 100644
--- a/fdpowermon/slack-desc
+++ b/fdpowermon/slack-desc
@@ -1,12 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
           |-----handy-ruler------------------------------------------------------|
 fdpowermon: fdpowermon (simple battery power monitor for laptops with ACPI)
 fdpowermon:
 fdpowermon: fdpowermon is a simple perl script that installs an icon in a system
 fdpowermon: tray compatible with the freedesktop.org specification.
 fdpowermon:
-fdpowermon: Every three seconds, fdpowermon calls acpi to find out what the current
-fdpowermon: battery level is. It will set the output of the acpi command as a
-fdpowermon: tooltip text, and will update the used icon as appropriate.
+fdpowermon: Every three seconds, fdpowermon calls acpi to find out what the
+fdpowermon: current battery level is. It will set the output of the acpi command
+fdpowermon: as a tooltip text, and will update the used icon as appropriate.
 fdpowermon:
 fdpowermon: Homepage: https://github.com/yoe/fdpowermon
 fdpowermon:
diff --git a/gxkb/README b/gxkb/README
old mode 100755
new mode 100644
diff --git a/gxkb/by-ru-flags.patch b/gxkb/by-ru-flags.patch
old mode 100755
new mode 100644
diff --git a/gxkb/by.png b/gxkb/by.png
old mode 100755
new mode 100644
diff --git a/gxkb/gxkb.info b/gxkb/gxkb.info
old mode 100755
new mode 100644
diff --git a/gxkb/ru.png b/gxkb/ru.png
old mode 100755
new mode 100644
diff --git a/gxkb/slack-desc b/gxkb/slack-desc
old mode 100755
new mode 100644
diff --git a/pyotherside/pyotherside.SlackBuild b/pyotherside/pyotherside.SlackBuild
index c4cfffd..a9310dc 100755
--- a/pyotherside/pyotherside.SlackBuild
+++ b/pyotherside/pyotherside.SlackBuild
@@ -35,12 +35,10 @@ if [ -z "$NUMJOBS" ]; then
   NUMJOBS=$(nproc)
 fi
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -59,22 +57,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -89,8 +82,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-
-# Compile the application and install it into the $PKG directory
 qmake
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -102,8 +93,6 @@ rm -rf $PKG/usr/tests
 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
 
-# Copy program documentation into the package
-# Also, include the SlackBuild script in the documentation directory
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
 # Build additional documentation
diff --git a/pyotherside/slack-desc b/pyotherside/slack-desc
index 38050ab..e5bc9f3 100644
--- a/pyotherside/slack-desc
+++ b/pyotherside/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
            |-----handy-ruler------------------------------------------------------|
 pyotherside: pyotherside (Python bindings for Qt)
 pyotherside:
diff --git a/pyscard/pyscard.SlackBuild b/pyscard/pyscard.SlackBuild
index c7f0e44..2ee31cb 100755
--- a/pyscard/pyscard.SlackBuild
+++ b/pyscard/pyscard.SlackBuild
@@ -30,12 +30,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-# Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -52,23 +50,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -90,7 +71,6 @@ python3 setup.py install --root=$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
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
 # Build additional documentation
diff --git a/pyscard/slack-desc b/pyscard/slack-desc
index d79d44a..9cc318e 100644
--- a/pyscard/slack-desc
+++ b/pyscard/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
        |-----handy-ruler------------------------------------------------------|
 pyscard: pyscard (Smartcard module for Python)
 pyscard:
diff --git a/python-fido2/python-fido2.SlackBuild b/python-fido2/python-fido2.SlackBuild
index 657b4ad..6d50102 100755
--- a/python-fido2/python-fido2.SlackBuild
+++ b/python-fido2/python-fido2.SlackBuild
@@ -31,12 +31,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-# Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,23 +51,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -92,8 +73,6 @@ python3 -m installer --destdir "$PKG" dist/*.whl
 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
 
-# Copy program documentation into the package
-# Also, include the SlackBuild script in the documentation directory
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -aR \
   COPYING COPYING.MPLv2 COPYING.APLv2 NEWS README.adoc examples/\
diff --git a/python-fido2/slack-desc b/python-fido2/slack-desc
index 221baa1..c72cc29 100644
--- a/python-fido2/slack-desc
+++ b/python-fido2/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
             |-----handy-ruler------------------------------------------------------|
 python-fido2: python-fido2 (FIDO2/WebAuthn library for clients and servers)
 python-fido2:
diff --git a/saflashplayer/README b/saflashplayer/README
index dd5eb5c..53f27f1 100644
--- a/saflashplayer/README
+++ b/saflashplayer/README
@@ -1,7 +1,4 @@
 Also known as Flash Player projector, SAFlashPlayer can play local SWF
 files without using web browser with Adobe plugin.
 
-Only 64bit binary is provided by Adobe.
-
-Checksum in .info file is unreliable, because Adobe updates the tarball
-without changing the link. This is also true for the program version.
+Only 64 bit binary is provided by Adobe.
diff --git a/saflashplayer/saflashplayer.SlackBuild b/saflashplayer/saflashplayer.SlackBuild
index e37f532..713223a 100755
--- a/saflashplayer/saflashplayer.SlackBuild
+++ b/saflashplayer/saflashplayer.SlackBuild
@@ -30,21 +30,19 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "i486" == "${ARCH}" ]; then
+if [ "x86_64" != "${ARCH}" ]; then
   echo
   echo "*************************************************************"
-  echo "It seems you are running a 32bit system. Standalone"
-  echo "flashplayer only supports 64bit."
+  echo "It seems you are not running a x86_64 system. Standalone"
+  echo "flashplayer only supports x86_64 architecture."
   echo "*************************************************************"
   echo
   exit 1
@@ -64,7 +62,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # saflashplayer is a standalone static binary, so no compilation is needed
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -72,8 +70,7 @@ cd $TMP
 
 tar xvf $CWD/flash_player_sa_linux.x86_64.tar.gz
 mkdir -p $PKG/usr/bin $PKG/usr/share/applications
-mv flashplayer $PKG/usr/bin/saflashplayer.bin
-cp -a $CWD/saflashplayer.sh $PKG/usr/bin/saflashplayer
+mv flashplayer $PKG/usr/bin/saflashplayer
 cp -a $CWD/saflashplayer.desktop $PKG/usr/share/applications/com.adobe.flashplayer.desktop
 chown -R root:root $PKG
 find -L $PKG \
@@ -84,14 +81,12 @@ find -L $PKG \
 
 # Stripping the binary causes it to segfault
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -aR LGPL license.pdf $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/saflashplayer/saflashplayer.sh b/saflashplayer/saflashplayer.sh
deleted file mode 100755
index e73bbda..0000000
--- a/saflashplayer/saflashplayer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/saflashplayer.bin "$@"
diff --git a/saflashplayer/slack-desc b/saflashplayer/slack-desc
index 1399d26..a8eb5e1 100644
--- a/saflashplayer/slack-desc
+++ b/saflashplayer/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
              |-----handy-ruler------------------------------------------------------|
 saflashplayer: saflashplayer (Stand-Alone Flash Player)
 saflashplayer:
@@ -9,3 +16,4 @@ saflashplayer:
 saflashplayer: Website: https://get.adobe.com/flashplayer
 saflashplayer:
 saflashplayer:
+saflashplayer:
diff --git a/shadowsocks-rust/shadowsocks-rust.SlackBuild b/shadowsocks-rust/shadowsocks-rust.SlackBuild
index f5f2fc5..7504467 100755
--- a/shadowsocks-rust/shadowsocks-rust.SlackBuild
+++ b/shadowsocks-rust/shadowsocks-rust.SlackBuild
@@ -30,7 +30,6 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -65,7 +64,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -118,4 +117,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/shadowsocks-rust/slack-desc b/shadowsocks-rust/slack-desc
index fe14fd9..ad198fc 100644
--- a/shadowsocks-rust/slack-desc
+++ b/shadowsocks-rust/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
                 |-----handy-ruler------------------------------------------------------|
 shadowsocks-rust: shadowsocks-rust (rust port of shadowsocks, a secure socks5 proxy)
 shadowsocks-rust:
@@ -9,4 +16,4 @@ shadowsocks-rust: Homepage: https://github.com/shadowsocks/shadowsocks-rust
 shadowsocks-rust:
 shadowsocks-rust:
 shadowsocks-rust:
-shadowsocks-rust:
\ No newline at end of file
+shadowsocks-rust:
diff --git a/yubikey-manager-qt/slack-desc b/yubikey-manager-qt/slack-desc
index 25d28f9..aa3d6f2 100644
--- a/yubikey-manager-qt/slack-desc
+++ b/yubikey-manager-qt/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
                   |-----handy-ruler------------------------------------------------------|
 yubikey-manager-qt: yubikey-manager-qt (Graphical application for configuring a YubiKey)
 yubikey-manager-qt:
diff --git a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
index ea129d9..0451354 100755
--- a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
+++ b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild
@@ -35,12 +35,10 @@ if [ -z "$NUMJOBS" ]; then
   NUMJOBS=$(nproc)
 fi
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -59,22 +57,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -107,8 +100,6 @@ cp -a resources/com.yubico.yubikey_manager.metainfo.xml $PKG/usr/share/metainfo/
 mkdir -p $PKG/usr/share/applications
 cp -a resources/ykman-gui.desktop $PKG/usr/share/applications
 
-# Copy program documentation into the package
-# Also, include the SlackBuild script in the documentation directory
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   COPYING NEWS README \
diff --git a/yubikey-manager/slack-desc b/yubikey-manager/slack-desc
index 5a2c731..e5905e4 100644
--- a/yubikey-manager/slack-desc
+++ b/yubikey-manager/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
                |-----handy-ruler------------------------------------------------------|
 yubikey-manager: yubikey-manager (Tool for managing your YubiKey configuration)
 yubikey-manager:
diff --git a/yubikey-manager/yubikey-manager.SlackBuild b/yubikey-manager/yubikey-manager.SlackBuild
index 82eb03e..f288dcc 100755
--- a/yubikey-manager/yubikey-manager.SlackBuild
+++ b/yubikey-manager/yubikey-manager.SlackBuild
@@ -31,12 +31,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-# Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,23 +51,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -97,7 +78,6 @@ cp -aR man $PKG/usr/
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   COPYING NEWS README.adoc \
diff --git a/yubioath-desktop/slack-desc b/yubioath-desktop/slack-desc
index 84f9060..f92dc24 100644
--- a/yubioath-desktop/slack-desc
+++ b/yubioath-desktop/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
                 |-----handy-ruler------------------------------------------------------|
 yubioath-desktop: yubioath-desktop (Yubico Authenticator for Desktop)
 yubioath-desktop:
@@ -9,3 +16,4 @@ yubioath-desktop:
 yubioath-desktop:
 yubioath-desktop:
 yubioath-desktop:
+yubioath-desktop:
diff --git a/yubioath-desktop/yubioath-desktop.SlackBuild b/yubioath-desktop/yubioath-desktop.SlackBuild
index c2b0412..e5d4e29 100755
--- a/yubioath-desktop/yubioath-desktop.SlackBuild
+++ b/yubioath-desktop/yubioath-desktop.SlackBuild
@@ -31,12 +31,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-fsleg}
 PKGTYPE=${PKGTYPE:-txz}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH="ia32" ;;
     x86_64*) ARCH="x64" ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -55,7 +53,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # This is just a repackaging of a pre-built binary, no compilation is needed
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -94,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE