From nobody Tue Dec 03 17:41:19 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 4Y2ny91Bgkz5gT6F; 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 4Y2ny76VzYz4Sh9; Tue, 3 Dec 2024 17:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733247679; 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=w1xgjR+zi+KfLMiTjhKT5ZhtDvghp6+Jc8iSKKYzrqQ=; b=vAg7MD1p33Skq7bR/EiC+V6uWz6wMdCnKx7WrYCDfXKoTvEyQW7G8esym8tfskA141iuQn bH4oIS+qRSAr+ASGdPSW6ibNKyXghAOpnXIOTXyWcyR5KGowcFS/4LBZ070LSh5DZ7kpVB fb46rqcbvMU2X3bhL3gdqHrhMJcKwel9L3XdxIGBvBhJ9A6cDlCj6wTx602/7JqzdX3oAH Pi+Scxte6Cz5/SANnLhQ+ZQdADOXl571K6TN1W4IMcBs4fc1kadxaowI26VYfloLJD4KTw rcanBYTbLpCG+hLkm1gedwnCAtPLWc0x6gv2AnIvbpHC9PRSc/ZVgUyzTnakqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733247679; 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=w1xgjR+zi+KfLMiTjhKT5ZhtDvghp6+Jc8iSKKYzrqQ=; b=iavIvByi/JMcGUEKEYT+F8Ab74tRE0kmmf+6QY1vy6r0jNHSRzvc/MTi5Gi9ldRGtI8GR6 9zpoDOuJ+x7vSmgGQO4zHAKQgAIYhzikCFJRMUovMhP8POlTvDs0h4HLl8CaULrL+AOYgM bAi3vN3/CPAH9O+d3l/BvWy/58dCel+hF0nmdgEcqwZ+1P6tVpuEwfgYTy3Gkco+QphL2U Egx+YORDScRXqVIvtuecYzrQsZxhQjg1drPSo7FpbcQY4ghSPH9wwYjVUN5GLO7BYQX50E kkW/pIfjFPrFNF7FwtPX8UFJVO1Suz317W/M2yns1hJ5dKJg4s2in/b1XQjz7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733247679; a=rsa-sha256; cv=none; b=oXiCv4xV3oBXPfIl9sTeB3C9mt7gVYMFntvPwQ2Y3xDXZdAIhZtceLgNHHH6IVi8BVDpvB arHn7pVwrLtBTtG7AhzkFEEPEMmiAHCA2CanF+DTuAMT5ufPjdTFgDIwlfuudtW2gxK2lD IXbVCilLkeEcO58scQVq8GZR/Hm0cfxz59elmBEGHqReq8KfGqosoujFqC1vxtqs2z1gbj UWzzKuBSmwJCxaTgS6OZHugLI5pMS20So3kp7Zg2AkcPkaxaQyjpiGYQL8WGqLqz9peYib Y2FVgE6PQT74t605lgPfHWLv7pPVJBsbUTYLnS3cKN5qsht2nxFtfxgUMPQrGw== 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 4Y2ny76702zYTl; Tue, 3 Dec 2024 17:41:19 +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 4B3HfJZi095255; Tue, 3 Dec 2024 17:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B3HfJLm095252; Tue, 3 Dec 2024 17:41:19 GMT (envelope-from git) Date: Tue, 3 Dec 2024 17:41:19 GMT Message-Id: <202412031741.4B3HfJLm095252@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: e7287e317e59 - main - www/npm-node*: Reorganize npm-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: e7287e317e59cbe9b1d9bebcb46214bdd1c5ac27 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7287e317e59cbe9b1d9bebcb46214bdd1c5ac27 commit e7287e317e59cbe9b1d9bebcb46214bdd1c5ac27 Author: Po-Chuan Hsieh AuthorDate: 2024-12-03 17:29:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-12-03 17:34:56 +0000 www/npm-node*: Reorganize npm-node* as node22 is the new default --- www/npm-node18/Makefile | 2 +- www/npm-node20/Makefile | 46 +++----------------------------- www/npm-node22/Makefile | 46 +++++++++++++++++++++++++++++--- www/{npm-node20 => npm-node22}/distinfo | 0 www/{npm-node20 => npm-node22}/pkg-descr | 0 www/{npm-node20 => npm-node22}/pkg-plist | 0 www/npm-node23/Makefile | 2 +- 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 +.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 diff --git a/www/npm-node20/distinfo b/www/npm-node22/distinfo similarity index 100% rename from www/npm-node20/distinfo rename to www/npm-node22/distinfo diff --git a/www/npm-node20/pkg-descr b/www/npm-node22/pkg-descr similarity index 100% rename from www/npm-node20/pkg-descr rename to www/npm-node22/pkg-descr diff --git a/www/npm-node20/pkg-plist b/www/npm-node22/pkg-plist similarity index 100% rename from www/npm-node20/pkg-plist rename to 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"