5 files changed, 63 insertions, 56 deletions
diff --git a/network/kmess/README b/network/kmess/README
index 734e7b9f72..f04f2e181b 100644
--- a/network/kmess/README
+++ b/network/kmess/README
@@ -1,8 +1,5 @@
-KMess, MSN Messenger for GNU/Linux
-
-KMess is a MSN Messenger chat client for GNU/Linux.
-It is Qt based and integrated with the KDE Desktop Environment.
-KMess has many features, like winks and offline-im messages
-receiving, fast file transfers, Live Mail e-mail notifications.
-
-Homepage: http://www.kmess.org
-\ No newline at end of file
+KMess is an alternative Live Messenger chat client for Linux.
+It allows Linux users to chat with friends who use Live Messenger in 
+Windows or Mac OS.  The strength of KMess is it's integration with the 
+KDE desktop environment, it focus on Messenger-specific features, and 
+an easy-to-use interface.
diff --git a/network/kmess/doinst.sh b/network/kmess/doinst.sh
new file mode 100644
index 0000000000..1f8ff67ded
--- /dev/null
+++ b/network/kmess/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild
index 2c950314a5..ad76bc1c30 100644
--- a/network/kmess/kmess.SlackBuild
+++ b/network/kmess/kmess.SlackBuild
@@ -1,19 +1,19 @@
 #!/bin/sh
 
-# Slackware build script for KMess
+# Slackware build script for kmess
 
-# Copyright 2008 Andrea Maccis (andrea.maccis@gmail.com)
+# Copyright 2008-2009  Tarantino Antonino <metrofox9@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
-# Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
@@ -22,9 +22,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 PRGNAM=kmess
-VERSION=${VERSION:-1.5.1}
+VERSION=2.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,18 +35,21 @@ 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" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-rm -rf $PKG
+set -e
+
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,22 +57,14 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  || exit 1
+cmake . \
+-DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \
+-DCMAKE_C_FLAGS="${SLKCFLAGS}" \
+-DCMAKE_INSTALL_PREFIX="/usr" \
+-DLIB_SUFFIX=${LIBDIRSUFFIX}
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+make
+make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -78,8 +72,12 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 mkdir -p $PKG/install
 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/network/kmess/kmess.info b/network/kmess/kmess.info
index e9236a04b4..b5cb27620d 100644
--- a/network/kmess/kmess.info
+++ b/network/kmess/kmess.info
@@ -1,8 +1,10 @@
 PRGNAM="kmess"
-VERSION="1.5.1"
-HOMEPAGE="http://www.kmess.org"
-DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-1.5.1.tar.gz"
-MD5SUM="a2971c7e12da80f5df5ba5db4f7873d8"
-MAINTAINER="Andrea Maccis"
-EMAIL="andrea.maccis@gmail.com"
-APPROVED="Michiel"
+VERSION="2.0"
+HOMEPAGE="http://kmess.org/"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/kmess/kmess-2.0.tar.gz"
+MD5SUM="619781ad93c9848672b17ecc8536545c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Tarantino Antonino"
+EMAIL="metrofox9@gmail.com"
+APPROVED="rworkman"
diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc
index 54034f4865..19a7d62fab 100644
--- a/network/kmess/slack-desc
+++ b/network/kmess/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
 
-     |-----handy-ruler---------------------------------------------------|
-kmess: KMess (a MSN Messenger for GNU/Linux)
+     |-----handy-ruler--------------------------------------------------------|
+kmess: Kmess (MSN Messenger client)
+kmess:
+kmess: KMess is a MSN Messenger client for Linux. It enables Linux users to
+kmess: chat with friends online who are using MSN Messenger in Windows or Mac
+kmess: OS. The strength of KMess is it's integration with the KDE desktop
+kmess: environment, focus on MSN Messenger specific features and an easy-to-use
+kmess: interface.
 kmess:
-kmess: KMess is a MSN Messenger chat client for GNU/Linux.
-kmess: It is Qt based and integrated with the KDE Desktop Environment.
-kmess: KMess has many features, like winks and offline-im messages
-kmess: receiving, fast file transfers, Live Mail e-mail notifications.
 kmess:
-kmess: Homepage: http://www.kmess.org
 kmess:
 kmess:
-kmess:
-\ No newline at end of file