3 files changed, 51 insertions, 17 deletions
diff --git a/libraries/soundtouch/slack-desc b/libraries/soundtouch/slack-desc
index 6cfd1501ae..6e01d00c30 100644
--- a/libraries/soundtouch/slack-desc
+++ b/libraries/soundtouch/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler--------------------------------------------------|
 soundtouch: soundtouch (Sound processing library)
 soundtouch:
 soundtouch: soundtouch is an open-source audio processing library
diff --git a/libraries/soundtouch/soundtouch.SlackBuild b/libraries/soundtouch/soundtouch.SlackBuild
index a88c0f5849..dd599b5fb9 100644
--- a/libraries/soundtouch/soundtouch.SlackBuild
+++ b/libraries/soundtouch/soundtouch.SlackBuild
@@ -1,15 +1,33 @@
 #!/bin/sh
 
 # Slackware build script for soundtouch 1.3.1
-# Written by heinz wiesinger hmwiesinger@gmx.at
 
-set -e
+# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 THE AUTHOR 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.
 
 PRGNAM=soundtouch
 VERSION=1.3.1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,8 +37,12 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -28,7 +50,18 @@ rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+am=$(automake --version | grep "1." | cut -d " " -f 4 | cut -d "." -f 2)
+
+for i in config.guess config.sub depcomp install-sh missing; do
+  rm -f config/$i
+  ln -s /usr/share/automake-1.$am/$i config/$i
+done
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -37,18 +70,19 @@ CXXFLAGS="$SLKCFLAGS" \
     --sysconfdir=/etc \
     --enable-shared \
     --disable-static \
-    --localstatedir=/var
+    --localstatedir=/var \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
+make \
+  pkgdocdir="/usr/doc/$PRGNAM-$VERSION"
 
-# Cleanup doc-files installed by make-install
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+make install \
+  pkgdocdir="/usr/doc/$PRGNAM-$VERSION" \
+  DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/soundtouch/soundtouch.info b/libraries/soundtouch/soundtouch.info
index 53978e7137..5e450c3b18 100644
--- a/libraries/soundtouch/soundtouch.info
+++ b/libraries/soundtouch/soundtouch.info
@@ -3,6 +3,6 @@ VERSION="1.3.1"
 HOMEPAGE="http://www.surina.net/soundtouch"
 DOWNLOAD="http://www.surina.net/soundtouch/soundtouch-1.3.1.tar.gz"
 MD5SUM="5e0185e81dbba2f2eed8581b7664ab04"
-MAINTAINER="heinz wiesinger"
-EMAIL="hmwiesinger@gmx.at"
-APPROVED="rworkman"
+MAINTAINER="ppr:kut"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="dsomero"