diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
| commit | 9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /mail/dovecot | |
| parent | 3c0724db4840983688df4cd77ea88653e9b13249 (diff) | |
| download | pkgsrc-9d5426ff76defa85311d3e55ed2c442fb5ae9977.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 'mail/dovecot')
| -rw-r--r-- | mail/dovecot/options.mk | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index 6f22de2fbb0..d44d89ea689 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,29 +1,16 @@ -# $NetBSD: options.mk,v 1.3 2004/08/05 02:22:19 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:51 jlam Exp $ -# Global and legacy options -.if defined(DOVECOT_USE_GNUTLS) || defined(DOVECOT_USE_MYSQL) || \ - defined(DOVECOT_USE_PGSQL) || defined(USE_INET6) || \ - defined(USE_OPENLDAP) || defined(USE_SASL2) -. if !defined(PKG_OPTIONS.dovecot) -. if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= gnutls -. endif -. if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= mysql -. endif -. if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= pgsql -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= inet6 -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= ldap -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss]) -PKG_OPTIONS.dovecot+= sasl -. endif -. endif +.if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= gnutls +.endif +.if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= mysql +.endif +.if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= pgsql +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= inet6 .endif PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot |