svn commit: r479428 - head/Mk
Mathieu Arnold
mat at FreeBSD.org
Mon Sep 10 14:40:58 UTC 2018
Author: mat
Date: Mon Sep 10 14:40:57 2018
New Revision: 479428
URL: https://svnweb.freebsd.org/changeset/ports/479428
Log:
Do not enable options that do not exist.
Differential Revision: https://reviews.freebsd.org/D13953
Modified:
head/Mk/bsd.options.mk (contents, props changed)
Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk Mon Sep 10 14:40:53 2018 (r479427)
+++ head/Mk/bsd.options.mk Mon Sep 10 14:40:57 2018 (r479428)
@@ -197,8 +197,6 @@ _OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700
package:300:pre package:500:do package:700:post \
stage:800:post
-PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6
-
# Add per arch options
.for opt in ${OPTIONS_DEFINE_${ARCH}}
.if empty(OPTIONS_DEFINE:M${opt})
@@ -223,11 +221,10 @@ _ALL_EXCLUDE+= ${opt}
. endif
.endfor
-# Remove options the port maintainer doesn't want
+# Remove options the port maintainer doesn't want, part 1
.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}}
. for otype in SINGLE RADIO MULTI GROUP
. for m in ${OPTIONS_${otype}}
OPTIONS_${otype}_${m}:= ${OPTIONS_${otype}_${m}:N${opt}}
@@ -255,6 +252,18 @@ COMPLETE_OPTIONS_LIST= ${ALL_OPTIONS}
. for m in ${OPTIONS_${otype}}
COMPLETE_OPTIONS_LIST+= ${OPTIONS_${otype}_${m}}
. endfor
+.endfor
+
+# Some options are always enabled by default.
+.for _opt in DOCS NLS EXAMPLES IPV6
+.if ${COMPLETE_OPTIONS_LIST:M${_opt}}
+PORT_OPTIONS+= ${_opt}
+.endif
+.endfor
+
+# Remove options the port maintainer doesn't want, part 2
+.for opt in ${_ALL_EXCLUDE:O:u}
+PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
.endfor
## Now create the list of activated options
More information about the svn-ports-head
mailing list