Date: Tue, 6 Jun 2006 06:17:14 +0800 (CST) From: Rong-En Fan <rafan@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roam@FreeBSD.org Subject: ports/98560: [PATCH] www/p5-WWW-Curl: update to 3.02 Message-ID: <200606052217.k55MHEjX070780@svm.csie.ntu.edu.tw> Resent-Message-ID: <200606052250.k55MoIUT068384@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98560
>Category: ports
>Synopsis: [PATCH] www/p5-WWW-Curl: update to 3.02
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 05 22:50:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
NTU CSIE
>Environment:
>Description:
- Update to 3.02
Port maintainer (roam@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- p5-WWW-Curl-3.02.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/p5-WWW-Curl/Makefile /home/rafan/tmp/ports/p5-WWW-Curl/Makefile
--- /usr/ports/www/p5-WWW-Curl/Makefile Mon Jun 7 18:49:12 2004
+++ /home/rafan/tmp/ports/p5-WWW-Curl/Makefile Tue Jun 6 06:14:47 2006
@@ -6,8 +6,7 @@
#
PORTNAME= WWW-Curl
-PORTVERSION= 2.0
-PORTREVISION= 1
+PORTVERSION= 3.02
CATEGORIES= www ftp perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
http://curl.haxx.se/libcurl/perl/
@@ -22,7 +21,7 @@
PERL_CONFIGURE= yes
MAN3= WWW::Curl.3 \
- WWW::Curl::easy.3 \
- Curl::easy.3
+ WWW::Curl::Easy.3 \
+ WWW::Curl::Multi.3
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/www/p5-WWW-Curl/distinfo /home/rafan/tmp/ports/p5-WWW-Curl/distinfo
--- /usr/ports/www/p5-WWW-Curl/distinfo Wed Jan 25 03:45:52 2006
+++ /home/rafan/tmp/ports/p5-WWW-Curl/distinfo Tue Jun 6 06:01:28 2006
@@ -1,3 +1,3 @@
-MD5 (WWW-Curl-2.0.tar.gz) = c8a74986c494e259ff1677e8a009492a
-SHA256 (WWW-Curl-2.0.tar.gz) = f359b2063edd656e0d16e4bb9cfb119494491f3480dcfd18b0143d899401d428
-SIZE (WWW-Curl-2.0.tar.gz) = 22546
+MD5 (WWW-Curl-3.02.tar.gz) = 0619d1a39fc92e9a5363f2269b7b1d59
+SHA256 (WWW-Curl-3.02.tar.gz) = d66d33f6cd5c288afa63b7fc9d6100c2595ef0254033d535bba85b14489e0a22
+SIZE (WWW-Curl-3.02.tar.gz) = 22971
diff -ruN --exclude=CVS /usr/ports/www/p5-WWW-Curl/files/patch-Curl.xs /home/rafan/tmp/ports/p5-WWW-Curl/files/patch-Curl.xs
--- /usr/ports/www/p5-WWW-Curl/files/patch-Curl.xs Tue Apr 20 20:07:57 2004
+++ /home/rafan/tmp/ports/p5-WWW-Curl/files/patch-Curl.xs Tue Jun 6 06:12:38 2006
@@ -1,61 +1,23 @@
-Index: Curl.xs
-===================================================================
-RCS file: /home/cvs/ringlet/perl/contrib/net/WWW-Curl/Curl.xs,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- Curl.xs 20 Apr 2004 10:55:02 -0000 1.1.1.1
-+++ Curl.xs 20 Apr 2004 11:17:25 -0000 1.2
-@@ -66,6 +66,12 @@
-
+--- Curl.xs.orig Tue Apr 20 21:24:18 2004
++++ Curl.xs Tue Jun 6 06:07:18 2006
+@@ -63,6 +63,12 @@
} perl_curl_easy;
+
+#if LIBCURL_VERSION_NUM >= 0x070b01
+typedef struct {
+ struct curl_httppost * post;
+ struct curl_httppost * last;
+} perl_curl_form;
+#else
- #if LIBCURL_VERSION_NUM >= 0x070900
typedef struct {
+ #if LIBCURL_VERSION_NUM >= 0x070900
struct HttpPost * post;
-@@ -77,6 +83,7 @@
+@@ -72,6 +78,7 @@
void * last;
- } perl_curl_form;
#endif
+ } perl_curl_form;
+#endif
- /* switch from curl option codes to the relevant callback index */
- static perl_curl_easy_callback_code callback_index(int option) {
-@@ -101,9 +108,11 @@
- return CALLBACK_PROGRESS;
- break;
-
-+#if (LIBCURL_VERSION_NUM<0x070b01)
- case CURLOPT_PASSWDFUNCTION:
- case CURLOPT_PASSWDDATA:
- return CALLBACK_PASSWD;
-+#endif
- break;
- }
- croak("Bad callback index requested\n");
-@@ -617,7 +626,9 @@
- case CURLOPT_INFILE:
- case CURLOPT_WRITEHEADER:
- case CURLOPT_PROGRESSDATA:
-+#if (LIBCURL_VERSION_NUM<0x070b01)
- case CURLOPT_PASSWDDATA:
-+#endif
- perl_curl_easy_register_callback(self,&(self->callback_ctx[callback_index(option)]),value);
- break;
-
-@@ -626,7 +637,9 @@
- case CURLOPT_READFUNCTION:
- case CURLOPT_HEADERFUNCTION:
- case CURLOPT_PROGRESSFUNCTION:
-+#if (LIBCURL_VERSION_NUM<0x070b01)
- case CURLOPT_PASSWDFUNCTION:
-+#endif
- perl_curl_easy_register_callback(self,&(self->callback[callback_index(option)]),value);
- break;
+ typedef struct {
Binary files /usr/ports/www/p5-WWW-Curl/p5-WWW-Curl-3.02.tbz and /home/rafan/tmp/ports/p5-WWW-Curl/p5-WWW-Curl-3.02.tbz differ
diff -ruN --exclude=CVS /usr/ports/www/p5-WWW-Curl/pkg-plist /home/rafan/tmp/ports/p5-WWW-Curl/pkg-plist
--- /usr/ports/www/p5-WWW-Curl/pkg-plist Mon Jan 23 03:22:48 2006
+++ /home/rafan/tmp/ports/p5-WWW-Curl/pkg-plist Tue Jun 6 06:15:38 2006
@@ -1,14 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Curl/easy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/easy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/form.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Easy.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Form.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Multi.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Curl.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Curl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy/autosplit.ix
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Easy/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Easy
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/WWW
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Curl
--- p5-WWW-Curl-3.02.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606052217.k55MHEjX070780>