<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/62fb4c05790ca7f1f0cd68da9801bca6f1f91206">https://github.com/macports/macports-ports/commit/62fb4c05790ca7f1f0cd68da9801bca6f1f91206</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 62fb4c05790ca7f1f0cd68da9801bca6f1f91206
</span>Author: Dennis Camera <dennis.camera@riiengineering.ch>
AuthorDate: Mon Mar 20 17:59:06 2023 +0100

<span style='display:block; white-space:pre;color:#404040;'>    p5-www-curl: fix build with curl 8.0.1
</span>---
 perl/p5-www-curl/Portfile                                |  5 +++--
 perl/p5-www-curl/files/constants-ignore-macros.patch     | 11 +++++++++++
 perl/p5-www-curl/files/curl-7.50.2-invalid-symbols.patch | 11 -----------
 perl/p5-www-curl/files/curl-7.66.0-rt130591.patch        |  4 ++--
 perl/p5-www-curl/files/curl-7.69.0-rt132197.patch        |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/Portfile b/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14303044284..33f6b168fed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +21,15 @@ checksums           rmd160  786b6e0461051eae67bdcded046095895ea2a6a2 \
</span> if {${perl5.major} != ""} {
     depends_lib-append  port:curl
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch Makefile.PL for compatibility with curl 7.50.2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch Makefile.PL to not detect preprocessor macros as constants
</span> # https://rt.cpan.org/Public/Bug/Display.html?id=117793
 # https://github.com/szbalint/WWW--Curl/issues/16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/szbalint/WWW--Curl/issues/26
</span> # additional patch for compatiblity with curl 7.66.0+
 # https://rt.cpan.org/Ticket/Display.html?id=130591
 # additional patch for compatiblity with curl 7.69.0+
 # https://rt.cpan.org/Public/Bug/Display.html?id=132197
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      curl-7.50.2-invalid-symbols.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      constants-ignore-macros.patch \
</span>                     curl-7.66.0-rt130591.patch \
                     curl-7.69.0-rt132197.patch \
                     patch-default-inc-excludes-dot.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/constants-ignore-macros.patch b/perl/p5-www-curl/files/constants-ignore-macros.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..269881caf66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/constants-ignore-macros.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig       2023-03-20 17:43:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL    2023-03-20 17:43:24.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     close H_IN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     open (H, "<", $curl_h) or die ("Cannot open $curl_h: ".$!);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     while(<H>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if (/^#define (CURL[A-Za-z0-9_]*)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (/^#define (CURL[A-Za-z0-9_]*)[[:blank:]]/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             push @syms, $1;
</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;color:#808080;'>diff --git a/perl/p5-www-curl/files/curl-7.50.2-invalid-symbols.patch b/perl/p5-www-curl/files/curl-7.50.2-invalid-symbols.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0e8e0dcb865..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/files/curl-7.50.2-invalid-symbols.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.PL.orig       2016-09-24 11:42:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.PL    2016-09-24 11:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     close H;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     for my $e (sort @syms) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           next;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        my ($group) = $e =~ m/^([^_]+_)/;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/curl-7.66.0-rt130591.patch b/perl/p5-www-curl/files/curl-7.66.0-rt130591.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2914d6ac0d4..6c565a4632d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/files/curl-7.66.0-rt130591.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/curl-7.66.0-rt130591.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,8 @@ index bb852e4..713656a 100644
</span>      close H;
  
      for my $e (sort @syms) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span>            next;
         }
         my ($group) = $e =~ m/^([^_]+_)/;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch b/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b52a4ca3213..99173f05653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-www-curl/files/curl-7.69.0-rt132197.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
</span>      close H;
  
      for my $e (sort @syms) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
</span>            next;
         }
         my ($group) = $e =~ m/^([^_]+_)/;
</pre><pre style='margin:0'>

</pre>