From nobody Fri Oct 29 06:33:17 2021 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 BA4F818203D3; Fri, 29 Oct 2021 06:33:17 +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 4HgXgK4yhpz3Cjj; Fri, 29 Oct 2021 06:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 803F91253C; Fri, 29 Oct 2021 06:33:17 +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 19T6XHrZ015345; Fri, 29 Oct 2021 06:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T6XHpY015344; Fri, 29 Oct 2021 06:33:17 GMT (envelope-from git) Date: Fri, 29 Oct 2021 06:33:17 GMT Message-Id: <202110290633.19T6XHpY015344@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: d2948b522a72 - main - www/yarn: make yarn-node16 available 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2948b522a724f188d430654d61a0fe38652090b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2948b522a724f188d430654d61a0fe38652090b commit d2948b522a724f188d430654d61a0fe38652090b Author: Jose Luis Duran AuthorDate: 2021-10-28 04:11:15 +0000 Commit: Matthias Fechner CommitDate: 2021-10-29 06:32:52 +0000 www/yarn: make yarn-node16 available Currently many node packages do not support node 17 which is used for www/node. This for example fixes the usage of www/gitlab-ce which cannot run the upgrade step if node 17 is used. PR: 259475 PR: 259476 PR: 259477 Approved by: pizzamig (maintainer) --- www/Makefile | 1 + www/yarn-node14/Makefile | 2 +- www/yarn-node16/Makefile | 12 ++++++++++++ www/yarn/Makefile | 7 +++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/www/Makefile b/www/Makefile index 4b4c280bcc2b..5fb054cf0900 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2360,6 +2360,7 @@ SUBDIR += yanopaste SUBDIR += yarn SUBDIR += yarn-node14 + SUBDIR += yarn-node16 SUBDIR += yarr SUBDIR += yaws SUBDIR += you-get diff --git a/www/yarn-node14/Makefile b/www/yarn-node14/Makefile index 7e51b027382d..b5020fea1fea 100644 --- a/www/yarn-node14/Makefile +++ b/www/yarn-node14/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -node14 CONFLICTS_INSTALL= yarn -OPTIONS_EXCLUDE= NODE +OPTIONS_EXCLUDE= NODE NODE16 OPTIONS_SLAVE= NODE14 MASTERDIR= ${.CURDIR}/../yarn diff --git a/www/yarn-node16/Makefile b/www/yarn-node16/Makefile new file mode 100644 index 000000000000..a082a498a15d --- /dev/null +++ b/www/yarn-node16/Makefile @@ -0,0 +1,12 @@ +# Created by: Luca Pizzamiglio + +PKGNAMESUFFIX= -node16 + +CONFLICTS_INSTALL= yarn + +OPTIONS_EXCLUDE= NODE NODE14 +OPTIONS_SLAVE= NODE16 + +MASTERDIR= ${.CURDIR}/../yarn + +.include "${MASTERDIR}/Makefile" diff --git a/www/yarn/Makefile b/www/yarn/Makefile index ec73d5ace7a0..31a0bac42337 100644 --- a/www/yarn/Makefile +++ b/www/yarn/Makefile @@ -1,6 +1,7 @@ PORTNAME= yarn DISTVERSIONPREFIX= v DISTVERSION= 1.22.17 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ @@ -13,20 +14,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe CPE_VENDOR= ${PORTNAME}pkg -CONFLICTS_INSTALL?= yarn-node14 yarn-node10 +CONFLICTS_INSTALL?= yarn-node16 yarn-node14 yarn-node10 OPTIONS_DEFINE= HADOOPCOMPAT OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= NODE14 NODE +OPTIONS_SINGLE_BACKEND= NODE16 NODE14 NODE OPTIONS_DEFAULT= NODE HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded NODE_DESC= Use www/node as backend NODE14_DESC= Use www/node14 as backend +NODE16_DESC= Use www/node16 as backend OPTIONS_SUB= yes NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE14_RUN_DEPENDS= node14>=14.0.0:www/node14 +NODE16_RUN_DEPENDS= node16>=16.0.0:www/node16 HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2*