multimedia/kaffeine: Updated for version 1.0_pre2

3 files changed, 37 insertions, 42 deletions

diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild
index c0d63cf02d090..2c583933a1647 100644
--- a/multimedia/kaffeine/kaffeine.SlackBuild
+++ b/multimedia/kaffeine/kaffeine.SlackBuild
@@ -2,8 +2,8 @@
 
 # Slackware build script for kaffeine
 
+# Copyright 2008-2009  Michiel van Wessem, Manchester, United Kingdom.
 # 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
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kaffeine
-VERSION=0.8.7
+VERSION=${VERSION:-1.0_pre2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,12 +34,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+SRC_VERSION=$(echo $VERSION | tr _ -)
+
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 fi
 
 set -e      # Exit on most errors
@@ -47,9 +52,9 @@ set -e      # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION 
+rm -rf $PRGNAM-$SRC_VERSION
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
+cd $PRGNAM-$SRC_VERSION 
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -57,26 +62,27 @@ find . \
  \( -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
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-# needed --with-extra-includes, otherwise it will not
-# find the cdparanoia headers. 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --with-extra-includes=/usr/include/cdda
+  make VERBOSE=1
+  make install VERBOSE=1 DESTDIR=$PKG
+cd -
 
-make 
-make install-strip 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
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README TODO VERSION \
+cp -a AUTHORS COPYING* Changelog INSTALL NOTES TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -85,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/multimedia/kaffeine/kaffeine.info b/multimedia/kaffeine/kaffeine.info
index 70f70d2cb6435..767e0045648e2 100644
--- a/multimedia/kaffeine/kaffeine.info
+++ b/multimedia/kaffeine/kaffeine.info
@@ -1,8 +1,10 @@
 PRGNAM="kaffeine"
-VERSION="0.8.7"
+VERSION="1.0_pre2"
 HOMEPAGE="http://kaffeine.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-0.8.7.tar.bz2"
-MD5SUM="3ce644c3c5a9583e9df7187f2cf1d8de"
+DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-1.0-pre2.tar.gz"
+MD5SUM="24eee004427d6b3f73ffb85a94fc6e3b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="Erik Hanson"
diff --git a/multimedia/kaffeine/kaffeine_locale.patch b/multimedia/kaffeine/kaffeine_locale.patch
deleted file mode 100644
index 736dfc9480527..0000000000000
--- a/multimedia/kaffeine/kaffeine_locale.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kaffeine-0.8.7-orig/configure	2008-07-06 15:20:09.000000000 +0000
-+++ kaffeine-0.8.7/configure	2008-12-03 17:42:27.000000000 +0000
-@@ -2772,8 +2772,8 @@
- 
- 
- # Define the identity of the package.
-- PACKAGE=kaffeine-0.8.6
-- VERSION="3.5.7"
-+ PACKAGE=kaffeine
-+ VERSION="3.5.10"
- 
- 
- cat >>confdefs.h <<_ACEOF