4 files changed, 56 insertions, 23 deletions
diff --git a/multimedia/xmltv/README b/multimedia/xmltv/README
index dfc57a67dd..d188498ef7 100644
--- a/multimedia/xmltv/README
+++ b/multimedia/xmltv/README
@@ -11,4 +11,10 @@ Estonia, Finland, France, Germany, Hungary and Romania, Iceland, Italy,
 Japan, Netherlands, North America, Norway, Portugal, Reunion Island (France),
 South Africa, Spain, Sweden, and Switzerland.
 
-Requires xmltv_prereq and perl-File-Slurp
+This requires:
+libwww-perl, perl-xml-twig, perl-Date-Manip, perl-XML-Writer,
+perl-Lingua-Preferred, perl-TermReadKey, perl-Unicode-String,
+perl-Term-ProgressBar, perl-File-Slurp, perl-xml-libxml,
+perl-Lingua-EN-Numbers-Ordinate.
+
+See README.SBo for optional requirements for grabbers.
diff --git a/multimedia/xmltv/README.SBo b/multimedia/xmltv/README.SBo
new file mode 100644
index 0000000000..82de94966a
--- /dev/null
+++ b/multimedia/xmltv/README.SBo
@@ -0,0 +1,24 @@
+This requires:
+libwww-perl, perl-xml-twig, perl-Date-Manip, perl-XML-Writer,
+perl-Lingua-Preferred, perl-TermReadKey, perl-Unicode-String,
+perl-Term-ProgressBar, perl-File-Slurp, perl-xml-libxml,
+perl-Lingua-EN-Numbers-Ordinate.
+
+optional requirements for grabbers:
+dk requires:          perl-HTML-Tree 
+fi requires:          perl-HTML-Tree 
+fr requires:          perl-HTML-Tree, perl-html-parser
+huro requires:        perl-HTML-Tree 
+is requires:          perl-XML-LibXSLT
+no_gf requires:       perl-HTTP-Cache-Transparent, perl-IO-stringy, perl-xml-libxml
+pt requires:          perl-HTML-Tree, perl-Unicode-UTF8simple
+eu_epg requires:      perl-Archive-Zip
+se_swedb requires:    perl-IO-stringy, perl-xml-libxml, perl-HTTP-Cache-Transparent
+hr requires:          perl-IO-stringy, perl-xml-libxml, perl-HTTP-Cache-Transparent
+uk_rt requires:       perl-IO-stringy, perl-HTTP-Cache-Transparent
+uk_bleb requires:     perl-IO-stringy, perl-Archive-Zip
+ee requires:          perl-IO-stringy
+tv_combiner requires: perl-xml-libxml
+tv_check requires:    perl-tk, perl-Tk-TableMatrix
+na_dtv requires:      perl-IO-stringy, perl-xml-libxml, perl-www-mechanize, perl-TimeDate
+na_dd requires:       perl-HTML-TableExtract, perl-www-mechanize, perl-SOAP-Lite
diff --git a/multimedia/xmltv/xmltv.SlackBuild b/multimedia/xmltv/xmltv.SlackBuild
index c26159f2c7..e0221d8089 100644
--- a/multimedia/xmltv/xmltv.SlackBuild
+++ b/multimedia/xmltv/xmltv.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware Build Script for xmltv
 
-# Copyright 2006-2009  David Somero (dsomero@hotmail.com) Athens,TN USA
+# Copyright 2006-2011  David Somero (dsomero@hotmail.com) Athens,TN USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmltv
-VERSION=0.5.56
+VERSION=0.5.59
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 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
@@ -50,34 +48,39 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 
 cd $PRGNAM-$VERSION 
-chown -R root:root . 
+chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-perl Makefile.PL -default
+perl Makefile.PL -default \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
 make
-make pure_vendor_install DESTDIR=$PKG/
+make test
+make install DESTDIR=$PKG
 
-mv $PKG/usr/share/man $PKG/usr
-rmdir $PKG/usr/share
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+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
 
-# Remove perlocal.pod and .packlist and .bs files from $PKG.
-( 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
+
+find $PKG -depth -type d -empty -delete || true
+
+rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog MANIFEST README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   ChangeLog README README.cygwin doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/xmltv/xmltv.info b/multimedia/xmltv/xmltv.info
index fabca92714..d36d0ccbe5 100644
--- a/multimedia/xmltv/xmltv.info
+++ b/multimedia/xmltv/xmltv.info
@@ -1,8 +1,8 @@
 PRGNAM="xmltv"
-VERSION="0.5.56"
+VERSION="0.5.59"
 HOMEPAGE="http://xmltv.org/wiki"
-DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv-0.5.56.tar.bz2"
-MD5SUM="308c01dc50f9f138bd9ada7483e2877b"
+DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv-0.5.59.tar.bz2"
+MD5SUM="29497a1d165ef0cdedfe376e04c06903"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Somero"