From nobody Wed Mar 4 04:20:11 2026 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 4fQfbH3XTGz6Stlt for ; Wed, 04 Mar 2026 04:20:11 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQfbH1jHVz3cBn for ; Wed, 04 Mar 2026 04:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772598011; 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=dv9Dxm3q9tKrbxOMb0z5f/k1HNLTicMaA6haTFN4eGI=; b=VLBTrWwG9TjWzseF60U4xkcBIzrGrrHQEHe1LovCBOVaT97lYM3/EikdI0d4i7074achEv FhsE/pqwzOmKQ4XCfAKH4lRnMKIozlFgs2Y9CgMF9HkH/GU6CjOa6ttYHiEaOGcJ/twZb7 +5NPOOtbgz4ZFuoFEYZ1ujm/Gpli3l2K8NEbSAcICZKC8nPPBU6noIzriSHoBt8bvLjB06 JOBGI4HyQ/VhYsJriQ3nuFUlGusdBBxbX95Ejr3a1DuookCrEHDtUgJ7o9gaEbzHC56/mg RvZe/LquEq/GTNVdpJlSSAorqyGTaD00TBsbEwt3n4w9mAHkYcDVIgKYZr0vZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772598011; a=rsa-sha256; cv=none; b=UyCq9pvmAJSLN5S0dNtF+LPKaEopNFdL5fUC6kCnuTQjoYuBr88/3apfZjYjOJaxDVo1rh jbbZTQr4ezoicWtW1fy0rePCL7E7YvHhXQpYNDE2ax0C5adWm+lL9ErvEs3kmHRxDt0hdW koDYXjSB8vhar9TXa+U8lHs76jgOCc1lGbEKPgVeoUK8/NPJIbYDaYVZXjwHekdGFbBctn dt84bzDVfLVuIiIOBdzrdBYD8orz5muaxdvwKzJWFKlMsKdGqr07QBjLUZwHe2xg/1pDCv 3l1qFk6CQFHnPq/H5cdRcjfHTNYNH8e9Ab5vuH/pjvDyZti9D79Nnq2c8FxGRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772598011; 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=dv9Dxm3q9tKrbxOMb0z5f/k1HNLTicMaA6haTFN4eGI=; b=XbBw5Guzh7bZVc0gDMehPAtY3PpU4ZBFc5T5V2A1hKArd2q+6L/p/aM7nfMZgjhAZJK7+h 2l4JpUAS3rvYe0BmhXUfZzUYh8J/TjEaHA58Q72InqJVuNZnDCFh4l4gPMbcgklyc7aYWv 2dqlqy/6wQSBo3ZX8188Y+JdH4kw5ydolwwwr8TGZR9hxl/0gA0hz29jjpJpOm0MNA5ybF O+oxv/gZmIR6DHx09q3QPjDGGV5fwCVet52V0lXtEzI8JmewEpDnNp1NB9jrpsMmWlW+gs QxsOmOCPMB0npDFJJTXmxwx5o1m9aQrbPYshT/stWo8evyR7exiHjYUGI8vAPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQfbH17vmzc5C for ; Wed, 04 Mar 2026 04:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 04:20:11 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e5b951b54dd4 - main - www/py-yt-dlp-ejs: Remove the IGNORE line 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: e5b951b54dd4277d96262f7e21dc1720ad4fd529 Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 04:20:11 +0000 Message-Id: <69a7b2fb.34509.65560dc1@gitrepo.freebsd.org> The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5b951b54dd4277d96262f7e21dc1720ad4fd529 commit e5b951b54dd4277d96262f7e21dc1720ad4fd529 Author: Yuri Victorovich AuthorDate: 2026-03-04 04:16:30 +0000 Commit: Yuri Victorovich CommitDate: 2026-03-04 04:20:02 +0000 www/py-yt-dlp-ejs: Remove the IGNORE line This do-fetch target does not repackage anything. It fetches the tarball, extracts it, then fetches NodeJS dependencies into the same folder, and packages this folder as a final tarball used during build. AFAIK there is nothing wrong with this port the way it is now. This can't be done in post-extract due to internet access that is required. --- www/py-yt-dlp-ejs/Makefile | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/www/py-yt-dlp-ejs/Makefile b/www/py-yt-dlp-ejs/Makefile index 16b2e7cdd012..b8cf81136b01 100644 --- a/www/py-yt-dlp-ejs/Makefile +++ b/www/py-yt-dlp-ejs/Makefile @@ -31,37 +31,37 @@ NO_ARCH= yes DD= ${DISTDIR}/${DIST_SUBDIR} -IGNORE= invalid code in do-fetch - -# do-fetch: -# @if ! [ -f ${DD}/${DISTNAME}${EXTRACT_SUFX} ] || \ -# ! [ -f ${DD}/${PORTNAME}-node-modules-${DISTVERSION}${EXTRACT_SUFX} ]; then \ -# ${MKDIR} ${DD} && ${MKDIR} ${WRKDIR} && \ -# ${ECHO_MSG} "====> Fetching ${DISTNAME}${EXTRACT_SUFX}" && \ -# cd ${DD} && ${FETCH_CMD} https://files.pythonhosted.org/packages/source/y/yt-dlp-ejs/${DISTNAME}${EXTRACT_SUFX} && \ -# ${ECHO_MSG} "====> Fetching and packaging node_modules using package-lock.json" && \ -# ${TAR} -xf ${DD}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR} && \ -# if [ -f ${FILESDIR}/package-lock.json ]; then \ -# ${ECHO_MSG} "====> Using existing package-lock.json"; \ -# ${CP} ${FILESDIR}/package-lock.json ${WRKDIR}/${DISTNAME}/; \ -# else \ -# ${ECHO_MSG} "====> Generating package-lock.json (it will be saved to ${FILESDIR})"; \ -# fi && \ -# cd ${WRKDIR}/${DISTNAME} && \ -# ${SETENV} HOME=${WRKDIR} npm ci && \ -# if ! [ -f ${FILESDIR}/package-lock.json ]; then \ -# ${ECHO_MSG} "====> Saving generated package-lock.json to ${FILESDIR}"; \ -# ${CP} ${WRKDIR}/${DISTNAME}/package-lock.json ${FILESDIR}/; \ -# fi && \ -# ${FIND} node_modules -name '.package-lock.json' -delete && \ -# ${FIND} node_modules -type d -name '@*' -empty -delete && \ -# ${FIND} node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ -# ${FIND} node_modules -print0 | ${SORT} -z | \ -# ${TAR} czf ${DD}/${PORTNAME}-node-modules-${DISTVERSION}${EXTRACT_SUFX} \ -# --format=bsdtar --no-read-sparse --gid 0 --uid 0 \ -# --options gzip:!timestamp --no-recursion --null -T - && \ -# ${RM} -rf ${WRKDIR}; \ -# fi +do-fetch: # this target (1) downloads the source tarball, (2) extracts it to a temporary location, (3) runs npm ci to fetch and install node_modules, and (4) packages the node_modules directory into a separate tarball for later extraction during the build phase. This allows us to avoid running npm ci during the build phase which will require network access + @if ! [ -f ${DD}/${DISTNAME}${EXTRACT_SUFX} ] || \ + ! [ -f ${DD}/${PORTNAME}-node-modules-${DISTVERSION}${EXTRACT_SUFX} ]; then \ + ${MKDIR} ${DD} && ${MKDIR} ${WRKDIR} && \ + ${ECHO_MSG} "====> (1) Fetching ${DISTNAME}${EXTRACT_SUFX}" && \ + cd ${DD} && ${FETCH_CMD} https://files.pythonhosted.org/packages/source/y/yt-dlp-ejs/${DISTNAME}${EXTRACT_SUFX} && \ + ${ECHO_MSG} "====> (2) Extracting the tarball" && \ + ${TAR} -xf ${DD}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR} && \ + ${ECHO_MSG} "====> (3) Fetching and packaging node_modules using package-lock.json" && \ + if [ -f ${FILESDIR}/package-lock.json ]; then \ + ${ECHO_MSG} "====> Using existing package-lock.json"; \ + ${CP} ${FILESDIR}/package-lock.json ${WRKDIR}/${DISTNAME}/; \ + else \ + ${ECHO_MSG} "====> Generating package-lock.json (it will be saved to ${FILESDIR})"; \ + fi && \ + cd ${WRKDIR}/${DISTNAME} && \ + ${SETENV} HOME=${WRKDIR} npm ci && \ + if ! [ -f ${FILESDIR}/package-lock.json ]; then \ + ${ECHO_MSG} "====> Saving generated package-lock.json to ${FILESDIR}"; \ + ${CP} ${WRKDIR}/${DISTNAME}/package-lock.json ${FILESDIR}/; \ + fi && \ + ${FIND} node_modules -name '.package-lock.json' -delete && \ + ${FIND} node_modules -type d -name '@*' -empty -delete && \ + ${FIND} node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ + ${ECHO_MSG} "====> (4) Packaging original tarball + NodeJS dependencies into a final tarball" && \ + ${FIND} node_modules -print0 | ${SORT} -z | \ + ${TAR} czf ${DD}/${PORTNAME}-node-modules-${DISTVERSION}${EXTRACT_SUFX} \ + --format=bsdtar --no-read-sparse --gid 0 --uid 0 \ + --options gzip:!timestamp --no-recursion --null -T - && \ + ${RM} -rf ${WRKDIR}; \ + fi post-extract: # Extract pre-downloaded node_modules