diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile index 581ca1c8c521..05b72fabd259 100644 --- a/www/yt-dlp/Makefile +++ b/www/yt-dlp/Makefile @@ -1,53 +1,55 @@ PORTNAME= yt-dlp DISTVERSION= 2023.12.30 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME} DIST_SUBDIR= ${PORTNAME}/${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Command-line program for downloading videos from various platforms WWW= https://github.com/yt-dlp/yt-dlp LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>0:archivers/py-brotli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodomex>0:security/py-pycryptodomex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.31.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.17:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}websockets>=12.0:devel/py-websockets@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_DEPENDS} +BUILD_DEPENDS= ${PY_DEPENDS} \ + pandoc:textproc/hs-pandoc RUN_DEPENDS= ${PY_DEPENDS} USES= gmake python shebangfix SHEBANG_GLOB= devscripts/*.py MAKE_ARGS= PYTHON=${PYTHON_CMD} NO_ARCH= yes OPTIONS_DEFINE= FFMPEG RTMPDUMP SECRETSTORAGE SYMLINK OPTIONS_DEFAULT= FFMPEG RTMPDUMP SYMLINK OPTIONS_SUB= yes FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump SECRETSTORAGE_DESC= Build with ${PYTHON_PKGNAMEPREFIX}SecretStorage for secretstorage option SECRETSTORAGE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>0:security/py-SecretStorage@${PY_FLAVOR} SECRETSTORAGE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>0:security/py-SecretStorage@${PY_FLAVOR} SYMLINK_DESC= Install youtube-dl symbolic link for executable SYMLINK_CONFLICTS= youtube_dl post-install-SYMLINK-on: @${RLN} ${STAGEDIR}${PREFIX}/bin/yt-dlp ${STAGEDIR}${PREFIX}/bin/youtube-dl .include diff --git a/www/yt-dlp/files/patch-Makefile b/www/yt-dlp/files/patch-Makefile index 01f05c9a446a..2828154ce338 100644 --- a/www/yt-dlp/files/patch-Makefile +++ b/www/yt-dlp/files/patch-Makefile @@ -1,67 +1,56 @@ ---- Makefile.orig 2022-10-04 04:50:32 UTC +--- Makefile.orig 2023-12-30 21:43:37 UTC +++ Makefile @@ -1,4 +1,4 @@ -all: lazy-extractors yt-dlp doc pypi-files +all: lazy-extractors yt-dlp clean: clean-test clean-dist clean-all: clean clean-cache completions: completion-bash completion-fish completion-zsh -@@ -39,16 +39,16 @@ SHAREDIR ?= $(PREFIX)/share +@@ -39,7 +39,7 @@ PYTHON ?= /usr/bin/env python3 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: lazy-extractors yt-dlp yt-dlp.1 completions -+install: lazy-extractors yt-dlp completions - mkdir -p $(DESTDIR)$(BINDIR) - install -m755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp - mkdir -p $(DESTDIR)$(MANDIR)/man1 -- install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1 -+ #install -m644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1 - mkdir -p $(DESTDIR)$(SHAREDIR)/bash-completion/completions - install -m644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp - mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions @@ -83,26 +83,26 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py done touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py mv zip/yt_dlp/__main__.py zip/ - cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py + cd zip ; bsdtar -a -cf ../yt-dlp.zip yt_dlp/*.py yt_dlp/*/*.py __main__.py rm -rf zip echo '#!$(PYTHON)' > yt-dlp cat yt-dlp.zip >> yt-dlp rm yt-dlp.zip chmod a+x yt-dlp -README.md: yt_dlp/*.py yt_dlp/*/*.py devscripts/make_readme.py - COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --ignore-config --help | $(PYTHON) devscripts/make_readme.py +#README.md: yt_dlp/*.py yt_dlp/*/*.py devscripts/make_readme.py +# COLUMNS=80 $(PYTHON) yt_dlp/__main__.py --ignore-config --help | $(PYTHON) devscripts/make_readme.py -CONTRIBUTING.md: README.md devscripts/make_contributing.py - $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md +#CONTRIBUTING.md: README.md devscripts/make_contributing.py +# $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md -issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml yt_dlp/version.py - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE/1_broken_site.yml - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE/2_site_support_request.yml - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE/3_site_feature_request.yml - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE/4_bug_report.yml - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml .github/ISSUE_TEMPLATE/5_feature_request.yml - $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/6_question.yml .github/ISSUE_TEMPLATE/6_question.yml +#issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml yt_dlp/version.py +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.yml .github/ISSUE_TEMPLATE/1_broken_site.yml +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.yml .github/ISSUE_TEMPLATE/2_site_support_request.yml +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.yml .github/ISSUE_TEMPLATE/3_site_feature_request.yml +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/4_bug_report.yml .github/ISSUE_TEMPLATE/4_bug_report.yml +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/5_feature_request.yml .github/ISSUE_TEMPLATE/5_feature_request.yml +# $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/6_question.yml .github/ISSUE_TEMPLATE/6_question.yml supportedsites: $(PYTHON) devscripts/make_supportedsites.py supportedsites.md diff --git a/www/yt-dlp/pkg-plist b/www/yt-dlp/pkg-plist index 5e7fcfe4e75d..25beb354d2cf 100644 --- a/www/yt-dlp/pkg-plist +++ b/www/yt-dlp/pkg-plist @@ -1,5 +1,6 @@ %%SYMLINK%%bin/youtube-dl bin/yt-dlp +man/man1/yt-dlp.1.gz share/bash-completion/completions/yt-dlp share/fish/vendor_completions.d/yt-dlp.fish share/zsh/site-functions/_yt-dlp