4 files changed, 27 insertions, 30 deletions
diff --git a/network/cclive/README b/network/cclive/README
index 6386ae5bf2..37ca4ff7a1 100644
--- a/network/cclive/README
+++ b/network/cclive/README
@@ -6,10 +6,9 @@ software, licensed under the GPLv3.
 
 This requires quvi.
 
-If you put the below lines in $HOME/.ccliverc, the output filename would
+If you put the lines below in $HOME/.ccliverc, the output filename would
 look nice.
 
-filename-format="%t.%s"
-regexp="/(\w|\s)/g"
-substitute="s/\s/_/g"
-format=best
+filename-format=%t.%s
+subst=s<\s>{_}g
+
diff --git a/network/cclive/cclive.SlackBuild b/network/cclive/cclive.SlackBuild
index 5e577f71cb..0831ea18e1 100644
--- a/network/cclive/cclive.SlackBuild
+++ b/network/cclive/cclive.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for cclive
 
-# Written by crocket (crockabiscuit@yahoo.com)
+# Written by crocket (crockabiscuit@gmail.com)
 
 PRGNAM=cclive
-VERSION=${VERSION:-0.6.5}
+VERSION=${VERSION:-0.7.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,20 +51,19 @@ 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 \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+  mv $PKG/usr/share/man $PKG/usr
+  rmdir $PKG/usr/share
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -73,8 +72,7 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/cclive/cclive.info b/network/cclive/cclive.info
index bb96ab479a..934a2aa670 100644
--- a/network/cclive/cclive.info
+++ b/network/cclive/cclive.info
@@ -1,10 +1,10 @@
 PRGNAM="cclive"
-VERSION="0.6.5"
-HOMEPAGE="http://code.google.com/p/cclive/"
-DOWNLOAD="http://cclive.googlecode.com/files/cclive-0.6.5.tar.bz2"
-MD5SUM="c3d50c05ca332b01286f9f3b6dd21841"
+VERSION="0.7.3.1"
+HOMEPAGE="http://cclive.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/cclive/files/0.7/cclive-0.7.3.1.tar.gz"
+MD5SUM="de25297e9f34677d4d1920078d9cf254"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="crocket"
-EMAIL="crockabiscuit@yahoo.com"
+EMAIL="crockabiscuit@gmail.com"
 APPROVED="Niels Horn"
diff --git a/network/cclive/slack-desc b/network/cclive/slack-desc
index acff3084e7..2860bb0ff9 100644
--- a/network/cclive/slack-desc
+++ b/network/cclive/slack-desc
@@ -14,6 +14,6 @@ cclive: video content. It has low memory footprint compared to other similar
 cclive: tools. It is a rewrite ot the clive software in C++, and it is free
 cclive: software, licensed under the GPLv3.
 cclive:
-cclive: The website is http://code.google.com/p/cclive/
+cclive: Website : http://cclive.sourceforge.net/
 cclive:
 cclive: