summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortv <tv>2005-08-29 13:14:43 +0000
committertv <tv>2005-08-29 13:14:43 +0000
commit76107d239ce218802d436e8a80c999b3b6dd1de7 (patch)
tree77406e8140bdc207719dcc956aaf8005a4ca863a /mail
parentacf30e785a6172a1c7d252533f847f19162991a9 (diff)
downloadpkgsrc-76107d239ce218802d436e8a80c999b3b6dd1de7.tar.gz
Make this not fail if gnutls is specified; rather, just fall back to
openssl (or no ssl) anyway.
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot/options.mk17
1 files changed, 9 insertions, 8 deletions
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index 086866785d7..c95275071cc 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -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
###