Date: Mon, 10 Jun 2013 06:30:30 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320436 - head/Mk Message-ID: <201306100630.r5A6UUF9053041@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jun 10 06:30:30 2013 New Revision: 320436 URL: http://svnweb.freebsd.org/changeset/ports/320436 Log: Factorise make pretty-print-config code Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Jun 10 06:22:49 2013 (r320435) +++ head/Mk/bsd.port.mk Mon Jun 10 06:30:30 2013 (r320436) @@ -6222,10 +6222,10 @@ showconfig: @${ECHO_MSG} "====> ${${m}_DESC}${${otype}_EOL}" . endif . for opt in ${OPTIONS_${otype}_${m}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n " ${opt}=off" -. else +. if ${PORT_OPTIONS:M${opt}} @${ECHO_MSG} -n " ${opt}=on" +. else + @${ECHO_MSG} -n " ${opt}=off" . endif . if !empty(${opt}_DESC) @${ECHO_MSG} -n ": "${${opt}_DESC:Q} @@ -6278,6 +6278,14 @@ rmconfig-recursive: .endif # rmconfig-recursive .if !target(pretty-print-config) +MULTI_START= [ +MULTI_END= ] +GROUP_START= [ +GROUP_END= ] +SINGLE_START= ( +SINGLE_END= ) +RADIO_START= ( +RADIO_END= ) pretty-print-config: .for opt in ${ALL_OPTIONS} . if empty(PORT_OPTIONS:M${opt}) @@ -6286,54 +6294,21 @@ pretty-print-config: @${ECHO_MSG} -n "+${opt} " . endif .endfor -.for multi in ${OPTIONS_MULTI} - @${ECHO_MSG} -n "${multi}[ " -. for opt in ${OPTIONS_MULTI_${multi}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "-${opt} " -. else +.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} " -. endif -. endfor - @${ECHO_MSG} -n "] " -.endfor -.for single in ${OPTIONS_SINGLE} - @${ECHO_MSG} -n "${single}( " -. for opt in ${OPTIONS_SINGLE_${single}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "-${opt} " . else - @${ECHO_MSG} -n "+${opt} " -. endif -. endfor - @${ECHO_MSG} -n ") " -.endfor -.for radio in ${OPTIONS_RADIO} - @${ECHO_MSG} -n "${radio}( " -. for opt in ${OPTIONS_RADIO_${radio}} -. if empty(PORT_OPTIONS:M${opt}) @${ECHO_MSG} -n "-${opt} " -. else - @${ECHO_MSG} -n "+${opt} " . endif . endfor - @${ECHO_MSG} -n ") " -.endfor -.for group in ${OPTIONS_GROUP} - @${ECHO_MSG} -n "${group}[ " -. for opt in ${OPTIONS_GROUP_${group}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "-${opt} " -. else - @${ECHO_MSG} -n "+${opt} " -. endif + @${ECHO_MSG} -n "${${otype}_END} " . endfor - @${ECHO_MSG} -n "] " .endfor -.undef multi -.undef single -.undef radio -.undef group +.undef otype +.undef m .undef opt @${ECHO_MSG} "" .endif # pretty-print-config
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306100630.r5A6UUF9053041>