Fri Jan 8 18:18:58 2021 UTC ()
Instead of auto-choosing openssl if gnutls is not selected, use
PKG_OPTIONS_OPTIONAL_GROUPS and allow building with neither.
The default remains openssl.


(schmonz)
diff -r1.13 -r1.14 pkgsrc/net/wget/options.mk
cvs diff -r1.13 -r1.14 pkgsrc/net/wget/options.mk (expand / switch to unified diff)

--- pkgsrc/net/wget/options.mk 2019/11/03 11:45:58 1.13
+++ pkgsrc/net/wget/options.mk 2021/01/08 18:18:58 1.14
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.13 2019/11/03 11:45:58 rillig Exp $ 1# $NetBSD: options.mk,v 1.14 2021/01/08 18:18:58 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.wget 3PKG_OPTIONS_VAR= PKG_OPTIONS.wget
4PKG_SUPPORTED_OPTIONS= idn inet6 psl 4PKG_SUPPORTED_OPTIONS= idn inet6 psl
5PKG_OPTIONS_REQUIRED_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls openssl 6PKG_OPTIONS_GROUP.ssl= gnutls openssl
7PKG_SUGGESTED_OPTIONS= idn inet6 openssl psl 7PKG_SUGGESTED_OPTIONS= idn inet6 openssl psl
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Support IDN 12### Support IDN
13### 13###
14.if !empty(PKG_OPTIONS:Midn) 14.if !empty(PKG_OPTIONS:Midn)
15.include "../../devel/libidn2/buildlink3.mk" 15.include "../../devel/libidn2/buildlink3.mk"
16.include "../../converters/libiconv/buildlink3.mk" 16.include "../../converters/libiconv/buildlink3.mk"
17CONFIGURE_ARGS+= --enable-iri 17CONFIGURE_ARGS+= --enable-iri
18.else 18.else
@@ -24,27 +24,29 @@ CONFIGURE_ARGS+= --disable-iri @@ -24,27 +24,29 @@ CONFIGURE_ARGS+= --disable-iri
24### 24###
25.if !empty(PKG_OPTIONS:Minet6) 25.if !empty(PKG_OPTIONS:Minet6)
26CONFIGURE_ARGS+= --enable-ipv6 26CONFIGURE_ARGS+= --enable-ipv6
27.else 27.else
28CONFIGURE_ARGS+= --disable-ipv6 28CONFIGURE_ARGS+= --disable-ipv6
29.endif 29.endif
30 30
31### 31###
32### Support SSL 32### Support SSL
33### 33###
34.if !empty(PKG_OPTIONS:Mgnutls) 34.if !empty(PKG_OPTIONS:Mgnutls)
35. include "../../security/gnutls/buildlink3.mk" 35. include "../../security/gnutls/buildlink3.mk"
36CONFIGURE_ARGS+=--with-ssl=gnutls 36CONFIGURE_ARGS+=--with-ssl=gnutls
37.else 37.elif !empty(PKG_OPTIONS:Mopenssl)
38. include "../../security/openssl/buildlink3.mk" 38. include "../../security/openssl/buildlink3.mk"
39CONFIGURE_ARGS+=--with-ssl=openssl 39CONFIGURE_ARGS+=--with-ssl=openssl
 40.else
 41CONFIGURE_ARGS+=--with-ssl=no
40.endif 42.endif
41 43
42### 44###
43### Support Public Suffix List 45### Support Public Suffix List
44### 46###
45.if !empty(PKG_OPTIONS:Mpsl) 47.if !empty(PKG_OPTIONS:Mpsl)
46. include "../../www/libpsl/buildlink3.mk" 48. include "../../www/libpsl/buildlink3.mk"
47CONFIGURE_ARGS+=--with-libpsl 49CONFIGURE_ARGS+=--with-libpsl
48.else 50.else
49CONFIGURE_ARGS+=--without-libpsl 51CONFIGURE_ARGS+=--without-libpsl
50.endif 52.endif