<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ab601bb9f7d20d00d9f00a309b3c55c5e21763c7">https://github.com/macports/macports-ports/commit/ab601bb9f7d20d00d9f00a309b3c55c5e21763c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ab601bb9f7d20d00d9f00a309b3c55c5e21763c7
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Aug 4 16:32:41 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Move brotli/http2/idn/psl/zstd to variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> While some users want commonly-used features enabled in curl by default,
</span><span style='display:block; white-space:pre;color:#404040;'> others wish to have the option to disable them to build a minimal curl
</span><span style='display:block; white-space:pre;color:#404040;'> for MacPorts to link with on older systems. Therefore move brotli,
</span><span style='display:block; white-space:pre;color:#404040;'> http2, idn, psl, and zstd features to variants which are on by default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55197
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61654
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65056
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/70481
</span>---
net/curl/Portfile | 47 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 36 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13a1543eece..98f952d3939 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,39 +35,35 @@ checksums-prepend ${curl_distfile}
</span> if {${name} eq ${subport}} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
depends_build path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:brotli \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libidn2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nghttp2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:zlib
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-brotli \
</span> --without-gnutls \
--without-gssapi \
--without-libgsasl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libidn2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libpsl \
</span> --without-librtmp \
--without-libssh2 \
--without-mbedtls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-nghttp2 \
</span> --without-nghttp3 \
--without-ngtcp2 \
--without-openssl \
--without-ssl \
--without-secure-transport \
--without-wolfssl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-zstd \
</span> --disable-ares \
--disable-ldap \
--disable-ldaps \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-brotli \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libidn2=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-nghttp2=${prefix} \
</span> --with-zlib=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zstd \
</span> ac_cv_prog_AWK=/usr/bin/awk
configure.cflags-append -mmacosx-version-min=${macosx_deployment_target}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +168,11 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --disable-ares --enable-ares
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant brotli description {Support brotli compression} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:brotli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-brotli --with-brotli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant darwinssl conflicts gnutls mbedtls ssl wolfssl description {Allow secure connections using Apple OS native TLS} {
configure.args-delete --without-ssl
configure.args-replace --without-secure-transport --with-secure-transport
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,6 +214,11 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --without-gssapi --with-gssapi
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant http2 description {Support HTTP/2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:nghttp2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-nghttp2 --with-nghttp2=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant http3 requires gnutls description {Support HTTP/3 with nghttp3 and ngtcp2} {
depends_lib-append port:nghttp3 \
port:ngtcp2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,12 +226,24 @@ if {${name} eq ${subport}} {
</span> --without-ngtcp2 --with-ngtcp2=${prefix}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant idn description {Support internationalized domain names} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libidn2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-libidn2 --with-libidn2=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant openldap description {Support performing Lightweight Directory Access Protocol queries with OpenLDAP} {
depends_lib-append path:lib/libldap.dylib:openldap
configure.args-replace --disable-ldap --enable-ldap
configure.args-replace --disable-ldaps --enable-ldaps
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Curl's psl support does not require its idn support but the libpsl port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depends on the libidn2 port so we might as well enable curl's idn support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant psl requires idn description {Use the public suffix list to avoid privacy-leaking "supercookies"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libpsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-libpsl --with-libpsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant rtmp description {Support RTMP media streams} {
depends_lib-append port:rtmpdump
configure.args-replace --without-librtmp --with-librtmp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,6 +262,13 @@ if {${name} eq ${subport}} {
</span> configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant zstd description {Support zstd compression} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-zstd --with-zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +brotli +http2 +idn +psl +zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset darwinssl] && ![variant_isset gnutls] && ![variant_isset mbedtls] && ![variant_isset wolfssl]} {
default_variants-append +ssl
}
</pre><pre style='margin:0'>
</pre>