CVS commit: pkgsrc/lang

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Nov  1 17:58:22 UTC 2022

Modified Files:
        pkgsrc/lang/nodejs: Makefile Makefile.common PLIST
        pkgsrc/lang/nodejs16: Makefile PLIST

Log Message:
lang/nodejs{,16}: as expected by upstream, install corepack (and bump
PKGREVISION). For earlier versions, no change.


To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 pkgsrc/lang/nodejs/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.67 -r1.68 pkgsrc/lang/nodejs/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/nodejs16/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/nodejs16/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/Makefile
diff -u pkgsrc/lang/nodejs/Makefile:1.244 pkgsrc/lang/nodejs/Makefile:1.245
--- pkgsrc/lang/nodejs/Makefile:1.244   Mon Oct 31 15:19:06 2022
+++ pkgsrc/lang/nodejs/Makefile Tue Nov  1 17:58:22 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.244 2022/10/31 15:19:06 adam Exp $
+# $NetBSD: Makefile,v 1.245 2022/11/01 17:58:22 schmonz Exp $
 
 DISTNAME=      node-v18.12.0
+PKGREVISION=   1
 EXTRACT_SUFX=  .tar.xz
 
 USE_LANGUAGES= c gnu++17
@@ -15,7 +16,6 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${PREFIX}/lib
 CONFIGURE_ARGS+=       --shared-brotli
 CONFIGURE_ARGS+=       --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
-CONFIGURE_ARGS+=       --without-corepack
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -23,11 +23,20 @@ CHECK_PORTABILITY_SKIP+=    deps/v8/tools/c
 CHECK_PORTABILITY_SKIP+=       deps/v8/tools/cppgc/test_cmake.sh
 CHECK_PORTABILITY_SKIP+=       tools/macos-installer/pkgbuild/npm/scripts/preinstall
 
