Index: www/npm/Makefile
===================================================================
--- www/npm/Makefile
+++ www/npm/Makefile
@@ -13,42 +13,41 @@
 
 RUN_DEPENDS=	gmake:devel/gmake
 
-USES=		cpe python:3.5+ shebangfix tar:xz
+USES=		cpe python:3.6+ shebangfix tar:xz
+CPE_VENDOR=	npmjs
+CPE_PRODUCT=	node_packaged_modules
 
-NO_ARCH=	yes
-NO_BUILD=	yes
-REINPLACE_ARGS=	-i ''
+SHEBANG_FILES=	lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
+SHEBANG_GLOB=	*.py
 
 CONFLICTS_INSTALL?=	npm-node10 npm-node12 npm-node14
 
-OPTIONS_SINGLE=	BACKEND
-OPTIONS_SINGLE_BACKEND=	NODE NODE10 NODE12 NODE14
-OPTIONS_DEFAULT=NODE
-NODE_DESC=	Use Node.js 15.x (www/node) as backend
-NODE10_DESC=	Use Node.js 10.x (www/node10) as backend
-NODE12_DESC=	Use Node.js 12.x (www/node12) as backend
-NODE14_DESC=	Use Node.js 14.x (www/node14) as backend
-
-CPE_VENDOR=	npmjs
-CPE_PRODUCT=	node_packaged_modules
+REINPLACE_ARGS=	-i ''
+NO_ARCH=	yes
+NO_BUILD=	yes
 
-SHEBANG_GLOB=	*.py
-SHEBANG_FILES=	lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples
+OPTIONS_DEFAULT=	NODE
+OPTIONS_SINGLE=		BACKEND
+OPTIONS_SINGLE_BACKEND=	NODE NODE10 NODE12 NODE14
+NODE10_DESC=		Use Node.js 10.x (www/node10) as backend
+NODE12_DESC=		Use Node.js 12.x (www/node12) as backend
+NODE14_DESC=		Use Node.js 14.x (www/node14) as backend
+NODE_DESC=		Use Node.js 16.x (www/node) as backend
 
-NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 NODE10_RUN_DEPENDS=	node10>=0.8.0:www/node10
 NODE12_RUN_DEPENDS=	node12>=0.8.0:www/node12
 NODE14_RUN_DEPENDS=	node14>=0.8.0:www/node14
+NODE_RUN_DEPENDS=	node>=0.8.0:www/node
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MNODE10}
 DEPRECATED=	Uses EOL Python 2.7 via www/node10
-EXPIRATION_DATE=2021-06-23
+EXPIRATION_DATE=	2021-06-23
 .endif
 .if ${PORT_OPTIONS:MNODE12}
 DEPRECATED=	Uses EOL Python 2.7 via www/node12
-EXPIRATION_DATE=2021-06-23
+EXPIRATION_DATE=	2021-06-23
 .endif
 
 .if ${ARCH} == i386