pkgsrc-Changes archive

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

CVS commit: pkgsrc/net/wget



Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jan  8 18:18:58 UTC 2021

Modified Files:
        pkgsrc/net/wget: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/wget/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wget/options.mk
diff -u pkgsrc/net/wget/options.mk:1.13 pkgsrc/net/wget/options.mk:1.14
--- pkgsrc/net/wget/options.mk:1.13     Sun Nov  3 11:45:58 2019
+++ pkgsrc/net/wget/options.mk  Fri Jan  8 18:18:58 2021
@@ -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 @@ CONFIGURE_ARGS+=     --disable-ipv6
 .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