+REPLACE_NODEJS+=               deps/corepack/dist/*.js
+.include "../../lang/nodejs/application.mk"
+CHECK_INTERPRETER_SKIP+=       lib/node_modules/corepack/shims/*.ps1
+
 .if ${MACHINE_ARCH} == "i386"
 # required for SSE2 code under i386.
 CXXFLAGS+=     -mstackrealign
 .endif
 
+.PHONY: minusx
+post-install: minusx
+minusx:
+       ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd
+
 .include "options.mk"
 
 # Node turns on -latomic for arm, mips and ppc.

Index: pkgsrc/lang/nodejs/Makefile.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.46 pkgsrc/lang/nodejs/Makefile.common:1.47
--- pkgsrc/lang/nodejs/Makefile.common:1.46     Thu May  5 07:08:06 2022
+++ pkgsrc/lang/nodejs/Makefile.common  Tue Nov  1 17:58:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2022/05/05 07:08:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.47 2022/11/01 17:58:22 schmonz Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs12/Makefile
 # used by lang/nodejs14/Makefile
@@ -73,7 +73,9 @@ CXXFLAGS.SunOS+=      -D_FILE_OFFSET_BITS=64
 pre-install:
        ${CHMOD} -R g-w ${WRKSRC}
 
-post-install:
+.PHONY: paxctl
+post-install: paxctl
+paxctl:
 .if defined(TOOLS_PLATFORM.paxctl)
        ${TOOLS_PLATFORM.paxctl} +m ${DESTDIR}${PREFIX}/bin/node
 .endif

Index: pkgsrc/lang/nodejs/PLIST
diff -u pkgsrc/lang/nodejs/PLIST:1.67 pkgsrc/lang/nodejs/PLIST:1.68
--- pkgsrc/lang/nodejs/PLIST:1.67       Sun Oct  2 03:29:35 2022
+++ pkgsrc/lang/nodejs/PLIST    Tue Nov  1 17:58:22 2022
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.67 2022/10/02 03:29:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.68 2022/11/01 17:58:22 schmonz Exp $
+bin/corepack
 bin/node
 include/node/common.gypi
 include/node/config.gypi
@@ -64,6 +65,61 @@ include/node/v8-weak-callback-info.h
 include/node/v8.h
 include/node/v8config.h
 ${PLIST.dtrace}lib/dtrace/node.d
+lib/node_modules/corepack/CHANGELOG.md
+lib/node_modules/corepack/LICENSE.md
+lib/node_modules/corepack/README.md
+lib/node_modules/corepack/dist/corepack.js
+lib/node_modules/corepack/dist/npm.js
+lib/node_modules/corepack/dist/npx.js
+lib/node_modules/corepack/dist/pnpm.js
+lib/node_modules/corepack/dist/pnpx.js
+lib/node_modules/corepack/dist/vcc.js
+lib/node_modules/corepack/dist/vendors-_yarn_berry_cache_proxy-agent-npm-5_0_0-41772f4b01-9_zip_node_modules_proxy-agent_index_js.js
+lib/node_modules/corepack/dist/yarn.js
+lib/node_modules/corepack/dist/yarnpkg.js
+lib/node_modules/corepack/package.json
+lib/node_modules/corepack/shims/corepack
+lib/node_modules/corepack/shims/corepack.cmd
+lib/node_modules/corepack/shims/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/corepack
+lib/node_modules/corepack/shims/nodewin/corepack.cmd
+lib/node_modules/corepack/shims/nodewin/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/npm
+lib/node_modules/corepack/shims/nodewin/npm.cmd
+lib/node_modules/corepack/shims/nodewin/npm.ps1
+lib/node_modules/corepack/shims/nodewin/npx
+lib/node_modules/corepack/shims/nodewin/npx.cmd
+lib/node_modules/corepack/shims/nodewin/npx.ps1
+lib/node_modules/corepack/shims/nodewin/pnpm
+lib/node_modules/corepack/shims/nodewin/pnpm.cmd
+lib/node_modules/corepack/shims/nodewin/pnpm.ps1
+lib/node_modules/corepack/shims/nodewin/pnpx
+lib/node_modules/corepack/shims/nodewin/pnpx.cmd
+lib/node_modules/corepack/shims/nodewin/pnpx.ps1
+lib/node_modules/corepack/shims/nodewin/yarn
+lib/node_modules/corepack/shims/nodewin/yarn.cmd
+lib/node_modules/corepack/shims/nodewin/yarn.ps1
+lib/node_modules/corepack/shims/nodewin/yarnpkg
+lib/node_modules/corepack/shims/nodewin/yarnpkg.cmd
+lib/node_modules/corepack/shims/nodewin/yarnpkg.ps1
+lib/node_modules/corepack/shims/npm
+lib/node_modules/corepack/shims/npm.cmd
+lib/node_modules/corepack/shims/npm.ps1
+lib/node_modules/corepack/shims/npx
+lib/node_modules/corepack/shims/npx.cmd
+lib/node_modules/corepack/shims/npx.ps1
+lib/node_modules/corepack/shims/pnpm
+lib/node_modules/corepack/shims/pnpm.cmd
+lib/node_modules/corepack/shims/pnpm.ps1
+lib/node_modules/corepack/shims/pnpx
+lib/node_modules/corepack/shims/pnpx.cmd
+lib/node_modules/corepack/shims/pnpx.ps1
+lib/node_modules/corepack/shims/yarn
+lib/node_modules/corepack/shims/yarn.cmd
+lib/node_modules/corepack/shims/yarn.ps1
+lib/node_modules/corepack/shims/yarnpkg
+lib/node_modules/corepack/shims/yarnpkg.cmd
+lib/node_modules/corepack/shims/yarnpkg.ps1
 man/man1/node.1
 share/doc/node/gdbinit
 share/doc/node/lldb_commands.py

Index: pkgsrc/lang/nodejs16/Makefile
diff -u pkgsrc/lang/nodejs16/Makefile:1.6 pkgsrc/lang/nodejs16/Makefile:1.7
--- pkgsrc/lang/nodejs16/Makefile:1.6   Mon Oct 17 11:01:44 2022
+++ pkgsrc/lang/nodejs16/Makefile       Tue Nov  1 17:58:22 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2022/10/17 11:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.7 2022/11/01 17:58:22 schmonz Exp $
 
 DISTNAME=      node-v16.18.0
+PKGREVISION=   1
 EXTRACT_SUFX=  .tar.xz
 
 USE_LANGUAGES= c gnu++14
@@ -15,7 +16,6 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${PREFIX}/lib
 CONFIGURE_ARGS+=       --shared-brotli
 CONFIGURE_ARGS+=       --shared-nghttp2
 CONFIGURE_ARGS+=       --with-intl=system-icu
-CONFIGURE_ARGS+=       --without-corepack
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -23,11 +23,20 @@ CHECK_PORTABILITY_SKIP+=    deps/v8/tools/c
 CHECK_PORTABILITY_SKIP+=       deps/v8/tools/cppgc/test_cmake.sh
 CHECK_PORTABILITY_SKIP+=       tools/macos-installer/pkgbuild/npm/scripts/preinstall
 
+REPLACE_NODEJS+=               deps/corepack/dist/*.js
+.include "../../lang/nodejs/application.mk"
+CHECK_INTERPRETER_SKIP+=       lib/node_modules/corepack/shims/*.ps1
+
 .if ${MACHINE_ARCH} == "i386"
 # required for SSE2 code under i386.
 CXXFLAGS+=     -mstackrealign
 .endif
 
+.PHONY: minusx
+post-install: minusx
+minusx:
+       ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd
+
 .include "../../lang/nodejs/options.mk"
 
 # Node turns on -latomic for arm, mips and ppc.

Index: pkgsrc/lang/nodejs16/PLIST
diff -u pkgsrc/lang/nodejs16/PLIST:1.2 pkgsrc/lang/nodejs16/PLIST:1.3
--- pkgsrc/lang/nodejs16/PLIST:1.2      Mon Oct 17 11:01:44 2022
+++ pkgsrc/lang/nodejs16/PLIST  Tue Nov  1 17:58:22 2022
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2022/10/17 11:01:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/11/01 17:58:22 schmonz Exp $
+bin/corepack
 bin/node
 include/node/common.gypi
 include/node/config.gypi
@@ -20,6 +21,61 @@ include/node/v8-profiler.h
 include/node/v8-version.h
 include/node/v8.h
 include/node/v8config.h
+lib/node_modules/corepack/CHANGELOG.md
+lib/node_modules/corepack/LICENSE.md
+lib/node_modules/corepack/README.md
+lib/node_modules/corepack/dist/corepack.js
+lib/node_modules/corepack/dist/npm.js
+lib/node_modules/corepack/dist/npx.js
+lib/node_modules/corepack/dist/pnpm.js
+lib/node_modules/corepack/dist/pnpx.js
+lib/node_modules/corepack/dist/vcc.js
+lib/node_modules/corepack/dist/vendors-_yarn_berry_cache_proxy-agent-npm-5_0_0-41772f4b01-9_zip_node_modules_proxy-agent_index_js.js
+lib/node_modules/corepack/dist/yarn.js
+lib/node_modules/corepack/dist/yarnpkg.js
+lib/node_modules/corepack/package.json
+lib/node_modules/corepack/shims/corepack
+lib/node_modules/corepack/shims/corepack.cmd
+lib/node_modules/corepack/shims/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/corepack
+lib/node_modules/corepack/shims/nodewin/corepack.cmd
+lib/node_modules/corepack/shims/nodewin/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/npm
+lib/node_modules/corepack/shims/nodewin/npm.cmd
+lib/node_modules/corepack/shims/nodewin/npm.ps1
+lib/node_modules/corepack/shims/nodewin/npx
+lib/node_modules/corepack/shims/nodewin/npx.cmd
+lib/node_modules/corepack/shims/nodewin/npx.ps1
+lib/node_modules/corepack/shims/nodewin/pnpm
+lib/node_modules/corepack/shims/nodewin/pnpm.cmd
+lib/node_modules/corepack/shims/nodewin/pnpm.ps1
+lib/node_modules/corepack/shims/nodewin/pnpx
+lib/node_modules/corepack/shims/nodewin/pnpx.cmd
+lib/node_modules/corepack/shims/nodewin/pnpx.ps1
+lib/node_modules/corepack/shims/nodewin/yarn
+lib/node_modules/corepack/shims/nodewin/yarn.cmd
+lib/node_modules/corepack/shims/nodewin/yarn.ps1
+lib/node_modules/corepack/shims/nodewin/yarnpkg
+lib/node_modules/corepack/shims/nodewin/yarnpkg.cmd
+lib/node_modules/corepack/shims/nodewin/yarnpkg.ps1
+lib/node_modules/corepack/shims/npm
+lib/node_modules/corepack/shims/npm.cmd
+lib/node_modules/corepack/shims/npm.ps1
+lib/node_modules/corepack/shims/npx
+lib/node_modules/corepack/shims/npx.cmd
+lib/node_modules/corepack/shims/npx.ps1
+lib/node_modules/corepack/shims/pnpm
+lib/node_modules/corepack/shims/pnpm.cmd
+lib/node_modules/corepack/shims/pnpm.ps1
+lib/node_modules/corepack/shims/pnpx
+lib/node_modules/corepack/shims/pnpx.cmd
+lib/node_modules/corepack/shims/pnpx.ps1
+lib/node_modules/corepack/shims/yarn
+lib/node_modules/corepack/shims/yarn.cmd
+lib/node_modules/corepack/shims/yarn.ps1
+lib/node_modules/corepack/shims/yarnpkg
+lib/node_modules/corepack/shims/yarnpkg.cmd
+lib/node_modules/corepack/shims/yarnpkg.ps1
 man/man1/node.1
 share/doc/node/gdbinit
 share/doc/node/lldb_commands.py