From 353bd5528b3fbf29561330dfcd11b9844cc6bca4 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 20 Dec 2016 17:56:40 +0000 Subject: [PATCH] Remove emulation of OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}, it is a thing now. Sponsored by: Absolight --- lang/php70/Makefile | 3 +-- lang/tcl86/Makefile | 5 ++--- lang/tcl87/Makefile | 5 ++--- www/firefox/Makefile.options | 3 +-- www/node/Makefile | 5 ++--- www/node6/Makefile | 5 ++--- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lang/php70/Makefile b/lang/php70/Makefile index 23c0cdd966dc..2d99d0c6c6dd 100644 --- a/lang/php70/Makefile +++ b/lang/php70/Makefile @@ -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 diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index 7c303cc359fd..5f339e01da1b 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -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 diff --git a/lang/tcl87/Makefile b/lang/tcl87/Makefile index 214479a53fef..6d5a541afdbe 100644 --- a/lang/tcl87/Makefile +++ b/lang/tcl87/Makefile @@ -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 diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index 7e622179a0ab..4bce44c853b2 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -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 diff --git a/www/node/Makefile b/www/node/Makefile index 4d2cd1f105b5..32ab243feff1 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -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 diff --git a/www/node6/Makefile b/www/node6/Makefile index d84a1186a99d..7e90dc09737c 100644 --- a/www/node6/Makefile +++ b/www/node6/Makefile @@ -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