www/npm-node*: Reorganize npm-node* as node22 is the new default

7 files changed, 48 insertions, 48 deletions

diff --git a/www/npm-node18/Makefile b/www/npm-node18/Makefile
index 62fff8f1e81b..9e1ddaf9d42c 100644
--- a/www/npm-node18/Makefile
+++ b/www/npm-node18/Makefile
@@ -1,5 +1,5 @@
 USES=		nodejs:18,run
 
-MASTERDIR=	${.CURDIR}/../npm-node20
+MASTERDIR=	${.CURDIR}/../npm-node22
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/npm-node20/Makefile b/www/npm-node20/Makefile
index c79304194ef4..348af63ac468 100644
--- a/www/npm-node20/Makefile
+++ b/www/npm-node20/Makefile
@@ -1,45 +1,5 @@
-PORTNAME=	npm
-PORTVERSION=	10.9.0
-CATEGORIES=	www
-MASTER_SITES=	LOCAL/sunpoet
-PKGNAMESUFFIX=	${NODEJS_SUFFIX}
+USES=		nodejs:20,run
 
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Node package manager
-WWW=		https://www.npmjs.com/package/npm \
-		https://docs.npmjs.com/cli/v10 \
-		https://github.com/npm/cli
+MASTERDIR=	${.CURDIR}/../npm-node22
 
-LICENSE=	ART20
-LICENSE_FILE=	${WRKSRC}/lib/node_modules/npm/LICENSE
-
-RUN_DEPENDS=	gmake:devel/gmake
-
-USES?=		nodejs:20,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-node22/Makefile b/www/npm-node22/Makefile
index a95ca153555b..2ebba18cded4 100644
--- a/www/npm-node22/Makefile
+++ b/www/npm-node22/Makefile
@@ -1,5 +1,45 @@
-USES=		nodejs:22,run
+PORTNAME=	npm
+PORTVERSION=	10.9.0
+CATEGORIES=	www
+MASTER_SITES=	LOCAL/sunpoet
+PKGNAMESUFFIX=	${NODEJS_SUFFIX}
 
-MASTERDIR=	${.CURDIR}/../npm-node20
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Node package manager
+WWW=		https://www.npmjs.com/package/npm \
+		https://docs.npmjs.com/cli/v10 \
+		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: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>
diff --git a/www/npm-node20/distinfo b/www/npm-node22/distinfo
index ae9d66244f03..ae9d66244f03 100644
--- a/www/npm-node20/distinfo
+++ b/www/npm-node22/distinfo
diff --git a/www/npm-node20/pkg-descr b/www/npm-node22/pkg-descr
index e63a2219f115..e63a2219f115 100644
--- a/www/npm-node20/pkg-descr
+++ b/www/npm-node22/pkg-descr
diff --git a/www/npm-node20/pkg-plist b/www/npm-node22/pkg-plist
index a09165524a13..a09165524a13 100644
--- a/www/npm-node20/pkg-plist
+++ b/www/npm-node22/pkg-plist
diff --git a/www/npm-node23/Makefile b/www/npm-node23/Makefile
index bdbac6fd2e0b..e31c06cfe420 100644
--- a/www/npm-node23/Makefile
+++ b/www/npm-node23/Makefile
@@ -1,5 +1,5 @@
 USES=		nodejs:23,run
 
-MASTERDIR=	${.CURDIR}/../npm-node20
+MASTERDIR=	${.CURDIR}/../npm-node22
 
 .include "${MASTERDIR}/Makefile"