svn commit: r454332 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Nov 16 19:41:20 2017
New Revision: 454332
URL: https://svnweb.freebsd.org/changeset/ports/454332

Log:
  Follow-up r454266: Sort and remove duplicates for [DE]SELECTED_OPTIONS.
  
  Some ports like graphics/povray-meta do funky things like add the same
  option into PORT_OPTIONS twice.  This also avoids a new leading blank
  space in some cases.
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Thu Nov 16 19:30:55 2017	(r454331)
+++ head/Mk/bsd.options.mk	Thu Nov 16 19:41:20 2017	(r454332)
@@ -643,13 +643,15 @@ _OPTIONS_${_target}:=	${_OPTIONS_${_target}} ${_prio}:
 # Wait to expand PORT_OPTIONS until the last moment in case something modifies
 # the selected OPTIONS after bsd.port.options.mk is included.  This uses
 # bmake's :@ for loop.
-SELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${PORT_OPTIONS:M${opt}}@}
-DESELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
+_SELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${PORT_OPTIONS:M${opt}}@}
+_DESELECTED_OPTIONS=	${ALL_OPTIONS:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
 .for otype in MULTI GROUP SINGLE RADIO
 .  for m in ${OPTIONS_${otype}}
-SELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${PORT_OPTIONS:M${opt}}@}
-DESELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
+_SELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${PORT_OPTIONS:M${opt}}@}
+_DESELECTED_OPTIONS+=	${OPTIONS_${otype}_${m}:@opt@${"${PORT_OPTIONS:M${opt}}":?:${opt}}@}
 .  endfor
 .endfor
+SELECTED_OPTIONS=	${_SELECTED_OPTIONS:O:u}
+DESELECTED_OPTIONS=	${_DESELECTED_OPTIONS:O:u}
 
 .endif