- Stage

- Use USES=tar

2 files changed, 111 insertions, 31 deletions

diff --git a/www/npm/Makefile b/www/npm/Makefile
index 4bad58827957..cce2afecdeb6 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -15,35 +15,12 @@ OPTIONS_DEFINE=	NODE_DEVEL
 NODE_DEVEL_DESC=Use www/node-devel instead of www/node
 
 NO_BUILD=	yes
-NO_MANCOMPRESS=	yes
-NO_STAGE=	yes
-USE_XZ=		yes
-
-MAN1=		npm.1 npm-README.1 npm-adduser.1 npm-bin.1 npm-bugs.1 \
-		npm-build.1 npm-bundle.1 npm-cache.1 npm-completion.1 \
-		npm-config.1 npm-dedupe.1 npm-deprecate.1 npm-docs.1 \
-		npm-edit.1 npm-explore.1 npm-help-search.1 npm-help.1 \
-		npm-init.1 npm-install.1 npm-link.1 npm-ls.1 npm-outdated.1 \
-		npm-owner.1 npm-pack.1 npm-prefix.1 npm-prune.1 npm-publish.1 \
-		npm-rebuild.1 npm-restart.1 npm-rm.1 npm-root.1 \
-		npm-run-script.1 npm-search.1 npm-shrinkwrap.1 npm-star.1 \
-		npm-stars.1 npm-start.1 npm-stop.1 npm-submodule.1 npm-tag.1 \
-		npm-test.1 npm-uninstall.1 npm-unpublish.1 npm-update.1 \
-		npm-version.1 npm-view.1 npm-whoami.1 repo.1
-MAN3=		npm.3 npm-bin.3 npm-bugs.3 npm-commands.3 npm-config.3 \
-		npm-deprecate.3 npm-docs.3 npm-edit.3 npm-explore.3 \
-		npm-help-search.3 npm-init.3 npm-install.3 npm-link.3 \
-		npm-load.3 npm-ls.3 npm-outdated.3 npm-owner.3 npm-pack.3 \
-		npm-prefix.3 npm-prune.3 npm-publish.3 npm-rebuild.3 \
-		npm-restart.3 npm-root.3 npm-run-script.3 npm-search.3 \
-		npm-shrinkwrap.3 npm-start.3 npm-stop.3 npm-submodule.3 \
-		npm-tag.3 npm-test.3 npm-uninstall.3 npm-unpublish.3 \
-		npm-update.3 npm-version.3 npm-view.3 npm-whoami.3 repo.3
-MAN5=		npm-folders.5 npm-global.5 npm-json.5 npmrc.5 package.json.5
-MAN7=		npm-coding-style.7 npm-config.7 npm-developers.7 \
-		npm-disputes.7 npm-faq.7 npm-index.7 npm-registry.7 \
-		npm-scripts.7 removing-npm.7 semver.7
+USES=		tar:xz
+
+MAKE_ARGS+=	npm_config_prefix=${STAGEDIR}${PREFIX}
+
 MANPREFIX=	${PREFIX}/lib/node_modules/npm
+PLIST_SUB+=	MANPREFIX="${MANPREFIX}"
 
 .include <bsd.port.options.mk>
 
@@ -56,11 +33,11 @@ RUN_DEPENDS+=	node>=0.8.0:${PORTSDIR}/www/node
 post-patch:
 	@${SED} -i '' -e 's|node cli.js|& --cache ${WRKDIR}/.cache|; /^install: / s| docclean||' ${WRKSRC}/Makefile
 	@${SED} -i '' -e 's|linkBins, linkMans|linkBins|' ${WRKSRC}/lib/build.js
-	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/node_modules/npm/man" > ${WRKDIR}/npm.conf
+	@${ECHO_CMD} "MANPATH ${MANPREFIX}/man" > ${WRKDIR}/npm.conf
 
 post-install:
