youtube-dl: Update net/youtube-dl to 20180425

pkgsrc changes:
 - Adjust patches/patch-youtube__dl_postprocessor_ffmpeg.py to prefer ffmpeg3
   over ffmpeg2

Changes:
version 2018.04.25

Core
* [utils] Fix match_str for boolean meta fields
+ [Makefile] Add support for pandoc 2 and disable smart extension (#16251)
* [YoutubeDL] Fix typo in media extension compatibility checker (#16215)

Extractors
+ [openload] Recognize IPv6 stream URLs (#16136, #16137, #16205, #16246,
  #16250)
+ [twitch] Extract is_live according to status (#16259)
* [pornflip] Relax URL regular expression (#16258)
- [etonline] Remove extractor (#16256)
* [breakcom] Fix extraction (#16254)
+ [youtube] Add ability to authenticate with cookies
* [youtube:feed] Implement lazy playlist extraction (#10184)
+ [svt] Add support for TV channel live streams (#15279, #15809)
* [ccma] Fix video extraction (#15931)
* [rentv] Fix extraction (#15227)
+ [nick] Add support for nickjr.nl (#16230)
* [extremetube] Fix metadata extraction
+ [keezmovies] Add support for generic embeds (#16134, #16154)
* [nexx] Extract new azure URLs (#16223)
* [cbssports] Fix extraction (#16217)
* [kaltura] Improve embeds detection (#16201)
* [instagram:user] Fix extraction (#16119)
* [cbs] Skip DRM asset types (#16104)


version 2018.04.16

Extractors
* [smotri:broadcast] Fix extraction (#16180)
+ [picarto] Add support for picarto.tv (#6205, #12514, #15276, #15551)
* [vine:user] Fix extraction (#15514, #16190)
* [pornhub] Relax URL regular expression (#16165)
* [cbc:watch] Re-acquire device token when expired (#16160)
+ [fxnetworks] Add support for https theplatform URLs (#16125, #16157)
+ [instagram:user] Add request signing (#16119)
+ [twitch] Add support for mobile URLs (#16146)

4 files changed, 19 insertions, 19 deletions

diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile
index 65060a2f8f5..e93c1352587 100644
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2018/04/09 09:40:52 leot Exp $
+# $NetBSD: Makefile,v 1.135 2018/04/25 15:42:12 leot Exp $
 
 # XXX: VERSION_DATE can contains also an optional part that indicates
 # XXX: possible same day revisions. PKGNAME preserves that dotted part as is.
-VERSION_DATE=	2018.04.09
+VERSION_DATE=	2018.04.25
 DISTNAME=	youtube-dl-${VERSION_DATE}
 PKGNAME=	${DISTNAME:S/.//:S/.//}
 CATEGORIES=	net
diff --git a/net/youtube-dl/PLIST b/net/youtube-dl/PLIST
index 1fe2691d9d9..2881304288b 100644
--- a/net/youtube-dl/PLIST
+++ b/net/youtube-dl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.60 2018/04/09 09:40:52 leot Exp $
+@comment $NetBSD: PLIST,v 1.61 2018/04/25 15:42:12 leot Exp $
 bin/youtube-dl
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -578,9 +578,6 @@ ${PYSITELIB}/youtube_dl/extractor/espn.pyo
 ${PYSITELIB}/youtube_dl/extractor/esri.py
 ${PYSITELIB}/youtube_dl/extractor/esri.pyc
 ${PYSITELIB}/youtube_dl/extractor/esri.pyo
-${PYSITELIB}/youtube_dl/extractor/etonline.py
-${PYSITELIB}/youtube_dl/extractor/etonline.pyc
-${PYSITELIB}/youtube_dl/extractor/etonline.pyo
 ${PYSITELIB}/youtube_dl/extractor/europa.py
 ${PYSITELIB}/youtube_dl/extractor/europa.pyc
 ${PYSITELIB}/youtube_dl/extractor/europa.pyo
@@ -1379,6 +1376,9 @@ ${PYSITELIB}/youtube_dl/extractor/phoenix.pyo
 ${PYSITELIB}/youtube_dl/extractor/photobucket.py
 ${PYSITELIB}/youtube_dl/extractor/photobucket.pyc
 ${PYSITELIB}/youtube_dl/extractor/photobucket.pyo
+${PYSITELIB}/youtube_dl/extractor/picarto.py
+${PYSITELIB}/youtube_dl/extractor/picarto.pyc
+${PYSITELIB}/youtube_dl/extractor/picarto.pyo
 ${PYSITELIB}/youtube_dl/extractor/piksel.py
 ${PYSITELIB}/youtube_dl/extractor/piksel.pyc
 ${PYSITELIB}/youtube_dl/extractor/piksel.pyo
diff --git a/net/youtube-dl/distinfo b/net/youtube-dl/distinfo
index 638f8219727..6ee3dc29c16 100644
--- a/net/youtube-dl/distinfo
+++ b/net/youtube-dl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.119 2018/04/09 09:40:52 leot Exp $
+$NetBSD: distinfo,v 1.120 2018/04/25 15:42:12 leot Exp $
 
-SHA1 (youtube-dl-2018.04.09.tar.gz) = c0a6b96d29baab0c416b68518c51b6c2ebab3137
-RMD160 (youtube-dl-2018.04.09.tar.gz) = 01958377774e8f126d80b578eb0bc850ab307acc
-SHA512 (youtube-dl-2018.04.09.tar.gz) = 48c2d56493d5a0db911ea3e443dc7a87fe345de2da2094cad037901267480c3b44f8f927480547ffa527240ea4c1b650f31e01068ba72c49518c4895e554572f
-Size (youtube-dl-2018.04.09.tar.gz) = 2944297 bytes
+SHA1 (youtube-dl-2018.04.25.tar.gz) = 46547d9222ce02f6532e27119f7eec3a89f0035e
+RMD160 (youtube-dl-2018.04.25.tar.gz) = dd811d536fad95fe1ea2cc4a6a8e183b687eb406
+SHA512 (youtube-dl-2018.04.25.tar.gz) = 89eda20c45575bbf894138b2fd41e38abf3cc21504fe141754544c436bf6030fa94a1496abf6b8c4bfdc77bdf1c8c1d320bf0f1a0ecc2d007409ef9421922c15
+Size (youtube-dl-2018.04.25.tar.gz) = 2947762 bytes
 SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b
-SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6c220e67ab138d1c00aa4f2bc02ac84548af7c30
+SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = 6833121cb60d3affbdccab6901fb5563accb119a
diff --git a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
index 2dc112cac8b..c6fafa97263 100644
--- a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
+++ b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.1 2016/03/05 20:41:10 leot Exp $
+$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.2 2018/04/25 15:42:12 leot Exp $
 
 Also look and use ffmpeg[23] if possible.
 
@@ -9,7 +9,7 @@ Also look and use ffmpeg[23] if possible.
  
      def _determine_executables(self):
 -        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
-+        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3']
++        programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2']
          prefer_ffmpeg = False
  
          self.basename = None
@@ -18,7 +18,7 @@ Also look and use ffmpeg[23] if possible.
                          return None
                      location = os.path.dirname(os.path.abspath(location))
 -                    if basename in ('ffmpeg', 'ffprobe'):
-+                    if basename in ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'ffprobe', 'ffprobe2', 'ffprobe3'):
++                    if basename in ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2'):
                          prefer_ffmpeg = True
  
                  self._paths = dict(
@@ -27,10 +27,10 @@ Also look and use ffmpeg[23] if possible.
  
          if prefer_ffmpeg:
 -            prefs = ('ffmpeg', 'avconv')
-+            prefs = ('ffmpeg', 'ffmpeg2', 'ffmpeg3', 'avconv')
++            prefs = ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'avconv')
          else:
 -            prefs = ('avconv', 'ffmpeg')
-+            prefs = ('avconv', 'ffmpeg', 'ffmpeg2', 'ffmpeg3')
++            prefs = ('avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2')
          for p in prefs:
              if self._versions[p]:
                  self.basename = p
@@ -38,10 +38,10 @@ Also look and use ffmpeg[23] if possible.
  
          if prefer_ffmpeg:
 -            prefs = ('ffprobe', 'avprobe')
-+            prefs = ('ffprobe', 'ffprobe2', 'ffprobe3', 'avprobe')
++            prefs = ('ffprobe', 'ffprobe3', 'ffprobe2', 'avprobe')
          else:
 -            prefs = ('avprobe', 'ffprobe')
-+            prefs = ('avprobe', 'ffprobe', 'ffprobe2', 'ffprobe3')
++            prefs = ('avprobe', 'ffprobe', 'ffprobe3', 'ffprobe2')
          for p in prefs:
              if self._versions[p]:
                  self.probe_basename = p