diff options
| author | Remko van der Vossen | 2022-12-02 09:32:22 +0100 |
|---|---|---|
| committer | Remko van der Vossen | 2022-12-02 09:32:22 +0100 |
| commit | dd8fdc9cbe4ce9abc2af28c765d9836e61c0678f (patch) | |
| tree | e2dafc8c0482c2abf839fa6624e658e319563b1f /ftp | |
| parent | f815bb6554bc5ec4d2612d4e385af8ef4608e219 (diff) | |
wget2: use optional_depends_one_of for SSL library selection
Diffstat (limited to 'ftp')
| -rwxr-xr-x | ftp/wget2/BUILD | 1 | ||||
| -rwxr-xr-x | ftp/wget2/CONFIGURE | 4 | ||||
| -rwxr-xr-x | ftp/wget2/DEPENDS | 19 | ||||
| -rw-r--r-- | ftp/wget2/HISTORY | 4 |
4 files changed, 13 insertions, 15 deletions
diff --git a/ftp/wget2/BUILD b/ftp/wget2/BUILD index 4a827e8d1c..448e746a60 100755 --- a/ftp/wget2/BUILD +++ b/ftp/wget2/BUILD @@ -1,3 +1,2 @@ OPTS+=' --disable-static' && -[[ $WGET_SSL == "none" ]] && OPTS+=" --without-ssl" default_build diff --git a/ftp/wget2/CONFIGURE b/ftp/wget2/CONFIGURE deleted file mode 100755 index 6ad9caa3f6..0000000000 --- a/ftp/wget2/CONFIGURE +++ /dev/null @@ -1,4 +0,0 @@ -config_query_list WGET_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL - -#config_query_option WGET_OPTS "Enable IPv6 support?" y \ -# "--enable-ipv6" "--disable-ipv6" diff --git a/ftp/wget2/DEPENDS b/ftp/wget2/DEPENDS index 926bdf98d3..12889f1909 100755 --- a/ftp/wget2/DEPENDS +++ b/ftp/wget2/DEPENDS @@ -1,3 +1,5 @@ +. "$GRIMOIRE/depends_one_of.function" + depends smgl-fhs && optional_depends pcre2 \ @@ -70,13 +72,10 @@ optional_depends doxygen \ '--disable-doc' \ 'build docs' && -case $WGET_SSL in - none) - ;; - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) - depends SSL "--with-ssl=openssl" && - optional_depends ca-certificates '' '' 'provides security certificates' - ;; -esac +optional_depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + wolfssl '--with-ssl=wolfssl' \ + '--with-ssl=none' \ + 'SSL library' diff --git a/ftp/wget2/HISTORY b/ftp/wget2/HISTORY index ed527e4b4a..2987bdb077 100644 --- a/ftp/wget2/HISTORY +++ b/ftp/wget2/HISTORY @@ -1,3 +1,7 @@ +2022-12-02 Remko van der Vossen <wich@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS: use optional_depends_one_of + for SSL library selection + 2022-05-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.0.1 |