libraries/xmltv_prereq: Updated for version 8

4 files changed, 14 insertions, 13 deletions

diff --git a/libraries/xmltv_prereq/README b/libraries/xmltv_prereq/README
index 9218d44bc8..4a35b57ec6 100644
--- a/libraries/xmltv_prereq/README
+++ b/libraries/xmltv_prereq/README
@@ -1,7 +1,7 @@
 xmltv_prereq is a package of several perl modules required to build and
-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.
+run xmltv. Many of these are now available from SlackBuilds.org; to
+prevent conflicts, you should remove any of the already-installed modules 
+from the modules list in xmltv_prereq.SlackBuild.
 The package includes the following modules by default:
 
  Class-MethodMaker-2.09   DateManip-5.44   HTML-Parser-3.56
@@ -11,5 +11,3 @@ The package includes the following modules by default:
  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 available at SlackBuilds.org
diff --git a/libraries/xmltv_prereq/slack-desc b/libraries/xmltv_prereq/slack-desc
index 77d9b5e9e4..4e4eb48a11 100644
--- a/libraries/xmltv_prereq/slack-desc
+++ b/libraries/xmltv_prereq/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-            |-----handy-ruler-----------------------------------------------|
+            |-----handy-ruler------------------------------------------------------|
 xmltv_prereq: xmltv_prereq (required perl modules for xmltv)
-xmltv_prereq: 
+xmltv_prereq:
 xmltv_prereq: Includes the following perl modules:
-xmltv_prereq: 
+xmltv_prereq:
 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 .
-xmltv_prereq: 
+xmltv_prereq:
diff --git a/libraries/xmltv_prereq/xmltv_prereq.SlackBuild b/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
index e92adb1aeb..2be92dfdcd 100644
--- a/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
+++ b/libraries/xmltv_prereq/xmltv_prereq.SlackBuild
@@ -23,8 +23,8 @@
 
 PRGNAM=xmltv_prereq
 VERSION=8
-ARCH=noarch
-BUILD=${BUILD:-3}
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -70,7 +70,8 @@ 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.10.0
+eval $(perl '-V:vendorlib')
+export PERL5LIB+=$PKG/$vendorlib
 
 for MODULE in $MODULES ; do
 ( cd $MODULE
@@ -108,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/xmltv_prereq/xmltv_prereq.info b/libraries/xmltv_prereq/xmltv_prereq.info
index d9a6ef22f9..101a54e3bb 100644
--- a/libraries/xmltv_prereq/xmltv_prereq.info
+++ b/libraries/xmltv_prereq/xmltv_prereq.info
@@ -3,6 +3,8 @@ VERSION="8"
 HOMEPAGE="http://xmltv.org/wiki/"
 DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv_prereq-8.tar.bz2"
 MD5SUM="3b2fd40679b0955fe2054f2f447c3a98"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"