[pkgsrc/trunk]: pkgsrc/mail/msmtp Only one SSL scheme can be used. Default t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6f96b487bb4
branches:  trunk
changeset: 498652:e6f96b487bb4
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Aug 29 13:09:58 2005 +0000

description:
Only one SSL scheme can be used.  Default to (and prefer) OpenSSL; allow
fallback to gnutls of ssl is not set in OPTIONS.

diffstat:

 mail/msmtp/options.mk |  34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diffs (49 lines):

diff -r 602d21a146b4 -r e6f96b487bb4 mail/msmtp/options.mk
--- a/mail/msmtp/options.mk     Mon Aug 29 11:37:08 2005 +0000
+++ b/mail/msmtp/options.mk     Mon Aug 29 13:09:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.7 2005/08/29 13:09:58 tv Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.msmtp
 PKG_SUPPORTED_OPTIONS= gnutls gsasl inet6 ssl
@@ -6,24 +6,22 @@
 
 .include "../../mk/bsd.options.mk"
 
-# GNUtls support
-.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
+###
+### SSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ssl=openssl
+.elif !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-ssl=gnutls
-.endif
-
-# GNUsasl support
-.if !empty(PKG_OPTIONS:Mgsasl)
-.include "../../security/gsasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ssl
 .endif
 
-# OpenSSL support
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ssl=openssl
+###
+### GNUsasl support
+###
+.if !empty(PKG_OPTIONS:Mgsasl)
+.  include "../../security/gsasl/buildlink3.mk"
 .endif
-
-# Disable any SSL support
-.if empty(PKG_OPTIONS:Mgnutls) && empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=       --disable-ssl
-.endif