5 files changed, 45 insertions, 26 deletions
diff --git a/multimedia/kaffeine/README b/multimedia/kaffeine/README
index 58f8e44484932..41b22606d4c7a 100644
--- a/multimedia/kaffeine/README
+++ b/multimedia/kaffeine/README
@@ -1,3 +1,3 @@
-Kaffeine is a full featured Multimedia-Player for KDE.  By default, it uses 
-xine as backend.  Kaffeine is free software distributed under the terms of 
-the GNU General Public Licence.
+Kaffeine is a full featured Multimedia-Player for KDE.  By default,
+it uses xine as backend.  Kaffeine is free software distributed under
+the terms of the GNU General Public Licence.
diff --git a/multimedia/kaffeine/doinst.sh b/multimedia/kaffeine/doinst.sh
index eec7ae1d81a1c..faca4c917c7ef 100644
--- a/multimedia/kaffeine/doinst.sh
+++ b/multimedia/kaffeine/doinst.sh
@@ -1,4 +1,4 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  ./usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild
index 3a7c062dc65a1..96c7e90da4264 100644
--- a/multimedia/kaffeine/kaffeine.SlackBuild
+++ b/multimedia/kaffeine/kaffeine.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for kaffeine
 
 # Copyright 2006  Martin Lefebvre <dadexter@sekurity.com>
+# Copyright 2008  Michiel van Wessem <michiel@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,12 @@
 # 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
-# No additional license terms added
-
 PRGNAM=kaffeine
-VERSION=0.8.4
+VERSION=0.8.7
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,30 +38,39 @@ 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
 
-KDEDIR=$(kde-config --prefix) || KDEDIR=/opt/kde
+set -e      # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$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 {} \;
+
+# Patch against malformed locale files. See also: 
+# http://bugs.kde.org/show_bug.cgi?id=167145a 
+# Thanks to Eugene A. Bogoroditskiy
+patch -p1 < $CWD/kaffeine_locale.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=$KDEDIR \
+  --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var \
-  --program-suffix="" \
-  --program-prefix=""
+  --localstatedir=/var 
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make 
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL README TODO VERSION \
diff --git a/multimedia/kaffeine/kaffeine.info b/multimedia/kaffeine/kaffeine.info
index c2d2ee92a94d1..70f70d2cb6435 100644
--- a/multimedia/kaffeine/kaffeine.info
+++ b/multimedia/kaffeine/kaffeine.info
@@ -1,8 +1,8 @@
 PRGNAM="kaffeine"
-VERSION="0.8.4"
+VERSION="0.8.7"
 HOMEPAGE="http://kaffeine.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-0.8.4.tar.bz2"
-MD5SUM="6f62ebb7a6f88ff49f452856a1660d95"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@sekurity.com"
-APPROVED="rworkman"
+DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-0.8.7.tar.bz2"
+MD5SUM="3ce644c3c5a9583e9df7187f2cf1d8de"
+MAINTAINER="Michiel van Wessem"
+EMAIL="michiel@slackbuilds.org"
+APPROVED="David Somero"
+\ No newline at end of file
diff --git a/multimedia/kaffeine/kaffeine_locale.patch b/multimedia/kaffeine/kaffeine_locale.patch
new file mode 100644
index 0000000000000..50d4d1eb25b86
--- /dev/null
+++ b/multimedia/kaffeine/kaffeine_locale.patch
@@ -0,0 +1,11 @@
+diff -Naur kaffeine-0.8.7-orig/configure kaffeine-0.8.7/configure
+--- kaffeine-0.8.7-orig/configure       2008-07-06 19:20:09.000000000 +0400
++++ kaffeine-0.8.7/configure    2008-07-23 20:20:29.000000000 +0400
+@@ -2772,7 +2772,7 @@
+
+
+ # Define the identity of the package.
+- PACKAGE=kaffeine-0.8.6
++ PACKAGE=kaffeine
+  VERSION="3.5.7"
+