multimedia/dvgrab: Updated for version 3.3

4 files changed, 36 insertions, 21 deletions

diff --git a/multimedia/dvgrab/README b/multimedia/dvgrab/README
index 6be201baaf73..9f05daa06d94 100644
--- a/multimedia/dvgrab/README
+++ b/multimedia/dvgrab/README
@@ -4,5 +4,5 @@ several file formats. It features autosplit of long video sequences,
 and supports saving the data as raw frames, AVI type 1, AVI type 2,
 Quicktime DV, or a series of JPEG stills.
 
-Dependencies: libraw1394, libiec61883, libavc1394, libdv, 
-libquicktime (optional) -- all available from SlackBuilds.org
+Dependencies: libiec61883, libavc1394, libdv, libquicktime (optional) 
+(all available from SlackBuilds.org)
diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild
index a04e03524791..eb5de6f1b50a 100644
--- a/multimedia/dvgrab/dvgrab.SlackBuild
+++ b/multimedia/dvgrab/dvgrab.SlackBuild
@@ -1,11 +1,28 @@
 #!/bin/sh
 
-# Slackware build script for suspend
+# Slackware build script for dvgrab
 
 # Written by Murat D. Kadirov <banderols@gmail.com>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR 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.
 
 PRGNAM=dvgrab
-VERSION=${VERSION:-3.2}
+VERSION=${VERSION:-3.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -44,14 +61,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 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 || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -59,15 +80,9 @@ make install DESTDIR=$PKG
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-( cd $PKG
-  find . -name perllocal.pod \
-    -o -name ".packlist" \
-    -o -name "*.bs" \
-    | xargs rm -f
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/dvgrab/dvgrab.info b/multimedia/dvgrab/dvgrab.info
index 4ed2a45c6a9b..463f83cd2424 100644
--- a/multimedia/dvgrab/dvgrab.info
+++ b/multimedia/dvgrab/dvgrab.info
@@ -1,8 +1,8 @@
 PRGNAM="dvgrab"
-VERSION="3.2"
+VERSION="3.3"
 HOMEPAGE="http://www.kinodv.org/"
-DOWNLOAD="http://surfnet.dl.sourceforge.net/sourceforge/kino/dvgrab-3.2.tar.gz"
-MD5SUM="3c2af59a3b8b76473b557adf4793cebd"
+DOWNLOAD="http://downloads.sourceforge.net/kino/dvgrab-3.3.tar.gz"
+MD5SUM="0154f15cbf2496a03d36beb5175bce99"
 MAINTAINER="Murat D. Kadirov"
 EMAIL="banderols@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/multimedia/dvgrab/slack-desc b/multimedia/dvgrab/slack-desc
index 6232e72596f2..a754c22bd36f 100644
--- a/multimedia/dvgrab/slack-desc
+++ b/multimedia/dvgrab/slack-desc
@@ -5,8 +5,8 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-      |-----handy-ruler---------------------------------------------------------|
-dvgrab: Grab (DV video and audio data via IEEE1394 links)
+      |-----handy-ruler-------------------------------------------------------|
+dvgrab: dvgrab (DV video and audio data via IEEE1394 links)
 dvgrab:
 dvgrab: dvgrab is a program that captures DV video and audio data from  digital
 dvgrab: camcorders  via  an  IEEE1394  link.  (IEEE1394 is also known under the