4 files changed, 75 insertions, 64 deletions
diff --git a/multimedia/vcdimager/README b/multimedia/vcdimager/README
index a50e3b3110..63257f057e 100644
--- a/multimedia/vcdimager/README
+++ b/multimedia/vcdimager/README
@@ -1,2 +1,4 @@
-GNU VCDImager is a full-featured mastering suite for authoring,
-disassembling and analyzing Video CDs and Super Video CDs.
+GNU VCDImager is a full-featured mastering suite for authoring, disassembling 
+and analyzing Video CDs and Super Video CDs.  Features include: Support for 
+VCD 1.1 and 2.0, Support for SVCD 1.0 full playback control, automatic padding
+of MPEG streams on the fly ... and more!
diff --git a/multimedia/vcdimager/slack-desc b/multimedia/vcdimager/slack-desc
index 16a7640a11..f30f5c2c6c 100644
--- a/multimedia/vcdimager/slack-desc
+++ b/multimedia/vcdimager/slack-desc
@@ -1,19 +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 ':'.
+# 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------------------------------------------------------|
-vcdimager: GNU VCDImager (Video CD tools)
-vcdimager: 
+         |-----handy-ruler----------------------------------------------------|
+vcdimager: vcdimager (VCD/SVCD Mastering Suite)
+vcdimager:
 vcdimager: GNU VCDImager is a full-featured mastering suite for authoring,
 vcdimager: disassembling and analyzing Video CDs and Super Video CDs.
-vcdimager: 
+vcdimager:
+vcdimager: Features include: Support for VCD 1.1 and 2.0, Support for SVCD 1.0
+vcdimager: full playback control, automatic padding of MPEG streams on the fly
+vcdimager: ... and more!
+vcdimager:
 vcdimager: Homepage: http://www.gnu.org/software/vcdimager/
-vcdimager: 
-vcdimager: 
-vcdimager: 
-vcdimager: 
-vcdimager: 
+vcdimager:
diff --git a/multimedia/vcdimager/vcdimager.SlackBuild b/multimedia/vcdimager/vcdimager.SlackBuild
index fddefdd4f7..eade08a771 100644
--- a/multimedia/vcdimager/vcdimager.SlackBuild
+++ b/multimedia/vcdimager/vcdimager.SlackBuild
@@ -1,56 +1,56 @@
 #!/bin/sh
 
-# Slackware build script for vcdimager
+# Slackware Build script for vcdimager 
 
-# Copyright 2007  Brian Reichert <rignes@pobox.com>
-# All rights reserved.
+# Copyright (c) 2009, eviljames <storgeek [ at ] gmail [ dot ] com>
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# 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.
 #
-# 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.
-
-set -e
+# 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.
 
 PRGNAM=vcdimager
 VERSION=0.7.23
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="AUTHORS BUGS ChangeLog_pre0_5 ChangeLog_pre0_7_14 \
-ChangeLog FAQ HACKING THANKS COPYING INSTALL NEWS README TODO"
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+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"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+
 cd $PRGNAM-$VERSION
-#chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chown -R root:root .
+find . \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 400 -o -perm 440 \) -exec chmod 644 {} \; -o \
+ \( -perm 777 -o -perm 775 -o -perm 511 -o -perm 711 -o -perm 555 \) -exec chmod 755 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -58,28 +58,35 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+make DESTDIR=$PKG install
 
-( 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
+( cd $PKGusr/man
+  find -type f -exec gzip -9 {} \;
+  for deadlink in $(find -type l ! -iname "*.gz"); do
+    ln -s $(readlink $deadlink).gz $deadlink.gz
+    rm $deadlink
+  done
 )
 
-# Compress info pages if they exist (and remove the dir file)
-if [ -d $PKG/usr/info ]; then
-  gzip -9 $PKG/usr/info/*.info*
-  rm -f $PKG/usr/info/dir
-fi
+rm -rf $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
+find $PKG -type f | xargs file | grep ELF | cut -f1 -d: | \
+  xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING ChangeLog* FAQ HACKING INSTALL NEWS README THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/vcdimager/vcdimager.info b/multimedia/vcdimager/vcdimager.info
index 6233ebacf7..289a7e85d1 100644
--- a/multimedia/vcdimager/vcdimager.info
+++ b/multimedia/vcdimager/vcdimager.info
@@ -1,8 +1,10 @@
 PRGNAM="vcdimager"
 VERSION="0.7.23"
 HOMEPAGE="http://www.gnu.org/software/vcdimager/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/vcdimager/vcdimager-0.7.23.tar.gz"
+DOWNLOAD="http://mirrors.kernel.org/gnu/vcdimager/vcdimager-0.7.23.tar.gz"
 MD5SUM="5e7d80fdbf0037ad20e438f2a9573253"
-MAINTAINER="Brian Reichert"
-EMAIL="rignes@pobox.com"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="eviljames"
+EMAIL="storgeek [ at ] gmail [ dot ] com"
 APPROVED="rworkman"