<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e1ed418961c5919aacfeb582bb0baa2d74243a8f">https://github.com/macports/macports-ports/commit/e1ed418961c5919aacfeb582bb0baa2d74243a8f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e1ed418961c5919aacfeb582bb0baa2d74243a8f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 22 23:10:13 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Enable brotli and http/2 support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65056
</span>---
net/curl/Portfile | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 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 3a96e574728..c8453e2d532 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,12 +35,14 @@ checksums ${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 port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:libidn2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libidn2 \
</span> port:libpsl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nghttp2 \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +52,6 @@ if {${name} eq ${subport}} {
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-brotli \
</span> --without-cyassl \
--without-gnutls \
--without-gssapi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,15 +59,17 @@ if {${name} eq ${subport}} {
</span> --without-librtmp \
--without-libssh2 \
--without-mbedtls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-nghttp2 \
</span> --without-nss \
--without-ssl \
--without-secure-transport \
--disable-ares \
--disable-ldap \
--disable-ldaps \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-brotli \
</span> --with-libidn2=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-nghttp2=${prefix} \
</span> --with-zlib=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --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;'>@@ -184,11 +187,6 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --without-gssapi --with-gssapi
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant http2 description {Support HTTP/2 with nghttp2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:nghttp2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-nghttp2 --with-nghttp2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,17 +206,17 @@ if {${name} eq ${subport}} {
</span> variant ssl conflicts darwinssl gnutls mbedtls wolfssl description {Allow secure connections using OpenSSL} {
depends_lib-append path:lib/libssl.dylib:openssl \
path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-ssl --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-ssl --with-openssl
</span> configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}
if {![variant_isset darwinssl] && ![variant_isset gnutls] && ![variant_isset mbedtls] && ![variant_isset wolfssl]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +ssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +ssl
</span> }
livecheck.type regex
livecheck.url [join [lrange [split [lindex ${master_sites} 0] {:}] 0 end-1] {:}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex ${name}-(\[0-9.\]+)[quotemeta ${extract.suffix}]
</span> } else {
livecheck.type none
}
</pre><pre style='margin:0'>
</pre>