svn commit: r320007 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Jun  5 17:21:32 2013
New Revision: 320007
URL: http://svnweb.freebsd.org/changeset/ports/320007

Log:
  Remove empty radio/single/group/multi options from lists
  This can happen due to slave/exclude

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Wed Jun  5 17:02:40 2013	(r320006)
+++ head/Mk/bsd.options.mk	Wed Jun  5 17:21:32 2013	(r320007)
@@ -157,6 +157,29 @@ OPTIONS_GROUP_${group}:=	${OPTIONS_GROUP
 .  endfor
 .endfor
 
+# Remove empty SINGLE/GROUP/RADIO/MULTI
+# Can be empty because of exclude/slaves
+.for single in ${OPTIONS_SINGLE}
+.if empty(OPTIONS_SINGLE_${single})
+OPTIONS_SINGLE:=	${OPTIONS_SINGLE:N${single}}
+.endif
+.endfor
+.for radio in ${OPTIONS_RADIO}
+.if empty(OPTIONS_RADIO_${radio})
+OPTIONS_RADIO:=	${OPTIONS_RADIO:N${radio}}
+.endif
+.endfor
+.for group in ${OPTIONS_GROUP}
+.if empty(OPTIONS_GROUP_${group})
+OPTIONS_GROUP:=	${OPTIONS_GROUP:N${group}}
+.endif
+.endfor
+.for multi in ${OPTIONS_MULTI}
+.if empty(OPTIONS_MULTI_${multi})
+OPTIONS_MULTI:=	${OPTIONS_MULTI:N${multi}}
+.endif
+.endfor
+
 # complete list
 COMPLETE_OPTIONS_LIST=	${ALL_OPTIONS}
 .for single in ${OPTIONS_SINGLE}