www/youtube_dlc: Remove, redirect users to www/yt-dlp

PR:		254375
Reported by:	daniel.engberg.lists@pyret.net
Approved by:	maintainer timeout

11 files changed, 1 insertions, 226 deletions

diff --git a/MOVED b/MOVED
index f44cfa3326a6..72196cc53dcd 100644
--- a/MOVED
+++ b/MOVED
@@ -16281,3 +16281,4 @@ graphics/ilmbase|math/Imath|2021-04-10|Ilmbase was split out into Imath and Open
 www/xshttpd||2021-04-12|Unmaintained and dead upstream
 www/xshttpd-devel||2021-04-12|Unmaintained and dead upstream
 dns/credns||2021-04-12|Broken 12+, unmaintained upstream
+www/youtube_dlc|www/yt-dlp|2021-04-12|Upstream have made a complete transition to new project name
diff --git a/www/Makefile b/www/Makefile
index 2a2eb42e3381..bc23553302fa 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2304,7 +2304,6 @@
     SUBDIR += you-get
     SUBDIR += yourls
     SUBDIR += youtube_dl
-    SUBDIR += youtube_dlc
     SUBDIR += yt-dlp
     SUBDIR += ytdl
     SUBDIR += yuicompressor
diff --git a/www/youtube_dlc/Makefile b/www/youtube_dlc/Makefile
deleted file mode 100644
index d6e931a448ab..000000000000
--- a/www/youtube_dlc/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-PORTNAME=	youtube_dlc
-DISTVERSION=	2021.02.19
-CATEGORIES=	www
-
-# Implicit approval to commit trivial version updates.
-MAINTAINER=	multimedia@FreeBSD.org
-COMMENT=	Program for downloading videos from various streaming services
-
-LICENSE=	UNLICENSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		gmake python shebangfix
-SHEBANG_GLOB=	devscripts/*.py
-USE_GITHUB=	yes
-GH_ACCOUNT=	pukkandan
-GH_PROJECT=	yt-dlp
-
-MAKE_ARGS=	PYTHON=${PYTHON_CMD}
-NO_ARCH=	yes
-
-OPTIONS_DEFINE=		FFMPEG MANPAGES RTMPDUMP SYMLINK
-OPTIONS_DEFAULT=	FFMPEG RTMPDUMP
-OPTIONS_SUB=	yes
-
-RTMPDUMP_DESC=	Use rtmpdump to download rtmp video streams
-SYMLINK_DESC=	Install youtube-dl symbolic link for executable
-
-FFMPEG_RUN_DEPENDS=	ffprobe:multimedia/ffmpeg
-MANPAGES_BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
-RTMPDUMP_RUN_DEPENDS=	rtmpdump:multimedia/rtmpdump
-SYMLINK_CONFLICTS=	youtube_dl
-
-post-patch-MANPAGES-on:
-	@${PATCH} -d ${WRKSRC} -p0 < ${PATCHDIR}/extrapatch-manpages
-
-post-install-SYMLINK-on:
-	@${RLN} ${STAGEDIR}${PREFIX}/bin/youtube-dlc ${STAGEDIR}${PREFIX}/bin/youtube-dl
-
-.include <bsd.port.mk>
diff --git a/www/youtube_dlc/distinfo b/www/youtube_dlc/distinfo
deleted file mode 100644
index 649a893bc389..000000000000
--- a/www/youtube_dlc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1613862414
-SHA256 (pukkandan-yt-dlp-2021.02.19_GH0.tar.gz) = 9a897969d6fb5c5f8806b3e220471a5ed1e964aae0d9b93952209e2febb978f1
-SIZE (pukkandan-yt-dlp-2021.02.19_GH0.tar.gz) = 1553522
diff --git a/www/youtube_dlc/files/extrapatch-manpages b/www/youtube_dlc/files/extrapatch-manpages
deleted file mode 100644
index 4b0bb6f0510e..000000000000
--- a/www/youtube_dlc/files/extrapatch-manpages
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	2021-01-17 23:11:52 UTC
-+++ Makefile
-@@ -1,6 +1,6 @@
- all: youtube-dlc man
- #doc: README.md CONTRIBUTING.md issuetemplates supportedsites
--man: youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
-+man: youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
- 
- 
- clean:
-@@ -24,6 +24,8 @@ MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d
- install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
- 	install -d $(DESTDIR)$(BINDIR)
- 	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
- 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
- 	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
- 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-@@ -95,10 +97,10 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
- #README.txt: README.md
- #	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
- 
--#youtube-dlc.1: README.md
--#	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
--#	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
--#	rm -f youtube-dlc.1.temp.md
-+youtube-dlc.1: README.md
-+	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-+	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-+	rm -f youtube-dlc.1.temp.md
- 
- youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
- 	$(PYTHON) devscripts/bash-completion.py
diff --git a/www/youtube_dlc/files/patch-Makefile b/www/youtube_dlc/files/patch-Makefile
deleted file mode 100644
index f8ed24670859..000000000000
--- a/www/youtube_dlc/files/patch-Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
---- Makefile.orig	2021-01-16 18:54:52 UTC
-+++ Makefile
-@@ -1,6 +1,6 @@
--all: youtube-dlc doc man
--doc: README.md CONTRIBUTING.md issuetemplates supportedsites
--man: README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
-+all: youtube-dlc man
-+#doc: README.md CONTRIBUTING.md issuetemplates supportedsites
-+man: youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
- 
- 
- clean:
-@@ -16,16 +16,14 @@ SHAREDIR ?= $(PREFIX)/share
- PYTHON ?= /usr/bin/env python3
- 
- # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
--SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
-+SYSCONFDIR = $(PREFIX)/etc
- 
- # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
- MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
- 
--install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
-+install: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish
- 	install -d $(DESTDIR)$(BINDIR)
- 	install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)
--	install -d $(DESTDIR)$(MANDIR)/man1
--	install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1
- 	install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
- 	install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc
- 	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
-@@ -71,36 +69,36 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py
- 	done
- 	touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py
- 	mv zip/youtube_dlc/__main__.py zip/
--	cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
-+	cd zip ; bsdtar -a -cf ../youtube-dlc.zip youtube_dlc/*.py youtube_dlc/*/*.py __main__.py
- 	rm -rf zip
- 	echo '#!$(PYTHON)' > youtube-dlc
- 	cat youtube-dlc.zip >> youtube-dlc
- 	rm youtube-dlc.zip
- 	chmod a+x youtube-dlc
- 
--README.md: youtube_dlc/*.py youtube_dlc/*/*.py
--	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py
-+#README.md: youtube_dlc/*.py youtube_dlc/*/*.py
-+#	COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py
- 
--CONTRIBUTING.md: README.md
--	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
-+#CONTRIBUTING.md: README.md
-+#	$(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
- 
--issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py
--	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
--	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
--	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
--	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE/4_bug_report.md
--	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md .github/ISSUE_TEMPLATE/5_feature_request.md
-+#issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py
-+#	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
-+#	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
-+#	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
-+#	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE/4_bug_report.md
-+#	$(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md .github/ISSUE_TEMPLATE/5_feature_request.md
- 
--supportedsites:
--	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
-+#supportedsites:
-+#	$(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
- 
--README.txt: README.md
--	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
-+#README.txt: README.md
-+#	pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
- 
--youtube-dlc.1: README.md
--	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
--	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
--	rm -f youtube-dlc.1.temp.md
-+#youtube-dlc.1: README.md
-+#	$(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
-+#	pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
-+#	rm -f youtube-dlc.1.temp.md
- 
- youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in
- 	$(PYTHON) devscripts/bash-completion.py
diff --git a/www/youtube_dlc/files/patch-youtube__dlc_____init____.py b/www/youtube_dlc/files/patch-youtube__dlc_____init____.py
deleted file mode 100644
index 0f020f42de6c..000000000000
--- a/www/youtube_dlc/files/patch-youtube__dlc_____init____.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- youtube_dlc/__init__.py.orig	2021-02-19 21:44:01 UTC
-+++ youtube_dlc/__init__.py
-@@ -38,7 +38,6 @@ from .utils import (
-     std_headers,
-     write_string,
- )
--from .update import update_self
- from .downloader import (
-     FileDownloader,
- )
-@@ -556,17 +555,9 @@ def _real_main(argv=None):
-         if opts.rm_cachedir:
-             ydl.cache.remove()
- 
--        # Update version
--        if opts.update_self:
--            # If updater returns True, exit. Required for windows
--            if update_self(ydl.to_screen, opts.verbose, ydl._opener):
--                if actual_use:
--                    sys.exit('ERROR: The program must exit for the update to complete')
--                sys.exit()
--
-         # Maybe do nothing
-         if not actual_use:
--            if opts.update_self or opts.rm_cachedir:
-+            if opts.rm_cachedir:
-                 sys.exit()
- 
-             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
diff --git a/www/youtube_dlc/files/patch-youtube__dlc_options.py b/www/youtube_dlc/files/patch-youtube__dlc_options.py
deleted file mode 100644
index 497198a73265..000000000000
--- a/www/youtube_dlc/files/patch-youtube__dlc_options.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- youtube_dlc/options.py.orig	2021-02-17 12:04:51 UTC
-+++ youtube_dlc/options.py
-@@ -151,10 +151,6 @@ def parseOpts(overrideArguments=None):
-         action='version',
-         help='Print program version and exit')
-     general.add_option(
--        '-U', '--update',
--        action='store_true', dest='update_self',
--        help='Update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
--    general.add_option(
-         '-i', '--ignore-errors', '--no-abort-on-error',
-         action='store_true', dest='ignoreerrors', default=True,
-         help='Continue on download errors, for example to skip unavailable videos in a playlist (default) (Alias: --no-abort-on-error)')
diff --git a/www/youtube_dlc/pkg-descr b/www/youtube_dlc/pkg-descr
deleted file mode 100644
index 53be983a2c1c..000000000000
--- a/www/youtube_dlc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-youtube-dlp(c) is an active fork of youtube-dl with several enhancements.
-It is a command-line program for downloading videos from YouTube.com and
-other video streaming services.
-
-WWW: https://github.com/pukkandan/yt-dlp/
diff --git a/www/youtube_dlc/pkg-message b/www/youtube_dlc/pkg-message
deleted file mode 100644
index 898139919852..000000000000
--- a/www/youtube_dlc/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-If you want to use mp3 audio conversion please make sure multimedia/ffmpeg is
-built with the "LAME" option enabled.
-EOM
-}
-]
diff --git a/www/youtube_dlc/pkg-plist b/www/youtube_dlc/pkg-plist
deleted file mode 100644
index bec3f63d33b5..000000000000
--- a/www/youtube_dlc/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%SYMLINK%%bin/youtube-dl
-bin/youtube-dlc
-etc/bash_completion.d/youtube-dlc
-%%MANPAGES%%man/man1/youtube-dlc.1.gz
-etc/fish/completions/youtube-dlc.fish
-share/zsh/site-functions/_youtube-dlc
-