1 files changed, 20 insertions, 20 deletions
diff --git a/libraries/libxmlxx/libxmlxx.SlackBuild b/libraries/libxmlxx/libxmlxx.SlackBuild
index 4a82214d15a9d..939c89cddd431 100644
--- a/libraries/libxmlxx/libxmlxx.SlackBuild
+++ b/libraries/libxmlxx/libxmlxx.SlackBuild
@@ -1,19 +1,22 @@
 #!/bin/sh
 
 # Slackware build script for libxml++
-# Written by Iskar Enev <iskar.enev@gmail.com>
+# Written by Iskar Enev <iskar.enev[@]gmail.com>
+# Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=libxmlxx
-PKGNAME=libxml++
-VERSION=2.18.0
+PKG_NAME=libxml++
+VERSION=2.20.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAME
+PKG=$TMP/package-$PKG_NAME
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -23,9 +26,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAME-$VERSION
-tar -xjvf $CWD/$PKGNAME-$VERSION.tar.bz2
-cd $PKGNAME-$VERSION
+rm -rf $PKG_NAME-$VERSION
+tar xvf $CWD/$PKG_NAME-$VERSION.tar.bz2
+cd $PKG_NAME-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -34,28 +37,25 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var \
-  || exit 1
-
+  --localstatedir=/var
 
-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
 )
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PKGNAME-$VERSION
-mv $PKG/usr/share/doc/libxml++-2.6/docs/* $PKG/usr/doc/$PKGNAME-$VERSION
-( cd $PKG/usr
-    rmdir -p share/doc/libxml++-2.6/docs
-)
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PKG_NAME-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  $PKG/usr/doc/$PKG_NAME-$VERSION
+mv $PKG/usr/share/doc/libxml++-2.6/docs/* $PKG/usr/doc/$PKG_NAME-$VERSION
+rm -rf $PKG/usr/share
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PKG_NAME-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$VERSION-$ARCH-$BUILD$TAG.tgz