Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Dec 2016 17:56:40 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429006 - in head: lang/php70 lang/tcl86 lang/tcl87 www/firefox www/node www/node6
Message-ID:  <201612201756.uBKHuexW087202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Dec 20 17:56:40 2016
New Revision: 429006
URL: https://svnweb.freebsd.org/changeset/ports/429006

Log:
  Remove emulation of OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}, it is a thing
  now.
  
  Sponsored by:	Absolight

Modified:
  head/lang/php70/Makefile   (contents, props changed)
  head/lang/tcl86/Makefile   (contents, props changed)
  head/lang/tcl87/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)
  head/www/node/Makefile   (contents, props changed)
  head/www/node6/Makefile   (contents, props changed)

Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/lang/php70/Makefile	Tue Dec 20 17:56:40 2016	(r429006)
@@ -44,8 +44,7 @@ OPTIONS_EXCLUDE_mips64=FPM
 OPTIONS_SUB=	yes
 
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE+=               ${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version

Modified: head/lang/tcl86/Makefile
==============================================================================
--- head/lang/tcl86/Makefile	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/lang/tcl86/Makefile	Tue Dec 20 17:56:40 2016	(r429006)
@@ -31,9 +31,8 @@ OPTIONS_SUB=	yes
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
-OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix

Modified: head/lang/tcl87/Makefile
==============================================================================
--- head/lang/tcl87/Makefile	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/lang/tcl87/Makefile	Tue Dec 20 17:56:40 2016	(r429006)
@@ -30,9 +30,8 @@ OPTIONS_SUB=	yes
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
-OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
 FOSSIL_CHECKIN=	24d90770030948ca
 

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/www/firefox/Makefile.options	Tue Dec 20 17:56:40 2016	(r429006)
@@ -17,8 +17,7 @@ OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 # dtrace(1) crashes during build or fails to allocate space for probe
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
 
 BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/www/node/Makefile	Tue Dec 20 17:56:40 2016	(r429006)
@@ -20,9 +20,8 @@ OPTIONS_SUB=	yes
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
-OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
 BUNDLED_SSL_USES_OFF=		ssl

Modified: head/www/node6/Makefile
==============================================================================
--- head/www/node6/Makefile	Tue Dec 20 17:55:28 2016	(r429005)
+++ head/www/node6/Makefile	Tue Dec 20 17:56:40 2016	(r429006)
@@ -21,9 +21,8 @@ OPTIONS_SUB=	yes
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
-OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
-OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_FreeBSD_9=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
 BUNDLED_SSL_USES_OFF=		ssl



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