Ports that depend on youtube-dl: Depend on yt-dlp

yt-dlp [1] is a youtube-dl fork with additional features and fixes.  For
ports that depend on www/youtube-dl switch the dependency to www/yt-dlp.
For ports that have an optional dependency on www/youtube-dl, create a
new OPTIONS_RADIO that includes www/yt-dlp and make it the default.

[1] https://github.com/yt-dlp/yt-dlp

Other changes:
- www/yt-dlp: Turn the symlink option on by default
- www/py-pafy: Fix build when depending on www/yt-dlp

PR:		259944
Reported by:	Oleh Vinichenko <moonlapse81@gmail.com>
Reviewed by:	diizzy, Oleh Vinichenko <moonlapse81@gmail.com>,
		VVD <vvd@unislabs.com>
Approved by:	0mp, adridg (kde@), rm, tcberner (multimedia@),
		yuri (maintainers)
		acm and nivit (maintainers, timeout)
Differential Revision:	https://reviews.freebsd.org/D33090

11 files changed, 37 insertions, 22 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index dff46fd135e1..073491cea418 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gpodder
 DISTVERSION=	3.10.17
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 
 MAINTAINER=	rm@FreeBSD.org
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}podcastparser>=0.6.0:devel/py-podcastparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \
-		youtube_dl>0:www/youtube_dl \
+		yt-dlp:www/yt-dlp \
 		${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR}
 
 USES=		gettext gmake gnome python:3.5+ shebangfix
diff --git a/multimedia/haruna/Makefile b/multimedia/haruna/Makefile
index f3f7967c0fdb..b3dde702795a 100644
--- a/multimedia/haruna/Makefile
+++ b/multimedia/haruna/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	haruna
 DISTVERSION=	0.7.3
+PORTREVISION=	1
 MASTER_SITES=	KDE/stable/${PORTNAME}/
 CATEGORIES=	multimedia kde
 
@@ -8,7 +9,7 @@ COMMENT=	KDE video player
 
 LIB_DEPENDS=	libmpv.so:multimedia/mpv
 RUN_DEPENDS=	kio-extras>0:devel/kio-extras \
-		youtube-dl:www/youtube_dl
+		yt-dlp:www/yt-dlp
 
 USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
 USE_KDE=	auth bookmarks codecs completion config configwidgets coreaddons \
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index c43a2244c2d0..ff71edcd81d1 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lives
 DISTVERSION=	3.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -60,10 +60,10 @@ OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
 OPTIONS_GROUP_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
 OPTIONS_GROUP_MP3=		MPG123 MPG321
 OPTIONS_GROUP_MPLAYERS=		MPLAYER MPV
-OPTIONS_GROUP_YOUTUBE_DLX=	YOUTUBE_DL YOUTUBE_DLC
+OPTIONS_RADIO_YOUTUBE_DLX=	YOUTUBE_DL YOUTUBE_DLC YTDLP
 OPTIONS_DEFAULT=		CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \
 				MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV SCHROEDINGER \
-				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YOUTUBE_DL
+				THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YTDLP
 OPTIONS_SUB=			yes
 
 ALSA_CONFIGURE_OFF=		--disable-alsa
@@ -136,6 +136,8 @@ WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland
 WMCTRL_DESC=			Install wmctrl
 WMCTRL_RUN_DEPENDS=		wmctrl:x11/wmctrl
+YTDLP_DESC=			Install yt-dlp (youtube-dl fork) - requires SYMLINK option
+YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
 YOUTUBE_DL_DESC=		Install youtube-dl
 YOUTUBE_DL_RUN_DEPENDS=		youtube-dl:www/youtube_dl
 YOUTUBE_DLC_DESC=		Install youtube-dlc
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index b473c8f1062b..b6b81c5fc016 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.34.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
@@ -47,11 +47,13 @@ CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
 
 OPTIONS_DEFINE=		ARCHIVE DOCS LCMS2 LUAJIT MANPAGES MUJS TEST UCHARDET EXAMPLES ZIMG
 OPTIONS_DEFAULT=	ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \
-			V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDL
+			V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDLP
 OPTIONS_GROUP=		IN VO AO
-OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L YTDL
+OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L
 OPTIONS_GROUP_VO=	CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
 OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL
+OPTIONS_RADIO=		YOUTUBE
+OPTIONS_RADIO_YOUTUBE=	YTDL YTDLP
 OPTIONS_SUB=		yes
 
 DVDNAV_DESC=		DVD menu navigation
@@ -60,6 +62,7 @@ MUJS_DESC=		Use MuJS for Javascript language support
 SIXEL_DESC=		Sixel graphics support
 UCHARDET_DESC=		Guess subtitle encoding via uchardet
 VULKAN_DESC=		Vulkan output support
+YTDLP_DESC=		Install yt-dlp (youtube-dl fork)
 YTDL_DESC=		Install youtube-dl
 ZIMG_DESC=		High quality software scaling via "z" library
 IN_DESC=		Input
@@ -157,6 +160,8 @@ X11_USES=			gnome xorg
 X11_USE=			XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
 X11_CONFIGURE_OFF=		--disable-x11
 
