- Remove MANPREFIX from PLIST_SUB

- Sort PLIST

2 files changed, 108 insertions, 109 deletions

diff --git a/www/npm/Makefile b/www/npm/Makefile
index f11824cc3570..6532884c1b67 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -21,7 +21,6 @@ MAKE_ARGS=	npm_config_prefix=${STAGEDIR}${PREFIX}
 REINPLACE_ARGS=	-i ''
 
 MANPREFIX=	${PREFIX}/lib/node_modules/npm
-PLIST_SUB=	MANPREFIX=lib/node_modules/npm
 
 NODE_DEVEL_RUN_DEPENDS=	node-devel>=0.8.0:${PORTSDIR}/www/node-devel
 NODE_DEVEL_RUN_DEPENDS_OFF=	node>=0.8.0:${PORTSDIR}/www/node
diff --git a/www/npm/pkg-plist b/www/npm/pkg-plist
index a33e4762d96c..bec81e732105 100644
--- a/www/npm/pkg-plist
+++ b/www/npm/pkg-plist
@@ -286,108 +286,108 @@ lib/node_modules/npm/lib/visnup.js
 lib/node_modules/npm/lib/whoami.js
 lib/node_modules/npm/lib/xmas.js
 lib/node_modules/npm/make.bat
-%%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-repo.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/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-repo.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/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/man/man1/npm-README.1.gz
+lib/node_modules/npm/man/man1/npm-adduser.1.gz
+lib/node_modules/npm/man/man1/npm-bin.1.gz
+lib/node_modules/npm/man/man1/npm-bugs.1.gz
+lib/node_modules/npm/man/man1/npm-build.1.gz
+lib/node_modules/npm/man/man1/npm-bundle.1.gz
+lib/node_modules/npm/man/man1/npm-cache.1.gz
+lib/node_modules/npm/man/man1/npm-completion.1.gz
+lib/node_modules/npm/man/man1/npm-config.1.gz
+lib/node_modules/npm/man/man1/npm-dedupe.1.gz
+lib/node_modules/npm/man/man1/npm-deprecate.1.gz
+lib/node_modules/npm/man/man1/npm-docs.1.gz
+lib/node_modules/npm/man/man1/npm-edit.1.gz
+lib/node_modules/npm/man/man1/npm-explore.1.gz
+lib/node_modules/npm/man/man1/npm-help-search.1.gz
+lib/node_modules/npm/man/man1/npm-help.1.gz
+lib/node_modules/npm/man/man1/npm-init.1.gz
+lib/node_modules/npm/man/man1/npm-install.1.gz
+lib/node_modules/npm/man/man1/npm-link.1.gz
+lib/node_modules/npm/man/man1/npm-ls.1.gz
+lib/node_modules/npm/man/man1/npm-outdated.1.gz
+lib/node_modules/npm/man/man1/npm-owner.1.gz
+lib/node_modules/npm/man/man1/npm-pack.1.gz
+lib/node_modules/npm/man/man1/npm-prefix.1.gz
+lib/node_modules/npm/man/man1/npm-prune.1.gz
+lib/node_modules/npm/man/man1/npm-publish.1.gz
+lib/node_modules/npm/man/man1/npm-rebuild.1.gz
+lib/node_modules/npm/man/man1/npm-repo.1.gz
+lib/node_modules/npm/man/man1/npm-restart.1.gz
+lib/node_modules/npm/man/man1/npm-rm.1.gz
+lib/node_modules/npm/man/man1/npm-root.1.gz
+lib/node_modules/npm/man/man1/npm-run-script.1.gz
+lib/node_modules/npm/man/man1/npm-search.1.gz
+lib/node_modules/npm/man/man1/npm-shrinkwrap.1.gz
+lib/node_modules/npm/man/man1/npm-star.1.gz
+lib/node_modules/npm/man/man1/npm-stars.1.gz
+lib/node_modules/npm/man/man1/npm-start.1.gz
+lib/node_modules/npm/man/man1/npm-stop.1.gz
+lib/node_modules/npm/man/man1/npm-submodule.1.gz
+lib/node_modules/npm/man/man1/npm-tag.1.gz
+lib/node_modules/npm/man/man1/npm-test.1.gz
+lib/node_modules/npm/man/man1/npm-uninstall.1.gz
+lib/node_modules/npm/man/man1/npm-unpublish.1.gz
+lib/node_modules/npm/man/man1/npm-update.1.gz
+lib/node_modules/npm/man/man1/npm-version.1.gz
+lib/node_modules/npm/man/man1/npm-view.1.gz
+lib/node_modules/npm/man/man1/npm-whoami.1.gz
+lib/node_modules/npm/man/man1/npm.1.gz
+lib/node_modules/npm/man/man3/npm-bin.3.gz
+lib/node_modules/npm/man/man3/npm-bugs.3.gz
+lib/node_modules/npm/man/man3/npm-commands.3.gz
+lib/node_modules/npm/man/man3/npm-config.3.gz
+lib/node_modules/npm/man/man3/npm-deprecate.3.gz
+lib/node_modules/npm/man/man3/npm-docs.3.gz
+lib/node_modules/npm/man/man3/npm-edit.3.gz
+lib/node_modules/npm/man/man3/npm-explore.3.gz
+lib/node_modules/npm/man/man3/npm-help-search.3.gz
+lib/node_modules/npm/man/man3/npm-init.3.gz
+lib/node_modules/npm/man/man3/npm-install.3.gz
+lib/node_modules/npm/man/man3/npm-link.3.gz
+lib/node_modules/npm/man/man3/npm-load.3.gz
+lib/node_modules/npm/man/man3/npm-ls.3.gz
+lib/node_modules/npm/man/man3/npm-outdated.3.gz
+lib/node_modules/npm/man/man3/npm-owner.3.gz
+lib/node_modules/npm/man/man3/npm-pack.3.gz
+lib/node_modules/npm/man/man3/npm-prefix.3.gz
+lib/node_modules/npm/man/man3/npm-prune.3.gz
+lib/node_modules/npm/man/man3/npm-publish.3.gz
+lib/node_modules/npm/man/man3/npm-rebuild.3.gz
+lib/node_modules/npm/man/man3/npm-repo.3.gz
+lib/node_modules/npm/man/man3/npm-restart.3.gz
+lib/node_modules/npm/man/man3/npm-root.3.gz
+lib/node_modules/npm/man/man3/npm-run-script.3.gz
+lib/node_modules/npm/man/man3/npm-search.3.gz
+lib/node_modules/npm/man/man3/npm-shrinkwrap.3.gz
+lib/node_modules/npm/man/man3/npm-start.3.gz
+lib/node_modules/npm/man/man3/npm-stop.3.gz
+lib/node_modules/npm/man/man3/npm-submodule.3.gz
+lib/node_modules/npm/man/man3/npm-tag.3.gz
+lib/node_modules/npm/man/man3/npm-test.3.gz
+lib/node_modules/npm/man/man3/npm-uninstall.3.gz
+lib/node_modules/npm/man/man3/npm-unpublish.3.gz
+lib/node_modules/npm/man/man3/npm-update.3.gz
+lib/node_modules/npm/man/man3/npm-version.3.gz
+lib/node_modules/npm/man/man3/npm-view.3.gz
+lib/node_modules/npm/man/man3/npm-whoami.3.gz
+lib/node_modules/npm/man/man3/npm.3.gz
+lib/node_modules/npm/man/man5/npm-folders.5.gz
+lib/node_modules/npm/man/man5/npm-global.5.gz
+lib/node_modules/npm/man/man5/npm-json.5.gz
+lib/node_modules/npm/man/man5/npmrc.5.gz
+lib/node_modules/npm/man/man5/package.json.5.gz
+lib/node_modules/npm/man/man7/npm-coding-style.7.gz
+lib/node_modules/npm/man/man7/npm-config.7.gz
+lib/node_modules/npm/man/man7/npm-developers.7.gz
+lib/node_modules/npm/man/man7/npm-disputes.7.gz
+lib/node_modules/npm/man/man7/npm-faq.7.gz
+lib/node_modules/npm/man/man7/npm-index.7.gz
+lib/node_modules/npm/man/man7/npm-registry.7.gz
+lib/node_modules/npm/man/man7/npm-scripts.7.gz
+lib/node_modules/npm/man/man7/removing-npm.7.gz
+lib/node_modules/npm/man/man7/semver.7.gz
 lib/node_modules/npm/node_modules/.bin/beep
 lib/node_modules/npm/node_modules/.bin/clear
 lib/node_modules/npm/node_modules/.bin/node-gyp
