4 files changed, 30 insertions, 42 deletions
diff --git a/multimedia/oggvideotools/README b/multimedia/oggvideotools/README
index ec3bdc36fed88..40cf991b3c321 100644
--- a/multimedia/oggvideotools/README
+++ b/multimedia/oggvideotools/README
@@ -1,8 +1,3 @@
-Ogg Video Tools is a toolbox for manipulating Ogg video files, which
-usually consist of a video stream (Theora) and an audio stream (Vorbis).
-
-It provides handy command line tools for creating and manipulating these
-video files.
-
-It needs SDL, libvorbis and libtheora which are all part of slackware
-install.
+Ogg Video Tools is a toolbox for manipulating Ogg video files, which usually
+consist of a video stream (Theora) and an audio stream (Vorbis).  It provides 
+handy command line tools for creating and manipulating these video files.
diff --git a/multimedia/oggvideotools/oggvideotools.SlackBuild b/multimedia/oggvideotools/oggvideotools.SlackBuild
index d0dc807c9bfc1..1fe3e8e853b4a 100644
--- a/multimedia/oggvideotools/oggvideotools.SlackBuild
+++ b/multimedia/oggvideotools/oggvideotools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for OggVideoTools
 # Home Page http://dev.streamnik.de/oggvideotools.html
 
-# Copyright (c) 2009, Nishant Limbachia, Hoffman Est, IL, USA (nishant@mnspace.net)
+# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,16 +25,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oggvideotools
-VERSION=0.8
+VERSION=0.8a
 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
@@ -58,7 +56,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 	# Exit on most errors
+set -e
 
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -72,31 +70,26 @@ 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 \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE" \
+    -DLIB_SUFFIX:STRING="$LIBDIRSUFFIX"
+  make
+  make DESTDIR=$PKG install/strip
+cd -
 
-make
-make install-strip DESTDIR=$PKG
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-
-cp -a AUTHORS ChangeLog COPYING INSTALL \
-  NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/*.html docs/DocuOggVideoTools.pdf $PKG/usr/doc/$PRGNAM-$VERSION/html
-
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a docs/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/oggvideotools/oggvideotools.info b/multimedia/oggvideotools/oggvideotools.info
index 7d2258188b766..9c7385d68c50d 100644
--- a/multimedia/oggvideotools/oggvideotools.info
+++ b/multimedia/oggvideotools/oggvideotools.info
@@ -1,10 +1,10 @@
 PRGNAM="oggvideotools"
-VERSION="0.8"
+VERSION="0.8a"
 HOMEPAGE="http://dev.streamnik.de/oggvideotools.html"
-DOWNLOAD="http://downloads.sourceforge.net/oggvideotools/oggvideotools-0.8.tar.gz"
-MD5SUM="d735b6a4cdb5557340cc4b7d558f1052"
+DOWNLOAD="http://downloads.sourceforge.net/oggvideotools/oggvideotools-0.8a.tar.gz"
+MD5SUM="e7fcfcc4e91187f7a2ca4aea26c2ce64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/multimedia/oggvideotools/slack-desc b/multimedia/oggvideotools/slack-desc
index caf9e77fc49d1..43cb9c866e693 100644
--- a/multimedia/oggvideotools/slack-desc
+++ b/multimedia/oggvideotools/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler---------------------------------------------|
-oggvideotools: oggvideotools (Ogg Video Tools)
+oggvideotools: oggvideotools (ogg video toolbox)
 oggvideotools:
 oggvideotools: Ogg Video Tools is a toolbox for manipulating ogg video
-oggvideotools: files. It provides handy command line tools for creating
-oggvideotools: and manipulating these video files.
+oggvideotools: files.
 oggvideotools:
 oggvideotools: Homepage: http://dev.streamnik.de/oggvideotools.html
 oggvideotools:
 oggvideotools:
 oggvideotools:
 oggvideotools:
+oggvideotools: