4 files changed, 21 insertions, 30 deletions
diff --git a/network/yturl/yturl.1 b/network/yturl/yturl.1
index a0dde51016..6201f0f820 100644
--- a/network/yturl/yturl.1
+++ b/network/yturl/yturl.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YTURL 1"
-.TH YTURL 1 "2014-03-16" "1.16" "SlackBuilds.org"
+.TH YTURL 1 "2015-01-20" "1.17.0" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -142,15 +142,15 @@
 yturl \- Get direct URLs to YouTube videos.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-yturl [\-h] [\-q \s-1QUALITY\s0] [\-\-3d] videoID/url
+yturl [\-h] [\-q \s-1QUALITY\s0] videoID/url
 .PP
 videoID/url is a YouTube url or bare video \s-1ID.\s0
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .IP "\-h, \-\-help" 4
 .IX Item "-h, --help"
-show this help message and exit
+show help message and exit
 .IP "\-q \s-1QUALITY,\s0 \-\-quality \s-1QUALITY\s0" 4
 .IX Item "-q QUALITY, --quality QUALITY"
 specify quality, can be \*(L"low\*(R", \*(L"medium\*(R", \*(L"high\*(R", or an itag (see
-http://goo.gl/uEIuR)
+http://en.wikipedia.org/wiki/YouTube#Quality_and_formats)
diff --git a/network/yturl/yturl.SlackBuild b/network/yturl/yturl.SlackBuild
index 93b803eef8..84795ef6ee 100644
--- a/network/yturl/yturl.SlackBuild
+++ b/network/yturl/yturl.SlackBuild
@@ -12,8 +12,13 @@
 # youtube API changes break the release and upstream takes a long time to
 # make a new release.
 
+# 20150120 bkw: upgrade to 1.17.0. The old download URL was broken,
+# wonder how long for?
+# Use "python setup.py" since upstream has started requiring it.
+# Get rid of unused SLKCFLAGS and LIBDIRSUFFIX variables.
+
 PRGNAM=yturl
-VERSION=${VERSION:-1.16}
+VERSION=${VERSION:-1.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -30,27 +35,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -59,13 +50,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/bin
-install -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+python setup.py install --root=$PKG
+
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/yturl/yturl.info b/network/yturl/yturl.info
index f77dbc6f09..8a845fd0ff 100644
--- a/network/yturl/yturl.info
+++ b/network/yturl/yturl.info
@@ -1,8 +1,8 @@
 PRGNAM="yturl"
-VERSION="1.16"
+VERSION="1.17.0"
 HOMEPAGE="https://github.com/cdown/yturl"
-DOWNLOAD="https://github.com/cdown/yturl/archive/v1.16.tar.gz"
-MD5SUM="4c178cf078d6a8470dfaa2dc8d77512e"
+DOWNLOAD="https://github.com/cdown/yturl/archive/1.17.0.tar.gz"
+MD5SUM="99c6c66e01ca25a47af229f8fb0e8bae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yturl/yturl.pod b/network/yturl/yturl.pod
index d182a0df86..b1f75a1a4b 100644
--- a/network/yturl/yturl.pod
+++ b/network/yturl/yturl.pod
@@ -1,5 +1,5 @@
 # POD source for yturl man page. Convert with:
-# pod2man --stderr -s1 -cSlackBuilds.org -r1.16 yturl.pod > yturl.1
+# pod2man --stderr -s1 -cSlackBuilds.org -r1.17.0 yturl.pod > yturl.1
 
 =pod
 
@@ -9,7 +9,7 @@ yturl - Get direct URLs to YouTube videos.
 
 =head1 SYNOPSIS
 
-yturl [-h] [-q QUALITY] [--3d] videoID/url
+yturl [-h] [-q QUALITY] videoID/url
 
 videoID/url is a YouTube url or bare video ID.
 
@@ -19,12 +19,12 @@ videoID/url is a YouTube url or bare video ID.
 
 =item -h, --help
 
-show this help message and exit
+show help message and exit
 
 =item -q QUALITY, --quality QUALITY
 
 specify quality, can be "low", "medium", "high", or an itag (see
-http://goo.gl/uEIuR)
+http://en.wikipedia.org/wiki/YouTube#Quality_and_formats)
 
 =back