2 files changed, 25 insertions, 15 deletions
diff --git a/audio/pasystray/pasystray.SlackBuild b/audio/pasystray/pasystray.SlackBuild
index 55f598cf7f..04dc4a3ad5 100644
--- a/audio/pasystray/pasystray.SlackBuild
+++ b/audio/pasystray/pasystray.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for pasystray
 #
-# Copyright 2014-2017  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2014-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pasystray
-VERSION=${VERSION:-0.6.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +69,9 @@ set -ue
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -101,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/pasystray/pasystray.info b/audio/pasystray/pasystray.info
index f2aadb5ba2..d4a35cd7e6 100644
--- a/audio/pasystray/pasystray.info
+++ b/audio/pasystray/pasystray.info
@@ -1,8 +1,8 @@
 PRGNAM="pasystray"
-VERSION="0.6.0"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/christophgysin/pasystray"
-DOWNLOAD="https://github.com/christophgysin/pasystray/archive/pasystray-0.6.0.tar.gz"
-MD5SUM="938d295520eb0605031f9f3531d5b1d6"
+DOWNLOAD="https://github.com/christophgysin/pasystray/archive/0.8.0/pasystray-0.8.0.tar.gz"
+MD5SUM="7fd769d2a476e2af1dac1ddfba658d8a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""