4 files changed, 39 insertions, 30 deletions
diff --git a/perl/perl-xml-libxml/README b/perl/perl-xml-libxml/README
index 8a7e2e2f2d..eac48f79a2 100644
--- a/perl/perl-xml-libxml/README
+++ b/perl/perl-xml-libxml/README
@@ -1,4 +1,7 @@
 XML::LibXML - Perl Binding for libxml2
 
-This requires the following from SlackBuilds.org:
- XML::NamespaceSupport, XML::LibXML::Common, XML::SAX
+This requires perl-xml-sax and perl-xml-namespacesupport
+
+Run these 2 commands if you remove this package.
+perl -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
+perl -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX))->save_parsers()"
diff --git a/perl/perl-xml-libxml/doinst.sh b/perl/perl-xml-libxml/doinst.sh
new file mode 100644
index 0000000000..ea301fb961
--- /dev/null
+++ b/perl/perl-xml-libxml/doinst.sh
@@ -0,0 +1,6 @@
+# Update SAX parsers
+chroot .  
+/usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" 1>/dev/null
+/usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" 1>/dev/null
+
+
diff --git a/perl/perl-xml-libxml/perl-xml-libxml.SlackBuild b/perl/perl-xml-libxml/perl-xml-libxml.SlackBuild
index b5752269f2..0d89acc22a 100644
--- a/perl/perl-xml-libxml/perl-xml-libxml.SlackBuild
+++ b/perl/perl-xml-libxml/perl-xml-libxml.SlackBuild
@@ -1,21 +1,20 @@
 #!/bin/sh
  
-# Slackware build script for perl-xml-namespacesupport
+# Slackware build script for perl-xml-libxml
 
 # Written by Murat D. Kadirov <banderols@gmail.com>
 
 PRGNAM=perl-xml-libxml
-SRCNAM=XML-LibXML
-VERSION=1.64
-BUILD=${BUILD:-2}
+VERSION=1.70
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+SRCNAM=XML-LibXML
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -36,29 +35,30 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-perl Makefile.PL
-make \
+perl Makefile.PL \
+  SKIP_SAX_INSTALL=1 \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
   INSTALLVENDORMAN1DIR=/usr/man/man1 \
   INSTALLVENDORMAN3DIR=/usr/man/man3
-make \
-  INSTALLVENDORMAN1DIR=/usr/man/man1 \
-  INSTALLVENDORMAN3DIR=/usr/man/man3 \
-  install_vendor \
-  DESTDIR=$PKG
+make
+make test
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-( cd $PKG
-  find . -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
-)
+find $PKG -name "perllocal.pod" -o -name ".packlist"  -o -name "*.bs"  | xargs rm -f || true
 
-# Remove empty directories
-find $PKG -depth -type d -empty -exec rm -rf {} \;
+find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  Changes LICENSE README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
diff --git a/perl/perl-xml-libxml/perl-xml-libxml.info b/perl/perl-xml-libxml/perl-xml-libxml.info
index 24704aaf72..acb9862465 100644
--- a/perl/perl-xml-libxml/perl-xml-libxml.info
+++ b/perl/perl-xml-libxml/perl-xml-libxml.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-xml-libxml"
-VERSION="1.64"
-HOMEPAGE="http://search.cpan.org/~pajas/XML-LibXML-1.64/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-1.64.tar.gz"
-MD5SUM="563a685d2aad2ace13a55acfeb818912"
+VERSION="1.70"
+HOMEPAGE="http://search.cpan.org/~pajas/XML-LibXML-1.70/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz"
+MD5SUM="33d4294f708e20c298cfe534d1166844"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Murat D. Kadirov"
 EMAIL="banderols@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"