# svn status
M       bsd.options.mk
M       bsd.port.mk

Index: bsd.options.mk
===================================================================
--- bsd.options.mk	(revision 313775)
+++ bsd.options.mk	(working copy)
@@ -51,21 +51,23 @@
 
 # Set the default values for the global options, as defined by portmgr
 .if !defined(NOPORTDOCS)
-PORT_OPTIONS+=	DOCS
+ALL_OPTIONS_DEFAULT+=	DOCS
 .endif
 
 .if !defined(WITHOUT_NLS)
-PORT_OPTIONS+=	NLS
+ALL_OPTIONS_DEFAULT+=	NLS
 .endif
 
 # Set the default values for the global options, as defined by portmgr
 .if !defined(NOPORTEXAMPLES)
-PORT_OPTIONS+=	EXAMPLES
+ALL_OPTIONS_DEFAULT+=	EXAMPLES
 .endif
 
 # Activate IPV6 by default
-PORT_OPTIONS+=	IPV6
+ALL_OPTIONS_DEFAULT+=	IPV6
 
+PORT_OPTIONS=	${ALL_OPTIONS_DEFAULT}
+
 # Exclude per arch options
 .for opt in ${OPTIONS_EXCLUDE_${ARCH}}
 OPTIONS_DEFINE:=	${OPTIONS_DEFINE:N${opt}}
@@ -164,6 +166,8 @@
 PORT_OPTIONS+=	${opt}
 .  endfor
 PORT_OPTIONS:=	${PORT_OPTIONS:O:u}
+ALL_OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT}
+ALL_OPTIONS_DEFAULT:=	${ALL_OPTIONS_DEFAULT:O:u}
 
 ## Set system-wide defined options (set by user in make.conf)
 .  for opt in ${OPTIONS_SET}
Index: bsd.port.mk
===================================================================
--- bsd.port.mk	(revision 313775)
+++ bsd.port.mk	(working copy)
@@ -6214,10 +6214,15 @@
 .if !empty(ALL_OPTIONS) || !empty(OPTIONS_SINGLE) || !empty(OPTIONS_MULTI) || !empty(OPTIONS_RADIO) || !empty(OPTIONS_GROUP)
 	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}":
 .for opt in ${ALL_OPTIONS}
+.  if ${ALL_OPTIONS_DEFAULT:M${opt}} == ${PORT_OPTIONS:M${opt}}
+	@${ECHO_MSG} -n " (default)  "
+.  else
+	@${ECHO_MSG} -n "            "
+.  endif
 .  if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
+	@${ECHO_MSG} -n "${opt}=off"
 .  else
-	@${ECHO_MSG} -n "     ${opt}=on"
+	@${ECHO_MSG} -n "${opt}=on"
 .  endif
 .  if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
@@ -6228,10 +6233,15 @@
 .for multi in ${OPTIONS_MULTI}
 	@${ECHO_MSG} "====> Options available for the multi ${multi}: you have to choose at least one of them"
 .  for opt in ${OPTIONS_MULTI_${multi}}
+.    if ${ALL_OPTIONS_DEFAULT:M${opt}} == ${PORT_OPTIONS:M${opt}}
+	@${ECHO_MSG} -n " (default)  "
+.    else
+	@${ECHO_MSG} -n "            "
+.    endif
 .    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
+	@${ECHO_MSG} -n "${opt}=off"
 .    else
-	@${ECHO_MSG} -n "     ${opt}=on"
+	@${ECHO_MSG} -n "${opt}=on"
 .    endif
 .    if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
@@ -6244,10 +6254,15 @@
 .for single in ${OPTIONS_SINGLE}
 	@${ECHO_MSG} "====> Options available for the single ${single}: you have to select exactly one of them"
 .  for opt in ${OPTIONS_SINGLE_${single}}
+.    if ${ALL_OPTIONS_DEFAULT:M${opt}} == ${PORT_OPTIONS:M${opt}}
+	@${ECHO_MSG} -n " (default)  "
+.    else
+	@${ECHO_MSG} -n "            "
+.    endif
 .    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
+	@${ECHO_MSG} -n "${opt}=off"
 .    else
-	@${ECHO_MSG} -n "     ${opt}=on"
+	@${ECHO_MSG} -n "${opt}=on"
 .    endif
 .    if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
@@ -6259,10 +6274,15 @@
 .for radio in ${OPTIONS_RADIO}
 	@${ECHO_MSG} "====> Options available for the radio ${radio}: you can only select none or one of them"
 .  for opt in ${OPTIONS_RADIO_${radio}}
+.    if ${ALL_OPTIONS_DEFAULT:M${opt}} == ${PORT_OPTIONS:M${opt}}
+	@${ECHO_MSG} -n " (default)  "
+.    else
+	@${ECHO_MSG} -n "            "
+.    endif
 .    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
+	@${ECHO_MSG} -n "${opt}=off"
 .    else
-	@${ECHO_MSG} -n "     ${opt}=on"
+	@${ECHO_MSG} -n "${opt}=on"
 .    endif
 .    if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}
@@ -6274,10 +6294,15 @@
 .for group in ${OPTIONS_GROUP}
 	@${ECHO_MSG} "====> Options available for the group ${group}"
 .  for opt in ${OPTIONS_GROUP_${group}}
+.    if ${ALL_OPTIONS_DEFAULT:M${opt}} == ${PORT_OPTIONS:M${opt}}
+	@${ECHO_MSG} -n " (default)  "
+.    else
+	@${ECHO_MSG} -n "            "
+.    endif
 .    if empty(PORT_OPTIONS:M${opt})
-	@${ECHO_MSG} -n "     ${opt}=off"
+	@${ECHO_MSG} -n "${opt}=off"
 .    else
-	@${ECHO_MSG} -n "     ${opt}=on"
+	@${ECHO_MSG} -n "${opt}=on"
 .    endif
 .    if !empty(${opt}_DESC)
 	@${ECHO_MSG} -n ": "${${opt}_DESC:Q}