Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Nov 2016 01:47:35 +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: r426881 - head/www/node6
Message-ID:  <201611230147.uAN1lZws061861@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Nov 23 01:47:35 2016
New Revision: 426881
URL: https://svnweb.freebsd.org/changeset/ports/426881

Log:
  www/node6: add dtrace option and enable by default
  
  Approved by:	bradleythughes@fastmail.fm (maintainer)

Modified:
  head/www/node6/Makefile
  head/www/node6/pkg-plist

Modified: head/www/node6/Makefile
==============================================================================
--- head/www/node6/Makefile	Wed Nov 23 00:23:49 2016	(r426880)
+++ head/www/node6/Makefile	Wed Nov 23 01:47:35 2016	(r426881)
@@ -2,8 +2,8 @@
 
 PORTNAME=	node
 PORTVERSION=	6.9.1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	6
@@ -14,9 +14,18 @@ COMMENT=	V8 JavaScript for client and se
 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
@@ -24,7 +33,9 @@ BUNDLED_SSL_CONFIGURE_OFF+=	--shared-ope
 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
 
@@ -37,6 +48,8 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDES
 		--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}
@@ -72,6 +85,13 @@ CONFIGURE_ARGS=	--openssl-no-asm
 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

Modified: head/www/node6/pkg-plist
==============================================================================
--- head/www/node6/pkg-plist	Wed Nov 23 00:23:49 2016	(r426880)
+++ head/www/node6/pkg-plist	Wed Nov 23 01:47:35 2016	(r426881)
@@ -109,6 +109,7 @@ 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



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