2 files changed, 22 insertions, 13 deletions
diff --git a/audio/a52dec/a52dec.SlackBuild b/audio/a52dec/a52dec.SlackBuild
index 773940b269..5393b21556 100644
--- a/audio/a52dec/a52dec.SlackBuild
+++ b/audio/a52dec/a52dec.SlackBuild
@@ -22,13 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=a52dec
 VERSION=0.7.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -37,15 +36,22 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
@@ -54,14 +60,18 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-shared
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --enable-shared \
+  --build=$ARCH-slackware-linux
 
 make
 make install 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 . | 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
 )
 
 ( cd $PKG/usr/man
@@ -70,16 +80,13 @@ make install DESTDIR=$PKG
     )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO \
+    $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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
-if [ "$1" = "--cleanup" ]; then
-	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/a52dec/a52dec.info b/audio/a52dec/a52dec.info
index be6ee25570..289b451552 100644
--- a/audio/a52dec/a52dec.info
+++ b/audio/a52dec/a52dec.info
@@ -2,7 +2,9 @@ PRGNAM="a52dec"
 VERSION="0.7.4"
 HOMEPAGE="http://liba52.sourceforge.net"
 DOWNLOAD="http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="caa9f5bc44232dc8aeea773fea56be80"
+MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="nille_kungen[AT]hotmail.com"
 APPROVED="rworkman,Erik Hanson"