9 files changed, 112 insertions, 64 deletions

diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index a99abb565425..95fe84353eb8 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -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,10 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl:install
 PERL_CONFIGURE=	yes
 
 MAN3=		WWW::Curl.3 \
-		WWW::Curl::easy.3 \
-		Curl::easy.3
+		WWW::Curl::Easy.3 \
+		WWW::Curl::Multi.3
+
+post-patch:
+		${FIND} ${WRKSRC} -type f -name \*.orig -delete
 
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Curl/distinfo b/www/p5-WWW-Curl/distinfo
index c79e89cf4515..9bcba13a4fc3 100644
--- a/www/p5-WWW-Curl/distinfo
+++ b/www/p5-WWW-Curl/distinfo
@@ -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 --git a/www/p5-WWW-Curl/files/patch-Curl.xs b/www/p5-WWW-Curl/files/patch-Curl.xs
index cb4da239bdbc..e93f1dfbe1d7 100644
--- a/www/p5-WWW-Curl/files/patch-Curl.xs
+++ b/www/p5-WWW-Curl/files/patch-Curl.xs
@@ -1,61 +1,20 @@
-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	Thu Jul 13 14:54:37 2006
++++ Curl.xs	Thu Jul 13 14:55:34 2006
+@@ -64,12 +64,17 @@
  
- } perl_curl_easy;
  
+ typedef struct {
 +#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 {
      struct HttpPost * post;
-@@ -77,6 +83,7 @@
+     struct HttpPost * last;
+ #else
+     void * post;
      void * last;
- } perl_curl_form;
- #endif
-+#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;
+ #endif
+ } perl_curl_form;
  
