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
@@ -3859,13 +3860,14 @@
For each
key=value
pair in
- OPT_USE the
+ OPT_USE, 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 is
+ set to value when option
+ OPT is selected. 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,57 @@
.endif
+
+ <varname><replaceable>OPT</replaceable>_USE_OFF</varname>
+
+ For each
+ key=value
+ pair in
+ OPT_USE_OFF,
+ the corresponding
+ USE_KEY is
+ set to value when option
+ OPT is not
+ selected. 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
OPT_CONFIGURE_ENABLE
- is set then
+ 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:
+ on the status of the option
+ OPT. An
+ optional argument can be specified with an
+ = symbol. This argument is only appended
+ to the
+ --enable-opt
+ configure option. For example:
- OPTIONS_DEFINE= OPT1
-OPT1_CONFIGURE_ENABLE= test
+ OPTIONS_DEFINE= OPT1 OPT2
+OPT1_CONFIGURE_ENABLE= test1
+OPT1_CONFIGURE_ENABLE= test2=exhaustive
is equivalent to:
@@ -3906,9 +3943,15 @@
.include <bsd.port.options.mk>
.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
@@ -3923,7 +3966,7 @@
--without-${OPT_CONFIGURE_WITH}
will be added to CONFIGURE_ARGS depending
on the status of the option
- OPT. An
+ OPT. An
optional argument can be specified with an
= symbol. This argument is only appended
to the
@@ -3958,11 +4001,10 @@
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:
+ is set, its value is appended to
+ CONFIGURE_ARGS when option
+ OPT is
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_CONFIGURE_ON= --add-test
@@ -3983,11 +4025,10 @@
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:
+ is set, its value is appended to
+ CONFIGURE_ARGS when option
+ OPT is not
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_CONFIGURE_OFF= --no-test
@@ -4008,10 +4049,10 @@
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:
+ is set, its value is appended to
+ CMAKE_ARGS when option
+ OPT is
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_CMAKE_ON= -DTEST:BOOL=true
@@ -4032,10 +4073,10 @@
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:
+ is set, its value is appended to
+ CMAKE_ARGS when option
+ OPT is not
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_CMAKE_OFF= -DTEST:BOOL=false
@@ -4051,6 +4092,54 @@
.endif
+
+ <varname><replaceable>OPT</replaceable>_QMAKE_ON</varname>
+
+ If
+ OPT_QMAKE_ON
+ is set, its value is appended to
+ QMAKE_ARGS when option
+ OPT is
+ selected. 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>
+
+ If
+ OPT_QMAKE_OFF
+ is set, its value is appended to
+ QMAKE_ARGS when option
+ OPT is not
+ selected. 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
@@ -4091,11 +4180,11 @@
If
OPT_ABOVEVARIABLE
- is defined then its value will be appended to
+ is set, its value is appended to
ABOVEVARIABLE
- depending on the status of the option
- OPT, for
- example:
+ when option
+ OPT is
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_LIB_DEPENDS= liba.so:${PORTSDIR}/devel/a
@@ -4117,10 +4206,10 @@
If
OPT_ABOVEVARIABLE_OFF
- is set then a dependency of type
+ is set, its value is appended to
ABOVEVARIABLE
- will be added when option
- OPT is not
+ when option
+ OPT is not
selected. For example:
OPTIONS_DEFINE= OPT1
@@ -4272,11 +4361,11 @@
If
OPT_ABOVEVARIABLE
- is defined then its value will be appended to
+ is set, its value is appended to
ABOVEVARIABLE
- depending on the status of the option
- OPT, for
- example:
+ when option
+ OPT is
+ selected. For example:
OPTIONS_DEFINE= OPT1
OPT1_USES= gmake
@@ -4299,10 +4388,10 @@
If
OPT_ABOVEVARIABLE_OFF
- is set then a flag
+ is set, its value is appended to
ABOVEVARIABLE
- will be automatically set when option
- OPT is not
+ when option
+ OPT is not
selected. For example:
OPTIONS_DEFINE= OPT1