Date: Thu, 25 Jul 2013 11:47:12 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323637 - head/Mk Message-ID: <201307251147.r6PBlC0n003526@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Jul 25 11:47:11 2013 New Revision: 323637 URL: http://svnweb.freebsd.org/changeset/ports/323637 Log: - Document the use of ${OPTIONS_NAME}_(UN)SET(_FORCE). - Remove options in ${OPTIONS_NAME}_(UN)SET from NEW_OPTIONS list. - Remove an intermediate sort. - Add support for ${OPTIONS_NAME}_(UN)SET_FORCE. Approved by: bapt Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Thu Jul 25 11:30:01 2013 (r323636) +++ head/Mk/bsd.options.mk Thu Jul 25 11:47:11 2013 (r323637) @@ -54,13 +54,14 @@ # # OPTIONS_SET - List of options to enable for all ports. # OPTIONS_UNSET - List of options to disable for all ports. -# ${UNIQUENAME}_SET - List of options to enable for a specific port. -# ${UNIQUENAME}_UNSET - List of options to disable for a specific port. +# ${OPTIONS_NAME}_SET - List of options to enable for a specific port. +# ${OPTIONS_NAME}_UNSET - List of options to disable for a specific port. # # OPTIONS_SET_FORCE - List of options to enable for all ports. # OPTIONS_UNSET_FORCE - List of options to disable for all ports. -# ${UNIQUENAME}_SET_FORCE - List of options to enable for a specific port. -# ${UNIQUENAME}_UNSET_FORCE - List of options to disable for a specific port. +# ${OPTIONS_NAME}_SET_FORCE - List of options to enable for a specific port. +# ${OPTIONS_NAME}_UNSET_FORCE +# - List of options to disable for a specific port. # # These variables can be used on the command line. They override the effects of # the make.conf variables above. @@ -184,13 +185,14 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . for opt in ${${OPTIONS_NAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) PORT_OPTIONS+= ${opt} +NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endif . endfor -PORT_OPTIONS:= ${PORT_OPTIONS:O:u} ## Unset the options excluded per-port (set by user in make.conf) . for opt in ${${OPTIONS_NAME}_UNSET} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} +NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor # XXX to remove once UNIQUENAME is removed @@ -251,6 +253,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor +# XXX To remove once UNIQUENAME will be removed ## Set the options specified per-port (set by user in make.conf) . for opt in ${${UNIQUENAME}_SET_FORCE} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -264,6 +267,21 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . endfor +# XXX To remove once UNIQUENAME will be removed + +## Set the options specified per-port (set by user in make.conf) +. for opt in ${${OPTIONS_NAME}_SET_FORCE} +. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) +PORT_OPTIONS+= ${opt} +NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} +. endif +. endfor + +## Unset the options excluded per-port (set by user in make.conf) +. for opt in ${${OPTIONS_NAME}_UNSET_FORCE} +PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} +NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} +. endfor ## Cmdline always win over the rest
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307251147.r6PBlC0n003526>