From owner-svn-doc-all@FreeBSD.ORG Fri Jan 30 18:11:27 2015 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDC1E1D6; Fri, 30 Jan 2015 18:11:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8F3623D; Fri, 30 Jan 2015 18:11:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0UIBRus082809; Fri, 30 Jan 2015 18:11:27 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0UIBRGi082808; Fri, 30 Jan 2015 18:11:27 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201501301811.t0UIBRGi082808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 30 Jan 2015 18:11:27 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46244 - head/en_US.ISO8859-1/books/porters-handbook/makefiles X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jan 2015 18:11:27 -0000 Author: mat (ports committer) Date: Fri Jan 30 18:11:26 2015 New Revision: 46244 URL: https://svnweb.freebsd.org/changeset/doc/46244 Log: Catch up with options changes. Various sentence rearranging and rewording. Differential Revision: https://reviews.freebsd.org/D1599 Approved by: wblock Sponsored by: Absolight Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Jan 30 08:25:47 2015 (r46243) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Fri Jan 30 18:11:26 2015 (r46244) @@ -3711,6 +3711,7 @@ SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT= PGSQL LDAP SSL +# Will add USE_PGSQL=yes PGSQL_USE= pgsql=yes # Will add --enable-postgres / --disable-postgres PGSQL_CONFIGURE_ENABLE= postgres @@ -3856,16 +3857,17 @@ SUB_LIST+= OPT1="@comment " NO_OPT1="" <varname><replaceable>OPT</replaceable>_USE</varname> - For each + When option OPT is selected, + for each key=value pair in - OPT_USE the + OPT_USE, + value is appended to the corresponding - USE_KEY - will be set to value. - If value has spaces in it, - replace them with commas, they will be changed back to - spaces during processing. For example: + USE_KEY. If + value has spaces in it, replace + them with commas and they will be changed back to spaces + during processing. For example: OPTIONS_DEFINE= OPT1 OPT1_USE= mysql=yes xorg=x11,xextproto,xext,xrandr @@ -3882,22 +3884,56 @@ USE_XORG= x11 xextproto xext xrandr .endif + + <varname><replaceable>OPT</replaceable>_USE_OFF</varname> + + When option OPT is + not selected, for each + key=value + pair in + OPT_USE_OFF, + value is appended to the + corresponding + USE_KEY. If + value has spaces in it, replace + them with commas and they will be changed back to spaces + during processing. For example: + + OPTIONS_DEFINE= OPT1 +OPT1_USE_OFF= mysql=yes xorg=x11,xextproto,xext,xrandr + + is equivalent to: + + OPTIONS_DEFINE= OPT1 + +.include <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MOPT1} +USE_MYSQL= yes +USE_XORG= x11 xextproto xext xrandr +.endif + + <varname><replaceable>OPT</replaceable>_CONFIGURE_ENABLE</varname> - If + When option OPT is selected, + for each entry in OPT_CONFIGURE_ENABLE - is set then - --enable-${OPT_CONFIGURE_ENABLE} - or - --disable-${OPT_CONFIGURE_ENABLE} - will be added to CONFIGURE_ARGS depending - on the value of the option - OPT, for - example: + then + --enable-entry + is appended to CONFIGURE_ARGS. When option + OPT is not selected, + --disable-entry + is appended to CONFIGURE_ARGS. An optional + argument can be specified with an = + symbol. This argument is only appended to the + --enable-entry + configure option. For example: - OPTIONS_DEFINE= OPT1 -OPT1_CONFIGURE_ENABLE= test + OPTIONS_DEFINE= OPT1 OPT2 +OPT1_CONFIGURE_ENABLE= test1 test2 +OPT2_CONFIGURE_ENABLE= test2=exhaustive is equivalent to: @@ -3906,33 +3942,38 @@ OPT1_CONFIGURE_ENABLE= test <varname><replaceable>OPT</replaceable>_CONFIGURE_WITH</varname> - If - OPT_CONFIGURE_WITH - is set then - --with-${OPT_CONFIGURE_WITH} - or - --without-${OPT_CONFIGURE_WITH} - will be added to CONFIGURE_ARGS depending - on the status of the option - OPT. An - optional argument can be specified with an - = symbol. This argument is only appended - to the - --with-opt + When option OPT is selected, + for each entry in + OPT_CONFIGURE_ENABLE + then + --with-entry + is appended to CONFIGURE_ARGS. When option + OPT is not selected, + --without-entry + is appended to CONFIGURE_ARGS. An optional + argument can be specified with an = + symbol. This argument is only appended to the + --with-entry configure option. For example: OPTIONS_DEFINE= OPT1 OPT2 OPT1_CONFIGURE_WITH= test1 -OPT1_CONFIGURE_WITH= test2=exhaustive +OPT2_CONFIGURE_WITH= test2=exhaustive is equivalent to: @@ -3956,13 +3997,11 @@ CONFIGURE_ARGS+= --without-test2 <varname><replaceable>OPT</replaceable>_CONFIGURE_ON</varname> - If - OPT_CONFIGURE_ON - is set then its value will be appended to - CONFIGURE_ARGS depending on the status of - the option - OPT, for - example: + When option OPT is selected, + the value of + OPT_CONFIGURE_ON, + if defined, is appended to + CONFIGURE_ARGS. For example: OPTIONS_DEFINE= OPT1 OPT1_CONFIGURE_ON= --add-test @@ -3981,13 +4020,11 @@ CONFIGURE_ARGS+= --add-test <varname><replaceable>OPT</replaceable>_CONFIGURE_OFF</varname> - If - OPT_CONFIGURE_OFF - is set then its value will be appended to - CONFIGURE_ARGS depending on the status of - the option - OPT, for - example: + When option OPT is + not selected, the value of + OPT_CONFIGURE_ON, + if defined, is appended to + CONFIGURE_ARGS. For example: OPTIONS_DEFINE= OPT1 OPT1_CONFIGURE_OFF= --no-test @@ -4006,12 +4043,11 @@ CONFIGURE_ARGS+= --no-test <varname><replaceable>OPT</replaceable>_CMAKE_ON</varname> - If - OPT_CMAKE_ON - is set then its value will be appended to - CMAKE_ARGS depending on the status of the - option OPT, - for example: + When option OPT is selected, + the value of + OPT_CMAKE_ON, + if defined, is appended to CMAKE_ARGS. + For example: OPTIONS_DEFINE= OPT1 OPT1_CMAKE_ON= -DTEST:BOOL=true @@ -4030,12 +4066,11 @@ CMAKE_ARGS+= -DTEST:BOOL=true <varname><replaceable>OPT</replaceable>_CMAKE_OFF</varname> - If - OPT_CMAKE_OFF - is set then its value will be appended to - CMAKE_ARGS depending on the status of the - option OPT, - for example: + When option OPT is + not selected, the value of + OPT_CMAKE_OFF, + if defined, is appended to CMAKE_ARGS. + For example: OPTIONS_DEFINE= OPT1 OPT1_CMAKE_OFF= -DTEST:BOOL=false @@ -4051,6 +4086,52 @@ CMAKE_ARGS+= -DTEST:BOOL=false .endif + + <varname><replaceable>OPT</replaceable>_QMAKE_ON</varname> + + When option OPT is selected, + the value of + OPT_QMAKE_ON, + if defined, is appended to + QMAKE_ARGS. For example: + + OPTIONS_DEFINE= OPT1 +OPT1_QMAKE_ON= -DTEST:BOOL=true + + is equivalent to: + + OPTIONS_DEFINE= OPT1 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOPT1} +QMAKE_ARGS+= -DTEST:BOOL=true +.endif + + + + <varname><replaceable>OPT</replaceable>_QMAKE_OFF</varname> + + When option OPT is + not selected, the value of + OPT_QMAKE_OFF, + if defined, is appended to + QMAKE_ARGS. For example: + + OPTIONS_DEFINE= OPT1 +OPT1_QMAKE_OFF= -DTEST:BOOL=false + + is equivalent to: + + OPTIONS_DEFINE= OPT1 + +.include <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MOPT1} +QMAKE_ARGS+= -DTEST:BOOL=false +.endif + + Dependencies @@ -4089,13 +4170,12 @@ CMAKE_ARGS+= -DTEST:BOOL=false <varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable></varname> - If - OPT_ABOVEVARIABLE - is defined then its value will be appended to - ABOVEVARIABLE - depending on the status of the option - OPT, for - example: + When option OPT is + selected, the value of + OPT_ABOVEVARIABLE, + if defined, is appended to + ABOVEVARIABLE. + For example: OPTIONS_DEFINE= OPT1 OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a @@ -4115,13 +4195,12 @@ LIB_DEPENDS+= liba.so:${PORTSDIR}/devel/ <varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable>_OFF</varname> - If - OPT_ABOVEVARIABLE_OFF - is set then a dependency of type - ABOVEVARIABLE - will be added when option - OPT is not - selected. For example: + When option OPT + is not selected, the value of + OPT_ABOVEVARIABLE_OFF, + if defined, is appended to + ABOVEVARIABLE. + For example: OPTIONS_DEFINE= OPT1 OPT1_LIB_DEPENDS_OFF= liba.so:${PORTSDIR}/devel/a @@ -4270,13 +4349,12 @@ DOCS_ALL_TARGET= doc <varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable></varname> - If - OPT_ABOVEVARIABLE - is defined then its value will be appended to - ABOVEVARIABLE - depending on the status of the option - OPT, for - example: + When option OPT is + selected, the value of + OPT_ABOVEVARIABLE, + if defined, is appended to + ABOVEVARIABLE. + For example: OPTIONS_DEFINE= OPT1 OPT1_USES= gmake @@ -4297,13 +4375,11 @@ CFLAGS+= -DTEST <varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable>_OFF</varname> - If - OPT_ABOVEVARIABLE_OFF - is set then a flag - ABOVEVARIABLE - will be automatically set when option - OPT is not - selected. For example: + When option OPT is not selected, the value of + OPT_ABOVEVARIABLE_OFF, + if defined, is appended to + ABOVEVARIABLE. + For example: OPTIONS_DEFINE= OPT1 OPT1_USES_OFF=gmake