Date: Wed, 22 Apr 2020 03:47:29 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532443 - head/www/p5-WWW-Curl/files Message-ID: <202004220347.03M3lTMI008340@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius (src committer) Date: Wed Apr 22 03:47:28 2020 New Revision: 532443 URL: https://svnweb.freebsd.org/changeset/ports/532443 Log: Re-do r530415 and other patches that skip certain defines in a more elegant way. Matching strings rather then regexps is preferred here. The problem with r530415 in particular was that it skipped any symbol matching CURLOPT, which cut a bunch of useful symbols. Approved by: sunpoet Modified: head/www/p5-WWW-Curl/files/patch-Makefile.PL Modified: head/www/p5-WWW-Curl/files/patch-Makefile.PL ============================================================================== --- head/www/p5-WWW-Curl/files/patch-Makefile.PL Wed Apr 22 03:37:45 2020 (r532442) +++ head/www/p5-WWW-Curl/files/patch-Makefile.PL Wed Apr 22 03:47:28 2020 (r532443) @@ -1,18 +1,24 @@ ---- Makefile.PL.orig 2014-02-21 16:08:09 UTC -+++ Makefile.PL -@@ -121,13 +121,14 @@ if (!defined($curl_h)) { +--- Makefile.PL.orig 2014-02-21 08:08:09.000000000 -0800 ++++ Makefile.PL 2020-04-20 15:36:35.008798000 -0700 +@@ -100,6 +100,13 @@ + print "Found curl.h in $curl_h\n"; + my @syms; + my $has_cpp = 0; ++ my @skiplist = qw/ ++ CURL_DID_MEMORY_FUNC_TYPEDEFS ++ CURL_STRICTER ++ CURLINC_CURL_H ++ CURL_WIN32 ++ CURLOPT ++ /; + open(H_IN, "-|", "cpp", $curl_h) and $has_cpp++; + unless ($has_cpp) { + warn "No working cpp ($!). Parsing curl.h in Perl"; +@@ -121,6 +128,7 @@ open (H, "<", $curl_h) or die ("Cannot open $curl_h: ".$!); while(<H>) { if (/^#define (CURL[A-Za-z0-9_]*)/) { -+ next if ($1 eq 'CURL_DID_MEMORY_FUNC_TYPEDEFS' || $1 eq 'CURL_STRICTER' || $1 eq 'CURLINC_CURL_H' ); ++ next if $1 ~~ @skiplist; push @syms, $1; } } - close H; - - for my $e (sort @syms) { -- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { -+ if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z|^CURLINC_|WIN32|CURLOPT)/) { - next; - } - my ($group) = $e =~ m/^([^_]+_)/;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004220347.03M3lTMI008340>