4 files changed, 32 insertions, 24 deletions
diff --git a/multimedia/mplayer-codecs-all/README b/multimedia/mplayer-codecs-all/README
index 8e158d5e46..dc6f16eb4a 100644
--- a/multimedia/mplayer-codecs-all/README
+++ b/multimedia/mplayer-codecs-all/README
@@ -1,5 +1,5 @@
-This script repackages the all-$DATE.tar.bz2 codecs archive distributed by mplayer.  
-These codecs install to /usr/lib/codecs (and are also symlinked to /usr/lib/win32 
-for compatibility).
+This script repackages the all-20071007.tar.bz2 codecs archive 
+distributed by MPlayer.  These codecs install to /usr/lib/codecs/ 
 
-When compiling MPlayer, use /usr/lib/codecs as the values for the codecs variables.
+When compiling MPlayer, use /usr/lib/codecs as the values for 
+the codecs variable.
diff --git a/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild b/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild
index c20140e714..2b7d12a9f0 100644
--- a/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild
+++ b/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mplayer-codecs-all
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,27 +22,27 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=mplayer-codecs-all
-VERSION=20061022
+VERSION=20071007
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/lib $OUTPUT
-cd $PKG/usr/lib
-tar -xjvf $CWD/all-$VERSION.tar.bz2 || exit 1
+cd $PKG/usr/lib || exit 1
+tar xvf $CWD/all-$VERSION.tar.bz2 || exit 1
 mv all-$VERSION codecs
 cd codecs
 
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+( cd $PKG 
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -50,11 +50,7 @@ mv $PKG/usr/lib/codecs/README $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Keep the compatibility symlink to /usr/lib/win32 for now
-( cd $PKG/usr/lib
-  ln -s codecs win32
-)
+sed -i s/DATE/$VERSION/ $PKG/install/slack-desc
 
 cd $PKG
 chown -R root:root .
diff --git a/multimedia/mplayer-codecs-all/mplayer-codecs-all.info b/multimedia/mplayer-codecs-all/mplayer-codecs-all.info
index f7fc5c2fe7..864efcb1fd 100644
--- a/multimedia/mplayer-codecs-all/mplayer-codecs-all.info
+++ b/multimedia/mplayer-codecs-all/mplayer-codecs-all.info
@@ -1,8 +1,8 @@
 PRGNAM="mplayer-codecs-all"
-VERSION="20061022"
+VERSION="20071007"
 HOMEPAGE="http://www.mplayerhq.hu"
-DOWNLOAD="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-20061022.tar.bz2"
-MD5SUM="cb4bb06ebc804f5dc4ec0ed516dc20d9"
+DOWNLOAD="http://www3.mplayerhq.hu/MPlayer/releases/codecs/all-20071007.tar.bz2"
+MD5SUM="0407e8ad132e37ccd3f932448ca201c5"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="robw810"
+APPROVED="erik"
diff --git a/multimedia/mplayer-codecs-all/slack-desc b/multimedia/mplayer-codecs-all/slack-desc
index 19c07e9e4e..6b83ed754d 100644
--- a/multimedia/mplayer-codecs-all/slack-desc
+++ b/multimedia/mplayer-codecs-all/slack-desc
@@ -1,7 +1,19 @@
-mplayer-codecs-all: Codecs for MPlayer (ALL - win32, quicktime, etc)
+# 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 ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
+mplayer-codecs-all: mplayer-codecs-all (Codecs for MPlayer (win32, quicktime, etc))
 mplayer-codecs-all: 
-mplayer-codecs-all: This is a repackaging of the all-$DATE.tar.bz2 
+mplayer-codecs-all: This is a repackaging of the all-DATE.tar.bz2 
 mplayer-codecs-all: archive distributed by mplayer.  These codecs
 mplayer-codecs-all: install to /usr/lib/codecs (and are also symlinked
 mplayer-codecs-all: to /usr/lib/win32 for compatibility).
 mplayer-codecs-all:
+mplayer-codecs-all:
+mplayer-codecs-all:
+mplayer-codecs-all:
+mplayer-codecs-all: