4 files changed, 33 insertions, 40 deletions

diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile
index a28455b716a8..aa3d1221900d 100644
--- a/net/p5-Net-Amazon-S3/Makefile
+++ b/net/p5-Net-Amazon-S3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-Amazon-S3
-PORTVERSION=	0.60
-PORTREVISION=	1
+PORTVERSION=	0.80
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -26,8 +25,9 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-MooseX-Types-DateTime-MoreCoercions>=0.07:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-MoreCoercions \
 		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-VM-EC2-Security-CredentialCache>=0:${PORTSDIR}/net/p5-VM-EC2-Security-CredentialCache \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+		p5-libwww>=6.03:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
diff --git a/net/p5-Net-Amazon-S3/distinfo b/net/p5-Net-Amazon-S3/distinfo
index 5f756b969543..d317bfc9b55d 100644
--- a/net/p5-Net-Amazon-S3/distinfo
+++ b/net/p5-Net-Amazon-S3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Net-Amazon-S3-0.60.tar.gz) = 628937132268e501fb82410f96636e01b183423ea133b6c362894da109d6ac81
-SIZE (Net-Amazon-S3-0.60.tar.gz) = 53232
+SHA256 (Net-Amazon-S3-0.80.tar.gz) = efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848
+SIZE (Net-Amazon-S3-0.80.tar.gz) = 60202
diff --git a/net/p5-Net-Amazon-S3/files/patch-moosefix b/net/p5-Net-Amazon-S3/files/patch-moosefix
deleted file mode 100644
index d0ce4154061f..000000000000
--- a/net/p5-Net-Amazon-S3/files/patch-moosefix
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Net/Amazon/S3/Client/Object.pm.orig	2014-07-13 05:44:37.000000000 -0700
-+++ lib/Net/Amazon/S3/Client/Object.pm	2014-07-13 05:44:46.000000000 -0700
-@@ -19,7 +19,7 @@
-     [ qw(private public-read public-read-write authenticated-read) ];
- 
- enum 'StorageClass' =>
--    qw(standard reduced_redundancy);
-+    [ qw(standard reduced_redundancy) ];
- 
- has 'client' =>
-     ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 );
diff --git a/net/p5-Net-Amazon-S3/pkg-plist b/net/p5-Net-Amazon-S3/pkg-plist
index 6933c0301de1..2bc0b62ab759 100644
--- a/net/p5-Net-Amazon-S3/pkg-plist
+++ b/net/p5-Net-Amazon-S3/pkg-plist
@@ -1,28 +1,4 @@
 bin/s3cl
-%%PERL5_MAN3%%/Net::Amazon::S3.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Bucket.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Client.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Client::Bucket.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Client::Object.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::HTTPRequest.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::CompleteMultipartUpload.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::CreateBucket.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteBucket.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteMultiObject.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteObject.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetBucketAccessControl.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetBucketLocationConstraint.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetObject.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetObjectAccessControl.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::InitiateMultipartUpload.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListAllMyBuckets.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListBucket.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListParts.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::PutObject.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::PutPart.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetBucketAccessControl.3.gz
-%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetObjectAccessControl.3.gz
 %%SITE_PERL%%/Net/Amazon/S3.pm
 %%SITE_PERL%%/Net/Amazon/S3/Bucket.pm
 %%SITE_PERL%%/Net/Amazon/S3/Client.pm
@@ -30,10 +6,12 @@ bin/s3cl
 %%SITE_PERL%%/Net/Amazon/S3/Client/Object.pm
 %%SITE_PERL%%/Net/Amazon/S3/HTTPRequest.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request.pm
+%%SITE_PERL%%/Net/Amazon/S3/Request/AbortMultipartUpload.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/CompleteMultipartUpload.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/CreateBucket.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/DeleteBucket.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/DeleteMultiObject.pm
+%%SITE_PERL%%/Net/Amazon/S3/Request/DeleteMultipleObjects.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/DeleteObject.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/GetBucketAccessControl.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/GetBucketLocationConstraint.pm
@@ -47,4 +25,30 @@ bin/s3cl
 %%SITE_PERL%%/Net/Amazon/S3/Request/PutPart.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/SetBucketAccessControl.pm
 %%SITE_PERL%%/Net/Amazon/S3/Request/SetObjectAccessControl.pm
+%%PERL5_MAN3%%/Net::Amazon::S3.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Bucket.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Client.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Client::Bucket.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Client::Object.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::HTTPRequest.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::AbortMultipartUpload.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::CompleteMultipartUpload.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::CreateBucket.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteBucket.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteMultiObject.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteMultipleObjects.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::DeleteObject.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetBucketAccessControl.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetBucketLocationConstraint.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetObject.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::GetObjectAccessControl.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::InitiateMultipartUpload.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListAllMyBuckets.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListBucket.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::ListParts.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::PutObject.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::PutPart.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetBucketAccessControl.3.gz
+%%PERL5_MAN3%%/Net::Amazon::S3::Request::SetObjectAccessControl.3.gz
 man/man1/s3cl.1.gz