pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/lftp Only one SSL scheme can be used. Default to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/494795e8dff2
branches:  trunk
changeset: 498653:494795e8dff2
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Aug 29 13:12:14 2005 +0000

description:
Only one SSL scheme can be used.  Default to (and prefer) gnutls, as
requested by the package author.  Fall back to openssl only if ssl is
set and -gnutls is specified in OPTIONS.

diffstat:

 net/lftp/options.mk |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r e6f96b487bb4 -r 494795e8dff2 net/lftp/options.mk
--- a/net/lftp/options.mk       Mon Aug 29 13:09:58 2005 +0000
+++ b/net/lftp/options.mk       Mon Aug 29 13:12:14 2005 +0000
@@ -1,22 +1,23 @@
-# $NetBSD: options.mk,v 1.3 2005/06/01 14:06:50 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/08/29 13:12:14 tv Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lftp
 PKG_SUPPORTED_OPTIONS= gnutls ssl
 PKG_SUGGESTED_OPTIONS= gnutls
+
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgnutls) && !empty(PKG_OPTIONS:Mssl)
-PKG_FAIL_REASON+=      "Options \"gnutls\" and \"ssl\" are mutually exclusive."
-.endif
-
+###
+### SSL support
+###
 .if !empty(PKG_OPTIONS:Mgnutls)
 CONFIGURE_ARGS+=       --without-openssl
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/gnutls/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=       --without-gnutls
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
-.include "../../security/openssl/buildlink3.mk"
+.  include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-gnutls
+CONFIGURE_ARGS+=       --without-openssl
 .endif



Home | Main Index | Thread Index | Old Index