diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml index d525200402..fe75e8f22e 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.sgml +++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml @@ -3872,20 +3872,23 @@ ${MANPREFIX}/man/de/man3/baz.3.gz are allowed. OPTIONS definition must appear before - the inclusion of bsd.port.pre.mk. + the inclusion of bsd.port.options.mk. The WITH_* and WITHOUT_* variables can only be tested after the inclusion of - bsd.port.pre.mk. - + bsd.port.options.mk. Inclusion of + bsd.port.pre.mk can be used instead, too, + and is still widely used in ports written before the introduction + of bsd.port.options.mk. But be aware that + some variables will not work as expected after the inclusion of + bsd.port.pre.mk, typically + USE_* flags. - - Example Simple use of <makevar>OPTIONS</makevar> OPTIONS= FOO "Enable option foo" On \ BAR "Support feature bar" Off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITHOUT_FOO) CONFIGURE_ARGS+= --without-foo @@ -3897,10 +3900,24 @@ CONFIGURE_ARGS+= --with-foo RUN_DEPENDS+= bar:${PORTSDIR}/bar/bar .endif +.include <bsd.port.mk> + + + + Old style use of <makevar>OPTIONS</makevar> + OPTIONS= FOO "Enable option foo" On + +.include <bsd.port.pre.mk> + +.if defined(WITHOUT_FOO) +CONFIGURE_ARGS+= --without-foo +.else +CONFIGURE_ARGS+= --with-foo +.endif + .include <bsd.port.post.mk> -