svn commit: r401514 - head/Mk
Mathieu Arnold
mat at FreeBSD.org
Fri Nov 13 13:50:37 UTC 2015
Author: mat
Date: Fri Nov 13 13:50:35 2015
New Revision: 401514
URL: https://svnweb.freebsd.org/changeset/ports/401514
Log:
Refactor the list of all excluded options so that the second place it is
needed is not forgotten any more.
PR: 204510
With hat: portmgr
Sponsored by: Absolight
Modified:
head/Mk/bsd.options.mk
Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk Fri Nov 13 13:47:52 2015 (r401513)
+++ head/Mk/bsd.options.mk Fri Nov 13 13:50:35 2015 (r401514)
@@ -205,9 +205,11 @@ OPTIONS_DEFINE+= ${opt}
# Add per arch defaults
OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${ARCH}}
+_ALL_EXCLUDE= ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} \
+ ${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${OPSYS}}
+
# Remove options the port maintainer doesn't want
-.for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE} \
- ${OPTIONS_EXCLUDE_${OPSYS}}
+.for opt in ${_ALL_EXCLUDE:O:u}
OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:N${opt}}
OPTIONS_DEFINE:= ${OPTIONS_DEFINE:N${opt}}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
@@ -451,7 +453,7 @@ ALL_OPTIONS= ${OPTIONS_DEFINE}
_OPTIONS_${target}?=
.endfor
-.for opt in ${COMPLETE_OPTIONS_LIST} ${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE}
+.for opt in ${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE:O:u}
# PLIST_SUB
PLIST_SUB?=
SUB_LIST?=
More information about the svn-ports-all
mailing list