From nobody Wed Nov 01 19:30:03 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 4SLHCH4rPpz4yvfs; Wed, 1 Nov 2023 19:30:03 +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 4SLHCH4Jzpz3XHQ; Wed, 1 Nov 2023 19:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698867003; 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=6pQX/BcPXWoOc8aUgn3ErCD/MD6tJ4c+cpYhUZ1LlxA=; b=jP6Q5cbmdSHbMe+SYnu2ZcVycnqHBxH0IksazRuRkxCbSQviORyrvf9stLhmhMyWUxCpr1 jT2Sxd2yxZ5WJrqWxQT5B5PJ1171JT96IJDf8DTfoKk9RSS3Zay2wwdsQS/l8E+vXgkBO0 JVwjDfoJQfpQDbmY9AcyuGOHYRea3ftqLsiWORvXUxkqtoUguYPaEmMW8jDmY/gfbkm0VJ l2LEwrDZdVpdTd+YR2sEbDUWiTtdzFmDNLPadmvrqv06VsuL++fPHFd+lkRYE/sdoj6qO0 h/o8ldQrO/d8OrnKHvvtXoX0JGrYo3ynca7Mfmt9NmbuO7Z+ToRNhUWE67rCKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698867003; 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=6pQX/BcPXWoOc8aUgn3ErCD/MD6tJ4c+cpYhUZ1LlxA=; b=tAT5OaSMUVFUujFQOia3VDGuuKYMWNhSQqvwEK8QacosgpYK54vZfiYktBD0AGfPConCCo 92Fg4nm+8ykfHXeHmYwm9RtyO5GhA4GCAu/y0Ot33913fXNedN1X7HR5TAzntue1fWwHNG 82bIY5lbtVYQCbq0oey0JBmPTWlxoIlPRXLDqQjYCw9zQ8H9NMLdZFvtWf8sJxS7vnTgOY xA23iJLBd2ZCu3/zOPioHjrE964O1846sxWqi6n9DM0h7lSpaM3pXLkhrQIVOSt3iHMutM DL1PfUcq6RCAToLj3MiIgZOxr/+ein4u2itPFyLiuiKGFWY8laLRFAQcn3zIMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698867003; a=rsa-sha256; cv=none; b=ep1n4KwJcpHIP/ir8xfEzlZt5zlEBLegnHMmCacp3zJ0wwq2bZt1yRuYOybTwsEoWJf0sv UZ5sGGcwuOGbC6wfc+jO6Ns7R965/6dcVxJigqePDR89ARmIeOzm5NPZSS2e1ZXtm11LeG Iy41tN/vDYf+vYSTPHik9DgcnAS+uF2lb97nlvST5jOwUiGIAtPhKHSaOS8HcT6jv27Llo mmEiP2Rz5AeMlkr1J7dqbGziLsaM43Xnjv/3PCXl9c/NUdIeALMfxpijI1i5+gmMODpmT9 ys+h8Amzcvjt/FfFHL/0XBcIKEdHTINYeNQ0EltVrFVlEQoesg9QZ4/C4X5FqA== 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 4SLHCH3QgDzyPq; Wed, 1 Nov 2023 19:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1JU3MT003196; Wed, 1 Nov 2023 19:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1JU3pa003191; Wed, 1 Nov 2023 19:30:03 GMT (envelope-from git) Date: Wed, 1 Nov 2023 19:30:03 GMT Message-Id: <202311011930.3A1JU3pa003191@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1d8473a561ea - main - www/yarn-node*: Reorganize yarn-node* as node20 is the new default 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d8473a561ea519f1bcf5b603760fa68fa5306c1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d8473a561ea519f1bcf5b603760fa68fa5306c1 commit 1d8473a561ea519f1bcf5b603760fa68fa5306c1 Author: Po-Chuan Hsieh AuthorDate: 2023-11-01 19:29:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-01 19:29:14 +0000 www/yarn-node*: Reorganize yarn-node* as node20 is the new default --- www/yarn-node16/Makefile | 2 +- www/yarn-node18/Makefile | 52 ++-------------------- www/yarn-node20/Makefile | 52 ++++++++++++++++++++-- www/{yarn-node18 => yarn-node20}/distinfo | 0 .../files/patch-lib_cli.js | 0 www/{yarn-node18 => yarn-node20}/pkg-descr | 0 www/{yarn-node18 => yarn-node20}/pkg-plist | 0 7 files changed, 53 insertions(+), 53 deletions(-) diff --git a/www/yarn-node16/Makefile b/www/yarn-node16/Makefile index 26bd42e35698..e556953d5a53 100644 --- a/www/yarn-node16/Makefile +++ b/www/yarn-node16/Makefile @@ -1,5 +1,5 @@ USES= nodejs:16,run -MASTERDIR= ${.CURDIR}/../yarn-node18 +MASTERDIR= ${.CURDIR}/../yarn-node20 .include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node18/Makefile b/www/yarn-node18/Makefile index 103671754b31..6e7609f00c8e 100644 --- a/www/yarn-node18/Makefile +++ b/www/yarn-node18/Makefile @@ -1,51 +1,5 @@ -PORTNAME= yarn -DISTVERSIONPREFIX= v -PORTVERSION= 1.22.19 -CATEGORIES= www -MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ -PKGNAMESUFFIX= ${NODEJS_SUFFIX} +USES= nodejs:18,run -MAINTAINER= pizzamig@FreeBSD.org -COMMENT= Package manager for node, alternative to npm -WWW= https://classic.yarnpkg.com/ +MASTERDIR= ${.CURDIR}/../yarn-node20 -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES?= nodejs:18,run -USES+= cpe -CPE_VENDOR= ${PORTNAME}pkg - -CONFLICTS_INSTALL= yarn-node[0-9][0-9] - -OPTIONS_DEFINE= HADOOPCOMPAT -HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded - -OPTIONS_SUB= yes - -HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2* - -NO_ARCH= yes -NO_BUILD= yes - -post-patch: - @${RM} ${WRKSRC}/bin/*.cmd - @${REINPLACE_CMD} -i '' \ - -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \ - ${WRKSRC}/package.json - @${REINPLACE_CMD} -i '' -e 's%Linux)%Linux|FreeBSD)%g' \ - ${WRKSRC}/bin/yarn - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/node_modules/yarn) - ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js \ - ${STAGEDIR}${PREFIX}/bin/yarn.js - ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg \ - ${STAGEDIR}${PREFIX}/bin/yarnpkg - -do-install-HADOOPCOMPAT-off: - ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \ - ${STAGEDIR}${PREFIX}/bin/yarn - -.include +.include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node20/Makefile b/www/yarn-node20/Makefile index 77d7de2d408f..8d34f0a20309 100644 --- a/www/yarn-node20/Makefile +++ b/www/yarn-node20/Makefile @@ -1,5 +1,51 @@ -USES= nodejs:20,run +PORTNAME= yarn +DISTVERSIONPREFIX= v +PORTVERSION= 1.22.19 +CATEGORIES= www +MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ +PKGNAMESUFFIX= ${NODEJS_SUFFIX} -MASTERDIR= ${.CURDIR}/../yarn-node18 +MAINTAINER= pizzamig@FreeBSD.org +COMMENT= Package manager for node, alternative to npm +WWW= https://classic.yarnpkg.com/ -.include "${MASTERDIR}/Makefile" +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES?= nodejs:20,run +USES+= cpe +CPE_VENDOR= ${PORTNAME}pkg + +CONFLICTS_INSTALL= yarn-node[0-9][0-9] + +OPTIONS_DEFINE= HADOOPCOMPAT +HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded + +OPTIONS_SUB= yes + +HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2* + +NO_ARCH= yes +NO_BUILD= yes + +post-patch: + @${RM} ${WRKSRC}/bin/*.cmd + @${REINPLACE_CMD} -i '' \ + -e 's|"installationMethod": "tar"|"installationMethod": "pkg"|g' \ + ${WRKSRC}/package.json + @${REINPLACE_CMD} -i '' -e 's%Linux)%Linux|FreeBSD)%g' \ + ${WRKSRC}/bin/yarn + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn + (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/node_modules/yarn) + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn.js \ + ${STAGEDIR}${PREFIX}/bin/yarn.js + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarnpkg \ + ${STAGEDIR}${PREFIX}/bin/yarnpkg + +do-install-HADOOPCOMPAT-off: + ${RLN} ${STAGEDIR}${PREFIX}/lib/node_modules/yarn/bin/yarn \ + ${STAGEDIR}${PREFIX}/bin/yarn + +.include diff --git a/www/yarn-node18/distinfo b/www/yarn-node20/distinfo similarity index 100% rename from www/yarn-node18/distinfo rename to www/yarn-node20/distinfo diff --git a/www/yarn-node18/files/patch-lib_cli.js b/www/yarn-node20/files/patch-lib_cli.js similarity index 100% rename from www/yarn-node18/files/patch-lib_cli.js rename to www/yarn-node20/files/patch-lib_cli.js diff --git a/www/yarn-node18/pkg-descr b/www/yarn-node20/pkg-descr similarity index 100% rename from www/yarn-node18/pkg-descr rename to www/yarn-node20/pkg-descr diff --git a/www/yarn-node18/pkg-plist b/www/yarn-node20/pkg-plist similarity index 100% rename from www/yarn-node18/pkg-plist rename to www/yarn-node20/pkg-plist