Index: head/www/node/Makefile
===================================================================
--- head/www/node/Makefile	(revision 426834)
+++ head/www/node/Makefile	(revision 426835)
@@ -1,99 +1,119 @@
 # $FreeBSD$
 
 PORTNAME=	node
 PORTVERSION=	6.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 
 MAINTAINER=	bradleythughes@fastmail.fm
 COMMENT=	V8 JavaScript for client and server (6.x)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
+OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
+OPTIONS_DEFAULT=	DTRACE
 OPTIONS_SUB=	yes
 
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
+
+OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
+OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+
 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:c++11-lib execinfo gmake python:2,build pkgconfig localbase
+USES=		compiler:c++11-lib execinfo gmake python:2,build pkgconfig \
+		localbase shebangfix
+
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	node[4567]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
 		--shared-cares \
 		--shared-libuv \
 		--shared-zlib
 
+SHEBANG_FILES=	tools/specialize_node_d.py tools/genv8constants.py
+
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 REINPLACE_ARGS=	-i ''
 MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 LIB_DEPENDS+=	libcares.so:dns/c-ares\
 		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 ${ARCH} == "armv6"
 CONFIGURE_ARGS=	--openssl-no-asm
 .endif
 
 .if ${COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
+.endif
+
+.if ${PORT_OPTIONS:MDTRACE}
+PLIST_SUB+=	DTRACE=""
+CONFIGURE_ARGS+=	--with-dtrace
+.else
+PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
 	# So many different ways to run python. Fix them all.
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -type f -name '*.gyp*' -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} \
 			-e "s|'python'|'${PYTHON_CMD}'|" \
 			-e 's|<!(python |<!(${PYTHON_CMD} |' \
 			-e 's|\&\& python |\&\& ${PYTHON_CMD} |'
 
 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: head/www/node/pkg-plist
