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/fetchmail | |
| 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/fetchmail')
| -rw-r--r-- | mail/fetchmail/options.mk | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index 924c6f119a2..38173c72f00 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,23 +1,22 @@ -# $NetBSD: options.mk,v 1.2 2004/08/05 03:30:16 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $ -# Global and legacy options -.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL) -. if !defined(PKG_OPTIONS.fetchmail) -. if defined(KERBEROS) -PKG_OPTIONS.fetchmail+= kerberos4 -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.fetchmail+= inet6 -. endif -. if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.fetchmail+= ssl -. endif -. endif +.if defined(KERBEROS) +PKG_DEFAULT_OPTIONS+= kerberos4 +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif +.if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ssl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail -PKG_OPTIONS.fetchmail?= inet6 ssl PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl + +.if !defined(PKG_OPTIONS.fetchmail) +PKG_DEFAULT_OPTIONS+= inet6 ssl +.endif + .include "../../mk/bsd.options.mk" ### |