Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -32,6 +32,10 @@
 # OPTIONS_GROUP_${NAME}		- List of OPTIONS grouped as group-choice (for
 #				  the group named as ${NAME} as defined in
 #				  OPTIONS_GROUP)
+# OPTIONS_SINGLE_${NAME}_SELECTED	- The selected single choice option (for
+#					  the single named as ${NAME})
+# OPTIONS_RADIO_${NAME}_SELECTED	- The selected radio choice option (for
+#					  the radio named as ${NAME})
 #
 # OPTIONS_EXCLUDE		- List of options unsupported (useful for slave ports)
 # OPTIONS_EXCLUDE_${ARCH}	- List of options unsupported on a given ${ARCH}
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -4681,7 +4681,7 @@
 .  for opt in ${OPTIONS_SINGLE_${single}}
 .    if empty(ALL_OPTIONS:M${single}) || !empty(PORT_OPTIONS:M${single})
 .      if !empty(PORT_OPTIONS:M${opt})
-OPTIONS_WRONG_SINGLE_${single}+=	${opt}
+OPTIONS_SINGLE_${single}_SELECTED+=	${opt}
 .        if defined(OPTFOUND)
 OPTIONS_WRONG_SINGLE+=	${single}
 .        else
@@ -4706,7 +4706,7 @@
 .for radio in ${OPTIONS_RADIO}
 .  for opt in ${OPTIONS_RADIO_${radio}}
 .    if !empty(PORT_OPTIONS:M${opt})
-OPTIONS_WRONG_RADIO_${radio}+=	${opt}
+OPTIONS_RADIO_${radio}_SELECTED+=	${opt}
 .      if defined(OPTFOUND)
 OPTIONS_WRONG_RADIO+=	${radio}
 .      else
@@ -4759,15 +4759,15 @@
 .endfor
 .for single in ${OPTIONS_WRONG_SINGLE}
 	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"
-.if defined(OPTIONS_WRONG_SINGLE_${single})
-	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_WRONG_SINGLE_${single}}"
+.if defined(OPTIONS_SINGLE_${single}_SELECTED)
+	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_SINGLE_${single}_SELECTED}"
 .else
 	@${ECHO_MSG} "=====> No option was selected (and one must be)"
 .endif
 .endfor
 .for radio in ${OPTIONS_WRONG_RADIO}
 	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"
-	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_WRONG_RADIO_${radio}}"
+	@${ECHO_MSG} "=====> Only one of these must be defined: ${OPTIONS_RADIO_${radio}_SELECTED}"
 .endfor
 .if defined(OPTIONS_WRONG_PREVENTS)
 	@${ECHO_MSG} "====> Two or more enabled options conflict with each other"