diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile index 8cb91ab5f07f..ebb6ad32f788 100644 --- a/www/yt-dlp/Makefile +++ b/www/yt-dlp/Makefile @@ -1,51 +1,51 @@ PORTNAME= yt-dlp -DISTVERSION= 2023.12.30 -PORTREVISION= 3 +DISTVERSION= 2024.03.10 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} RUN_DEPENDS= ${PY_DEPENDS} USES= gmake python shebangfix SHEBANG_GLOB= devscripts/*.py -MAKE_ARGS= PYTHON=${PYTHON_CMD} +MAKE_ARGS= PYTHON=${PYTHON_CMD} \ + MANDIR=${PREFIX}/share/man NO_ARCH= yes OPTIONS_DEFINE= FFMPEG SECRETSTORAGE SYMLINK OPTIONS_DEFAULT= FFMPEG SYMLINK OPTIONS_SUB= yes FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg 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/distinfo b/www/yt-dlp/distinfo index 1ee45aea5fa4..8e16b9fc3843 100644 --- a/www/yt-dlp/distinfo +++ b/www/yt-dlp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703987239 -SHA256 (yt-dlp/2023.12.30/yt-dlp.tar.gz) = 5408fe5d12cd1c430ee10346770e3d60baad5c63a38b41c8967005e4956780a7 -SIZE (yt-dlp/2023.12.30/yt-dlp.tar.gz) = 5402838 +TIMESTAMP = 1710101671 +SHA256 (yt-dlp/2024.03.10/yt-dlp.tar.gz) = 1db8eade9e860543b655f5f973e26727ac2cc20874dc6fed9a3e78a4a05ee989 +SIZE (yt-dlp/2024.03.10/yt-dlp.tar.gz) = 5515436 diff --git a/www/yt-dlp/files/patch-Makefile b/www/yt-dlp/files/patch-Makefile index ddb0ea286b16..91297915aa5d 100644 --- a/www/yt-dlp/files/patch-Makefile +++ b/www/yt-dlp/files/patch-Makefile @@ -1,77 +1,62 @@ ---- Makefile.orig 2023-12-30 21:43:37 UTC +--- Makefile.orig 2024-03-10 19:41:19 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 -@@ -34,12 +34,12 @@ BINDIR ?= $(PREFIX)/bin - - PREFIX ?= /usr/local - BINDIR ?= $(PREFIX)/bin --MANDIR ?= $(PREFIX)/man -+MANDIR ?= $(PREFIX)/share/man - 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) -@@ -83,26 +83,26 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py +@@ -90,26 +90,26 @@ yt-dlp: $(CODE_FILES) done - touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py + (cd zip && touch -t 200001010101 $(CODE_FILES)) 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 +- (cd zip && zip -q ../yt-dlp $(CODE_FILES) __main__.py) ++ (cd zip && bsdtar -a -cf ../yt-dlp.zip $(CODE_FILES) __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 +-README.md: $(CODE_FILES) 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 ++#README.md: $(CODE_FILES) 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 -@@ -110,10 +110,10 @@ README.txt: README.md +@@ -117,10 +117,10 @@ README.txt: README.md README.txt: README.md pandoc -f $(MARKDOWN) -t plain README.md -o README.txt -yt-dlp.1: README.md devscripts/prepare_manpage.py - $(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md - pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1 - rm -f yt-dlp.1.temp.md +#yt-dlp.1: README.md devscripts/prepare_manpage.py +# $(PYTHON) devscripts/prepare_manpage.py yt-dlp.1.temp.md +# pandoc -s -f $(MARKDOWN) -t man yt-dlp.1.temp.md -o yt-dlp.1 +# rm -f yt-dlp.1.temp.md - completions/bash/yt-dlp: yt_dlp/*.py yt_dlp/*/*.py devscripts/bash-completion.in + completions/bash/yt-dlp: $(CODE_FILES) devscripts/bash-completion.in mkdir -p completions/bash