D13953.id47870.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13953.id47870.diff
View Options

	Index: head/Mk/bsd.options.mk
	===================================================================
	--- head/Mk/bsd.options.mk
	+++ head/Mk/bsd.options.mk
	@@ -197,8 +197,6 @@
	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 @@
	. 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 @@
	. 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