===================================================================
--- head/www/node/pkg-plist	(revision 426834)
+++ head/www/node/pkg-plist	(revision 426835)
@@ -1,114 +1,115 @@
 bin/node
 include/node/common.gypi
 include/node/config.gypi
 include/node/libplatform/libplatform.h
 include/node/node.h
 include/node/node_buffer.h
 include/node/node_object_wrap.h
 include/node/node_version.h
 %%BUNDLED_SSL%%include/node/openssl/aes.h
 %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/aix-gcc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-x32/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/asn1.h
 %%BUNDLED_SSL%%include/node/openssl/asn1_mac.h
 %%BUNDLED_SSL%%include/node/openssl/asn1t.h
 %%BUNDLED_SSL%%include/node/openssl/bio.h
 %%BUNDLED_SSL%%include/node/openssl/blowfish.h
 %%BUNDLED_SSL%%include/node/openssl/bn.h
 %%BUNDLED_SSL%%include/node/openssl/buffer.h
 %%BUNDLED_SSL%%include/node/openssl/camellia.h
 %%BUNDLED_SSL%%include/node/openssl/cast.h
 %%BUNDLED_SSL%%include/node/openssl/cmac.h
 %%BUNDLED_SSL%%include/node/openssl/cms.h
 %%BUNDLED_SSL%%include/node/openssl/comp.h
 %%BUNDLED_SSL%%include/node/openssl/conf.h
 %%BUNDLED_SSL%%include/node/openssl/conf_api.h
 %%BUNDLED_SSL%%include/node/openssl/crypto.h
 %%BUNDLED_SSL%%include/node/openssl/des.h
 %%BUNDLED_SSL%%include/node/openssl/des_old.h
 %%BUNDLED_SSL%%include/node/openssl/dh.h
 %%BUNDLED_SSL%%include/node/openssl/dsa.h
 %%BUNDLED_SSL%%include/node/openssl/dso.h
 %%BUNDLED_SSL%%include/node/openssl/dtls1.h
 %%BUNDLED_SSL%%include/node/openssl/e_os2.h
 %%BUNDLED_SSL%%include/node/openssl/ebcdic.h
 %%BUNDLED_SSL%%include/node/openssl/ec.h
 %%BUNDLED_SSL%%include/node/openssl/ecdh.h
 %%BUNDLED_SSL%%include/node/openssl/ecdsa.h
 %%BUNDLED_SSL%%include/node/openssl/engine.h
 %%BUNDLED_SSL%%include/node/openssl/err.h
 %%BUNDLED_SSL%%include/node/openssl/evp.h
 %%BUNDLED_SSL%%include/node/openssl/hmac.h
 %%BUNDLED_SSL%%include/node/openssl/idea.h
 %%BUNDLED_SSL%%include/node/openssl/krb5_asn.h
 %%BUNDLED_SSL%%include/node/openssl/kssl.h
 %%BUNDLED_SSL%%include/node/openssl/lhash.h
 %%BUNDLED_SSL%%include/node/openssl/md4.h
 %%BUNDLED_SSL%%include/node/openssl/md5.h
 %%BUNDLED_SSL%%include/node/openssl/mdc2.h
 %%BUNDLED_SSL%%include/node/openssl/modes.h
 %%BUNDLED_SSL%%include/node/openssl/obj_mac.h
 %%BUNDLED_SSL%%include/node/openssl/objects.h
 %%BUNDLED_SSL%%include/node/openssl/ocsp.h
 %%BUNDLED_SSL%%include/node/openssl/opensslconf.h
 %%BUNDLED_SSL%%include/node/openssl/opensslv.h
 %%BUNDLED_SSL%%include/node/openssl/ossl_typ.h
 %%BUNDLED_SSL%%include/node/openssl/pem.h
 %%BUNDLED_SSL%%include/node/openssl/pem2.h
 %%BUNDLED_SSL%%include/node/openssl/pkcs12.h
 %%BUNDLED_SSL%%include/node/openssl/pkcs7.h
 %%BUNDLED_SSL%%include/node/openssl/pqueue.h
 %%BUNDLED_SSL%%include/node/openssl/rand.h
 %%BUNDLED_SSL%%include/node/openssl/rc2.h
 %%BUNDLED_SSL%%include/node/openssl/rc4.h
 %%BUNDLED_SSL%%include/node/openssl/ripemd.h
 %%BUNDLED_SSL%%include/node/openssl/rsa.h
 %%BUNDLED_SSL%%include/node/openssl/safestack.h
 %%BUNDLED_SSL%%include/node/openssl/seed.h
 %%BUNDLED_SSL%%include/node/openssl/sha.h
 %%BUNDLED_SSL%%include/node/openssl/srp.h
 %%BUNDLED_SSL%%include/node/openssl/srtp.h
 %%BUNDLED_SSL%%include/node/openssl/ssl.h
 %%BUNDLED_SSL%%include/node/openssl/ssl2.h
 %%BUNDLED_SSL%%include/node/openssl/ssl23.h
 %%BUNDLED_SSL%%include/node/openssl/ssl3.h
 %%BUNDLED_SSL%%include/node/openssl/stack.h
 %%BUNDLED_SSL%%include/node/openssl/symhacks.h
 %%BUNDLED_SSL%%include/node/openssl/tls1.h
 %%BUNDLED_SSL%%include/node/openssl/ts.h
 %%BUNDLED_SSL%%include/node/openssl/txt_db.h
 %%BUNDLED_SSL%%include/node/openssl/ui.h
 %%BUNDLED_SSL%%include/node/openssl/ui_compat.h
 %%BUNDLED_SSL%%include/node/openssl/whrlpool.h
 %%BUNDLED_SSL%%include/node/openssl/x509.h
 %%BUNDLED_SSL%%include/node/openssl/x509_vfy.h
 %%BUNDLED_SSL%%include/node/openssl/x509v3.h
 include/node/v8-debug.h
 include/node/v8-experimental.h
 include/node/v8-platform.h
 include/node/v8-profiler.h
 include/node/v8-testing.h
 include/node/v8-util.h
 include/node/v8-version.h
 include/node/v8.h
 include/node/v8config.h
+%%DTRACE%%lib/dtrace/node.d
 @(,,444) man/man1/node.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/gdbinit
 share/systemtap/tapset/node.stp