[pkgsrc/trunk]: pkgsrc/lang/npm npm: fixes for rebuild; small cleanups

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fdeaa757d24
branches:  trunk
changeset: 379710:1fdeaa757d24
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri May 04 09:40:02 2018 +0000

description:
npm: fixes for rebuild; small cleanups

diffstat:

 lang/npm/Makefile               |  20 +++++++++++---------
 lang/npm/distinfo               |   3 ++-
 lang/npm/patches/patch-Makefile |  24 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diffs (96 lines):

diff -r 7efc1062fae7 -r 1fdeaa757d24 lang/npm/Makefile
--- a/lang/npm/Makefile Fri May 04 08:42:20 2018 +0000
+++ b/lang/npm/Makefile Fri May 04 09:40:02 2018 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/05/03 21:09:17 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/04 09:40:02 adam Exp $
 
 DISTNAME=      npm-6.0.0
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=npm/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    filip%joyent.com@localhost
 HOMEPAGE=      https://github.com/npm/npm/
@@ -14,15 +15,15 @@
 DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX} ${MARKED}.tar.gz
 SITES.${MARKED}.tar.gz=        -https://github.com/markedjs/marked/archive/v${MARKED:S/marked-//}.tar.gz
 
-GITHUB_TAG=    v${PKGVERSION_NOREV}
 USE_TOOLS+=    gmake perl
-MAKE_JOBS_SAFE=        no
 
-REPLACE_INTERPRETER+=          node
-REPLACE.node.old=              .*node
-REPLACE.node.new=              ${PREFIX}/bin/node
-REPLACE_FILES.node=            bin/npm-cli.js bin/npx-cli.js
-CHECK_INTERPRETER_SKIP+=       lib/node_modules/npm/*
+REPLACE_INTERPRETER+=  node
+REPLACE.node.old=      .*node
+REPLACE.node.new=      ${PREFIX}/bin/node
+REPLACE_FILES.node=    bin/npm-cli.js
+REPLACE_FILES.node+=   bin/npx-cli.js
+
+CHECK_INTERPRETER_SKIP+=lib/node_modules/npm/*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,12 +31,13 @@
        cd ${WRKSRC} && node bin/npm-cli.js install ${WRKDIR}/${MARKED} --no-global --no-timing --no-save
 
 do-install:
-       cd ${WRKSRC} && ${FIND} . -type f -name '*.orig' -exec ${RM} -f {} \;
+       ${FIND} ${WRKSRC} -type f -name '*.orig' -delete
        cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/node \
                bin/npm-cli.js pack
        cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/node \
                bin/npm-cli.js install -g -f ${DISTNAME}.tgz
 .if ${PKGMANDIR} != "share/man"
+       ${RM} -f -r ${DESTDIR}${PREFIX}/${PKGMANDIR}
        ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR}
 .endif
 
diff -r 7efc1062fae7 -r 1fdeaa757d24 lang/npm/distinfo
--- a/lang/npm/distinfo Fri May 04 08:42:20 2018 +0000
+++ b/lang/npm/distinfo Fri May 04 09:40:02 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2018/05/03 21:09:17 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2018/05/04 09:40:02 adam Exp $
 
 SHA1 (marked-0.3.19.tar.gz) = d30691ac399f05d156f40a0a893ce7a2a7f6c5be
 RMD160 (marked-0.3.19.tar.gz) = e78a28dfaf5fc1039e48f63228f892fa24a13e6f
@@ -8,5 +8,6 @@
 RMD160 (npm-6.0.0.tar.gz) = 9af81fc50ba7407c04c03d96edcc8ddd13b43e75
 SHA512 (npm-6.0.0.tar.gz) = 7c5288a268373fa52d5b3d55bd5d40f71459cc2e2f5610b3ecbb61323cbd8b82d6e7ebb5fbea3449de22d4002329895ae3d99f6aceb62dae46875b4669e5cbbd
 Size (npm-6.0.0.tar.gz) = 8551157 bytes
+SHA1 (patch-Makefile) = b5f882d5ab883bfdb527a5802a0f477feef3eb27
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 291e079fb48caea7501ab864c19ef26672b76bc5
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_xcode__emulation.py) = 7f9f5cd8aadafd309ba8dfb27f96fe8fa56a8af8
diff -r 7efc1062fae7 -r 1fdeaa757d24 lang/npm/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/npm/patches/patch-Makefile   Fri May 04 09:40:02 2018 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile,v 1.1 2018/05/04 09:40:02 adam Exp $
+
+Do not build npm-index.html on rebuild.
+
+--- Makefile.orig      2018-05-04 09:28:53.000000000 +0000
++++ Makefile
+@@ -23,7 +23,7 @@ files_mandocs = $(shell find doc/files -
+                man/man5/npm-json.5 \
+                man/man5/npm-global.5
+ 
+-misc_mandocs = $(shell find doc/misc -name '*.md' \
++misc_mandocs = $(shell find doc/misc -name '*.md' -not -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
+ 
+-misc_htmldocs = $(shell find doc/misc -name '*.md' \
++misc_htmldocs = $(shell find doc/misc -name '*.md' -not -name 'npm-index.md' \
+                  |sed 's|.md|.html|g' \
+                  |sed 's|doc/misc/|html/doc/misc/|g' ) \
+                  html/doc/index.html