Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Dec 2016 13:32:54 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427497 - head/lang/tcl86
Message-ID:  <201612011332.uB1DWst0042149@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Thu Dec  1 13:32:54 2016
New Revision: 427497
URL: https://svnweb.freebsd.org/changeset/ports/427497

Log:
  lang/tcl86: enable DTRACE option by default where possible
  
  PR:		214794
  Approved by:	gahr

Modified:
  head/lang/tcl86/Makefile
  head/lang/tcl86/pkg-plist

Modified: head/lang/tcl86/Makefile
==============================================================================
--- head/lang/tcl86/Makefile	Thu Dec  1 13:18:30 2016	(r427496)
+++ head/lang/tcl86/Makefile	Thu Dec  1 13:32:54 2016	(r427497)
@@ -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_FILE=	${WRKSRC}/../license.terms
 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 @@ TZDATA_INSTALL_TARGET=	install-tzdata
 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@|; \

Modified: head/lang/tcl86/pkg-plist
==============================================================================
--- head/lang/tcl86/pkg-plist	Thu Dec  1 13:18:30 2016	(r427496)
+++ head/lang/tcl86/pkg-plist	Thu Dec  1 13:32:54 2016	(r427497)
@@ -31,6 +31,7 @@ include/tcl%%TCL_VER%%/generic/tclTomMat
 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%%/parray.tcl
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612011332.uB1DWst0042149>