Page MenuHomeFreeBSD

D1599.id3324.diff
No OneTemporary

D1599.id3324.diff

Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -3711,6 +3711,7 @@
OPTIONS_DEFAULT= PGSQL LDAP SSL
+# Will add USE_PGSQL=yes
PGSQL_USE= pgsql=yes
# Will add --enable-postgres / --disable-postgres
PGSQL_CONFIGURE_ENABLE= postgres
@@ -3861,10 +3862,11 @@
pair in
<varname><replaceable>OPT</replaceable>_USE</varname> the
corresponding
- <varname>USE_<replaceable>KEY</replaceable></varname>
- will be set to <replaceable>value</replaceable>.
- If <replaceable>value</replaceable> has spaces in it,
- replace them with commas, they will be changed back to
+ <varname>USE_<replaceable>KEY</replaceable></varname> will
+ be set to <replaceable>value</replaceable> when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected. If <replaceable>value</replaceable> has spaces in
+ it, replace them with commas, they will be changed back to
spaces during processing. For example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
@@ -3882,6 +3884,36 @@
.endif</programlisting>
</sect3>
+ <sect3 xml:id="options-use-off">
+ <title><varname><replaceable>OPT</replaceable>_USE_OFF</varname></title>
+
+ <para>For each
+ <literal><replaceable>key</replaceable>=<replaceable>value</replaceable></literal>
+ pair in
+ <varname><replaceable>OPT</replaceable>_USE_OFF</varname>
+ the corresponding
+ <varname>USE_<replaceable>KEY</replaceable></varname> will
+ be set to <replaceable>value</replaceable> when option
+ <literal><replaceable>OPT</replaceable></literal> is not
+ selected. If <replaceable>value</replaceable> has spaces in
+ it, replace them with commas, they will be changed back to
+ spaces during processing. For example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_USE_OFF= mysql=yes xorg=x11,xextproto,xext,xrandr</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ! ${PORT_OPTIONS:MOPT1}
+USE_MYSQL= yes
+USE_XORG= x11 xextproto xext xrandr
+.endif</programlisting>
+ </sect3>
+
<sect3 xml:id="options-configure_enable">
<title><varname><replaceable>OPT</replaceable>_CONFIGURE_ENABLE</varname></title>
@@ -3892,12 +3924,17 @@
or
<literal>--disable-${<replaceable>OPT</replaceable>_CONFIGURE_ENABLE}</literal>
will be added to <varname>CONFIGURE_ARGS</varname> depending
- on the value of the option
- <literal><replaceable>OPT</replaceable></literal>, for
- example:</para>
+ on the status of the option
+ <literal><replaceable>OPT</replaceable></literal>. An
+ optional argument can be specified with an
+ <literal>=</literal> symbol. This argument is only appended
+ to the
+ <literal>--enable-<replaceable>opt</replaceable></literal>
+ configure option. For example:</para>
- <programlisting>OPTIONS_DEFINE= OPT1
-OPT1_CONFIGURE_ENABLE= test</programlisting>
+ <programlisting>OPTIONS_DEFINE= OPT1 OPT2
+OPT1_CONFIGURE_ENABLE= test1
+OPT1_CONFIGURE_ENABLE= test2=exhaustive</programlisting>
<para>is equivalent to:</para>
@@ -3906,9 +3943,15 @@
.include &lt;bsd.port.options.mk&gt;
.if ${PORT_OPTIONS:MOPT1}
-CONFIGURE_ARGS+= --enable-test
+CONFIGURE_ARGS+= --enable-test1
+.else
+CONFIGURE_ARGS+= --disable-test1
+.endif
+
+.if ${PORT_OPTIONS:MOPT2}
+CONFIGURE_ARGS+= --enable-test2=exhaustive
.else
-CONFIGURE_ARGS+= --disable-test
+CONFIGURE_ARGS+= --disable-test2
.endif</programlisting>
</sect3>
@@ -3959,10 +4002,9 @@
<para>If
<varname><replaceable>OPT</replaceable>_CONFIGURE_ON</varname>
is set then its value will be appended to
- <varname>CONFIGURE_ARGS</varname> depending on the status of
- the option
- <literal><replaceable>OPT</replaceable></literal>, for
- example:</para>
+ <varname>CONFIGURE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_CONFIGURE_ON= --add-test</programlisting>
@@ -3984,10 +4026,9 @@
<para>If
<varname><replaceable>OPT</replaceable>_CONFIGURE_OFF</varname>
is set then its value will be appended to
- <varname>CONFIGURE_ARGS</varname> depending on the status of
- the option
- <literal><replaceable>OPT</replaceable></literal>, for
- example:</para>
+ <varname>CONFIGURE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is not
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_CONFIGURE_OFF= --no-test</programlisting>
@@ -4009,9 +4050,9 @@
<para>If
<varname><replaceable>OPT</replaceable>_CMAKE_ON</varname>
is set then its value will be appended to
- <varname>CMAKE_ARGS</varname> depending on the status of the
- option <literal><replaceable>OPT</replaceable></literal>,
- for example:</para>
+ <varname>CMAKE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_CMAKE_ON= -DTEST:BOOL=true</programlisting>
@@ -4033,9 +4074,9 @@
<para>If
<varname><replaceable>OPT</replaceable>_CMAKE_OFF</varname>
is set then its value will be appended to
- <varname>CMAKE_ARGS</varname> depending on the status of the
- option <literal><replaceable>OPT</replaceable></literal>,
- for example:</para>
+ <varname>CMAKE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is not
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_CMAKE_OFF= -DTEST:BOOL=false</programlisting>
@@ -4051,6 +4092,54 @@
.endif</programlisting>
</sect3>
+ <sect3 xml:id="options-qmake_on">
+ <title><varname><replaceable>OPT</replaceable>_QMAKE_ON</varname></title>
+
+ <para>If
+ <varname><replaceable>OPT</replaceable>_QMAKE_ON</varname>
+ is set then its value will be appended to
+ <varname>QMAKE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_QMAKE_ON= -DTEST:BOOL=true</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MOPT1}
+QMAKE_ARGS+= -DTEST:BOOL=true
+.endif</programlisting>
+ </sect3>
+
+ <sect3 xml:id="options-qmake_off">
+ <title><varname><replaceable>OPT</replaceable>_QMAKE_OFF</varname></title>
+
+ <para>If
+ <varname><replaceable>OPT</replaceable>_QMAKE_OFF</varname>
+ is set then its value will be appended to
+ <varname>QMAKE_ARGS</varname> when option
+ <literal><replaceable>OPT</replaceable></literal> is not
+ selected, for example:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+OPT1_QMAKE_OFF= -DTEST:BOOL=false</programlisting>
+
+ <para>is equivalent to:</para>
+
+ <programlisting>OPTIONS_DEFINE= OPT1
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ! ${PORT_OPTIONS:MOPT1}
+QMAKE_ARGS+= -DTEST:BOOL=false
+.endif</programlisting>
+ </sect3>
+
<sect3 xml:id="options-dependencies">
<title>Dependencies</title>
@@ -4093,9 +4182,9 @@
<varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable></varname>
is defined then its value will be appended to
<literal><replaceable>ABOVEVARIABLE</replaceable></literal>
- depending on the status of the option
- <literal><replaceable>OPT</replaceable></literal>, for
- example:</para>
+ when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a</programlisting>
@@ -4117,9 +4206,9 @@
<para>If
<varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable>_OFF</varname>
- is set then a dependency of type
+ is defined then its value will be appended to
<literal><replaceable>ABOVEVARIABLE</replaceable></literal>
- will be added when option
+ when option
<literal><replaceable>OPT</replaceable></literal> is not
selected. For example:</para>
@@ -4274,9 +4363,9 @@
<varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable></varname>
is defined then its value will be appended to
<literal><replaceable>ABOVEVARIABLE</replaceable></literal>
- depending on the status of the option
- <literal><replaceable>OPT</replaceable></literal>, for
- example:</para>
+ when option
+ <literal><replaceable>OPT</replaceable></literal> is
+ selected, for example:</para>
<programlisting>OPTIONS_DEFINE= OPT1
OPT1_USES= gmake
@@ -4301,7 +4390,7 @@
<varname><replaceable>OPT</replaceable>_<replaceable>ABOVEVARIABLE</replaceable>_OFF</varname>
is set then a flag
<literal><replaceable>ABOVEVARIABLE</replaceable></literal>
- will be automatically set when option
+ when option
<literal><replaceable>OPT</replaceable></literal> is not
selected. For example:</para>

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 14, 6:08 PM (5 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38920009
Default Alt Text
D1599.id3324.diff (9 KB)

Event Timeline