7 files changed, 14 insertions, 98 deletions

diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index aa7e185eab33..6a6085116421 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	WWW-Curl
-PORTVERSION=	3.02
-PORTREVISION=	2
+PORTVERSION=	4.05
+PORTREVISION=	0
 CATEGORIES=	www ftp perl5
 MASTER_SITES=	CPAN \
 		http://curl.haxx.se/libcurl/perl/
@@ -20,9 +20,7 @@ LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl:install
 
 PERL_CONFIGURE=	yes
 
-MAN3=		WWW::Curl.3 \
-		WWW::Curl::Easy.3 \
-		WWW::Curl::Multi.3
+MAN3=		WWW::Curl.3
 
 post-patch:
 		${FIND} ${WRKSRC} -type f -name \*.orig -delete
diff --git a/www/p5-WWW-Curl/distinfo b/www/p5-WWW-Curl/distinfo
index 9bcba13a4fc3..d2e52361ddc4 100644
--- a/www/p5-WWW-Curl/distinfo
+++ b/www/p5-WWW-Curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (WWW-Curl-3.02.tar.gz) = 0619d1a39fc92e9a5363f2269b7b1d59
-SHA256 (WWW-Curl-3.02.tar.gz) = d66d33f6cd5c288afa63b7fc9d6100c2595ef0254033d535bba85b14489e0a22
-SIZE (WWW-Curl-3.02.tar.gz) = 22971
+MD5 (WWW-Curl-4.05.tar.gz) = a49d09edc7491d9d8abec3ef79799853
+SHA256 (WWW-Curl-4.05.tar.gz) = 208bf29e4f61591974c4572d839d25a91b36a0387680fa51fa3e7d496a8f0fd6
+SIZE (WWW-Curl-4.05.tar.gz) = 40162
diff --git a/www/p5-WWW-Curl/files/patch-Curl.xs b/www/p5-WWW-Curl/files/patch-Curl.xs
deleted file mode 100644
index e93f1dfbe1d7..000000000000
--- a/www/p5-WWW-Curl/files/patch-Curl.xs
+++ /dev/null
@@ -1,20 +0,0 @@
---- Curl.xs.orig	Thu Jul 13 14:54:37 2006
-+++ Curl.xs	Thu Jul 13 14:55:34 2006
-@@ -64,12 +64,17 @@
- 
- 
- typedef struct {
-+#if LIBCURL_VERSION_NUM >= 0x070b01
-+    struct curl_httppost * post;
-+    struct curl_httppost * last;
-+#else
- #if LIBCURL_VERSION_NUM >= 0x070900
-     struct HttpPost * post;
-     struct HttpPost * last;
- #else
-     void * post;
-     void * last;
-+#endif
- #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
deleted file mode 100644
index 154c39b016df..000000000000
--- a/www/p5-WWW-Curl/files/patch-Easy.pm.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 71bcd87a2672..db3754aa7ac3 100644
--- a/www/p5-WWW-Curl/files/patch-README
+++ b/www/p5-WWW-Curl/files/patch-README
@@ -1,46 +1,11 @@
---- README.orig	Thu Jul 13 14:57:57 2006
-+++ README	Thu Jul 13 14:59:47 2006
+--- README.orig	2008-07-06 16:51:23.000000000 +0800
++++ README	2008-07-06 16:54:11.000000000 +0800
 @@ -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:
+ installed. You then may install this module via the usual way
+ (for installation on Windows please see README.Win32):
  
-     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
deleted file mode 100644
index 137f5f732220..000000000000
--- a/www/p5-WWW-Curl/files/patch-lib-WWW-Curl-Multi.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/pkg-plist b/www/p5-WWW-Curl/pkg-plist
index 226cab47f4aa..ccd081f9fb16 100644
--- a/www/p5-WWW-Curl/pkg-plist
+++ b/www/p5-WWW-Curl/pkg-plist
@@ -1,12 +1,16 @@
+@comment $FreeBSD$
 %%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/Multi.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl/Share.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
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Share/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Easy
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/Share
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl