6 files changed, 57 insertions, 16 deletions
diff --git a/network/yturl/README b/network/yturl/README
index d060345c51ee9..cbf181691a8b7 100644
--- a/network/yturl/README
+++ b/network/yturl/README
@@ -3,4 +3,4 @@ yturl (get direct URLs to YouTube videos)
 yturl is a simple command-line utility written in Python. It converts
 youtube URLs or video IDs into directly-watchable URLs. Example use:
 
-mplayer "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
+mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
diff --git a/network/yturl/slack-desc b/network/yturl/slack-desc
index b291dcaf58378..e02591739e56f 100644
--- a/network/yturl/slack-desc
+++ b/network/yturl/slack-desc
@@ -11,7 +11,7 @@ yturl:
 yturl: yturl is a simple command-line utility written in Python. It converts
 yturl: youtube URLs or video IDs into directly-watchable URLs. Example use:
 yturl:
-yturl: mplayer "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
+yturl: mpv "$(yturl 'http://www.youtube.com/watch?v=KxaCOHT0pmI')"
 yturl:
 yturl:
 yturl:
diff --git a/network/yturl/yturl.1 b/network/yturl/yturl.1
index 6201f0f820902..fe3c5eb244c80 100644
--- a/network/yturl/yturl.1
+++ b/network/yturl/yturl.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "YTURL 1"
-.TH YTURL 1 "2015-01-20" "1.17.0" "SlackBuilds.org"
+.TH YTURL 1 "2015-09-10" "1.20.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
@@ -145,6 +145,30 @@ yturl \- Get direct URLs to YouTube videos.
 yturl [\-h] [\-q \s-1QUALITY\s0] videoID/url
 .PP
 videoID/url is a YouTube url or bare video \s-1ID.\s0
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+By default, yturl prints the media \s-1URL\s0 to standard output.
+.PP
+.Vb 3
+\&    $ yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq
+\&    Using itag 43.
+\&    http://r2\-\-\-sn\-uphxqvujvh\-30al.googlevideo.com/videoplayback?source=[...]
+.Ve
+.PP
+This means that you can do something like the following to watch it in
+mpv:
+.PP
+.Vb 1
+\&    $ mpv "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
+.Ve
+.PP
+(also works with vlc, but for some reason not with mplayer)
+.PP
+Or something like the following to download it (using curl):
+.PP
+.Vb 1
+\&    $ curl \-Lo bill "$(yturl \*(Aqhttp://www.youtube.com/watch?v=8TCxE0bWQeQ\*(Aq)"
+.Ve
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .IP "\-h, \-\-help" 4
diff --git a/network/yturl/yturl.SlackBuild b/network/yturl/yturl.SlackBuild
index 84795ef6ee8b1..9997f9d97e13b 100644
--- a/network/yturl/yturl.SlackBuild
+++ b/network/yturl/yturl.SlackBuild
@@ -17,18 +17,16 @@
 # Use "python setup.py" since upstream has started requiring it.
 # Get rid of unused SLKCFLAGS and LIBDIRSUFFIX variables.
 
+# 20150910 bkw: upgrade to 1.20.0.
+# ARCH=noarch, there's no object code in the package.
+# Add DESCRIPTION section to man page.
+
 PRGNAM=yturl
-VERSION=${VERSION:-1.17.0}
+VERSION=${VERSION:-1.20.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -56,7 +54,7 @@ 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.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE* $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 8a845fd0ff740..128cf5a260990 100644
--- a/network/yturl/yturl.info
+++ b/network/yturl/yturl.info
@@ -1,8 +1,8 @@
 PRGNAM="yturl"
-VERSION="1.17.0"
+VERSION="1.20.0"
 HOMEPAGE="https://github.com/cdown/yturl"
-DOWNLOAD="https://github.com/cdown/yturl/archive/1.17.0.tar.gz"
-MD5SUM="99c6c66e01ca25a47af229f8fb0e8bae"
+DOWNLOAD="https://github.com/cdown/yturl/archive/1.20.0.tar.gz"
+MD5SUM="46e3328a9e6c754b8bd2f8b5cf21c1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/yturl/yturl.pod b/network/yturl/yturl.pod
index b1f75a1a4bf78..51a47b4a19cd1 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.17.0 yturl.pod > yturl.1
+# pod2man --stderr -s1 -cSlackBuilds.org -r1.20.0 yturl.pod > yturl.1
 
 =pod
 
@@ -13,6 +13,25 @@ yturl [-h] [-q QUALITY] videoID/url
 
 videoID/url is a YouTube url or bare video ID.
 
+=head1 DESCRIPTION
+
+By default, yturl prints the media URL to standard output.
+
+    $ yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ'
+    Using itag 43.
+    http://r2---sn-uphxqvujvh-30al.googlevideo.com/videoplayback?source=[...]
+
+This means that you can do something like the following to watch it in
+mpv:
+
+    $ mpv "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
+
+(also works with vlc, but for some reason not with mplayer)
+
+Or something like the following to download it (using curl):
+
+    $ curl -Lo bill "$(yturl 'http://www.youtube.com/watch?v=8TCxE0bWQeQ')"
+
 =head1 OPTIONS
 
 =over 4