@@ -1492,7 +1492,6 @@ lib/node_modules/npm/test/tap/url-dependencies.js
 lib/node_modules/npm/test/tap/url-dependencies/package.json
 lib/node_modules/npm/test/tap/version-no-tags.js
 lib/node_modules/npm/test/update-test.sh
-@dirrmtry lib/node_modules
 @dirrm lib/node_modules/npm/test/tap/url-dependencies
 @dirrm lib/node_modules/npm/test/tap/uninstall-package
 @dirrm lib/node_modules/npm/test/tap/startstop
@@ -1809,11 +1808,11 @@ lib/node_modules/npm/test/update-test.sh
 @dirrm lib/node_modules/npm/node_modules/abbrev
 @dirrm lib/node_modules/npm/node_modules/.bin
 @dirrm lib/node_modules/npm/node_modules
-@dirrm %%MANPREFIX%%/man/man7
-@dirrm %%MANPREFIX%%/man/man5
-@dirrm %%MANPREFIX%%/man/man3
-@dirrm %%MANPREFIX%%/man/man1
-@dirrm %%MANPREFIX%%/man
+@dirrm lib/node_modules/npm/man/man7
+@dirrm lib/node_modules/npm/man/man5
+@dirrm lib/node_modules/npm/man/man3
+@dirrm lib/node_modules/npm/man/man1
+@dirrm lib/node_modules/npm/man
 @dirrm lib/node_modules/npm/lib/utils/completion
 @dirrm lib/node_modules/npm/lib/utils
 @dirrm lib/node_modules/npm/lib
@@ -1832,3 +1831,4 @@ lib/node_modules/npm/test/update-test.sh
 @dirrm lib/node_modules/npm/bin/node-gyp-bin
 @dirrm lib/node_modules/npm/bin
 @dirrm lib/node_modules/npm
+@dirrmtry lib/node_modules