cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yes more simplification in showconfig, pretty-print-config and pkgng manifest generation

Browse Source
This commit is contained in:
Baptiste Daroussin 2013-06-14 06:56:16 +00:00
parent 11bc9c3ef4
commit 632f0ed926
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=320886
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.pkgng.mk
View File

@ -83,11 +83,7 @@ fake-pkg:
@${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}," >> ${MANIFESTF}
.endfor
.undef opt
@${ECHO_CMD} "}" >> ${MANIFESTF}

26
Mk/bsd.port.mk
View File

@ -6185,11 +6185,7 @@ showconfig:
.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
@ -6205,11 +6201,7 @@ showconfig:
@${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
@ -6271,22 +6263,14 @@ RADIO_START= (
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