<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/65784cb779b059baae47a00f107e012be432a632">https://github.com/macports/macports-ports/commit/65784cb779b059baae47a00f107e012be432a632</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 65784cb779b Revert "curl: Move HTTP/2 support back to +http2 variant"
</span>65784cb779b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65784cb779b059baae47a00f107e012be432a632
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 3 08:05:33 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> Revert "curl: Move HTTP/2 support back to +http2 variant"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit b944040204a0f97164809ada1205c1071e7d8436.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now that the nghttp2 port no longer imposes a C++ version requirement,
</span><span style='display:block; white-space:pre;color:#404040;'> http2 support can be enabled unconditionally.
</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/65056
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65063
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/70048
</span>---
net/curl/Portfile | 21 +++------------------
1 file changed, 3 insertions(+), 18 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 d54a4d8e989..88cbae60c35 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,13 +35,14 @@ 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
depends_lib port:brotli \
port:libidn2 \
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;'>@@ -53,7 +54,6 @@ if {${name} eq ${subport}} {
</span> --without-librtmp \
--without-libssh2 \
--without-mbedtls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-nghttp2 \
</span> --without-nghttp3 \
--without-ngtcp2 \
--without-openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,7 @@ if {${name} eq ${subport}} {
</span> --disable-ldaps \
--with-brotli \
--with-libidn2=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-nghttp2=${prefix} \
</span> --with-zlib=${prefix} \
--with-zstd \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,22 +213,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=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # HTTP/2 support is desirable but nghttp2 requires C++20. Some users
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use a bootstrap MacPorts installation to provide a newer curl for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a primary MacPorts installation and requiring those users to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a C++20 compiler for that is undesirable. Also, newer clangs use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cmake, which uses curl, so it would introduce a dependency cycle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # So enable this variant by default only on systems that have a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # suitable compiler in Xcode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} ne "darwin" || ${os.major} >= 23} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +http2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant http3 requires gnutls description {Support HTTP/3 with nghttp3 and ngtcp2} {
depends_lib-append port:nghttp3 \
port:ngtcp2
</pre><pre style='margin:0'>
</pre>