Date: Sun, 20 Oct 2019 17:21:52 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515062 - in head/www/p5-WWW-Curl: . files Message-ID: <201910201721.x9KHLqAR089620@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Oct 20 17:21:52 2019 New Revision: 515062 URL: https://svnweb.freebsd.org/changeset/ports/515062 Log: Fix compatibility with curl 7.66 - Bump PORTREVISION for package change PR: 241280 Submitted by: olivier Modified: head/www/p5-WWW-Curl/Makefile head/www/p5-WWW-Curl/files/patch-Curl.xs head/www/p5-WWW-Curl/files/patch-Makefile.PL Modified: head/www/p5-WWW-Curl/Makefile ============================================================================== --- head/www/p5-WWW-Curl/Makefile Sun Oct 20 17:21:47 2019 (r515061) +++ head/www/p5-WWW-Curl/Makefile Sun Oct 20 17:21:52 2019 (r515062) @@ -3,7 +3,7 @@ PORTNAME= WWW-Curl PORTVERSION= 4.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ftp perl5 MASTER_SITES= CPAN \ http://curl.haxx.se/libcurl/perl/ Modified: head/www/p5-WWW-Curl/files/patch-Curl.xs ============================================================================== --- head/www/p5-WWW-Curl/files/patch-Curl.xs Sun Oct 20 17:21:47 2019 (r515061) +++ head/www/p5-WWW-Curl/files/patch-Curl.xs Sun Oct 20 17:21:52 2019 (r515062) @@ -1,6 +1,25 @@ ---- Curl.xs.orig 2019-09-17 09:12:44 UTC +--- Curl.xs.orig 2014-02-21 16:08:30 UTC +++ Curl.xs -@@ -73,7 +73,7 @@ typedef struct { +@@ -18,6 +18,10 @@ + #include <curl/easy.h> + #include <curl/multi.h> + ++#ifdef CURLINC_MULTI_H ++#define __CURL_MULTI_H ++#endif ++ + #define header_callback_func writeheader_callback_func + + /* Do a favor for older perl versions */ +@@ -38,6 +42,7 @@ typedef enum { + SLIST_HTTPHEADER = 0, + SLIST_QUOTE, + SLIST_POSTQUOTE, ++ SLIST_CONNECT_TO, + #ifdef CURLOPT_RESOLVE + SLIST_RESOLVE, + #endif +@@ -73,7 +78,7 @@ typedef struct { #ifdef __CURL_MULTI_H struct CURLM *curlm; #else @@ -9,3 +28,22 @@ #endif } perl_curl_multi; +@@ -129,6 +134,10 @@ slist_index(int option) + case CURLOPT_POSTQUOTE: + return SLIST_POSTQUOTE; + break; ++ case CURLOPT_CONNECT_TO: ++ return SLIST_CONNECT_TO; ++ break; ++ + #ifdef CURLOPT_RESOLVE + case CURLOPT_RESOLVE: + return SLIST_RESOLVE; +@@ -754,6 +763,7 @@ curl_easy_setopt(self, option, value, push=0) + case CURLOPT_HTTPHEADER: + case CURLOPT_QUOTE: + case CURLOPT_POSTQUOTE: ++ case CURLOPT_CONNECT_TO: + #ifdef CURLOPT_RESOLVE + case CURLOPT_RESOLVE: + #endif Modified: head/www/p5-WWW-Curl/files/patch-Makefile.PL ============================================================================== --- head/www/p5-WWW-Curl/files/patch-Makefile.PL Sun Oct 20 17:21:47 2019 (r515061) +++ head/www/p5-WWW-Curl/files/patch-Makefile.PL Sun Oct 20 17:21:52 2019 (r515062) @@ -1,6 +1,6 @@ --- Makefile.PL.orig 2014-02-21 16:08:09 UTC +++ Makefile.PL -@@ -121,6 +121,7 @@ if (!defined($curl_h)) { +@@ -121,13 +121,14 @@ if (!defined($curl_h)) { open (H, "<", $curl_h) or die ("Cannot open $curl_h: ".$!); while(<H>) { if (/^#define (CURL[A-Za-z0-9_]*)/) { @@ -8,3 +8,11 @@ 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_)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910201721.x9KHLqAR089620>