2 files changed, 19 insertions, 9 deletions
diff --git a/multimedia/pyradio/pyradio.SlackBuild b/multimedia/pyradio/pyradio.SlackBuild
index 69a85bb7a2..dfa0adf3b5 100644
--- a/multimedia/pyradio/pyradio.SlackBuild
+++ b/multimedia/pyradio/pyradio.SlackBuild
@@ -1,31 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pyradio 
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
- 
+# Written by Jostein Berntsen <jvbernts@online.no>
+
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pyradio
 VERSION=${VERSION:-0.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+
 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"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,5 +79,5 @@ 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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/multimedia/pyradio/pyradio.info b/multimedia/pyradio/pyradio.info
index 3bc67d90b0..2f8d48ed97 100644
--- a/multimedia/pyradio/pyradio.info
+++ b/multimedia/pyradio/pyradio.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"