Index: bsd.pkgng.mk
===================================================================
diff --git a/head/Mk/bsd.pkgng.mk b/head/Mk/bsd.pkgng.mk
--- a/head/Mk/bsd.pkgng.mk	(revision 320843)
+++ b/head/Mk/bsd.pkgng.mk	(working copy)
@@ -83,11 +83,7 @@
 	@${ECHO_CMD} "]" >> ${MANIFESTF}
 	@${ECHO_CMD} -n "options: {" >> ${MANIFESTF}
 .for opt in ${COMPLETE_OPTIONS_LIST}
-.if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_CMD} -n "${opt}: off," >> ${MANIFESTF}
-.else
-	@${ECHO_CMD} -n "${opt}: on," >> ${MANIFESTF}
-.endif
+	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n " ${opt}: $${match:-off},"
 .endfor
 .undef opt
 	@${ECHO_CMD} "}" >> ${MANIFESTF}
Index: bsd.port.mk
===================================================================
diff --git a/head/Mk/bsd.port.mk b/head/Mk/bsd.port.mk
--- a/head/Mk/bsd.port.mk	(revision 320847)
+++ b/head/Mk/bsd.port.mk	(working copy)
@@ -6188,11 +6188,7 @@
 .if !empty(COMPLETE_OPTIONS_LIST)
 	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}":
 .for opt in ${ALL_OPTIONS}
-.  if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
-.  else
-	@${ECHO_MSG} -n "     ${opt}=on"
-.  endif
+	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n "     ${opt}=$${match:-off}"
 .  if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
 .  endif
@@ -6208,11 +6204,7 @@
 		@${ECHO_MSG} "====> ${${m}_DESC}${${otype}_EOL}"
 .    endif
 .    for opt in ${OPTIONS_${otype}_${m}}
-.      if ${PORT_OPTIONS:M${opt}}
-	@${ECHO_MSG} -n "     ${opt}=on"
-.      else
-	@${ECHO_MSG} -n "     ${opt}=off"
-.      endif
+	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n "     ${opt}=$${match:-off}"
 .      if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
 .      endif
@@ -6274,22 +6266,14 @@
 RADIO_END=	)
 pretty-print-config:
 .for opt in ${ALL_OPTIONS}
-.  if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "-${opt} "
-.  else
-	@${ECHO_MSG} -n "+${opt} "
-.  endif
+	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="+" ; ${ECHO_MSG} -n "$${match:--}${opt} "
 .endfor
 .for otype in MULTI GROUP SINGLE RADIO
 .  for m in ${OPTIONS_${otype}}
 	@${ECHO_MSG} -n "${m}${${otype}_START} "
 .    for opt in ${OPTIONS_${otype}_${m}}
-.    if ${PORT_OPTIONS:M${opt}}
-	@${ECHO_MSG} -n "+${opt} "
-.    else
-	@${ECHO_MSG} -n "-${opt} "
-.    endif
-.  endfor
+		@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="+" ; ${ECHO_MSG} -n "$${match:--}${opt} "
+.    endfor
 	@${ECHO_MSG} -n "${${otype}_END} "
 .  endfor
 .endfor