2 files changed, 16 insertions, 19 deletions
diff --git a/multimedia/xvidcore/xvidcore.SlackBuild b/multimedia/xvidcore/xvidcore.SlackBuild
index eb1136da57..dbe848413a 100644
--- a/multimedia/xvidcore/xvidcore.SlackBuild
+++ b/multimedia/xvidcore/xvidcore.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xvidcore
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-1.2.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -44,12 +44,14 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -57,25 +59,20 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cd build/generic || exit 1
+cd build/generic
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --build=$ARCH-slackware-linux \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+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
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 cd $TMP/$PRGNAM
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/xvidcore/xvidcore.info b/multimedia/xvidcore/xvidcore.info
index 98b363934e..60b2990ad2 100644
--- a/multimedia/xvidcore/xvidcore.info
+++ b/multimedia/xvidcore/xvidcore.info
@@ -1,10 +1,10 @@
 PRGNAM="xvidcore"
-VERSION="1.2.1"
+VERSION="1.2.2"
 HOMEPAGE="http://www.xvid.org/"
-DOWNLOAD="http://downloads.xvid.org/downloads/xvidcore-1.2.1.tar.gz"
+DOWNLOAD="http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.gz"
+MD5SUM="2ce9b1d280d703b5bc8e702c79e660b5"
 DOWNLOAD_x86_64=""
-MD5SUM="3f57b3e153687fddefc9ccdf0dc737b7"
 MD5SUM_x86_64=""
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"