Index: head/www/npm/Makefile
===================================================================
--- head/www/npm/Makefile	(revision 454434)
+++ head/www/npm/Makefile	(revision 454435)
@@ -1,55 +1,58 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	npm
 PORTVERSION=	5.4.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Node package manager
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	gmake:devel/gmake
 
 CONFLICTS_INSTALL=	npm2 npm3 npm4
 
 OPTIONS_SINGLE=	BACKEND
-OPTIONS_SINGLE_BACKEND=	NODE4 NODE6 NODE8
-OPTIONS_DEFAULT=NODE8
+OPTIONS_SINGLE_BACKEND=	NODE NODE4 NODE6 NODE8
+OPTIONS_DEFAULT=NODE
+NODE_DESC=	Use Node.js 9.x (www/node) as backend
 NODE4_DESC=	Use Node.js 4.x (www/node4) as backend
 NODE6_DESC=	Use Node.js 6.x (www/node6) as backend
-NODE8_DESC=	Use Node.js 8.x (www/node) as backend
+NODE8_DESC=	Use Node.js 8.x (www/node8) as backend
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ''
 USES=		cpe python:2,run shebangfix tar:xz
 
 CPE_VENDOR=	npmjs
 CPE_PRODUCT=	node_packaged_modules
 
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
 
+NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 NODE4_RUN_DEPENDS=	node4>=0.8.0:www/node4
 NODE6_RUN_DEPENDS=	node6>=0.8.0:www/node6
-NODE8_RUN_DEPENDS=	node>=0.8.0:www/node
+NODE8_RUN_DEPENDS=	node8>=0.8.0:www/node8
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 # Workaround for kernel bug 178881
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-bug-178881
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/etc/man.d/npm.conf
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp
 	@${FIND} ${WRKSRC}/ -name '*.sh' -exec ${REINPLACE_CMD} -e '1 s|/usr/local|${LOCALBASE}|' {} +
 
 do-install:
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/
 
 .include <bsd.port.post.mk>