Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (dd8fdc9cbe4ce9abc2af28c765d9836e61c0678f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (dd8fdc9cbe4ce9abc2af28c765d9836e61c0678f)
  • Date: Fri, 2 Dec 2022 08:34:57 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

ftp/wget2/BUILD | 1 -
ftp/wget2/CONFIGURE | 4 ----
ftp/wget2/DEPENDS | 19 +++++++++----------
ftp/wget2/HISTORY | 4 ++++
4 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit dd8fdc9cbe4ce9abc2af28c765d9836e61c0678f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

wget2: use optional_depends_one_of for SSL library selection

diff --git a/ftp/wget2/BUILD b/ftp/wget2/BUILD
index 4a827e8..448e746 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 6ad9caa..0000000
--- 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 926bdf9..12889f1 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 ed527e4..2987bdb 100644
--- a/ftp/wget2/HISTORY
+++ b/ftp/wget2/HISTORY
@@ -1,3 +1,7 @@
+2022-12-02 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS: use optional_depends_one_of
+ for SSL library selection
+
2022-05-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.1




  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (dd8fdc9cbe4ce9abc2af28c765d9836e61c0678f), Remko van der Vossen, 12/02/2022

Archive powered by MHonArc 2.6.24.

Top of Page