+YTDLP_RUN_DEPENDS=		yt-dlp:www/yt-dlp
+
 YTDL_RUN_DEPENDS=		youtube-dl:www/youtube_dl
 
 ZIMG_LIB_DEPENDS=		libzimg.so:graphics/sekrit-twc-zimg
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index d3f7426aeb3f..6d5e3e22e88b 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	smtube
 DISTVERSION=	21.10.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/smtube/SMTube/${PORTVERSION}/
 
@@ -11,7 +12,7 @@ COMMENT=	SMPlayer YouTube browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
-RUN_DEPENDS=	youtube-dl:www/youtube_dl
+RUN_DEPENDS=	yt-dlp:www/yt-dlp
 
 USES=		gl gmake qt:5 tar:bzip2
 USE_GL=		gl
diff --git a/multimedia/ytfzf/Makefile b/multimedia/ytfzf/Makefile
index 2acb21de8460..03922ab000b8 100644
--- a/multimedia/ytfzf/Makefile
+++ b/multimedia/ytfzf/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	ytfzf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	0mp@FreeBSD.org
@@ -16,7 +17,7 @@ RUN_DEPENDS=	curl:ftp/curl \
 		notify-send:devel/libnotify \
 		shuf:sysutils/shuf \
 		ueberzug:graphics/py-ueberzug@${PY_FLAVOR} \
-		youtube-dl:www/youtube_dl
+		yt-dlp:www/yt-dlp
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
index 9d11843c22e8..3ed705cbd1c0 100644
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	awgg
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -12,7 +12,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	aria2c:www/aria2 \
 		wget:ftp/wget \
 		curl:ftp/curl \
-		youtube-dl:www/youtube_dl \
+		yt-dlp:www/yt-dlp \
 		axel:ftp/axel
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
diff --git a/www/py-pafy/Makefile b/www/py-pafy/Makefile
index 071995ba1412..c788dc28603b 100644
--- a/www/py-pafy/Makefile
+++ b/www/py-pafy/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pafy
 PORTVERSION=	0.5.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +13,8 @@ COMMENT=	Python API for YouTube
 LICENSE=	GPLv3
 
 # At the moment the internal backend does not work
-BUILD_DEPENDS=	youtube_dl>=2016.02.22:www/youtube_dl
-RUN_DEPENDS=	youtube_dl>=2016.02.22:www/youtube_dl
+BUILD_DEPENDS=	yt-dlp:www/yt-dlp
+RUN_DEPENDS=	yt-dlp:www/yt-dlp
 
 USES=	python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/www/py-pafy/files/patch-pafy_backend__youtube__dl.py b/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
index 30dd2057c55c..39c0a7ba92eb 100644
--- a/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
+++ b/www/py-pafy/files/patch-pafy_backend__youtube__dl.py
@@ -1,12 +1,14 @@
---- pafy/backend_youtube_dl.py.orig	2018-02-11 21:15:57 UTC
+--- pafy/backend_youtube_dl.py.orig	2019-11-20 14:42:31 UTC
 +++ pafy/backend_youtube_dl.py
-@@ -8,6 +8,9 @@ if sys.version_info[:2] >= (3, 0):
+@@ -10,7 +10,10 @@ if sys.version_info[:2] >= (3, 0):
  else:
      uni = unicode
  
+-import youtube_dl
 +if sys.platform.startswith('freebsd'):
 +    # FreeBSD installs youtube_dl as a zip archive
 +    sys.path.insert(1, '%%LOCALBASE%%/bin/youtube-dl')
- import youtube_dl
++import yt_dlp
  
  from . import g
+ from .backend_shared import BasePafy, BaseStream, remux, get_status_string, get_size_done
diff --git a/www/py-pafy/files/patch-pafy_pafy.py b/www/py-pafy/files/patch-pafy_pafy.py
index b713784a90e0..bd9d501067cc 100644
--- a/www/py-pafy/files/patch-pafy_pafy.py
+++ b/www/py-pafy/files/patch-pafy_pafy.py
@@ -1,12 +1,14 @@
---- pafy/pafy.py.orig	2018-02-11 21:15:57 UTC
+--- pafy/pafy.py.orig	2019-11-20 14:42:31 UTC
 +++ pafy/pafy.py
-@@ -45,6 +45,9 @@ Pafy = None
+@@ -45,7 +45,10 @@ Pafy = None
  backend = "internal"
  if os.environ.get("PAFY_BACKEND") != "internal":
      try:
+-        import youtube_dl
 +        if sys.platform.startswith('freebsd'):
 +            # FreeBSD installs youtube_dl as a zip archive
 +            sys.path.insert(1, '%%LOCALBASE%%/bin/youtube-dl')
-         import youtube_dl
++        import yt_dlp
          backend = "youtube-dl"
      except ImportError:
+         raise ImportError(
diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile
index 962ab721a346..c2788c3a300b 100644
--- a/www/yt-dlp/Makefile
+++ b/www/yt-dlp/Makefile
@@ -25,7 +25,7 @@ MAKE_ARGS=	PYTHON=${PYTHON_CMD}
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		FFMPEG RTMPDUMP SYMLINK
-OPTIONS_DEFAULT=	FFMPEG RTMPDUMP
+OPTIONS_DEFAULT=	FFMPEG RTMPDUMP SYMLINK
 OPTIONS_SUB=		yes
 
 FFMPEG_RUN_DEPENDS=	ffprobe:multimedia/ffmpeg