2 files changed, 33 insertions, 24 deletions
diff --git a/system/yakuake/yakuake.SlackBuild b/system/yakuake/yakuake.SlackBuild
index 194ec396ea3ba..357afea0b4f21 100644
--- a/system/yakuake/yakuake.SlackBuild
+++ b/system/yakuake/yakuake.SlackBuild
@@ -3,8 +3,10 @@
 # Slackware build script for yakuake
 # Written by Steffen Schwebel (steffen.schwebel at web.de)
 
+# Modified by SlackBuilds.org
+
 PRGNAM=yakuake
-VERSION=2.8.1
+VERSION=2.9.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,44 +18,49 @@ 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 = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ $ARCH = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-elif [ $ARCH = "ipent4" ]; then
-  SLKCFLAGS="-O2 -march=pentium4 -mtune=i686 -msse -msse2"
-elif [ $ARCH = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX="64"
 else
   echo "Unrecognized architecture type! Check the script: $0"
   exit 1
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $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 .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc/kde \
-  --program-prefix="" \
-  --program-suffix="" \
-  || exit 1
+cmake \
+  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+  .
+
+make
+make install DESTDIR=$PKG
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # No man pages with yakuake
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL README TODO VERSION yakuake/NEWS \
+cp -a AUTHORS COPYING* KDE4FAQ NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
@@ -63,4 +70,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/system/yakuake/yakuake.info b/system/yakuake/yakuake.info
index c29ccbadc5b4e..0be2d6a36ba6d 100644
--- a/system/yakuake/yakuake.info
+++ b/system/yakuake/yakuake.info
@@ -1,8 +1,10 @@
 PRGNAM="yakuake"
-VERSION="2.8.1"
+VERSION="2.9.6"
 HOMEPAGE="http://yakuake.kde.org"
-DOWNLOAD="http://download.berlios.de/yakuake/yakuake-2.8.1.tar.bz2"
-MD5SUM="b638dd6ec3d7ca50ed28cbe5f15cc56b"
+DOWNLOAD="http://download.berlios.de/yakuake/yakuake-2.9.6.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="d5cbb912596fd1b3a92fdb04fe46cee0"
+MD5SUM_x86_64=""
 MAINTAINER="Steffen Schwebel"
 EMAIL="steffen.schwebel@web.de"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"