diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-10-08 12:28:17 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-10-11 13:11:56 +0000 |
| commit | 7e391f798baea59a5b3ef50675d42cc32bfc8717 (patch) | |
| tree | 96c8684fea9481d1221323a1dfbf4457edbcc647 | |
| parent | 1d1638a2294600a16ec5f7e8ca091e848cd616de (diff) | |
| download | ports-7e391f798baea59a5b3ef50675d42cc32bfc8717.tar.gz ports-7e391f798baea59a5b3ef50675d42cc32bfc8717.zip | |
ftp/curl: Convert to options helper
(cherry picked from commit aabdfa405a77f8ecabb504e2bde73aae57488ad0)
| -rw-r--r-- | ftp/curl/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 2f41a9caf739..2d5b51fdca99 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -26,10 +26,10 @@ CONFIGURE_ARGS= --disable-werror \ --enable-netrc \ --enable-openssl-auto-load-config \ --enable-progress-meter \ - --without-ca-bundle \ - --without-ca-path \ --with-fish-functions-dir=${LOCALBASE}/share/fish/completions \ - --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions + --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ + --without-ca-bundle \ + --without-ca-path CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes @@ -86,6 +86,7 @@ CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug DICT_CONFIGURE_ENABLE= dict FTP_CONFIGURE_ENABLE= ftp +GNUTLS_CONFIGURE_ON= --with-ca-fallback GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libnettle.so:security/nettle @@ -123,6 +124,7 @@ LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 MQTT_CONFIGURE_ENABLE= mqtt NTLM_CONFIGURE_ENABLE= ntlm +OPENSSL_CONFIGURE_ON= --with-ca-fallback OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} @@ -150,10 +152,6 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+=--with-ca-fallback -.endif - .if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif |