4 files changed, 34 insertions, 39 deletions
diff --git a/network/kvirc/README b/network/kvirc/README
index 97b84a500519f..98976bcd7f90e 100644
--- a/network/kvirc/README
+++ b/network/kvirc/README
@@ -7,4 +7,3 @@ themes support (configurable from GUI or scripting), transparency support,
 dran'n'drop toolbar editing, activity notifier as well as proxy support,
 SSL and IPv6 sockets support, a modular arch which loads modules only when
 necessary and a huge API for writing extensions
-
diff --git a/network/kvirc/kvirc.SlackBuild b/network/kvirc/kvirc.SlackBuild
index d68de4f239702..374ae524c84fc 100644
--- a/network/kvirc/kvirc.SlackBuild
+++ b/network/kvirc/kvirc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for KVIrc
 
-# Copyright 2008 Elvio "HelLViS69" Basello <hellvis69@slackware.it>
+# Copyright 2010 Elvio "HelLViS69" Basello <hellvis69@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kvirc
-VERSION=${VERSION:-3.4.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -56,14 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Exit on errors
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -72,42 +69,33 @@ 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 \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --with-big-channels \
-  --with-x
+mkdir release
+cd release
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMANDIR=man \
+    -DMANUAL_REVISION=4541 \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
-make
-make install DESTDIR=$PKG
-
-# Strip binaries and libraries
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Compress man pages
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Make the package; be sure to leave it in $OUTPUT
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/network/kvirc/kvirc.info b/network/kvirc/kvirc.info
index 6cbd1fec56393..b831d52cb9676 100644
--- a/network/kvirc/kvirc.info
+++ b/network/kvirc/kvirc.info
@@ -1,10 +1,10 @@
 PRGNAM="kvirc"
-VERSION="3.4.2"
+VERSION="4.0.0"
 HOMEPAGE="http://kvirc.net"
-DOWNLOAD="ftp://ftp.kvirc.de/pub/kvirc/3.4.2/source/kvirc-3.4.2.tar.bz2"
-MD5SUM="cc1839c54f6c1bf9a15e169f3213a0a7"
+DOWNLOAD="ftp://ftp.kvirc.de/pub/kvirc/4.0.0/source/kvirc-4.0.0.tar.bz2"
+MD5SUM="8fafe420551c273e684236fd4e396af5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Elvio Basello (HelLViS69)"
 EMAIL="hellvis69@slackware.it"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/kvirc/slack-desc b/network/kvirc/slack-desc
index 9e89db3e16cbe..75a780541eb61 100644
--- a/network/kvirc/slack-desc
+++ b/network/kvirc/slack-desc
@@ -1,11 +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 ':'.
+
+     |-----handy-ruler------------------------------------------------------|
 kvirc: KVIrc (The K-Visual IRC Client)
-kvirc: 
+kvirc:
 kvirc: KVIrc is a free portable Internet Relay Chat client based
 kvirc: on the excellent Qt GUI toolkit. KVIrc is being written by
 kvirc: Szymon Stefanek and The KVIrc Development Team with the
 kvirc: contribution of many IRC addicted developers around the
 kvirc: world
-kvirc: 
+kvirc:
 kvirc: Homepage: http://kvirc.net
 kvirc:
 kvirc: