diff --git a/www/npm/Makefile b/www/npm/Makefile index 6e167073d2c0..805d0f55f96f 100644 --- a/www/npm/Makefile +++ b/www/npm/Makefile @@ -1,40 +1,41 @@ PORTNAME= npm PORTVERSION= 9.1.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Node package manager WWW= https://www.npmjs.com/package/npm \ https://github.com/npm/cli LICENSE= ART20 LICENSE_FILE= ${WRKSRC}/lib/node_modules/npm/LICENSE RUN_DEPENDS= gmake:devel/gmake USES?= nodejs:run USES+= cpe python:3.6+ shebangfix tar:xz NO_ARCH= yes NO_BUILD= yes REINPLACE_ARGS= -i '' CONFLICTS_INSTALL?= npm-node[0-9][0-9] CPE_VENDOR= npmjs 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} -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 .include diff --git a/www/npm/files/patch-npm-run b/www/npm/files/patch-npm-run deleted file mode 100644 index 913d1f4c0453..000000000000 --- a/www/npm/files/patch-npm-run +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/node_modules/npm/node_modules/@npmcli/promise-spawn/lib/index.js.orig 2022-11-18 17:24:11 UTC -+++ lib/node_modules/npm/node_modules/@npmcli/promise-spawn/lib/index.js -@@ -117,7 +117,7 @@ const spawnWithShell = (cmd, args, opts, extra) => { - for (const arg of args) { - script += ` ${escape.sh(arg)}` - } -- realArgs.push('-c', script) -+ realArgs.push('-c', '--', script) - } - - return promiseSpawn(command, realArgs, options, extra)