libraries/libxmlxx: Updated for version 2.20.0

4 files changed, 29 insertions, 29 deletions

diff --git a/libraries/libxmlxx/README b/libraries/libxmlxx/README
index ddee39a925..07b8a2cbcd 100644
--- a/libraries/libxmlxx/README
+++ b/libraries/libxmlxx/README
@@ -2,4 +2,4 @@ libxml++ is a C++ wrapper for the libxml XML parser library. Its original
 author is Ari Johnson and it is currently maintained by Christophe de 
 Vienne and Murray Cumming. It is released under the LGPL version 2 or above.
 
-Requires: glibmm (slackbuild available at slackbuilds.org)
+Requires: glibmm (build script available at SlackBuilds.org)
diff --git a/libraries/libxmlxx/libxmlxx.SlackBuild b/libraries/libxmlxx/libxmlxx.SlackBuild
index 4a82214d15..939c89cddd 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
diff --git a/libraries/libxmlxx/libxmlxx.info b/libraries/libxmlxx/libxmlxx.info
index a59aab09df..d2072b180f 100644
--- a/libraries/libxmlxx/libxmlxx.info
+++ b/libraries/libxmlxx/libxmlxx.info
@@ -1,8 +1,8 @@
 PRGNAM="libxmlxx"
-VERSION="2.18.0"
+VERSION="2.20.0"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.18/libxml++-2.18.0.tar.bz2"
-MD5SUM="ae1d27f2117193bbd71dec92a265db9a"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.20/libxml++-2.20.0.tar.bz2"
+MD5SUM="4fe6ae1344e523ea4756733be71f9af3"
 MAINTAINER="Iskar Enev"
 EMAIL="iskar.enev@gmail.com"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/libraries/libxmlxx/slack-desc b/libraries/libxmlxx/slack-desc
index c8e41e01db..c3439c14ae 100644
--- a/libraries/libxmlxx/slack-desc
+++ b/libraries/libxmlxx/slack-desc
@@ -5,13 +5,13 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-		  |-----handy-ruler---------------------------------------------------------|
-libxml++: libxml++
+        |-----handy-ruler---------------------------------------------------|
+libxml++: libxml++ (C++ wrapper for the libxml XML parser library)
 libxml++:
 libxml++: libxml++ is a C++ wrapper for the libxml XML parser library. Its 
 libxml++: original author is Ari Johnson and it is currently maintained by 
-libxml++: Christophe de Vienne and Murray Cumming. It is released under the LGPL 
-libxml++: version 2 or above.
+libxml++: Christophe de Vienne and Murray Cumming. It is released under the
+libxml++: LGPL version 2 or above.
 libxml++: 
 libxml++: 
 libxml++: