diff options
| -rw-r--r-- | Packages.txt | 23 | ||||
| -rw-r--r-- | mk/bsd.options.mk | 6 |
2 files changed, 15 insertions, 14 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 diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 7fe6e367530..64b1ffa5a37 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $ +# $NetBSD: bsd.options.mk,v 1.8 2004/08/22 19:42:10 jlam Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -69,12 +69,12 @@ # # PKG_OPTIONS_VAR= PKG_OPTIONS.wibble # 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 |