4 files changed, 47 insertions, 28 deletions
diff --git a/multimedia/xmltv/README b/multimedia/xmltv/README
index e17c0d9bc1..dc25b7b3c4 100644
--- a/multimedia/xmltv/README
+++ b/multimedia/xmltv/README
@@ -1,14 +1,15 @@
-XMLTV is a set of utilities to manage your TV viewing.  They work with 
-TV listings stored in the XMLTV format, which is based on XML. The idea
-is to separate out the back-end (getting the listings) from the front-end 
-(displaying them for the user), and to implement useful operations like 
-picking out your favorite programs as filters that read and write XML 
-documents.
+XMLTV is a set of utilities to manage your TV viewing.  They work with
+TV listings stored in the XMLTV format, which is based on XML. The
+idea is to separate out the back-end (getting the listings) from the
+front-end (displaying them for the user), and to implement useful
+operations like picking out your favorite programs as filters that
+read and write XML documents.
 
-At present there are back-ends grabbing TV listings for Australia, Belgium 
-and Luxembourg, Brazil, Argentina, Britain and Ireland, Croatia, Denmark, 
-Estonia, Finland, France, Germany, Hungary and Romania, Iceland, Italy, 
-Japan, Netherlands, North America, Norway, Portugal, Reunion Island (France),
-South Africa, Spain, Sweden, and Switzerland.
+At present there are back-ends grabbing TV listings for Australia,
+Belgium and Luxembourg, Brazil, Argentina, Britain and Ireland,
+Croatia, Denmark, Estonia, Finland, France, Germany, Hungary and
+Romania, Iceland, Italy, Japan, Netherlands, North America, Norway,
+Portugal, Reunion Island (France), South Africa, Spain, Sweden, and
+Switzerland.
 
 See README.SBo for optional requirements for grabbers.
diff --git a/multimedia/xmltv/README.SBo b/multimedia/xmltv/README.SBo
index 82de94966a..270be339d3 100644
--- a/multimedia/xmltv/README.SBo
+++ b/multimedia/xmltv/README.SBo
@@ -1,9 +1,3 @@
-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 
diff --git a/multimedia/xmltv/xmltv.SlackBuild b/multimedia/xmltv/xmltv.SlackBuild
index d7efae8986..fecc8adef1 100644
--- a/multimedia/xmltv/xmltv.SlackBuild
+++ b/multimedia/xmltv/xmltv.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Build Script for xmltv
 
@@ -22,31 +22,55 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xmltv
-VERSION=${VERSION:-0.5.66}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -76,11 +100,11 @@ find $PKG -depth -type d -empty -delete || true
 rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog README README.cygwin doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README* doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/xmltv/xmltv.info b/multimedia/xmltv/xmltv.info
index aa11981c21..698c0cc054 100644
--- a/multimedia/xmltv/xmltv.info
+++ b/multimedia/xmltv/xmltv.info
@@ -1,8 +1,8 @@
 PRGNAM="xmltv"
-VERSION="0.5.66"
+VERSION="0.6.3"
 HOMEPAGE="http://xmltv.org/wiki"
-DOWNLOAD="http://downloads.sourceforge.net/xmltv/xmltv-0.5.66.tar.bz2"
-MD5SUM="1ad51ff5a02e8320bd908c7908c49661"
+DOWNLOAD="https://github.com/XMLTV/xmltv/archive/v0.6.3/xmltv-0.6.3.tar.gz"
+MD5SUM="60ce0c74b1d7254753d7508ee8a4c46c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libwww-perl perl-Date-Manip perl-File-Slurp perl-Lingua-EN-Numbers-Ordinate perl-Lingua-Preferred perl-Term-ProgressBar perl-Unicode-String perl-XML-Writer perl-xml-libxml perl-xml-twig perl-XML-TreePP"