5 files changed, 85 insertions, 100 deletions
diff --git a/network/kadu/README b/network/kadu/README
index 082c3db049ca2..3388f9c0734cd 100644
--- a/network/kadu/README
+++ b/network/kadu/README
@@ -1,20 +1,3 @@
-Kadu is a dynamically evolving instant messenger compatible with the 
-Gadu-Gadu protocol. 
+Kadu is an IM client for the Gadu-Gadu protocol.
 
-Kadu's modular structure enables the programmer to add new functionality
-by writing a new module or to remove unneeded features by not building
-all shipped modules.
-
-Some features include Gadu-Gadu v6.1 support, contacts' groups with drag and
-drop support, message encryption with OpenSSL, detailed error notification, 
-and configurable windows look (colors).
-
-BUILDING NOTES:
-If you leave the default configuration, Kadu depends on libsndfile 
-(which is available on SlackBuilds.org).
-
-If you wish to customize Kadu build, then copy the .config file from sources 
-to SlackBuild directory, rename it config and edit it to fulfill your needs.
-
-You need to be on-line in order to download additional modules that are not
-included in the sources.
+This requires libsndfile and libgadu.
diff --git a/network/kadu/doinst.sh b/network/kadu/doinst.sh
new file mode 100644
index 0000000000000..9f1846bc38ccf
--- /dev/null
+++ b/network/kadu/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
+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/kadu/kadu.SlackBuild b/network/kadu/kadu.SlackBuild
index 2a4d80e40dd7e..79371b1da9682 100644
--- a/network/kadu/kadu.SlackBuild
+++ b/network/kadu/kadu.SlackBuild
@@ -1,40 +1,7 @@
 #!/bin/sh
 
-# Slackware build script for Kadu
-
-# Copyright (c) 2008  Andrzej Telszewski <atelszewski@gmail.com>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following disclaimer
-#   in the documentation and/or other materials provided with the
-#   distribution.
-# * Neither the name of the {company} nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS 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; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Script modified by the SlackBuilds.org project.
-
 PRGNAM=kadu
-VERSION=0.6.0
+VERSION=${VERSION:-0.6.5.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -45,56 +12,79 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 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
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT  
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $TMP/$PRGNAM-$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-# Directory name of Kadu sources doesn't include the program version, so we
-# simply add it to be compatibile.
-mv kadu kadu-$VERSION
-cd $PRGNAM-$VERSION
+cd $PRGNAM
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+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 {} \;
 
-# Kadu uses .config file to specify modules it should be built with. Check 
-# README for more info.
-if [ -e "$CWD/config" ]; then
-  cp $CWD/config .config
-fi
+# Modifying .config file:
+sed -i "s|module_filtering=n|module_filtering=m|g" .config
+sed -i "s|module_screenshot=n|module_screenshot=m|g" .config
+sed -i "s|module_agent=n|module_agent=m|g" .config
+sed -i "s|module_tabs=n|module_tabs=m|g" .config
+sed -i "s|module_profiles=n|module_profiles=m|g" .config
+sed -i "s|module_firewall=n|module_firewall=m|g" .config
+# mediaplayer
+#sed -i "s|module_mediaplayer=n|module_mediaplayer=m|g" .config
+#sed -i "s|module_amarok1_mediaplayer=n|module_amarok1_mediaplayer=m|g" .config
+#sed -i "s|module_xmms_mediaplayer=n|module_xmms_mediaplayer=m|g" .config
+# sprawdzanie pisowni
+sed -i "s|module_spellchecker=n|module_spellchecker=m|g" .config
+# icons
+#sed -i "s|icons_kadu05=n|icons_kadu05=y|g" .config
+#sed -i "s|icons_tango16=n|icons_tango16=y|g" .config
+#sed -i "s|icons_oxygen16=n|icons_oxygen16=y|g" .config
+#sed -i "s|emoticons_gg6_compatible=n|emoticons_gg6_compatible=y|g" .config
+#sed -i "s|emoticons_tango=n|emoticons_tango=y|g" .config
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc/kde \
-  --localstatedir=/var \
-  --build=$ARCH-slackware-linux
+cmake . \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DSYSCONF_INSTALL_DIR=/etc \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
+  -DBUILD_DESCRIPTION="Slackware"
 
 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 || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  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 FAQ HISTORY ChangeLog INSTALL README \
-  TODO VERSION THANKS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a \
+   AUTHORS COPYING ChangeLog INSTALL TODO README THANKS VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 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/kadu/kadu.info b/network/kadu/kadu.info
index d074ece450af6..d236a5add0988 100644
--- a/network/kadu/kadu.info
+++ b/network/kadu/kadu.info
@@ -1,8 +1,10 @@
 PRGNAM="kadu"
-VERSION="0.6.0"
-HOMEPAGE="http://www.kadu.net/"
-DOWNLOAD="http://www.kadu.net/download/stable/kadu-0.6.0.tar.bz2"
-MD5SUM="8f1ee07558c82573d2c6e7ccd05f224f"
-MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
-APPROVED="Michiel"
-\ No newline at end of file
+VERSION="0.6.5.3"
+HOMEPAGE="http://www.kadu.net"
+DOWNLOAD="http://www.kadu.net/download/stable/kadu-0.6.5.3.tar.bz2"
+MD5SUM="7914d941020b0fa092748ffe0295174f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="M Slodkiewicz"
+EMAIL="slociu@wp.pl"
+APPROVED="rworkman"
diff --git a/network/kadu/slack-desc b/network/kadu/slack-desc
index 64307693796d5..1cd5eee8e5539 100644
--- a/network/kadu/slack-desc
+++ b/network/kadu/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-    |-----handy-ruler--------------------------------------------------------|
-kadu: kadu (Gadu-Gadu protocol compatibile IM for *NIX like systems)
-kadu: 
-kadu: Kadu is a dynamically evolving instant messenger compatible with
-kadu: the Gadu-Gadu protocol. It can be run on all platforms supporting
-kadu: the Qt toolkit (except Windows).
-kadu: Kadu's modular structure enables the programmer to add new
-kadu: functionality by writing a new module or to remove unneeded
-kadu: features by not building all shipped modules.
-kadu: 
-kadu: Homepage: http://www.kadu.net/
-kadu: 
+    |-----handy-ruler------------------------------------------------------|
+kadu: kadu (Gadu-Gadu IM client)
+kadu:
+kadu: Kadu is an instant messaging client for the Gadu-Gadu protocol.
+kadu:
+kadu:
+kadu:
+kadu:
+kadu:
+kadu:
+kadu:
+kadu: