1 files changed, 29 insertions, 17 deletions
diff --git a/audio/sunvox/sunvox.SlackBuild b/audio/sunvox/sunvox.SlackBuild
index 99ce5d4447..889858d9c0 100644
--- a/audio/sunvox/sunvox.SlackBuild
+++ b/audio/sunvox/sunvox.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Sunvox
 
@@ -22,20 +22,30 @@
 #  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=sunvox
-VERSION=${VERSION:-1.9.4}
+VERSION=${VERSION:-2.1.1c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
+#    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}
@@ -44,11 +54,11 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-install -d ${PKG}/usr/{bin,doc,share/{${PRGNAM}/instruments/,${PRGNAM}/effects/,${PRGNAM}/examples/,${PRGNAM}/docs/,${PRGNAM}/icon/,applications/}}
+install -d ${PKG}/usr/{bin,doc,share/{${PRGNAM}/instruments/,${PRGNAM}/effects/,${PRGNAM}/examples/,${PRGNAM}/curves/,${PRGNAM}/icon/,applications/}}
 
 cd $TMP
 rm -rf $PRGNAM
-unzip $CWD/$PRGNAM-${VERSION}c.zip
+unzip $CWD/$PRGNAM-${VERSION}.zip
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -62,26 +72,28 @@ BINDIR="$TMP/$PRGNAM/$PRGNAM/linux_x86/"
 [ $ARCH == 'arm' ] && BINDIR="$TMP/$PRGNAM/$PRGNAM/raspberry_pi/"
 
 install -Dm755 $BINDIR/${PRGNAM}* $PKG/usr/bin/
-if [ $ARCH == 'arm' ]; then
-    install -dm755 $PKG/lib/
-    ln -s ld-linux.so.3 $PKG/lib/ld-linux-armhf.so.3
-fi
+
+# I think this was a sketchy move to begin with ... but I no longer have Slackware on ARM to test it. Thoughts?
+#if [ $ARCH == 'arm' ]; then
+#    install -dm755 $PKG/lib/
+#    ln -s ld-linux.so.3 $PKG/lib/ld-linux-armhf.so.3
+#fi
 
 install -Dm644 $CWD/sunvox.desktop $PKG/usr/share/applications/
 install -Dm644 $CWD/sunvox.png $PKG/usr/share/sunvox/icon/
 
-for dir in instruments effects examples docs ; do
-  cd "$TMP/$PRGNAM/$dir/"
-  find . -type d -exec install -d "$PKG/usr/share/$PRGNAM/${dir}/"{} \;
-  find . -type f -exec install -Dm644 {,"$PKG/usr/share/$PRGNAM/${dir}/"}{} \;
+for dir in instruments effects examples curves ; do
+  ( cd "$TMP/$PRGNAM/$dir/" && find . -type d -exec install -d "$PKG/usr/share/$PRGNAM/${dir}/"{} \; )
+  ( cd "$TMP/$PRGNAM/$dir/" && find . -type f -exec install -Dm644 {,"$PKG/usr/share/$PRGNAM/${dir}/"}{} \; )
 done
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/$PRGNAM/docs/$PRGNAM.SlackBuild
-ln -s ../share/$PRGNAM/docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+install -d "$PKG/usr/doc/$PRGNAM-$VERSION/"
+( cd "$TMP/$PRGNAM/docs/" && find . -type f -exec install -Dm644 {,"$PKG/usr/doc/$PRGNAM-$VERSION/"}{} \; )
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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