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 /mail/postfix | |
| 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 'mail/postfix')
| -rw-r--r-- | mail/postfix/options.mk | 59 |
1 files changed, 21 insertions, 38 deletions
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 738f27fa444..ba5b2e0f8b3 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2004/08/11 06:51:31 jlam Exp $ +# $NetBSD: options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options # @@ -10,43 +10,26 @@ # XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS # XXX POSTFIX_USE_SASL_AUTH # -.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ - defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ - defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ - defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ - defined(POSTFIX_OPTIONS) -. if !defined(PKG_OPTIONS.postfix) -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= ldap -. endif -. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= inet6 -. endif -. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= tls -. endif -. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pcre -. endif -. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= mysql -. endif -. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pgsql -. endif -. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(POSTFIX_OPTIONS) -PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} -. endif -. endif +.if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif +.if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= tls +.endif +.if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pcre +.endif +.if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= mysql +.endif +.if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pgsql +.endif +.if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +PKG_DEFAULT_OPTIONS+= sasl +.endif +.if defined(POSTFIX_OPTIONS) +PKG_DEFAULT_OPTIONS= ${POSTFIX_OPTIONS} .endif PKG_OPTIONS_VAR= PKG_OPTIONS.postfix |