From owner-svn-ports-head@freebsd.org Tue Nov 22 18:13:52 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67A49C50DB7; Tue, 22 Nov 2016 18:13:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1C431EE1; Tue, 22 Nov 2016 18:13:51 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMIDpMB071510; Tue, 22 Nov 2016 18:13:51 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMIDoLK071508; Tue, 22 Nov 2016 18:13:50 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201611221813.uAMIDoLK071508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 22 Nov 2016 18:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426835 - head/www/node X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Nov 2016 18:13:52 -0000 Author: swills Date: Tue Nov 22 18:13:50 2016 New Revision: 426835 URL: https://svnweb.freebsd.org/changeset/ports/426835 Log: www/node: add dtrace option and enable by default Approved by: bradleythughes@fastmail.fm (maintainer) Modified: head/www/node/Makefile head/www/node/pkg-plist Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Tue Nov 22 17:58:54 2016 (r426834) +++ head/www/node/Makefile Tue Nov 22 18:13:50 2016 (r426835) @@ -2,7 +2,7 @@ PORTNAME= node PORTVERSION= 6.9.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -13,9 +13,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 @@ -23,7 +32,9 @@ BUNDLED_SSL_CONFIGURE_OFF= --shared-open 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 @@ -36,6 +47,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} @@ -71,6 +84,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/node/pkg-plist ============================================================================== --- head/www/node/pkg-plist Tue Nov 22 17:58:54 2016 (r426834) +++ head/www/node/pkg-plist Tue Nov 22 18:13:50 2016 (r426835) @@ -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