diff options
| author | jlam <jlam> | 2004-09-12 04:33:12 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-09-12 04:33:12 +0000 |
| commit | 2ec44c08cfcac1cb5f1854194b06c4afb190c8ab (patch) | |
| tree | 886106e6e078997da30ace8632c2e3ffa1a8d1d6 /mail | |
| parent | c240fcc04cec8f5228891135eb452a4e6f6ad44e (diff) | |
| download | pkgsrc-2ec44c08cfcac1cb5f1854194b06c4afb190c8ab.tar.gz | |
Rename mail/mutt's SASL option to 'sasl1' so that setting USE_SASL2 in
/etc/mk.conf won't cause mutt to try to build using SASL (since it only
supports SASLv1, which conflicts with SASLv2). This fixes PR pkg/26821
by Martin Husemann.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt/options.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index 3d5f7ebef1c..13ede387b90 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/09/12 04:33:12 jlam Exp $ # Global and legacy options .if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) @@ -11,11 +11,11 @@ PKG_DEFAULT_OPTIONS+= ncurses PKG_DEFAULT_OPTIONS+= ssl .endif .if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) -PKG_DEFAULT_OPTIONS+= sasl +PKG_DEFAULT_OPTIONS+= sasl1 .endif PKG_OPTIONS_VAR= PKG_OPTIONS.mutt -PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl +PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl1 .if !defined(PKG_OPTIONS.mutt) PKG_DEFAULT_OPTIONS+= ssl @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} ### ### SASLv1 ### -.if !empty(PKG_OPTIONS:Msasl) +.if !empty(PKG_OPTIONS:Msasl1) . include "../../security/cyrus-sasl/buildlink3.mk" CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} .endif |