3 files changed, 23 insertions, 13 deletions
diff --git a/libraries/libdvbpsi/libdvbpsi.SlackBuild b/libraries/libdvbpsi/libdvbpsi.SlackBuild
index a235f277243b8..0a3e94fa8f91e 100644
--- a/libraries/libdvbpsi/libdvbpsi.SlackBuild
+++ b/libraries/libdvbpsi/libdvbpsi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdvbpsi
 
-# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -38,10 +38,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -63,6 +66,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -73,16 +77,20 @@ 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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+    $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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdvbpsi/libdvbpsi.info b/libraries/libdvbpsi/libdvbpsi.info
index 5fd450ccbbff8..b1e7a424ccb0b 100644
--- a/libraries/libdvbpsi/libdvbpsi.info
+++ b/libraries/libdvbpsi/libdvbpsi.info
@@ -2,7 +2,9 @@ PRGNAM="libdvbpsi"
 VERSION="0.1.6"
 HOMEPAGE="http://developers.videolan.org/libdvbpsi/"
 DOWNLOAD="http://download.videolan.org/pub/libdvbpsi/0.1.6/libdvbpsi5-0.1.6.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="bd2d9861be3311e1e03c91cd9345f542"
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="Michiel"
diff --git a/libraries/libdvbpsi/slack-desc b/libraries/libdvbpsi/slack-desc
index 4fd183c3d4433..b66a93d3b8f81 100644
--- a/libraries/libdvbpsi/slack-desc
+++ b/libraries/libdvbpsi/slack-desc
@@ -7,13 +7,13 @@
 
          |-----handy-ruler------------------------------------------------------|
 libdvbpsi: libdvbpsi (Library for MPEG TS and DVB PSI Tables)
-libdvbpsi: 
+libdvbpsi:
 libdvbpsi: libdvbpsi is a simple library designed for decoding and generation
 libdvbpsi: of MPEG TS and DVB PSI tables.
-libdvbpsi: 
+libdvbpsi:
 libdvbpsi: Homepage: http://developers.videolan.org/libdvbpsi/
-libdvbpsi: 
-libdvbpsi: 
-libdvbpsi: 
-libdvbpsi: 
-libdvbpsi: 
+libdvbpsi:
+libdvbpsi:
+libdvbpsi:
+libdvbpsi:
+libdvbpsi: