Date: Mon, 26 Oct 2020 08:32:42 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553325 - in head/www: . youtube_dlc youtube_dlc/files Message-ID: <202010260832.09Q8WgVw086696@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Mon Oct 26 08:32:42 2020 New Revision: 553325 URL: https://svnweb.freebsd.org/changeset/ports/553325 Log: New port: www/youtube_dlc This is an active fork of youtube-dl with references to copyright material removed [1]. [1] https://github.com/blackjack4494/yt-dlc/commit/dd2d55f10dac8b6cb5e8ab4b2cccb302655b40ea#diff-fdb1ee8d93ba2ba9f31ec19f7332f7d1a676a795f8dc0396f7f5f19b45ec3a96 PR: 250608 Submitted by: daniel.engberg.lists@pyret.net Added: head/www/youtube_dlc/ - copied from r553324, head/www/youtube_dl/ head/www/youtube_dlc/files/extrapatch-manpages (contents, props changed) head/www/youtube_dlc/files/patch-youtube__dlc_____init____.py - copied, changed from r553324, head/www/youtube_dl/files/patch-youtube_dl____init__.py head/www/youtube_dlc/files/patch-youtube__dlc_options.py - copied, changed from r553324, head/www/youtube_dl/files/patch-youtube_dl__options.py head/www/youtube_dlc/pkg-plist (contents, props changed) Deleted: head/www/youtube_dlc/files/patch-youtube_dl____init__.py head/www/youtube_dlc/files/patch-youtube_dl__options.py Modified: head/www/Makefile head/www/youtube_dlc/Makefile head/www/youtube_dlc/distinfo head/www/youtube_dlc/files/patch-Makefile head/www/youtube_dlc/pkg-descr Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Mon Oct 26 08:23:41 2020 (r553324) +++ head/www/Makefile Mon Oct 26 08:32:42 2020 (r553325) @@ -2330,6 +2330,7 @@ SUBDIR += you-get SUBDIR += yourls SUBDIR += youtube_dl + SUBDIR += youtube_dlc SUBDIR += ytdl SUBDIR += yuicompressor SUBDIR += zend-framework Modified: head/www/youtube_dlc/Makefile ============================================================================== --- head/www/youtube_dl/Makefile Mon Oct 26 08:23:41 2020 (r553324) +++ head/www/youtube_dlc/Makefile Mon Oct 26 08:32:42 2020 (r553325) @@ -1,41 +1,41 @@ # $FreeBSD$ -PORTNAME= youtube_dl -PORTVERSION= 2020.09.20 +PORTNAME= youtube_dlc +DISTVERSION= 2020.10.24-6 CATEGORIES= www -MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/ -DISTNAME= youtube-dl-${PORTVERSION} # Implicit approval to commit trivial version updates. MAINTAINER= multimedia@FreeBSD.org -COMMENT= Program for downloading videos from various services +COMMENT= Program for downloading videos from various streaming services LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake python +USES= gmake python shebangfix +SHEBANG_GLOB= devscripts/*.py +USE_GITHUB= yes +GH_ACCOUNT= blackjack4494 +GH_PROJECT= yt-dlc MAKE_ARGS= PYTHON=${PYTHON_CMD} -ALL_TARGET= youtube-dl NO_ARCH= yes -WRKSRC= ${WRKDIR}/youtube-dl -PLIST_FILES= bin/youtube-dl \ - etc/bash_completion.d/youtube-dl.sh \ - man/man1/youtube-dl.1.gz \ - share/fish/vendor_completions.d/youtube-dl.fish \ - share/zsh/site-functions/_youtube-dl - -OPTIONS_DEFINE= FFMPEG RTMPDUMP +OPTIONS_DEFINE= FFMPEG MANPAGES RTMPDUMP SYMLINK OPTIONS_DEFAULT= 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-extract: -# remove tarball provided version, build our own - @${RM} ${WRKSRC}/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> Modified: head/www/youtube_dlc/distinfo ============================================================================== --- head/www/youtube_dl/distinfo Mon Oct 26 08:23:41 2020 (r553324) +++ head/www/youtube_dlc/distinfo Mon Oct 26 08:32:42 2020 (r553325) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600600974 -SHA256 (youtube-dl-2020.09.20.tar.gz) = ac1a799cf968345bf29089ed2e5c5d4f4a32031625d808369e61b6362d1c7cde -SIZE (youtube-dl-2020.09.20.tar.gz) = 3188480 +TIMESTAMP = 1603544255 +SHA256 (blackjack4494-yt-dlc-2020.10.24-6_GH0.tar.gz) = 252cc51baca7ceba21d0f5673a6ba72b058c8b6acf78c22db6509bac9760bae5 +SIZE (blackjack4494-yt-dlc-2020.10.24-6_GH0.tar.gz) = 1492059 Added: head/www/youtube_dlc/files/extrapatch-manpages ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/youtube_dlc/files/extrapatch-manpages Mon Oct 26 08:32:42 2020 (r553325) @@ -0,0 +1,34 @@ +--- Makefile.orig 2020-10-25 01:01:48 UTC ++++ Makefile +@@ -1,4 +1,4 @@ +-all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites ++all: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites + + clean: + rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe +@@ -20,8 +20,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)$(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.sh + install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions +@@ -91,10 +91,10 @@ supportedsites: + #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 Modified: head/www/youtube_dlc/files/patch-Makefile ============================================================================== --- head/www/youtube_dl/files/patch-Makefile Mon Oct 26 08:23:41 2020 (r553324) +++ head/www/youtube_dlc/files/patch-Makefile Mon Oct 26 08:32:42 2020 (r553325) @@ -1,6 +1,12 @@ ---- Makefile.orig 2019-12-24 22:21:59.865317000 +0100 -+++ Makefile 2019-12-24 22:24:39.962172000 +0100 -@@ -12,7 +12,7 @@ +--- Makefile.orig 2020-10-24 05:32:48 UTC ++++ Makefile +@@ -1,4 +1,4 @@ +-all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites ++all: youtube-dlc youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites + + clean: + rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe +@@ -12,22 +12,22 @@ SHAREDIR ?= $(PREFIX)/share PYTHON ?= /usr/bin/env python # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local @@ -9,39 +15,64 @@ # 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) -@@ -23,11 +23,11 @@ - install -d $(DESTDIR)$(MANDIR)/man1 - install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1 + +-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)$(MANDIR)/man1 ++# install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1 install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d -- install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl -+ install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl.sh +- install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc ++ install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc.sh install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions - install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl + install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc - install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions -- install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish +- install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish + install -d $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d -+ install -m 644 youtube-dl.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dl.fish ++ install -m 644 youtube-dlc.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/youtube-dlc.fish codetest: flake8 . -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py done - touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py - mv zip/youtube_dl/__main__.py zip/ -- cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py -+ cd zip ; bsdtar -a -cf ../youtube-dl.zip youtube_dl/*.py youtube_dl/*/*.py __main__.py + 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-dl - cat youtube-dl.zip >> youtube-dl -@@ -90,11 +90,6 @@ + echo '#!$(PYTHON)' > youtube-dlc + cat youtube-dlc.zip >> youtube-dlc +@@ -75,8 +75,8 @@ youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py + README.md: youtube_dlc/*.py youtube_dlc/*/*.py + COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py - README.txt: README.md - pandoc -f $(MARKDOWN) -t plain README.md -o README.txt -- --youtube-dl.1: README.md -- $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md -- pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1 -- rm -f youtube-dl.1.temp.md +-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 - youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in + 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 +@@ -88,13 +88,13 @@ issuetemplates: devscripts/make_issue_template.py .git + 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 Copied and modified: head/www/youtube_dlc/files/patch-youtube__dlc_____init____.py (from r553324, head/www/youtube_dl/files/patch-youtube_dl____init__.py) ============================================================================== --- head/www/youtube_dl/files/patch-youtube_dl____init__.py Mon Oct 26 08:23:41 2020 (r553324, copy source) +++ head/www/youtube_dlc/files/patch-youtube__dlc_____init____.py Mon Oct 26 08:32:42 2020 (r553325) @@ -1,5 +1,5 @@ ---- youtube_dl/__init__.py.orig 2018-05-09 02:36:28 UTC -+++ youtube_dl/__init__.py +--- youtube_dlc/__init__.py.orig 2020-10-24 05:32:48 UTC ++++ youtube_dlc/__init__.py @@ -36,7 +36,6 @@ from .utils import ( write_string, render_table, @@ -8,7 +8,7 @@ from .downloader import ( FileDownloader, ) -@@ -437,17 +436,13 @@ def _real_main(argv=None): +@@ -452,17 +451,13 @@ def _real_main(argv=None): } with YoutubeDL(ydl_opts) as ydl: Copied and modified: head/www/youtube_dlc/files/patch-youtube__dlc_options.py (from r553324, head/www/youtube_dl/files/patch-youtube_dl__options.py) ============================================================================== --- head/www/youtube_dl/files/patch-youtube_dl__options.py Mon Oct 26 08:23:41 2020 (r553324, copy source) +++ head/www/youtube_dlc/files/patch-youtube__dlc_options.py Mon Oct 26 08:32:42 2020 (r553325) @@ -1,5 +1,5 @@ ---- youtube_dl/options.py.orig 2018-05-09 02:36:28 UTC -+++ youtube_dl/options.py +--- youtube_dlc/options.py.orig 2020-10-24 05:32:48 UTC ++++ youtube_dlc/options.py @@ -138,10 +138,6 @@ def parseOpts(overrideArguments=None): action='version', help='Print program version and exit') Modified: head/www/youtube_dlc/pkg-descr ============================================================================== --- head/www/youtube_dl/pkg-descr Mon Oct 26 08:23:41 2020 (r553324) +++ head/www/youtube_dlc/pkg-descr Mon Oct 26 08:32:42 2020 (r553325) @@ -1,5 +1,5 @@ -youtube-dl is a small command-line program for downloading videos -from YouTube.com, metacafe.com, google video, photobucket videos, -yahoo videos, dailymotion and others +youtube-dlc 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://yt-dl.org/ +WWW: https://github.com/blackjack4494/yt-dlc/ Added: head/www/youtube_dlc/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/youtube_dlc/pkg-plist Mon Oct 26 08:32:42 2020 (r553325) @@ -0,0 +1,6 @@ +%%SYMLINK%%bin/youtube-dl +bin/youtube-dlc +etc/bash_completion.d/youtube-dlc.sh +%%MANPAGES%%man/man1/youtube-dlc.1.gz +share/fish/vendor_completions.d/youtube-dlc.fish +share/zsh/site-functions/_youtube-dlc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010260832.09Q8WgVw086696>