[pkgsrc/trunk]: pkgsrc/mail/mutt Rename mail/mutt's SASL option to 'sasl1' so...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbd2c6f46c23
branches:  trunk
changeset: 480514:cbd2c6f46c23
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 12 04:33:12 2004 +0000

description:
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:

 mail/mutt/options.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r e4df3af055ac -r cbd2c6f46c23 mail/mutt/options.mk
--- a/mail/mutt/options.mk      Sun Sep 12 04:26:20 2004 +0000
+++ b/mail/mutt/options.mk      Sun Sep 12 04:33:12 2004 +0000
@@ -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+=  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 @@
 ###
 ### 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