From nobody Mon Mar 20 21:31:46 2023 X-Original-To: dev-commits-ports-all@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 4PgSc261cvz40HCg; Mon, 20 Mar 2023 21:31:46 +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 4PgSc25bxSz3sDD; Mon, 20 Mar 2023 21:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679347906; 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=UlTMUobE0rl2z0GLU4btYLe+1sEYb8AoX2vQMBvOxjg=; b=ctKRJCnUX9HaT3eMqorz/JxLuM2y0NNpdB2Lhyyxa8ofaBIpY4rarC3ouDBam4XCZlGB4r PcZ9RCwGH8IqYNuBlbBCpmE4BZZhFwmYdYrtznveFTm55ZJ197Rq93GoHqWWRA5C/0Annl Imh0wN/kzjTtRghRMD8i0EVsSBU0G3INPs9KxGyP7BKDSVkggZkqUtXkvROn3tYRpjMKrx 20oISynLskj13/c2qm0XgD6BFuRxIVCPKRPK4bS9qelvCUdhBbt/Hf6A72r6bPy3Cdqlib G7qdFLEGUI6pAk0C3TdxJdIv5ZaNG3iVPYD14x6o+xHoHw7cZwu0mFzuld8dhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679347906; 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=UlTMUobE0rl2z0GLU4btYLe+1sEYb8AoX2vQMBvOxjg=; b=rrO0eZHG3J6avZleL7qGpAYqNCp//C1uDdiNZ9X2bs6dMH6J+UJtCZ07H6WlQqFoDJghfs 48pNVkFvgb9J0DHzxk+xZnWJEWyxR1CIu6hzHv4U5JlmtXwZhbzK0Dl2NEOx1cq9L5iBDK QQG/i/LUQlpP5JunFpdTKhauQ96MRpItrEzGwaBktTUG3yJTWfPAh+7AUuXnvFOgxa39Ty s2v9/8VUi+7NxpFvJZxZFJaEZxlZ5/3a3o5LMfuvdMg4aXsrV9x5jWBLf/r++47wcczmSn gcS/8cM+/CqMqmwDj2EiWU25TXYbFyhPrWaSAL189Hrl3FeGzDyB4Jpq/I6TyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679347906; a=rsa-sha256; cv=none; b=JmkC7ZXTXpVaCWhES4h1dR+giVppDs+w9q8ml3LzjnufLW6FSphWBkgYdfI7JokbEzDVWU miZ0OE1K0ILJmqGiv0EIcfYy0kAe7yF8EKcnGNvHAtk/NPaTNmc3U7dAsq90Ho3ppXKpJT NRGQMHhUn18AaHPGHy5L2MbQARKr4o3OmNZefxhHmXTukezILNQ25aBEwEzNLuxDC1UkYN U4QqWlleQTS6Oy0Zew5E1zctNM986l/D18/BsiRXf9tWjQ6eAsYTC1pSPYWCvyt2E62dp4 Kf0I2tWszOJ9rGxaUlUu6dfYXg5nRmiHzoTF2J0elMVS4pjHkFvf9x+cZUmftg== 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 4PgSc24gbNzlZf; Mon, 20 Mar 2023 21:31:46 +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 32KLVkIK063402; Mon, 20 Mar 2023 21:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KLVkpK063385; Mon, 20 Mar 2023 21:31:46 GMT (envelope-from git) Date: Mon, 20 Mar 2023 21:31:46 GMT Message-Id: <202303202131.32KLVkpK063385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: f38c599f9ba6 - main - www/youtube_dl: Un-deprecate port, update to recent upstream snap List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f38c599f9ba66af1ff65009808e4ce84be464722 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=f38c599f9ba66af1ff65009808e4ce84be464722 commit f38c599f9ba66af1ff65009808e4ce84be464722 Author: Thomas Zander AuthorDate: 2023-03-20 21:19:02 +0000 Commit: Thomas Zander CommitDate: 2023-03-20 21:31:44 +0000 www/youtube_dl: Un-deprecate port, update to recent upstream snap Details: - Rework the port to fetch from GitHub per repo hash instead of releases. - Rationale: Upstream does not seem to publish releases anymore, but continues development on git HEAD. PR: 270108 --- www/youtube_dl/Makefile | 18 +++++++----------- www/youtube_dl/distinfo | 6 +++--- www/youtube_dl/files/patch-Makefile | 22 +++++----------------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index 70bc68026475..a167bb31e173 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -1,9 +1,6 @@ PORTNAME= youtube_dl -DISTVERSION= 2021.12.17 +PORTVERSION= 2023.03.14 CATEGORIES= www -MASTER_SITES= https://github.com/ytdl-org/youtube-dl/releases/download/${DISTVERSION}/ \ - https://yt-dl.org/downloads/${DISTVERSION}/ -DISTNAME= youtube-dl-${DISTVERSION} # Implicit approval to commit trivial version updates. MAINTAINER= multimedia@FreeBSD.org @@ -13,15 +10,18 @@ WWW= https://yt-dl.org/ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Unmaintained upstream, www/yt-dlp can be used going forward -EXPIRATION_DATE=2023-03-31 +BUILD_DEPENDS= pandoc:textproc/hs-pandoc USES= gmake python +USE_GITHUB= yes +GH_ACCOUNT= ytdl-org +GH_PROJECT= youtube-dl +GH_TAGNAME= 6fece0a + 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 \ @@ -37,8 +37,4 @@ RTMPDUMP_DESC= Use rtmpdump to download rtmp video streams FFMPEG_RUN_DEPENDS= ffprobe:multimedia/ffmpeg RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump -post-extract: -# remove tarball provided version, build our own - @${RM} ${WRKSRC}/youtube-dl - .include diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo index 32eb9ce55533..0c54f5e88d1d 100644 --- a/www/youtube_dl/distinfo +++ b/www/youtube_dl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639680444 -SHA256 (youtube-dl-2021.12.17.tar.gz) = 9f3b99c8b778455165b4525f21505e86c7ff565f3ac319e19733d810194135df -SIZE (youtube-dl-2021.12.17.tar.gz) = 3332299 +TIMESTAMP = 1679299345 +SHA256 (ytdl-org-youtube-dl-2023.03.14-6fece0a_GH0.tar.gz) = e6a57710bde2e7d137f28a6e829834281f2f0470675f99dcb9182088533aaa46 +SIZE (ytdl-org-youtube-dl-2023.03.14-6fece0a_GH0.tar.gz) = 1638794 diff --git a/www/youtube_dl/files/patch-Makefile b/www/youtube_dl/files/patch-Makefile index d88e1149d60a..8ac0bb1eed00 100644 --- a/www/youtube_dl/files/patch-Makefile +++ b/www/youtube_dl/files/patch-Makefile @@ -1,6 +1,6 @@ ---- 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 2023-03-14 16:23:20 UTC ++++ Makefile +@@ -12,7 +12,7 @@ SHAREDIR ?= $(PREFIX)/share PYTHON ?= /usr/bin/env python # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local @@ -9,7 +9,7 @@ # 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 @@ +@@ -23,11 +23,11 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-compl install -d $(DESTDIR)$(MANDIR)/man1 install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1 install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d @@ -24,7 +24,7 @@ codetest: flake8 . -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ youtube-dl: youtube_dl/*.py youtube_dl/*/*.py done touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py mv zip/youtube_dl/__main__.py zip/ @@ -33,15 +33,3 @@ rm -rf zip echo '#!$(PYTHON)' > youtube-dl cat youtube-dl.zip >> youtube-dl -@@ -90,11 +90,6 @@ - - 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 - - youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in - $(PYTHON) devscripts/bash-completion.py