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/mutt | |
| 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/mutt')
| -rw-r--r-- | mail/mutt/options.mk | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index f0b073f8d58..3d5f7ebef1c 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,27 +1,26 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 07:19:25 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options -.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \ - defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL) -. if !defined(PKG_OPTIONS.mutt) -. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= slang -. endif -. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ncurses -. endif -. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ssl -. endif -. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= sasl -. endif -. endif +.if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= slang +.endif +.if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ncurses +.endif +.if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ssl +.endif +.if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.mutt -PKG_OPTIONS.mutt?= ssl PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl + +.if !defined(PKG_OPTIONS.mutt) +PKG_DEFAULT_OPTIONS+= ssl +.endif + .include "../../mk/bsd.options.mk" ### |