libraries/xmltv_prereq: Updated for version 8

3 files changed, 19 insertions, 16 deletions

diff --git a/libraries/xmltv_prereq/README b/libraries/xmltv_prereq/README
index a95776a20aae..9218d44bc81a 100644
--- a/libraries/xmltv_prereq/README
+++ b/libraries/xmltv_prereq/README
@@ -1,12 +1,15 @@
 xmltv_prereq is a package of several perl modules required to build and
-run xmltv.  The package includes the following:
+run xmltv. Many of these are now available from SlackBuilds.org, to
+prevent conflicts you should remove any of the modules you have installed
+separately from the modules list in xmltv_prereq.SlackBuild.
+The package includes the following modules by default:
 
- Class-MethodMaker-2.09 HTML-Tagset-3.10 TermReadKey-2.30 Tk-804.027
- DateManip-5.44 XML-NamespaceSupport-1.09 libwww-perl-5.805 
- HTML-TableExtract-2.1 HTML-Tree-3.23 Lingua-EN-Numbers-Ordinate-1.02
- Lingua-Preferred-0.2.4 PerlIO-gzip-0.18 SOAP-Lite-0.69
- Term-ProgressBar-2.09 Tk-TableMatrix-1.23 Unicode-String-2.09
- XML-LibXML-1.62 XML-Twig-3.29 XML-Writer-0.602 WWW-Mechanize-1.20
- XML-LibXML-Common-0.13 HTML-Parser-3.56 xmltv_prereq1: XML-SAX-0.15
+ Class-MethodMaker-2.09   DateManip-5.44   HTML-Parser-3.56
+ HTML-TableExtract-2.1   HTML-Tagset-3.10   HTML-Tree-3.23
+ libwww-perl-5.805   Lingua-EN-Numbers-Ordinate-1.02   Lingua-Preferred-0.2.4
+ PerlIO-gzip-0.18   SOAP-Lite-0.69   Term-ProgressBar-2.09
+ TermReadKey-2.30   Tk-804.027   Tk-TableMatrix-1.23   Unicode-String-2.09
+ WWW-Mechanize-1.20   XML-LibXML-1.62   XML-LibXML-Common-0.13
+ XML-NamespaceSupport-1.09   XML-SAX-0.15   XML-Twig-3.29   XML-Writer-0.602
 
-Requires Compress-Zlib availible at SlackBuilds.org
\ No newline at end of file
+Requires Compress-Zlib available at SlackBuilds.org
diff --git a/libraries/xmltv_prereq/slack-desc b/libraries/xmltv_prereq/slack-desc
index a7fa17e7f3d8..77d9b5e9e480 100644
--- a/libraries/xmltv_prereq/slack-desc
+++ b/libraries/xmltv_prereq/slack-desc
@@ -10,10 +10,10 @@ xmltv_prereq: xmltv_prereq (required perl modules for xmltv)
 xmltv_prereq: 
 xmltv_prereq: Includes the following perl modules:
 xmltv_prereq: 
-xmltv_prereq: Class-MethodMaker  HTML-Tagset  TermReadKey  Compress-Zlib
+xmltv_prereq: Class-MethodMaker  HTML-Tagset  TermReadKey  libwww-perl
 xmltv_prereq: DateManip  XML-NamespaceSupport  HTML-TableExtract  HTML-Tree
 xmltv_prereq: Lingua-EN-Numbers-Ordinate  Lingua-Preferred  PerlIO-gzip 
 xmltv_prereq: SOAP-Lite  Term-ProgressBar  Tk-TableMatrix  Unicode-String
 xmltv_prereq: XML-LibXML  XML-Twig  XML-Writer  WWW-Mechanize  Tk
-xmltv_prereq: XML-LibXML-Common  HTML-Parser  XML-SAX  libwww-perl 
+xmltv_prereq: XML-LibXML-Common  HTML-Parser  XML-SAX .
 xmltv_prereq: 
diff --git a/libraries/xmltv_prereq/xmltv_prereq.SlackBuild b/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
index 34d624dc8c3f..e92adb1aebc4 100644
--- a/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
+++ b/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware Build Script for xmltv_prereq
 
-# Copyright 2006-2007  David Somero (dsomero@hotmail.com)
+# Copyright 2006-2009  David Somero (dsomero@hotmail.com) Athens,TN USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 PRGNAM=xmltv_prereq
 VERSION=8
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -32,8 +32,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e		# Exit on most errors
-
 ## List of modules to compile
 MODULES="
 00_Class-MethodMaker-2.09
@@ -61,6 +59,8 @@ XML-Writer-0.602
 WWW-Mechanize-1.20
 "
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -70,7 +70,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root . 
 chmod -R u+w,go+r-w,a-s .
 
-export PERL5LIB=$PKG/usr/lib/perl5/vendor_perl/5.8.8
+export PERL5LIB+=$PKG/usr/lib/perl5/vendor_perl/5.10.0
 
 for MODULE in $MODULES ; do
 ( cd $MODULE