pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/wget Instead of auto-choosing openssl if gnutls is...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b930a73dd2ea
branches:  trunk
changeset: 444471:b930a73dd2ea
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Jan 08 18:18:58 2021 +0000

description:
Instead of auto-choosing openssl if gnutls is not selected, use
PKG_OPTIONS_OPTIONAL_GROUPS and allow building with neither.
The default remains openssl.

diffstat:

 net/wget/options.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 4eddb88a6431 -r b930a73dd2ea net/wget/options.mk
--- a/net/wget/options.mk       Fri Jan 08 17:14:01 2021 +0000
+++ b/net/wget/options.mk       Fri Jan 08 18:18:58 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2019/11/03 11:45:58 rillig Exp $
+# $NetBSD: options.mk,v 1.14 2021/01/08 18:18:58 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wget
 PKG_SUPPORTED_OPTIONS=         idn inet6 psl
-PKG_OPTIONS_REQUIRED_GROUPS=   ssl
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
 PKG_SUGGESTED_OPTIONS=         idn inet6 openssl psl
 
@@ -34,9 +34,11 @@
 .if !empty(PKG_OPTIONS:Mgnutls)
 .  include "../../security/gnutls/buildlink3.mk"
 CONFIGURE_ARGS+=--with-ssl=gnutls
-.else
+.elif !empty(PKG_OPTIONS:Mopenssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=--with-ssl=openssl
+.else
+CONFIGURE_ARGS+=--with-ssl=no
 .endif
 
 ###



Home | Main Index | Thread Index | Old Index