3 files changed, 26 insertions, 39 deletions
diff --git a/multimedia/tovid/slack-desc b/multimedia/tovid/slack-desc
index 528c88f5ef92..b3a83f3e4d23 100644
--- a/multimedia/tovid/slack-desc
+++ b/multimedia/tovid/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--------------------------------------------------------|
+     |-----handy-ruler------------------------------------------------------|
 tovid: tovid (a collection of GPL video disc authoring tools)
 tovid:
 tovid: tovid is a collection of GPL video disc authoring tools; it can help
-tovid: you create your own DVDs, VCDs, and SVCDs for playback on your home DVD
-tovid: player.
+tovid: you create your own DVDs, VCDs, and SVCDs for playback on your home
+tovid: DVD player.
 tovid:
-tovid: Note: The scripts rely heavily on external tools, please take care that
-tovid: all dependencies are met.
+tovid: Note: The scripts rely heavily on external tools, please take care
+tovid: that all dependencies are met.
 tovid:
 tovid: Homepage: http://tovid.wikia.com/wiki/Tovid_Wiki
 tovid:
diff --git a/multimedia/tovid/tovid.SlackBuild b/multimedia/tovid/tovid.SlackBuild
index f9f0bbd858b6..44083246262b 100644
--- a/multimedia/tovid/tovid.SlackBuild
+++ b/multimedia/tovid/tovid.SlackBuild
@@ -1,25 +1,26 @@
 #!/bin/sh
 
 # Slackware Build script for tovid by eviljames
-#Copyright (c) 2010, eviljames <storgeek [ at ] gmail [ dot ] com>
+
+# Copyright (c) 2010, eviljames <storgeek [ at ] gmail [ dot ] com>
+# Copyright (c) 2010-2011, Niels Horn, Rio de Janeiro, RJ, Brazil
 #
-#Permission to use, copy, modify, and/or distribute this software for any
-#purpose with or without fee is hereby granted, provided that the above
-#copyright notice and this permission notice appear in all copies.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
-#THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-#WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-#MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-#ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-#WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-#ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-#OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# modified by Niels Horn <niels.horn@gmail.com> for new python install method
-# Revision date: 2010/07/16
+# Revision date: 2011/08/10
 
 PRGNAM=tovid
-VERSION=${VERSION:-0.33}
+VERSION=${VERSION:-0.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,20 +37,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -80,7 +67,7 @@ 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/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README SENSE \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
@@ -88,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/tovid/tovid.info b/multimedia/tovid/tovid.info
index d5e69052ddc6..e762723c02a5 100644
--- a/multimedia/tovid/tovid.info
+++ b/multimedia/tovid/tovid.info
@@ -1,10 +1,10 @@
 PRGNAM="tovid"
-VERSION="0.33"
+VERSION="0.34"
 HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki/"
-DOWNLOAD="http://tovid.googlecode.com/files/tovid-0.33.tar.gz"
-MD5SUM="078610cf7a5296d59bdd8c7cc88ffb77"
+DOWNLOAD="http://tovid.googlecode.com/files/tovid-0.34.tar.gz"
+MD5SUM="30563e7c5e63963184fdcba7c9eceb33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"