2 files changed, 29 insertions, 19 deletions
diff --git a/libraries/libdvbpsi/libdvbpsi.SlackBuild b/libraries/libdvbpsi/libdvbpsi.SlackBuild
index f10617d452..a235f27724 100644
--- a/libraries/libdvbpsi/libdvbpsi.SlackBuild
+++ b/libraries/libdvbpsi/libdvbpsi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libdvbpsi
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
+# Note - the source tarball and extracted directory suffix a "5" to the name
+# That's reflected in the script (in case you're wondering)
 
 PRGNAM=libdvbpsi
-# Note - the source tarball and extracted directory suffix a "4" to the name
-# That's reflected in the script (in case you're wondering)
-VERSION=0.1.5
+VERSION=0.1.6
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -40,16 +40,24 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr $OUTPUT
-cd $TMP || exit 1
-rm -rf ${PRGNAM}4-$VERSION
-tar -xjvf $CWD/${PRGNAM}4-$VERSION.tar.bz2 || exit 1
-cd ${PRGNAM}4-$VERSION || exit 1
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf ${PRGNAM}5-$VERSION
+tar xvf $CWD/${PRGNAM}5-$VERSION.tar.bz2
+cd ${PRGNAM}5-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -57,10 +65,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+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
diff --git a/libraries/libdvbpsi/libdvbpsi.info b/libraries/libdvbpsi/libdvbpsi.info
index 05bbbe8ad4..5fd450ccbb 100644
--- a/libraries/libdvbpsi/libdvbpsi.info
+++ b/libraries/libdvbpsi/libdvbpsi.info
@@ -1,8 +1,8 @@
 PRGNAM="libdvbpsi"
-VERSION="0.1.5"
+VERSION="0.1.6"
 HOMEPAGE="http://developers.videolan.org/libdvbpsi/"
-DOWNLOAD="http://download.videolan.org/pub/libdvbpsi/0.1.5/libdvbpsi4-0.1.5.tar.bz2"
-MD5SUM="407cd074b7d6eaf31b20b693ed924655"
+DOWNLOAD="http://download.videolan.org/pub/libdvbpsi/0.1.6/libdvbpsi5-0.1.6.tar.bz2"
+MD5SUM="bd2d9861be3311e1e03c91cd9345f542"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="robw810"
+APPROVED="Michiel"