diff options
Diffstat (limited to 'lang/npm/patches')
| -rw-r--r-- | lang/npm/patches/patch-Makefile | 34 | ||||
| -rw-r--r-- | lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/lang/npm/patches/patch-Makefile b/lang/npm/patches/patch-Makefile index 9c605682f20..2aa23f41edc 100644 --- a/lang/npm/patches/patch-Makefile +++ b/lang/npm/patches/patch-Makefile @@ -1,24 +1,24 @@ -$NetBSD: patch-Makefile,v 1.2 2018/05/11 09:37:13 adam Exp $ +$NetBSD: patch-Makefile,v 1.3 2019/11/24 20:21:23 adam Exp $ Do not build npm-index.html on rebuild. +Do not build htmldocs, as these need some binary packages. ---- Makefile.orig 2018-05-04 09:28:53.000000000 +0000 +--- Makefile.orig 2019-11-18 18:22:06.000000000 +0000 +++ Makefile -@@ -23,7 +23,7 @@ files_mandocs = $(shell find doc/files - - man/man5/npm-json.5 \ - man/man5/npm-global.5 +@@ -17,6 +17,7 @@ files_mandocs = $(shell find docs/conten + |sed 's|docs/content/configuring-npm/|man/man5/|g' ) \ --misc_mandocs = $(shell find doc/misc -name '*.md' \ -+misc_mandocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \ + misc_mandocs = $(shell find docs/content/using-npm -name '*.md' \ ++ \! -name 'npm-index.md' \ |sed 's|.md|.7|g' \ - |sed 's|doc/misc/|man/man7/|g' ) \ - man/man7/npm-index.7 -@@ -39,7 +39,7 @@ files_htmldocs = $(shell find doc/files - html/doc/files/npm-json.html \ - html/doc/files/npm-global.html + |sed 's|docs/content/using-npm/|man/man7/|g' ) \ --misc_htmldocs = $(shell find doc/misc -name '*.md' \ -+misc_htmldocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \ - |sed 's|.md|.html|g' \ - |sed 's|doc/misc/|html/doc/misc/|g' ) \ - html/doc/index.html +@@ -53,7 +54,7 @@ htmldocs: + node ../bin/npm-cli.js run build:static echo>&2 && \ + rm -rf node_modules .cache public/*js public/*json public/404* public/page-data public/manifest* + +-docs: mandocs htmldocs ++docs: mandocs + + markedclean: + rm -rf node_modules/marked node_modules/.bin/marked .building_marked diff --git a/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js b/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js index 79f8ca34038..b3c2a4d66ce 100644 --- a/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js +++ b/lang/npm/patches/patch-node__modules_node-gyp_lib_configure.js @@ -1,8 +1,8 @@ -$NetBSD: patch-node__modules_node-gyp_lib_configure.js,v 1.2 2019/08/03 07:32:55 adam Exp $ +$NetBSD: patch-node__modules_node-gyp_lib_configure.js,v 1.3 2019/11/24 20:21:23 adam Exp $ Skip Python detection, version 2.7 is required and we know where it is. ---- node_modules/node-gyp/lib/configure.js.orig 2019-07-23 16:20:30.000000000 +0000 +--- node_modules/node-gyp/lib/configure.js.orig 2019-11-18 18:22:06.000000000 +0000 +++ node_modules/node-gyp/lib/configure.js @@ -15,21 +15,14 @@ if (win) { } @@ -11,7 +11,7 @@ Skip Python detection, version 2.7 is required and we know where it is. - var python + var python = '@PYTHONBIN@' var buildDir = path.resolve('build') - var configNames = [ 'config.gypi', 'common.gypi' ] + var configNames = ['config.gypi', 'common.gypi'] var configs = [] var nodeDir var release = processRelease(argv, gyp, process.version, process.release) |