Date: Mon, 17 Nov 2025 19:17:42 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: 2011c16e63c3 - main - www/npm-node*: Reorganize npm-node* as node24 is the new default Message-ID: <202511171917.5AHJHgDU009801@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2011c16e63c3cfce4747c3fc1d81be0758a196d0 commit 2011c16e63c3cfce4747c3fc1d81be0758a196d0 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-11-17 19:15:16 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-11-17 19:15:16 +0000 www/npm-node*: Reorganize npm-node* as node24 is the new default --- www/npm-node20/Makefile | 2 +- www/npm-node22/Makefile | 46 +++----------------------------- www/npm-node24/Makefile | 46 +++++++++++++++++++++++++++++--- www/{npm-node22 => npm-node24}/distinfo | 0 www/{npm-node22 => npm-node24}/pkg-descr | 0 www/{npm-node22 => npm-node24}/pkg-plist | 0 www/npm-node25/Makefile | 2 +- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/www/npm-node20/Makefile b/www/npm-node20/Makefile index 348af63ac468..826ca62f7c17 100644 --- a/www/npm-node20/Makefile +++ b/www/npm-node20/Makefile @@ -1,5 +1,5 @@ USES= nodejs:20,run -MASTERDIR= ${.CURDIR}/../npm-node22 +MASTERDIR= ${.CURDIR}/../npm-node24 .include "${MASTERDIR}/Makefile" diff --git a/www/npm-node22/Makefile b/www/npm-node22/Makefile index b9fdeecc6063..9f865929a021 100644 --- a/www/npm-node22/Makefile +++ b/www/npm-node22/Makefile @@ -1,45 +1,5 @@ -PORTNAME= npm -PORTVERSION= 11.6.1 -CATEGORIES= www -MASTER_SITES= LOCAL/sunpoet -PKGNAMESUFFIX= ${NODEJS_SUFFIX} +USES= nodejs:22,run -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Node package manager -WWW= https://www.npmjs.com/package/npm \ - https://docs.npmjs.com/ \ - https://github.com/npm/cli +MASTERDIR= ${.CURDIR}/../npm-node24 -LICENSE= ART20 -LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE - -RUN_DEPENDS= gmake:devel/gmake - -USES?= nodejs:22,run -USES+= cpe python shebangfix tar:xz - -NO_ARCH= yes -NO_BUILD= yes -REINPLACE_ARGS= -i '' - -CONFLICTS_INSTALL= npm-node[0-9][0-9] - -CPE_VENDOR= npmjs - -PORTSCOUT= ignore:1 - -SHEBANG_GLOB= *.py - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/etc/man.d/npm.conf - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp - @${REINPLACE_CMD} -e 's|exec python |exec ${PYTHON_CMD} |' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp - @${FIND} ${WRKSRC}/ -name '*.sh' -exec ${REINPLACE_CMD} -e '1 s|/usr/local|${LOCALBASE}|' {} + - @${FIND} ${WRKSRC}/ -name '*.bak' -delete - -do-install: - cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/ - ${ECHO_CMD} 'python=${PYTHON_CMD}' > ${STAGEDIR}${PREFIX}/etc/npmrc - ${PYTHON_CMD} -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp -o 0 -o 1 - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/www/npm-node24/Makefile b/www/npm-node24/Makefile index 8ad8600cf41c..cce134b9fab1 100644 --- a/www/npm-node24/Makefile +++ b/www/npm-node24/Makefile @@ -1,5 +1,45 @@ -USES= nodejs:24,run +PORTNAME= npm +PORTVERSION= 11.6.1 +CATEGORIES= www +MASTER_SITES= LOCAL/sunpoet +PKGNAMESUFFIX= ${NODEJS_SUFFIX} -MASTERDIR= ${.CURDIR}/../npm-node22 +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Node package manager +WWW= https://www.npmjs.com/package/npm \ + https://docs.npmjs.com/ \ + https://github.com/npm/cli -.include "${MASTERDIR}/Makefile" +LICENSE= ART20 +LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE + +RUN_DEPENDS= gmake:devel/gmake + +USES?= nodejs:24,run +USES+= cpe python shebangfix tar:xz + +NO_ARCH= yes +NO_BUILD= yes +REINPLACE_ARGS= -i '' + +CONFLICTS_INSTALL= npm-node[0-9][0-9] + +CPE_VENDOR= npmjs + +PORTSCOUT= ignore:1 + +SHEBANG_GLOB= *.py + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/etc/man.d/npm.conf + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp + @${REINPLACE_CMD} -e 's|exec python |exec ${PYTHON_CMD} |' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp + @${FIND} ${WRKSRC}/ -name '*.sh' -exec ${REINPLACE_CMD} -e '1 s|/usr/local|${LOCALBASE}|' {} + + @${FIND} ${WRKSRC}/ -name '*.bak' -delete + +do-install: + cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/ + ${ECHO_CMD} 'python=${PYTHON_CMD}' > ${STAGEDIR}${PREFIX}/etc/npmrc + ${PYTHON_CMD} -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp -o 0 -o 1 + +.include <bsd.port.mk> diff --git a/www/npm-node22/distinfo b/www/npm-node24/distinfo similarity index 100% rename from www/npm-node22/distinfo rename to www/npm-node24/distinfo diff --git a/www/npm-node22/pkg-descr b/www/npm-node24/pkg-descr similarity index 100% rename from www/npm-node22/pkg-descr rename to www/npm-node24/pkg-descr diff --git a/www/npm-node22/pkg-plist b/www/npm-node24/pkg-plist similarity index 100% rename from www/npm-node22/pkg-plist rename to www/npm-node24/pkg-plist diff --git a/www/npm-node25/Makefile b/www/npm-node25/Makefile index 22066b65d811..72d0fc312251 100644 --- a/www/npm-node25/Makefile +++ b/www/npm-node25/Makefile @@ -1,5 +1,5 @@ USES= nodejs:25,run -MASTERDIR= ${.CURDIR}/../npm-node22 +MASTERDIR= ${.CURDIR}/../npm-node24 .include "${MASTERDIR}/Makefile"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511171917.5AHJHgDU009801>