From nobody Wed May 18 04:31:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0EACD1AEC186; Wed, 18 May 2022 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L30RW4Y2mz4VpH; Wed, 18 May 2022 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652848264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQrxghVmGfjoc8Pbrhfx8PEp7sqCZK9uIDnk1XLg8Mg=; b=x4YfE1erpzfXFYdp3uEa2JDh4HBYzvyjO/V6pm/wPbXxjHIlGm0uqw4srJMGl98zU3+jqt xEm7q2NGoQ61B9ajgm5SykbWLBR+BCsQRoW8mo20F42jWyC8seXzpmuWn55mOuvZbTE+Mr HtRWue7K9BIRLm+t4E52k/ua00FSs9N86DOtcZMw/wOumwH7GoT5ObhhEf/UzU9KJDJEaI ZjakZjb/OdsnicwDeBzuMa1INtRdBJh8tCx+0Zb4tdePdSgxnyAVvR7RnFCHDpjyIyu1BG 7oyMveHvZ/HmHr9QkbpWE+Th9k6VLdEmA018vquTEjjeOg1cykvekJR/ZutI8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78CCB22471; Wed, 18 May 2022 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24I4V3Gt011985; Wed, 18 May 2022 04:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24I4V35Z011984; Wed, 18 May 2022 04:31:03 GMT (envelope-from git) Date: Wed, 18 May 2022 04:31:03 GMT Message-Id: <202205180431.24I4V35Z011984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 3ac953a950ac - main - www/yt-dlp: Update 2022.04.08 -> 2022.05.18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ac953a950ac0061c20629ce051e80cccd66f94e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652848264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQrxghVmGfjoc8Pbrhfx8PEp7sqCZK9uIDnk1XLg8Mg=; b=JVE8kMlFBq1Qmm0sUob5j+73renZyNDESlmpDUFSdgLoJrCtgs2kKSh7uXspVghpThLqxV 9gwt+Q/+4yfd+riU8gAHJkPXmGxJQzwzoln5xv4TOShipwCIaq9eOEvuVLeq60a1u+DHL9 JsGJamM2ZfG4/UeZDRdodzjzMyanXB5Q4WNJrPoNxgfo3NGWKgcBohxmCCvVMP0brXHd91 Q+63IEMwJmc1JMtYvpdOrn55dVqlsjGiZ5TnFvkWGMiQQqVRzB2OdYDjlo/WsknTkRupk5 wTxWG4awH6H4MTVsXSNC0P+TcJAqwIrYWj6SKxA8Q2eBOtReIVjHJJ9lI54j+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652848264; a=rsa-sha256; cv=none; b=AKCtEkiu7CfXeMbMsM+eTwjKdTYvIk7kwxd3PQquV4w+ISD9LBeb48Rj1wzwzcSV+x7aAJ cglfe5MksVDlHHzxCFE8N75li7A9mBP1nSKT6xuGs+LSbRhat49LTvCgK+99whxI4EIwxy fCwHShUrLQc9FP1vTtOlaFyEw6Eih1b6JBjXxUgAuBCe+caM0XbSSt5QD8iNHrDnO/H4oS rF7i3jgFCzwtapgjUm1rOCSjrQKy6nQaolTgmKaQ18XoA2vG8ekhGHfephx5nFbwv3Cdz9 YjMJaYEVr8YfoHcqtsKAnFXv38354dNNIm3fGvIi1oRYYQqR77hrwgafzzfZWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ac953a950ac0061c20629ce051e80cccd66f94e commit 3ac953a950ac0061c20629ce051e80cccd66f94e Author: Yuri Victorovich AuthorDate: 2022-05-18 04:30:29 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-18 04:31:01 +0000 www/yt-dlp: Update 2022.04.08 -> 2022.05.18 --- www/yt-dlp/Makefile | 3 +-- www/yt-dlp/distinfo | 6 ++--- www/yt-dlp/files/patch-Makefile | 38 ++++++++++++------------------- www/yt-dlp/files/patch-yt__dlp_cookies.py | 8 +++---- www/yt-dlp/files/patch-yt__dlp_options.py | 2 +- www/yt-dlp/pkg-plist | 4 ++-- 6 files changed, 26 insertions(+), 35 deletions(-) diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile index a27bd05f3715..6593ed147ac6 100644 --- a/www/yt-dlp/Makefile +++ b/www/yt-dlp/Makefile @@ -1,6 +1,5 @@ PORTNAME= yt-dlp -DISTVERSION= 2022.04.08 -PORTREVISION= 1 +DISTVERSION= 2022.05.18 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org diff --git a/www/yt-dlp/distinfo b/www/yt-dlp/distinfo index 33215a014b55..49b3c3de5ee8 100644 --- a/www/yt-dlp/distinfo +++ b/www/yt-dlp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649428848 -SHA256 (yt-dlp-yt-dlp-2022.04.08_GH0.tar.gz) = 0e427a4df804787e1543a0ca42436564f0122d7a38b8712089ebd31cce39c224 -SIZE (yt-dlp-yt-dlp-2022.04.08_GH0.tar.gz) = 2037140 +TIMESTAMP = 1652847318 +SHA256 (yt-dlp-yt-dlp-2022.05.18_GH0.tar.gz) = 6bb20a8afd5d4449fbb1bc7032854eb285defc1e46337df0942852e2d26d18f5 +SIZE (yt-dlp-yt-dlp-2022.05.18_GH0.tar.gz) = 2034054 diff --git a/www/yt-dlp/files/patch-Makefile b/www/yt-dlp/files/patch-Makefile index 1baed35e2811..6040544260bd 100644 --- a/www/yt-dlp/files/patch-Makefile +++ b/www/yt-dlp/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2022-01-21 11:57:11 UTC +--- Makefile.orig 2022-05-18 03:37:32 UTC +++ Makefile @@ -1,15 +1,15 @@ -all: lazy-extractors yt-dlp doc pypi-files @@ -20,7 +20,7 @@ .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites -@@ -37,17 +37,23 @@ SHAREDIR ?= $(PREFIX)/share +@@ -39,16 +39,17 @@ SHAREDIR ?= $(PREFIX)/share PYTHON ?= /usr/bin/env python3 # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local @@ -29,32 +29,24 @@ +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) + 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 - install -Dm755 yt-dlp $(DESTDIR)$(BINDIR)/yt-dlp -- install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1 -- install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp -+# install -Dm644 yt-dlp.1 $(DESTDIR)$(MANDIR)/man1/yt-dlp.1 -+# install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SHAREDIR)/bash-completion/completions/yt-dlp -+ mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d -+ install -Dm644 completions/bash/yt-dlp $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/yt-dlp -+ mkdir -p $(DESTDIR)$(SHAREDIR)/zsh/site-functions - install -Dm644 completions/zsh/_yt-dlp $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_yt-dlp -- install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish -+# install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SHAREDIR)/fish/vendor_completions.d/yt-dlp.fish -+ mkdir -p $(DESTDIR)$(SYSCONFDIR)/fish/completions -+ install -Dm644 completions/fish/yt-dlp.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/yt-dlp.fish - - codetest: - flake8 . -@@ -67,37 +73,38 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py + 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 +@@ -84,37 +85,38 @@ yt-dlp: yt_dlp/*.py yt_dlp/*/*.py done - touch -t 200001010101 zip/yt_dlp/*.py zip/yt_dlp/*/*.py + touch -t 200001010101 zip/yt_dlp/*.py 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 ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py __main__.py +- cd zip ; zip -q ../yt-dlp yt_dlp/*.py yt_dlp/*/*.py yt_dlp/*/*/*.py __main__.py ++ #cd zip ; zip -q ../yt-dlp yt_dlp/*.py 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 diff --git a/www/yt-dlp/files/patch-yt__dlp_cookies.py b/www/yt-dlp/files/patch-yt__dlp_cookies.py index b9562230e38b..e298f7b0c119 100644 --- a/www/yt-dlp/files/patch-yt__dlp_cookies.py +++ b/www/yt-dlp/files/patch-yt__dlp_cookies.py @@ -1,6 +1,6 @@ ---- yt_dlp/cookies.py.orig 2022-05-14 11:34:22.365323000 -0400 -+++ yt_dlp/cookies.py 2022-05-14 11:34:52.544340000 -0400 -@@ -140,7 +140,7 @@ +--- yt_dlp/cookies.py.orig 2022-05-18 03:37:32 UTC ++++ yt_dlp/cookies.py +@@ -156,7 +156,7 @@ def _extract_firefox_cookies(profile, logger): def _firefox_browser_dir(): @@ -8,4 +8,4 @@ + if sys.platform in ('linux', 'linux2','freebsd13','freebsd14'): return os.path.expanduser('~/.mozilla/firefox') elif sys.platform == 'win32': - return os.path.expandvars(r'%APPDATA%\Mozilla\Firefox\Profiles') + return os.path.expandvars(R'%APPDATA%\Mozilla\Firefox\Profiles') diff --git a/www/yt-dlp/files/patch-yt__dlp_options.py b/www/yt-dlp/files/patch-yt__dlp_options.py index 00a8b6fe81f6..7adce2d76943 100644 --- a/www/yt-dlp/files/patch-yt__dlp_options.py +++ b/www/yt-dlp/files/patch-yt__dlp_options.py @@ -6,7 +6,7 @@ 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)') +- help='Update this program to latest version') - general.add_option( '-i', '--ignore-errors', action='store_true', dest='ignoreerrors', diff --git a/www/yt-dlp/pkg-plist b/www/yt-dlp/pkg-plist index 8401d1199c9d..5e7fcfe4e75d 100644 --- a/www/yt-dlp/pkg-plist +++ b/www/yt-dlp/pkg-plist @@ -1,5 +1,5 @@ %%SYMLINK%%bin/youtube-dl bin/yt-dlp -etc/bash_completion.d/yt-dlp -etc/fish/completions/yt-dlp.fish +share/bash-completion/completions/yt-dlp +share/fish/vendor_completions.d/yt-dlp.fish share/zsh/site-functions/_yt-dlp