diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | 5cc6a7c1f324655a55780f73b3d7d11d39d55ec5 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /databases | |
| parent | a3f9a03576685fb9a6a35d58b1695247504fc00a (diff) | |
| download | pkgsrc-5cc6a7c1f324655a55780f73b3d7d11d39d55ec5.tar.gz | |
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.
This fixes PR pkg/26590.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/openldap/options.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 79e87470e15..4aada900454 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,19 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $ - -# Global and legacy options -.if defined(KERBEROS) || defined(USE_SASL) || defined(USE_SASL2) -. if !defined(PKG_OPTIONS.openldap) -. if defined(KERBEROS) -PKG_OPTIONS.openldap+= kerberos -. endif -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.openldap+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.openldap+= sasl -. endif -. endif -.endif +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp |