git: 6182d5b8b708 - main - multimedia/lives: Make www/yt-dlp only YouTube option

From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Fri, 10 Dec 2021 04:15:46 UTC
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6182d5b8b7082397a005af992f8e029090e26e28

commit 6182d5b8b7082397a005af992f8e029090e26e28
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2021-12-10 04:10:02 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-12-10 04:15:11 +0000

    multimedia/lives: Make www/yt-dlp only YouTube option
    
    PR:             260282
    
    Differential Revision:  https://reviews.freebsd.org/D33090
---
 multimedia/lives/Makefile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index ff71edcd81d1..430d07ed5adc 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lives
 DISTVERSION=	3.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://lives-video.com/releases/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -54,13 +54,12 @@ DOC_FILES=	AUTHORS COPYING COPYING.LGPL ChangeLog FEATURES GETTING.STARTED NEWS
 OPTIONS_DEFINE=			ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \
 				LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \
 				SCHROEDINGER THEORA V4L WAYLAND
-OPTIONS_GROUP=			RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3 YOUTUBE_DLX
+OPTIONS_GROUP=			RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3
 OPTIONS_GROUP_RUNTIME=		CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \
-				SSWF X264 XDG_SCREENSAVER XWININFO
+				SSWF X264 XDG_SCREENSAVER XWININFO YTDLP
 OPTIONS_GROUP_EXT_WIN_CAPTURE=	WMCTRL XDOTOOL
 OPTIONS_GROUP_MP3=		MPG123 MPG321
 OPTIONS_GROUP_MPLAYERS=		MPLAYER MPV
-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 YTDLP
@@ -138,11 +137,6 @@ 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
-YOUTUBE_DLC_RUN_DEPENDS=	youtube-dlc:www/youtube_dlc
-YOUTUBE_DLX_DESC=		Install youtube-dl (runtime check)
 X264_RUN_DEPENDS=		x264:multimedia/x264
 XDG_SCREENSAVER_DESC=		Used to disable screensaver during playback
 XDG_SCREENSAVER_RUN_DEPENDS=	xdg-screensaver:devel/xdg-utils