-	@${INSTALL_DATA} ${WRKDIR}/npm.conf ${PREFIX}/etc/man.d/npm.conf
-	@${CHMOD} +x ${PREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
+	@${INSTALL_DATA} ${WRKDIR}/npm.conf ${STAGEDIR}${PREFIX}/etc/man.d/npm.conf
+	@${CHMOD} +x ${STAGEDIR}${PREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
 
 # maintainer section:
 # require: bash, git, gmake, node
diff --git a/www/npm/pkg-plist b/www/npm/pkg-plist
index d872b297839f..05a7116bc38d 100644
--- a/www/npm/pkg-plist
+++ b/www/npm/pkg-plist
@@ -1,5 +1,107 @@
 bin/npm
 etc/man.d/npm.conf
+%%MANPREFIX%%/man/man1/npm-README.1.gz
+%%MANPREFIX%%/man/man1/npm-adduser.1.gz
+%%MANPREFIX%%/man/man1/npm-bin.1.gz
+%%MANPREFIX%%/man/man1/npm-bugs.1.gz
+%%MANPREFIX%%/man/man1/npm-build.1.gz
+%%MANPREFIX%%/man/man1/npm-bundle.1.gz
+%%MANPREFIX%%/man/man1/npm-cache.1.gz
+%%MANPREFIX%%/man/man1/npm-completion.1.gz
+%%MANPREFIX%%/man/man1/npm-config.1.gz
+%%MANPREFIX%%/man/man1/npm-dedupe.1.gz
+%%MANPREFIX%%/man/man1/npm-deprecate.1.gz
+%%MANPREFIX%%/man/man1/npm-docs.1.gz
+%%MANPREFIX%%/man/man1/npm-edit.1.gz
+%%MANPREFIX%%/man/man1/npm-explore.1.gz
+%%MANPREFIX%%/man/man1/npm-help-search.1.gz
+%%MANPREFIX%%/man/man1/npm-help.1.gz
+%%MANPREFIX%%/man/man1/npm-init.1.gz
+%%MANPREFIX%%/man/man1/npm-install.1.gz
+%%MANPREFIX%%/man/man1/npm-link.1.gz
+%%MANPREFIX%%/man/man1/npm-ls.1.gz
+%%MANPREFIX%%/man/man1/npm-outdated.1.gz
+%%MANPREFIX%%/man/man1/npm-owner.1.gz
+%%MANPREFIX%%/man/man1/npm-pack.1.gz
+%%MANPREFIX%%/man/man1/npm-prefix.1.gz
+%%MANPREFIX%%/man/man1/npm-prune.1.gz
+%%MANPREFIX%%/man/man1/npm-publish.1.gz
+%%MANPREFIX%%/man/man1/npm-rebuild.1.gz
+%%MANPREFIX%%/man/man1/npm-restart.1.gz
+%%MANPREFIX%%/man/man1/npm-rm.1.gz
+%%MANPREFIX%%/man/man1/npm-root.1.gz
+%%MANPREFIX%%/man/man1/npm-run-script.1.gz
+%%MANPREFIX%%/man/man1/npm-search.1.gz
+%%MANPREFIX%%/man/man1/npm-shrinkwrap.1.gz
+%%MANPREFIX%%/man/man1/npm-star.1.gz
+%%MANPREFIX%%/man/man1/npm-stars.1.gz
+%%MANPREFIX%%/man/man1/npm-start.1.gz
+%%MANPREFIX%%/man/man1/npm-stop.1.gz
+%%MANPREFIX%%/man/man1/npm-submodule.1.gz
+%%MANPREFIX%%/man/man1/npm-tag.1.gz
+%%MANPREFIX%%/man/man1/npm-test.1.gz
+%%MANPREFIX%%/man/man1/npm-uninstall.1.gz
+%%MANPREFIX%%/man/man1/npm-unpublish.1.gz
+%%MANPREFIX%%/man/man1/npm-update.1.gz
+%%MANPREFIX%%/man/man1/npm-version.1.gz
+%%MANPREFIX%%/man/man1/npm-view.1.gz
+%%MANPREFIX%%/man/man1/npm-whoami.1.gz
+%%MANPREFIX%%/man/man1/npm.1.gz
+%%MANPREFIX%%/man/man1/repo.1.gz
+%%MANPREFIX%%/man/man3/npm-bin.3.gz
+%%MANPREFIX%%/man/man3/npm-bugs.3.gz
+%%MANPREFIX%%/man/man3/npm-commands.3.gz
+%%MANPREFIX%%/man/man3/npm-config.3.gz
+%%MANPREFIX%%/man/man3/npm-deprecate.3.gz
+%%MANPREFIX%%/man/man3/npm-docs.3.gz
+%%MANPREFIX%%/man/man3/npm-edit.3.gz
+%%MANPREFIX%%/man/man3/npm-explore.3.gz
+%%MANPREFIX%%/man/man3/npm-help-search.3.gz
+%%MANPREFIX%%/man/man3/npm-init.3.gz
+%%MANPREFIX%%/man/man3/npm-install.3.gz
+%%MANPREFIX%%/man/man3/npm-link.3.gz
+%%MANPREFIX%%/man/man3/npm-load.3.gz
+%%MANPREFIX%%/man/man3/npm-ls.3.gz
+%%MANPREFIX%%/man/man3/npm-outdated.3.gz
+%%MANPREFIX%%/man/man3/npm-owner.3.gz
+%%MANPREFIX%%/man/man3/npm-pack.3.gz
+%%MANPREFIX%%/man/man3/npm-prefix.3.gz
+%%MANPREFIX%%/man/man3/npm-prune.3.gz
+%%MANPREFIX%%/man/man3/npm-publish.3.gz
+%%MANPREFIX%%/man/man3/npm-rebuild.3.gz
+%%MANPREFIX%%/man/man3/npm-restart.3.gz
+%%MANPREFIX%%/man/man3/npm-root.3.gz
+%%MANPREFIX%%/man/man3/npm-run-script.3.gz
+%%MANPREFIX%%/man/man3/npm-search.3.gz
+%%MANPREFIX%%/man/man3/npm-shrinkwrap.3.gz
+%%MANPREFIX%%/man/man3/npm-start.3.gz
+%%MANPREFIX%%/man/man3/npm-stop.3.gz
+%%MANPREFIX%%/man/man3/npm-submodule.3.gz
+%%MANPREFIX%%/man/man3/npm-tag.3.gz
+%%MANPREFIX%%/man/man3/npm-test.3.gz
+%%MANPREFIX%%/man/man3/npm-uninstall.3.gz
+%%MANPREFIX%%/man/man3/npm-unpublish.3.gz
+%%MANPREFIX%%/man/man3/npm-update.3.gz
+%%MANPREFIX%%/man/man3/npm-version.3.gz
+%%MANPREFIX%%/man/man3/npm-view.3.gz
+%%MANPREFIX%%/man/man3/npm-whoami.3.gz
+%%MANPREFIX%%/man/man3/npm.3.gz
+%%MANPREFIX%%/man/man3/repo.3.gz
+%%MANPREFIX%%/man/man5/npm-folders.5.gz
+%%MANPREFIX%%/man/man5/npm-global.5.gz
+%%MANPREFIX%%/man/man5/npm-json.5.gz
+%%MANPREFIX%%/man/man5/npmrc.5.gz
+%%MANPREFIX%%/man/man5/package.json.5.gz
+%%MANPREFIX%%/man/man7/npm-coding-style.7.gz
+%%MANPREFIX%%/man/man7/npm-config.7.gz
+%%MANPREFIX%%/man/man7/npm-developers.7.gz
+%%MANPREFIX%%/man/man7/npm-disputes.7.gz
+%%MANPREFIX%%/man/man7/npm-faq.7.gz
+%%MANPREFIX%%/man/man7/npm-index.7.gz
+%%MANPREFIX%%/man/man7/npm-registry.7.gz
+%%MANPREFIX%%/man/man7/npm-scripts.7.gz
+%%MANPREFIX%%/man/man7/removing-npm.7.gz
+%%MANPREFIX%%/man/man7/semver.7.gz
 lib/node_modules/npm/.npmignore
 lib/node_modules/npm/AUTHORS
 lib/node_modules/npm/LICENSE
@@ -1301,6 +1403,7 @@ lib/node_modules/npm/test/tap/peer-deps-without-package-json.js
 lib/node_modules/npm/test/tap/peer-deps-without-package-json/.gitkeep
 lib/node_modules/npm/test/tap/publish-config.js
 lib/node_modules/npm/test/update-test.sh
+@comment @exec /bin/chmod +x %D/lib/node_modules/npm/bin/node-gyp-bin/node-gyp
 @dirrm lib/node_modules/npm/test/tap/peer-deps-without-package-json
 @dirrm lib/node_modules/npm/test/tap/peer-deps-invalid
 @dirrm lib/node_modules/npm/test/tap/package-with-peer-dep