[pkgsrc/trunk]: pkgsrc/mail/dovecot Make this not fail if gnutls is specified...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0202fce3400f
branches:  trunk
changeset: 498654:0202fce3400f
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Aug 29 13:14:43 2005 +0000

description:
Make this not fail if gnutls is specified; rather, just fall back to
openssl (or no ssl) anyway.

diffstat:

 mail/dovecot/options.mk |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 494795e8dff2 -r 0202fce3400f mail/dovecot/options.mk
--- a/mail/dovecot/options.mk   Mon Aug 29 13:12:14 2005 +0000
+++ b/mail/dovecot/options.mk   Mon Aug 29 13:14:43 2005 +0000
@@ -1,19 +1,20 @@
-# $NetBSD: options.mk,v 1.7 2005/08/19 04:57:01 grant Exp $
+# $NetBSD: options.mk,v 1.8 2005/08/29 13:14:43 tv Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS= gnutls inet6 ldap mysql pgsql sasl pam
+PKG_SUPPORTED_OPTIONS= gnutls inet6 ldap mysql pam pgsql sasl ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
 .include "../../mk/bsd.options.mk"
 
 ###
-### Build with GNU TLS or OpenSSL as the underlying crypto library.
+### Build with OpenSSL as the underlying crypto library.
 ###
-.if !empty(PKG_OPTIONS:Mgnutls)
-PKG_FAIL_REASON+=      "GNU TLS support is currently broken."
-CONFIGURE_ARGS+=       --enable-ssl=gnutls
-.  include "../../security/gnutls/buildlink3.mk"
-.else
+# (gnutls is broken in dovecot 0.99.x)
+.if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=        --enable-ssl=openssl
 .  include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ssl
 .endif
 
 ###