Update net/youtube-dl to 2016.03.01.

pkgsrc changes:
o Add a patch in order to also honor ffmpeg[23] and ffprobe[23].
  Noticed by Adrien Fernandes.

Changes:
2016.03.01:
[webofstories] Tolerate malforder og:title (Closes #8417)
[zdf] Ignore hls manifests that use https (closes #8665)
[mdr] Fix extraction (Closes #8702)
[rtve.es:live] Fix extraction
[*] other misc bug fixes and improvements

2016.02.27:
[xfileshare] Add support for powerwatch (Closes #8628)
[facebook] Support mobile URLs (closes #8638)
[uStudio] Add new extractor
[space] Remove extractor (Closes #8662) - Now uses ooyala embed
[vidzi] Fix extraction
[videomega] Fix extraction (closes #7606)
[bokecc] Add new extractor (#2336)
[imdb] Recognize 1080p formats (Closes #8677)
[tnaflixnetwork:embed] Add extractor
[dplay] add support for it.dplay.com and dplay.dk
[dplay] Add support for dplay.no
[*] other misc bug fixes and improvements

4 files changed, 62 insertions, 11 deletions

diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile
index 223cb15e759..bf052db67d6 100644
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2016/02/25 19:07:59 leot Exp $
+# $NetBSD: Makefile,v 1.83 2016/03/05 20:41:10 leot Exp $
 
-VERSION_DATE=	2016.02.22
+VERSION_DATE=	2016.03.01
 DISTNAME=	youtube-dl-${VERSION_DATE}
 PKGNAME=	youtube-dl-${VERSION_DATE:S/.//g}
 CATEGORIES=	net
diff --git a/net/youtube-dl/PLIST b/net/youtube-dl/PLIST
index 222545385bf..cd42f34a2ca 100644
--- a/net/youtube-dl/PLIST
+++ b/net/youtube-dl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/02/25 19:07:59 leot Exp $
+@comment $NetBSD: PLIST,v 1.16 2016/03/05 20:41:10 leot Exp $
 bin/youtube-dl
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -185,6 +185,9 @@ ${PYSITELIB}/youtube_dl/extractor/blinkx.pyo
 ${PYSITELIB}/youtube_dl/extractor/bloomberg.py
 ${PYSITELIB}/youtube_dl/extractor/bloomberg.pyc
 ${PYSITELIB}/youtube_dl/extractor/bloomberg.pyo
+${PYSITELIB}/youtube_dl/extractor/bokecc.py
+${PYSITELIB}/youtube_dl/extractor/bokecc.pyc
+${PYSITELIB}/youtube_dl/extractor/bokecc.pyo
 ${PYSITELIB}/youtube_dl/extractor/bpb.py
 ${PYSITELIB}/youtube_dl/extractor/bpb.pyc
 ${PYSITELIB}/youtube_dl/extractor/bpb.pyo
@@ -1310,9 +1313,6 @@ ${PYSITELIB}/youtube_dl/extractor/soundgasm.pyo
 ${PYSITELIB}/youtube_dl/extractor/southpark.py
 ${PYSITELIB}/youtube_dl/extractor/southpark.pyc
 ${PYSITELIB}/youtube_dl/extractor/southpark.pyo
-${PYSITELIB}/youtube_dl/extractor/space.py
-${PYSITELIB}/youtube_dl/extractor/space.pyc
-${PYSITELIB}/youtube_dl/extractor/space.pyo
 ${PYSITELIB}/youtube_dl/extractor/spankbang.py
 ${PYSITELIB}/youtube_dl/extractor/spankbang.pyc
 ${PYSITELIB}/youtube_dl/extractor/spankbang.pyo
@@ -1562,6 +1562,9 @@ ${PYSITELIB}/youtube_dl/extractor/urort.pyo
 ${PYSITELIB}/youtube_dl/extractor/ustream.py
 ${PYSITELIB}/youtube_dl/extractor/ustream.pyc
 ${PYSITELIB}/youtube_dl/extractor/ustream.pyo
+${PYSITELIB}/youtube_dl/extractor/ustudio.py
+${PYSITELIB}/youtube_dl/extractor/ustudio.pyc
+${PYSITELIB}/youtube_dl/extractor/ustudio.pyo
 ${PYSITELIB}/youtube_dl/extractor/varzesh3.py
 ${PYSITELIB}/youtube_dl/extractor/varzesh3.pyc
 ${PYSITELIB}/youtube_dl/extractor/varzesh3.pyo
diff --git a/net/youtube-dl/distinfo b/net/youtube-dl/distinfo
index 49c7ff6624b..9af371194ad 100644
--- a/net/youtube-dl/distinfo
+++ b/net/youtube-dl/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.68 2016/02/25 19:07:59 leot Exp $
+$NetBSD: distinfo,v 1.69 2016/03/05 20:41:10 leot Exp $
 
-SHA1 (youtube-dl-2016.02.22.tar.gz) = 6a87af1e6e4873f3a342652567f1befabb131d12
-RMD160 (youtube-dl-2016.02.22.tar.gz) = 27eb044d0bb8c99b7db4938672468b2b91eca438
-SHA512 (youtube-dl-2016.02.22.tar.gz) = 9b1e5bf5cfe8aef0dd55093c046669358b7efc01d0a89abd8a75a4f3dd132dec90b74f1e7bddadf22d4ea21a91168f4962752739c9acd9c232c6757c2307054c
-Size (youtube-dl-2016.02.22.tar.gz) = 1971515 bytes
+SHA1 (youtube-dl-2016.03.01.tar.gz) = 48033b2cea1676f9be7c221bad8908d4615f860c
+RMD160 (youtube-dl-2016.03.01.tar.gz) = 580772a479e9a204beb46d51c25a46b336f999f4
+SHA512 (youtube-dl-2016.03.01.tar.gz) = 2b2c273ef047dbc3b9d70945e32e49ee11067a11c9cb518c05cb1998f53a20f341cca60906db4cb48fbbd9d464b6a35566d1296e85d65b2db7dc007f4c74f262
+Size (youtube-dl-2016.03.01.tar.gz) = 1983124 bytes
 SHA1 (patch-setup.py) = 31521d16e718cc8fc048acb695639f70de35f6f4
+SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6c220e67ab138d1c00aa4f2bc02ac84548af7c30
diff --git a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
new file mode 100644
index 00000000000..2dc112cac8b
--- /dev/null
+++ b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
@@ -0,0 +1,47 @@
+$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.1 2016/03/05 20:41:10 leot Exp $
+
+Also look and use ffmpeg[23] if possible.
+
+--- youtube_dl/postprocessor/ffmpeg.py.orig	2016-02-09 11:57:41.000000000 +0000
++++ youtube_dl/postprocessor/ffmpeg.py
+@@ -51,7 +51,7 @@ class FFmpegPostProcessor(PostProcessor)
+         return FFmpegPostProcessor(downloader)._versions
+ 
+     def _determine_executables(self):
+-        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
++        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3']
+         prefer_ffmpeg = False
+ 
+         self.basename = None
+@@ -79,7 +79,7 @@ class FFmpegPostProcessor(PostProcessor)
+                         self._versions = {}
+                         return None
+                     location = os.path.dirname(os.path.abspath(location))
+-                    if basename in ('ffmpeg', 'ffprobe'):
++                    if basename in ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3'):
+                         prefer_ffmpeg = True
+ 
+                 self._paths = dict(
+@@ -93,18 +93,18 @@ class FFmpegPostProcessor(PostProcessor)
+             self._paths = dict((p, p) for p in programs)
+ 
+         if prefer_ffmpeg:
+-            prefs = ('ffmpeg', 'avconv')
++            prefs = ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'avconv')
+         else:
+-            prefs = ('avconv', 'ffmpeg')
++            prefs = ('avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3')
+         for p in prefs:
+             if self._versions[p]:
+                 self.basename = p
+                 break
+ 
+         if prefer_ffmpeg:
+-            prefs = ('ffprobe', 'avprobe')
++            prefs = ('ffprobe', 'ffprobe2', 'ffprobe3', 'avprobe')
+         else:
+-            prefs = ('avprobe', 'ffprobe')
++            prefs = ('avprobe', 'ffprobe', 'ffprobe2', 'ffprobe3')
+         for p in prefs:
+             if self._versions[p]:
+                 self.probe_basename = p