Index: lang/tcl86/Makefile
===================================================================
--- lang/tcl86/Makefile	(revision 426832)
+++ lang/tcl86/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
 		TCLTK/tcl8_6
@@ -19,12 +19,22 @@
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	TCLMAN TZDATA MODULES THREADS DEBUG
+OPTIONS_DEFINE_amd64=	DTRACE
 OPTIONS_DEFAULT=MODULES THREADS
+OPTIONS_DEFAULT_amd64=	DTRACE
 TCLMAN_DESC=	Install Tcl function manpages
 TZDATA_DESC=	Install Tcl timezone data
 MODULES_DESC=	Install Tcl common modules
 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}}
+
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 
@@ -55,9 +65,16 @@
 MODULES_INSTALL_TARGET=	install-modules
 THREADS_CONFIGURE_ENABLE=	threads
 DEBUG_CONFIGURE_ENABLE=	symbols
+DTRACE_CONFIGURE_ENABLE=	dtrace
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDTRACE}
+PLIST_SUB+=	DTRACE=""
+.else
+PLIST_SUB+=	DTRACE="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e \
 	    's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \
Index: lang/tcl86/pkg-plist
===================================================================
--- lang/tcl86/pkg-plist	(revision 426832)
+++ lang/tcl86/pkg-plist	(working copy)
@@ -31,6 +31,7 @@
 include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/unix/tclUnixPort.h
 include/tcl%%TCL_VER%%/unix/tclUnixThrd.h
+%%DTRACE%%include/tcl%%TCL_VER%%/unix/tclDTrace.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
 include/tcl%%TCL_VER%%/tclPlatDecls.h
@@ -261,6 +262,7 @@
 lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
+%%DTRACE%%lib/tcl%%TCL_VER%%/tclDTrace.d
 lib/tcl%%TCL_VER%%/tclIndex
 lib/tcl%%TCL_VER%%/tclooConfig.sh
 lib/tcl%%TCL_VER%%/tm.tcl
Index: lang/tcl87/Makefile
===================================================================
--- lang/tcl87/Makefile	(revision 426832)
+++ lang/tcl87/Makefile	(working copy)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
+PORTREVISION=	1
 DISTVERSION=	8.7.a0.20161104
 CATEGORIES=	lang
 MASTER_SITES=	http://core.tcl.tk/tcl/tarball/
@@ -17,12 +18,22 @@
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	TCLMAN TZDATA MODULES THREADS DEBUG
+OPTIONS_DEFINE_amd64=	DTRACE
 OPTIONS_DEFAULT=MODULES THREADS
+OPTIONS_DEFAULT_amd64=	DTRACE
 TCLMAN_DESC=	Install Tcl function manpages
 TZDATA_DESC=	Install Tcl timezone data
 MODULES_DESC=	Install Tcl common modules
 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}}
+
 FOSSIL_CHECKIN=	24d90770030948ca
 
 PATCH_WRKSRC=	${WRKDIR}/Tcl_Source_Code
@@ -55,7 +66,16 @@
 MODULES_INSTALL_TARGET=	install-modules
 THREADS_CONFIGURE_ENABLE=	threads
 DEBUG_CONFIGURE_ENABLE=	symbols
+DTRACE_CONFIGURE_ENABLE=	dtrace
 
+.include <bsd.port.options.mk>
+ 
+.if ${PORT_OPTIONS:MDTRACE}
+PLIST_SUB+=	DTRACE=""
+.else
+PLIST_SUB+=	DTRACE="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e \
 	    's|@TCL_BUILD_LIB_SPEC@|@TCL_LIB_SPEC@|; \
Index: lang/tcl87/pkg-plist
===================================================================
--- lang/tcl87/pkg-plist	(revision 426832)
+++ lang/tcl87/pkg-plist	(working copy)
@@ -31,6 +31,7 @@
 include/tcl%%TCL_VER%%/generic/tommath.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
+%%DTRACE%%include/tcl%%TCL_VER%%/unix/tclDTrace.h
 include/tcl%%TCL_VER%%/tclOO.h
 include/tcl%%TCL_VER%%/tclOODecls.h
 include/tcl%%TCL_VER%%/tclPlatDecls.h
@@ -261,6 +262,7 @@
 lib/tcl%%TCL_VER%%/safe.tcl
 lib/tcl%%TCL_VER%%/tclAppInit.c
 lib/tcl%%TCL_VER%%/tclConfig.sh
+%%DTRACE%%lib/tcl%%TCL_VER%%/tclDTrace.d
 lib/tcl%%TCL_VER%%/tclIndex
 lib/tcl%%TCL_VER%%/tclooConfig.sh
 lib/tcl%%TCL_VER%%/tm.tcl