From nobody Tue Dec 03 17:41:20 2024 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 4Y2ny939m6z5gTFN; Tue, 03 Dec 2024 17:41:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2ny91Xynz4Sdk; Tue, 3 Dec 2024 17:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733247681; 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=16o+9P5/SMo5T7HTIpq6kDx7oL5KOD5qv6j6pFED3Dw=; b=gLik5DY7SPfZ1DTWKpW3xIx+UL452H7Od+sTAWCVROVZbzDic0n9WfFBWpbHmHZU/FWAfx TbY3PNLeDvJuaKb3qThSj4LpCrxyDmMXTrTtPnOk4Ho4MUb5aNIhfxSFnUGCJL1YP6YOQx N4bd8+AAeyKW4xTVH26kiTlfucXBAYKX3F1FB8DrvAeBhPbgKmH6oomKKNtZuJWVJTk8mZ 2V1yHYcy7+IZCPNFJkg9BZT050GLov/jzhjt3NSE96lEuPFzd9DomAacpA4iHb3QgIM6Ng nkx+GLc0XDAW1ak5zYN9DerfbeV/yO+At2coYZesxwArTr/6KrEdbaK0WFv5zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733247681; 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=16o+9P5/SMo5T7HTIpq6kDx7oL5KOD5qv6j6pFED3Dw=; b=KU0HoDqIx24WGb8mhnAIh4qERlnIogfQ9lx3MUDqoG/o2JnebrQjYlUspDcXEWI8nCUzuU rY4fsrJ3RxNgrSGxn9uG00665RGzYwUeq2bgsLdB6wJO/tLglQJirsw3CbJe3TGC49Fk+F a67zwI5BMNmpBnKSXJmoVT3AiEx6021SZtlpURusgcGaesvuZ95QGXQrIuioFqmcB7yYXo Inp9l80XJuhhQbhypijEIB7hAhxeaHT+SpLvT5rLlJBQieaeboz3wT4xYF/Hp40s+P9BD4 drRUmuTVtGwJoxfh854rH2sA+RlyIY8oynlvuTpDcrJssnBS3+sPVArC5KmAtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733247681; a=rsa-sha256; cv=none; b=uzAFA81xZqr7ZuPDyNjaOhK0D1JlGDniGYhDR+bLWgr4Rw9jhUrEt9s6QGoNCJfxR0ULdC tgGcOrFsYiqtlUHMKnMak4eM71B1Yx1p2yf5ADsYjQaxPLcYh6PGv0TEapuk922LV4Xy+J ZXNTkfb2SgxWoFVyrQcJ84XVyKektWSXku06BzGd1MmYo5j/2OtOyHlGq4QmWLy0B48798 7wG06P5Sfl3hBNh/UW4Ij/rEkc3Ao+nBqjoGQYLR7mJmNTpR7x1ruP6Z5PkKs670fxhzZt 1pkW9Ce78KQE0/9PAEyRwaMC5R7EFBpNsmcnpuDRPUD1pIvk8WU97wRU7CzC1g== 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 4Y2ny86mPHzXnb; Tue, 3 Dec 2024 17:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B3HfKFx095312; Tue, 3 Dec 2024 17:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B3HfK1g095309; Tue, 3 Dec 2024 17:41:20 GMT (envelope-from git) Date: Tue, 3 Dec 2024 17:41:20 GMT Message-Id: <202412031741.4B3HfK1g095309@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: ef17b830d649 - main - www/yarn-node*: Reorganize yarn-node* as node22 is the new default 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef17b830d649cd5c0c4e659015e47bc934b8ced3 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef17b830d649cd5c0c4e659015e47bc934b8ced3 commit ef17b830d649cd5c0c4e659015e47bc934b8ced3 Author: Po-Chuan Hsieh AuthorDate: 2024-12-03 17:29:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-12-03 17:34:56 +0000 www/yarn-node*: Reorganize yarn-node* as node22 is the new default --- www/yarn-node18/Makefile | 2 +- www/yarn-node20/Makefile | 52 ++---------------------------- www/yarn-node22/Makefile | 52 ++++++++++++++++++++++++++++-- www/{yarn-node20 => yarn-node22}/distinfo | 0 www/{yarn-node20 => yarn-node22}/pkg-descr | 0 www/{yarn-node20 => yarn-node22}/pkg-plist | 0 www/yarn-node23/Makefile | 2 +- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/www/yarn-node18/Makefile b/www/yarn-node18/Makefile index 6e7609f00c8e..20ad43db95ec 100644 --- a/www/yarn-node18/Makefile +++ b/www/yarn-node18/Makefile @@ -1,5 +1,5 @@ USES= nodejs:18,run -MASTERDIR= ${.CURDIR}/../yarn-node20 +MASTERDIR= ${.CURDIR}/../yarn-node22 .include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node20/Makefile b/www/yarn-node20/Makefile index 8d34f0a20309..e5433dbb11fb 100644 --- a/www/yarn-node20/Makefile +++ b/www/yarn-node20/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:20,run -MAINTAINER= pizzamig@FreeBSD.org -COMMENT= Package manager for node, alternative to npm -WWW= https://classic.yarnpkg.com/ +MASTERDIR= ${.CURDIR}/../yarn-node22 -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 +.include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node22/Makefile b/www/yarn-node22/Makefile index 53fde2b308e0..c302c2681dda 100644 --- a/www/yarn-node22/Makefile +++ b/www/yarn-node22/Makefile @@ -1,5 +1,51 @@ -USES= nodejs:22,run +PORTNAME= yarn +DISTVERSIONPREFIX= v +PORTVERSION= 1.22.19 +CATEGORIES= www +MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ +PKGNAMESUFFIX= ${NODEJS_SUFFIX} -MASTERDIR= ${.CURDIR}/../yarn-node20 +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:22,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-node20/distinfo b/www/yarn-node22/distinfo similarity index 100% rename from www/yarn-node20/distinfo rename to www/yarn-node22/distinfo diff --git a/www/yarn-node20/pkg-descr b/www/yarn-node22/pkg-descr similarity index 100% rename from www/yarn-node20/pkg-descr rename to www/yarn-node22/pkg-descr diff --git a/www/yarn-node20/pkg-plist b/www/yarn-node22/pkg-plist similarity index 100% rename from www/yarn-node20/pkg-plist rename to www/yarn-node22/pkg-plist diff --git a/www/yarn-node23/Makefile b/www/yarn-node23/Makefile index 6d92a1e1ed13..52b8b5d5cc34 100644 --- a/www/yarn-node23/Makefile +++ b/www/yarn-node23/Makefile @@ -1,5 +1,5 @@ USES= nodejs:23,run -MASTERDIR= ${.CURDIR}/../yarn-node20 +MASTERDIR= ${.CURDIR}/../yarn-node22 .include "${MASTERDIR}/Makefile"