diff --git a/www/p5-WWW-Curl/files/patch-Easy.pm.in b/www/p5-WWW-Curl/files/patch-Easy.pm.in
new file mode 100644
index 000000000000..154c39b016df
--- /dev/null
+++ b/www/p5-WWW-Curl/files/patch-Easy.pm.in
@@ -0,0 +1,11 @@
+--- Easy.pm.in.orig	Thu Jul 13 14:57:28 2006
++++ Easy.pm.in	Thu Jul 13 14:57:33 2006
+@@ -4,7 +4,7 @@
+ use Carp;
+ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+ 
+-$VERSION = '3.01';
++$VERSION = '3.02';
+ 
+ require WWW::Curl;
+ require Exporter;
diff --git a/www/p5-WWW-Curl/files/patch-README b/www/p5-WWW-Curl/files/patch-README
new file mode 100644
index 000000000000..71bcd87a2672
--- /dev/null
+++ b/www/p5-WWW-Curl/files/patch-README
@@ -0,0 +1,46 @@
+--- README.orig	Thu Jul 13 14:57:57 2006
++++ README	Thu Jul 13 14:59:47 2006
+@@ -3,7 +3,7 @@
+ The perl module WWW::Curl provides an interface to the cURL library "libcurl".
+ See http://curl.haxx.se/ for more information on cURL and libcurl.
+ 
+-This module requires libcurl and the corresponding headerfiles to be
++This module requires libcurl and the corresponding header files to be
+ installed. You then may install this module via the usual way:
+ 
+     perl Makefile.PL
+@@ -18,7 +18,8 @@
+ 
+     perl Makefile.PL /home/foo/curl/include
+ 
+-The maintainer has never tried to run this on windows, so all feedback welcome.
++The maintainer has never tried to run this on windows, so all feedback is
++welcome.
+ 
+ Testing:
+  
+@@ -31,7 +32,7 @@
+ Test 08ssl.t will only work well if you have a list of "well-known"
+ CA certificates in the file 'ca-bundle.crt' in the current directory.
+ This file can be obtained from most distributions of mod_ssl (www.modssl.org) -
+-it isn't supplied here, as its currently >250Kbytes.
++it isn't supplied here, as it's currently >250Kbytes.
+ 
+ The module provides the same functionality as libcurl provides to C programs,
+ please refer to the documentation of libcurl. A number of examples may be
+@@ -41,12 +42,12 @@
+ express or implied. Send praise, patches, money, beer and pizza to the author.
+ Send complaints to /dev/null. ;-)
+ 
+-The author of the original relase of this software is Georg Horn <horn at koblenz-net.de>
++The author of the original release of this software is Georg Horn <horn at koblenz-net.de>
+ 
+-Parts of the callback support were added Forrest Cahoon
++Parts of the callback support were added by Forrest Cahoon
+ <forrest.cahoon at merrillcorp.com>
+ 
+-More callback support, many tests additional documentation and Makefile
++More callback support, many tests, additional documentation, and Makefile
+ features have been added by Cris Bailiff <c.bailiff+curl at devsecure.com>
+ 
+ Curl multi support has been added by Sebastian Riedel <sri at oook.de>
diff --git a/www/p5-WWW-Curl/files/patch-lib-WWW-Curl-Multi.pm b/www/p5-WWW-Curl/files/patch-lib-WWW-Curl-Multi.pm
new file mode 100644
index 000000000000..137f5f732220
--- /dev/null
+++ b/www/p5-WWW-Curl/files/patch-lib-WWW-Curl-Multi.pm
@@ -0,0 +1,20 @@
+--- lib/WWW/Curl/Multi.pm.orig	Thu Jul 13 15:02:54 2006
++++ lib/WWW/Curl/Multi.pm	Thu Jul 13 15:03:33 2006
+@@ -22,7 +22,7 @@
+ 
+ WWW::Curl::Multi is an extension to WWW::Curl::Easy
+ which makes it possible to process multiple easy
+-handles parallel.
++handles in parallel.
+ 
+ =head1 METHODS
+ 
+@@ -33,7 +33,7 @@
+         This method adds a WWW::Curl::Easy object to the multi stack.
+ 
+     $curlm->perform
+-        This method parallel perlforms all WWW::Curl::Easy objects
++        This method performs in parallel all the WWW::Curl::Easy objects
+         on the stack.
+ 	
+ 	*Warning* - this does not perform exactly the
diff --git a/www/p5-WWW-Curl/files/patch-lib-WWW-Curl.pm b/www/p5-WWW-Curl/files/patch-lib-WWW-Curl.pm
new file mode 100644
index 000000000000..63bfb6aaa917
--- /dev/null
+++ b/www/p5-WWW-Curl/files/patch-lib-WWW-Curl.pm
@@ -0,0 +1,11 @@
+--- lib/WWW/Curl.pm.orig	Thu Jul 13 15:04:35 2006
++++ lib/WWW/Curl.pm	Thu Jul 13 15:04:18 2006
+@@ -35,7 +35,7 @@
+ Version 3.02 adds some backwards compatibility for scripts still using
+ 'WWW::Curl::easy' names.
+ 
+-Version 3.00 adds WWW::Curl::Multi interface, and a new module names
++Version 3.00 adds WWW::Curl::Multi interface, and new module names
+ following perl conventions (WWW::Curl::Easy rather than WWW::Curl::easy),
+ by Sebastian Riedel <sri@cpan.org>
+ 
diff --git a/www/p5-WWW-Curl/pkg-descr b/www/p5-WWW-Curl/pkg-descr
index 656436dea968..1229c7bd3802 100644
--- a/www/p5-WWW-Curl/pkg-descr
+++ b/www/p5-WWW-Curl/pkg-descr
@@ -2,7 +2,7 @@ WWW-Curl is the Perl binding interface to libcurl (ports/ftp/curl)
 
 WWW-Curl has formerly been known as Curl-easy
 
-Author: Chris Bailiff
+Author: Cris Bailiff
 
 WWW: http://curl.haxx.se/libcurl/perl/
 
diff --git a/www/p5-WWW-Curl/pkg-plist b/www/p5-WWW-Curl/pkg-plist
index 8d0e60f133d1..226cab47f4aa 100644
--- a/www/p5-WWW-Curl/pkg-plist
+++ b/www/p5-WWW-Curl/pkg-plist
@@ -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