Date: Mon, 10 Jun 2013 13:47:44 +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: r320475 - head/Mk Message-ID: <201306101347.r5ADli3k091404@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jun 10 13:47:43 2013 New Revision: 320475 URL: http://svnweb.freebsd.org/changeset/ports/320475 Log: Simplify the creation of the options part of the pkgng manifest Modified: head/Mk/bsd.pkgng.mk Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Mon Jun 10 13:36:44 2013 (r320474) +++ head/Mk/bsd.pkgng.mk Mon Jun 10 13:47:43 2013 (r320475) @@ -83,53 +83,13 @@ fake-pkg: .endfor @${ECHO_CMD} "]" >> ${MANIFESTF} @${ECHO_CMD} -n "options: {" >> ${MANIFESTF} -.for opt in ${ALL_OPTIONS} +.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 .endfor -.for multi in ${OPTIONS_MULTI} -. for opt in ${OPTIONS_MULTI_${multi}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} -. else - @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} -. endif -. endfor -.endfor -.for single in ${OPTIONS_SINGLE} -. for opt in ${OPTIONS_SINGLE_${single}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} -. else - @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} -. endif -. endfor -.endfor -.for radio in ${OPTIONS_RADIO} -. for opt in ${OPTIONS_RADIO_${radio}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} -. else - @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} -. endif -. endfor -.endfor -.for group in ${OPTIONS_GROUP} -. for opt in ${OPTIONS_GROUP_${group}} -. if empty(PORT_OPTIONS:M${opt}) - @${ECHO_MSG} -n "${opt}: off, " >> ${MANIFESTF} -. else - @${ECHO_MSG} -n "${opt}: on, " >> ${MANIFESTF} -. endif -. endfor -.endfor -.undef multi -.undef single -.undef radio -.undef group .undef opt @${ECHO_CMD} "}" >> ${MANIFESTF} @[ -f ${PKGINSTALL} ] && ${CP} ${PKGINSTALL} ${METADIR}/+INSTALL; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306101347.r5ADli3k091404>