Date: Mon, 17 Nov 2025 19:17:44 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5578c93d0972 - main - www/yarn-node*: Reorganize yarn-node* as node24 is the new default Message-ID: <202511171917.5AHJHisx009880@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5578c93d0972731c217a18caba0bd2615f821f47 commit 5578c93d0972731c217a18caba0bd2615f821f47 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-11-17 19:15:23 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-11-17 19:15:23 +0000 www/yarn-node*: Reorganize yarn-node* as node24 is the new default - While I'm here, fix the missing move of www/yarn-node20/files in ef17b830d649cd5c0c4e659015e47bc934b8ced3 --- www/yarn-node20/Makefile | 2 +- www/yarn-node22/Makefile | 52 ++------------------- www/yarn-node24/Makefile | 53 ++++++++++++++++++++-- www/{yarn-node22 => yarn-node24}/distinfo | 0 .../files/patch-lib_cli.js | 0 www/{yarn-node22 => yarn-node24}/pkg-descr | 0 www/{yarn-node22 => yarn-node24}/pkg-plist | 0 www/yarn-node25/Makefile | 2 +- 8 files changed, 55 insertions(+), 54 deletions(-) diff --git a/www/yarn-node20/Makefile b/www/yarn-node20/Makefile index e5433dbb11fb..9cf6e063171e 100644 --- a/www/yarn-node20/Makefile +++ b/www/yarn-node20/Makefile @@ -1,5 +1,5 @@ USES= nodejs:20,run -MASTERDIR= ${.CURDIR}/../yarn-node22 +MASTERDIR= ${.CURDIR}/../yarn-node24 .include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node22/Makefile b/www/yarn-node22/Makefile index c302c2681dda..b1c2a321e09f 100644 --- a/www/yarn-node22/Makefile +++ b/www/yarn-node22/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:22,run -MAINTAINER= pizzamig@FreeBSD.org -COMMENT= Package manager for node, alternative to npm -WWW= https://classic.yarnpkg.com/ +MASTERDIR= ${.CURDIR}/../yarn-node24 -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 <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/www/yarn-node24/Makefile b/www/yarn-node24/Makefile index f65ee187eaed..864b08faeacf 100644 --- a/www/yarn-node24/Makefile +++ b/www/yarn-node24/Makefile @@ -1,5 +1,52 @@ -USES= nodejs:24,run +PORTNAME= yarn +DISTVERSIONPREFIX= v +PORTVERSION= 1.22.19 +PORTREVISION= 1 +CATEGORIES= www +MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/ +PKGNAMESUFFIX= ${NODEJS_SUFFIX} -MASTERDIR= ${.CURDIR}/../yarn-node22 +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:24,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 <bsd.port.mk> diff --git a/www/yarn-node22/distinfo b/www/yarn-node24/distinfo similarity index 100% rename from www/yarn-node22/distinfo rename to www/yarn-node24/distinfo diff --git a/www/yarn-node20/files/patch-lib_cli.js b/www/yarn-node24/files/patch-lib_cli.js similarity index 100% rename from www/yarn-node20/files/patch-lib_cli.js rename to www/yarn-node24/files/patch-lib_cli.js diff --git a/www/yarn-node22/pkg-descr b/www/yarn-node24/pkg-descr similarity index 100% rename from www/yarn-node22/pkg-descr rename to www/yarn-node24/pkg-descr diff --git a/www/yarn-node22/pkg-plist b/www/yarn-node24/pkg-plist similarity index 100% rename from www/yarn-node22/pkg-plist rename to www/yarn-node24/pkg-plist diff --git a/www/yarn-node25/Makefile b/www/yarn-node25/Makefile index 2aaae2918ce9..0fa210696aa8 100644 --- a/www/yarn-node25/Makefile +++ b/www/yarn-node25/Makefile @@ -1,5 +1,5 @@ USES= nodejs:25,run -MASTERDIR= ${.CURDIR}/../yarn-node22 +MASTERDIR= ${.CURDIR}/../yarn-node24 .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511171917.5AHJHisx009880>