2 files changed, 12 insertions, 12 deletions
diff --git a/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild b/multimedia/mplayer-codecs-all/mplayer-codecs-all.SlackBuild
index 2b7d12a9f0..875aa38a8a 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-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,19 +25,20 @@
 PRGNAM=mplayer-codecs-all
 VERSION=20071007
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/lib $OUTPUT
-cd $PKG/usr/lib || exit 1
-tar xvf $CWD/all-$VERSION.tar.bz2 || exit 1
-mv all-$VERSION codecs
-cd codecs
+tar xvf $CWD/all-$VERSION.tar.bz2 -C $PKG/usr/lib
+mv $PKG/usr/lib/all-$VERSION $PKG/usr/lib/codecs
 
 ( cd $PKG 
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -46,11 +47,10 @@ cd codecs
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mv $PKG/usr/lib/codecs/README $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/lib/codecs/README $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-sed -i s/DATE/$VERSION/ $PKG/install/slack-desc
+sed s/DATE/$VERSION/ $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 chown -R root:root .
diff --git a/multimedia/mplayer-codecs-all/slack-desc b/multimedia/mplayer-codecs-all/slack-desc
index 6b83ed754d..61aa63123a 100644
--- a/multimedia/mplayer-codecs-all/slack-desc
+++ b/multimedia/mplayer-codecs-all/slack-desc
@@ -6,12 +6,12 @@
 # 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 (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: 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: install to /usr/lib/codecs 
+mplayer-codecs-all: 
 mplayer-codecs-all:
 mplayer-codecs-all:
 mplayer-codecs-all: