diff options
| author | jlam <jlam> | 2004-08-22 19:42:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:42:10 +0000 |
| commit | c66f057fbc7253b5687a9d8e939c2a2636b46f11 (patch) | |
| tree | 564180489a632a6904990e8b2d6923ec799b4f08 /Packages.txt | |
| parent | b1276828b47cd0e050c7db6a6dd702ffc806f96a (diff) | |
| download | pkgsrc-c66f057fbc7253b5687a9d8e939c2a2636b46f11.tar.gz | |
Match documentation to reality to reflect recent change in semantics for
PKG_DEFAULT_OPTIONS.
Diffstat (limited to 'Packages.txt')
| -rw-r--r-- | Packages.txt | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Packages.txt b/Packages.txt index 0fddaa762d4..dada784ea58 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.351 2004/08/12 10:07:28 jlam Exp $ +# $NetBSD: Packages.txt,v 1.352 2004/08/22 19:42:10 jlam Exp $ ########################################################################### ========================== @@ -2138,20 +2138,21 @@ package Makefile. -------------8<-------------8<-------------8<-------------8<------------- # Global and legacy options -.if defined(USE_OPENLDAP) || defined(USE_SASL2) -. if !defined(PKG_OPTIONS.wibble) -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.wibble+= ldap -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.wibble+= sasl -. endif -. endif +.if defined(WIBBLE_USE_OPENLDAP) && !empty(WIBBLE_USE_OPENLDAP:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ldap +.endif +.if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.wibble -PKG_OPTIONS.wibble?= sasl # package-specific default PKG_SUPPORTED_OPTIONS= ldap sasl +# +# Default options for "wibble" package. +# +.if !defined(PKG_OPTIONS.wibble) +PKG_DEFAULT_OPTIONS+= sasl +endif .include "../../mk/bsd.options.mk" # Package-specific option-handling |