Index: branches/2016Q4/www/node4/Makefile
===================================================================
--- branches/2016Q4/www/node4/Makefile	(revision 424840)
+++ branches/2016Q4/www/node4/Makefile	(revision 424841)
@@ -1,106 +1,92 @@
 # Created by: Jin-Sih Lin <linpct@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	4.6.0
+PORTVERSION=	4.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	bradleythughes@fastmail.fm
 COMMENT=	V8 JavaScript for client and server (4.x LTS)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
 OPTIONS_SUB=	yes
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
 BUNDLED_SSL_USES_OFF=		ssl
 BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
-USES=		compiler execinfo gmake python:2 pkgconfig localbase
+USES=		compiler:c++11-lib execinfo gmake python:2 pkgconfig localbase
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	node-[0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]* node5-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 	 	--without-npm \
 		--shared-libuv \
 		--shared-zlib
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 REINPLACE_ARGS=	-i ''
 MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 LIB_DEPENDS+=	libuv.so:devel/libuv
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 
 .if ${OSVERSION} < 1100085
 # node.js requires openssl 1.0.2, use the port since base isn't new enough
 WITH_OPENSSL_PORT=yes
 .endif
 
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 .if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
-.endif
-
-.if ${COMPILER_TYPE} == clang
-MAKE_ENV+=	LINK=clang++
-CFLAGS+=	-Wno-unused-private-field
-.if ${COMPILER_VERSION} >= 33
-CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
-.if ${COMPILER_VERSION} >= 34
-CFLAGS+=	-Wno-unused-const-variable
-.endif
-.endif
-.else
-MAKE_ARGS+=	strictaliasing=off
-USE_GCC=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|python -c|${PYTHON_CMD} -c|" \
 		${WRKSRC}/deps/v8/build/toolchain.gypi
 	@${REINPLACE_CMD} -e "s|'python',|'${PYTHON_CMD}',|" \
 		${WRKSRC}/common.gypi \
 		${WRKSRC}/deps/v8/build/shim_headers.gypi \
 		${WRKSRC}/deps/v8/build/standalone.gypi \
 		${WRKSRC}/deps/v8/src/d8.gyp \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp \
 		${WRKSRC}/node.gyp \
 		${WRKSRC}/tools/icu/icu-generic.gyp
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase above will ensure that we pick up includes for real
 	# external dependencies.
 	${FIND} ${WRKSRC}/out -type f -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 .include <bsd.port.post.mk>
Index: branches/2016Q4/www/node4/distinfo
===================================================================
--- branches/2016Q4/www/node4/distinfo	(revision 424840)
+++ branches/2016Q4/www/node4/distinfo	(revision 424841)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475046393
-SHA256 (node-v4.6.0.tar.gz) = 0838f12e329edb252e6e6baddca85632bf5ff2ec900e737e88f9bf9b38946b1b
-SIZE (node-v4.6.0.tar.gz) = 22746881
+TIMESTAMP = 1476814607
+SHA256 (node-v4.6.1.tar.gz) = b8ca4db42c5a1fed95baf6996ff776db3c95ad2bcf73c7aed2f1f921a1225de3
+SIZE (node-v4.6.1.tar.gz) = 22746422
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424840)
+++ branches/2016Q4	(revision 424841)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r424840