From nobody Wed Nov 01 19:29:59 2023 X-Original-To: dev-commits-ports-all@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 4SLHCC1wlCz4yvYx; Wed, 1 Nov 2023 19:29:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SLHCC1WxXz3WmJ; Wed, 1 Nov 2023 19:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698866999; 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=X9pk5ahqBU0m8l1hvLNcJnfRu+SxyEz14QplZp1gesM=; b=arlLIixwY31mMUcuX4lw10WZe0oMOrpUJ7FxLO0kbrBpZ0NTmoL57p+gzt57Te/0/VWzQO ZBPAq1EexPd1uCjPestZ01B4SLj5WZlp0tpv5OE8gzdNdV3/LEVxBGGuXIgrwAsQMQyMtX PriyZCjru1B+xyToMk5fZ/dHbLBEOS8ZSA+CK4pRpU5zPl4iEPHrFHCY4heD7d0XhYnkZr Fgd9LpsBrX1vzC0yGgZ2z3tPDhCHFAAcjbJeyOvUST1MTT1pntjanN+CfVHOSROs3420Cj +3UFQHolB92zxiahCuf3OxEj17IYOxYa/u78pt390tWkNMK74Z+LPR0bPS7k2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698866999; 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=X9pk5ahqBU0m8l1hvLNcJnfRu+SxyEz14QplZp1gesM=; b=H+UqMep8XXJqQzH3M2WynltixB7plFzPlgHtZ/aKMAHatht6rMotLInl3J0G4wOvPiXNMV J/oCBdmv9LplgY1Gv9SXS+GcdIPqkMAkYCgyBbO4SuGd9HRniKu0XUBahqkPM2dd7e61CN GiPT3vchhY0TRUdHxvb6Jfgyt3cKr3+DKzj7WC0BWH7RQZLgIr3vGiyxttgxHhhh76d4gw 3dUD8EF8XumGXrQXSckSsUiRO1mkHcba1zBTaWvOdTCZyLgrkf7RcLPs/r/CttGRwpXNxM dOD6vw0w2VfJ5hy3lZGLRwGqgjpmYm4i5/qO6YWbdf9OFhD/n0UOVAg3aoFVRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698866999; a=rsa-sha256; cv=none; b=mYf6XIdBl6XWwBSHlsGsPSDg0yWyPj8duhL8uK0qS9BCcSWCRmnVb4gTclNZ1lUC0E1FXR U+22OfD2c2UMm5Z8vrz/Y87EYD2AHQk+njpzUN2Rd8mK41JJafC6SYNGhvsrhyMriYzEH8 32YQqFnHC4AX2QE/UWTfa/jSwYJkZWrztDKJSvzA1HL+IJytQw1bmzjkJv3XzyWQpUFLGk G//7o3eXe7dysBPZvWfHJysZYho4RvFYbBtaBlG//JHBhNhNG0sgCdtPfKe7Womyyjlr1H N7D43bRW+doNon2lTCf53n/ox3W70xAuDsSFTsH3yBX7guArdxQESRu6sh/n+A== 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 4SLHCC0cKLzyYs; Wed, 1 Nov 2023 19:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A1JTxFQ000700; Wed, 1 Nov 2023 19:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A1JTxLi000697; Wed, 1 Nov 2023 19:29:59 GMT (envelope-from git) Date: Wed, 1 Nov 2023 19:29:59 GMT Message-Id: <202311011929.3A1JTxLi000697@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: 35784fd58565 - main - www/npm-node*: Reorganize npm-node* as node20 is the new default List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 35784fd5856543fa9048e43ce597fd812816b1c7 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=35784fd5856543fa9048e43ce597fd812816b1c7 commit 35784fd5856543fa9048e43ce597fd812816b1c7 Author: Po-Chuan Hsieh AuthorDate: 2023-11-01 19:29:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-01 19:29:08 +0000 www/npm-node*: Reorganize npm-node* as node20 is the new default --- www/npm-node18/Makefile | 47 ++------------------------------ www/npm-node20/Makefile | 47 ++++++++++++++++++++++++++++++-- www/{npm-node18 => npm-node20}/distinfo | 0 www/{npm-node18 => npm-node20}/pkg-descr | 0 www/{npm-node18 => npm-node20}/pkg-plist | 0 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/www/npm-node18/Makefile b/www/npm-node18/Makefile index c2315b1364e5..62fff8f1e81b 100644 --- a/www/npm-node18/Makefile +++ b/www/npm-node18/Makefile @@ -1,46 +1,5 @@ -PORTNAME= npm -PORTVERSION= 10.2.0 -CATEGORIES= www -MASTER_SITES= LOCAL/sunpoet -PKGNAMESUFFIX= ${NODEJS_SUFFIX} +USES= nodejs:18,run -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Node package manager -WWW= https://www.npmjs.com/package/npm \ - https://github.com/npm/cli +MASTERDIR= ${.CURDIR}/../npm-node20 -LICENSE= ART20 -LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE - -RUN_DEPENDS= gmake:devel/gmake - -USES?= nodejs:18,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}|' {} + - -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/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp - ${PYTHON_CMD} -O -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp - # After Python 3.8 expires, use the following line instead of the above 2 lines. - #${PYTHON_CMD} -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -o 0 -o 1 - -.include +.include "${MASTERDIR}/Makefile" diff --git a/www/npm-node20/Makefile b/www/npm-node20/Makefile index 50518ea70c81..f4e591ff7d39 100644 --- a/www/npm-node20/Makefile +++ b/www/npm-node20/Makefile @@ -1,5 +1,46 @@ -USES= nodejs:20,run +PORTNAME= npm +PORTVERSION= 10.2.0 +CATEGORIES= www +MASTER_SITES= LOCAL/sunpoet +PKGNAMESUFFIX= ${NODEJS_SUFFIX} -MASTERDIR= ${.CURDIR}/../npm-node18 +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Node package manager +WWW= https://www.npmjs.com/package/npm \ + 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: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}|' {} + + +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/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp + ${PYTHON_CMD} -O -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp + # After Python 3.8 expires, use the following line instead of the above 2 lines. + #${PYTHON_CMD} -m compileall -d ${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -f ${STAGEDIR}${PREFIX}/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp -o 0 -o 1 + +.include diff --git a/www/npm-node18/distinfo b/www/npm-node20/distinfo similarity index 100% rename from www/npm-node18/distinfo rename to www/npm-node20/distinfo diff --git a/www/npm-node18/pkg-descr b/www/npm-node20/pkg-descr similarity index 100% rename from www/npm-node18/pkg-descr rename to www/npm-node20/pkg-descr diff --git a/www/npm-node18/pkg-plist b/www/npm-node20/pkg-plist similarity index 100% rename from www/npm-node18/pkg-plist rename to www/npm-node20/pkg-plist