4 files changed, 40 insertions, 10 deletions

diff --git a/net/p5-Net-Amazon-EC2/Makefile b/net/p5-Net-Amazon-EC2/Makefile
index fad04eb1408c..9e0076306877 100644
--- a/net/p5-Net-Amazon-EC2/Makefile
+++ b/net/p5-Net-Amazon-EC2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Net-Amazon-EC2
-PORTVERSION=	0.06
+PORTVERSION=	0.07
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,18 +15,44 @@ MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Perl interface to the Amazon Elastic Compute Cloud
 
 BUILD_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
-		${SITE_PERL}/Digest/HMAC_SHA1.pm:${PORTSDIR}/security/p5-Digest-HMAC \
+		p5-Digest-HMAC>=1.01:${PORTSDIR}/security/p5-Digest-HMAC \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Moose.pm:${PORTSDIR}/devel/p5-Moose
+		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Moose>=0.38:${PORTSDIR}/devel/p5-Moose
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3=		Net::Amazon::EC2.3
+MAN3=		Net::Amazon::EC2.3 \
+		Net::Amazon::EC2::AvailabilityZone.3 \
+		Net::Amazon::EC2::BlockDeviceMapping.3 \
+		Net::Amazon::EC2::ConfirmProductInstanceResponse.3 \
+		Net::Amazon::EC2::ConsoleOutput.3 \
+		Net::Amazon::EC2::DescribeAddress.3 \
+		Net::Amazon::EC2::DescribeImageAttribute.3 \
+		Net::Amazon::EC2::DescribeImagesResponse.3 \
+		Net::Amazon::EC2::DescribeKeyPairsResponse.3 \
+		Net::Amazon::EC2::Error.3 \
+		Net::Amazon::EC2::Errors.3 \
+		Net::Amazon::EC2::GroupSet.3 \
+		Net::Amazon::EC2::InstanceState.3 \
+		Net::Amazon::EC2::IpPermission.3 \
+		Net::Amazon::EC2::IpRange.3 \
+		Net::Amazon::EC2::KeyPair.3 \
+		Net::Amazon::EC2::LaunchPermission.3 \
+		Net::Amazon::EC2::LaunchPermissionOperation.3 \
+		Net::Amazon::EC2::PlacementResponse.3 \
+		Net::Amazon::EC2::ProductCode.3 \
+		Net::Amazon::EC2::ProductInstanceResponse.3 \
+		Net::Amazon::EC2::ReservationInfo.3 \
+		Net::Amazon::EC2::RunningInstances.3 \
+		Net::Amazon::EC2::SecurityGroup.3 \
+		Net::Amazon::EC2::TerminateInstancesResponse.3 \
+		Net::Amazon::EC2::UserData.3 \
+		Net::Amazon::EC2::UserIdGroupPair.3
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/p5-Net-Amazon-EC2/distinfo b/net/p5-Net-Amazon-EC2/distinfo
index eb9557c16bb9..4a3e5e111a0a 100644
--- a/net/p5-Net-Amazon-EC2/distinfo
+++ b/net/p5-Net-Amazon-EC2/distinfo
@@ -1,3 +1,3 @@
-MD5 (Net-Amazon-EC2-0.06.tar.gz) = 3621ca7f99444ae4f176ccbeb514e0f6
-SHA256 (Net-Amazon-EC2-0.06.tar.gz) = 37608df24fa6cb9ebb01e8ba015b96a9bcdca17541bce070ed48aed365e7b952
-SIZE (Net-Amazon-EC2-0.06.tar.gz) = 29076
+MD5 (Net-Amazon-EC2-0.07.tar.gz) = cbe7b081b16f54fc9ff3be81f031714f
+SHA256 (Net-Amazon-EC2-0.07.tar.gz) = 248a9b501c56afd96e93263b35a15ecad072d0fe3a425cfffaa662c75047fbd9
+SIZE (Net-Amazon-EC2-0.07.tar.gz) = 32279
diff --git a/net/p5-Net-Amazon-EC2/pkg-descr b/net/p5-Net-Amazon-EC2/pkg-descr
index 4c15a295dfb0..28ac64eadc2e 100644
--- a/net/p5-Net-Amazon-EC2/pkg-descr
+++ b/net/p5-Net-Amazon-EC2/pkg-descr
@@ -1,3 +1,4 @@
-This module provides a Perlish interface to Amazon Elastic Compute Cloud.
+This module provides a Perlish interface to Amazon Elastic Compute
+Cloud.
 
 WWW:	http://search.cpan.org/dist/Net-Amazon-EC2/
diff --git a/net/p5-Net-Amazon-EC2/pkg-plist b/net/p5-Net-Amazon-EC2/pkg-plist
index 41f7efe8d943..8ec266af1198 100644
--- a/net/p5-Net-Amazon-EC2/pkg-plist
+++ b/net/p5-Net-Amazon-EC2/pkg-plist
@@ -1,6 +1,9 @@
 %%SITE_PERL%%/Net/Amazon/EC2.pm
+%%SITE_PERL%%/Net/Amazon/EC2/AvailabilityZone.pm
+%%SITE_PERL%%/Net/Amazon/EC2/BlockDeviceMapping.pm
 %%SITE_PERL%%/Net/Amazon/EC2/ConfirmProductInstanceResponse.pm
 %%SITE_PERL%%/Net/Amazon/EC2/ConsoleOutput.pm
+%%SITE_PERL%%/Net/Amazon/EC2/DescribeAddress.pm
 %%SITE_PERL%%/Net/Amazon/EC2/DescribeImageAttribute.pm
 %%SITE_PERL%%/Net/Amazon/EC2/DescribeImagesResponse.pm
 %%SITE_PERL%%/Net/Amazon/EC2/DescribeKeyPairsResponse.pm
@@ -13,10 +16,10 @@
 %%SITE_PERL%%/Net/Amazon/EC2/KeyPair.pm
 %%SITE_PERL%%/Net/Amazon/EC2/LaunchPermission.pm
 %%SITE_PERL%%/Net/Amazon/EC2/LaunchPermissionOperation.pm
+%%SITE_PERL%%/Net/Amazon/EC2/PlacementResponse.pm
 %%SITE_PERL%%/Net/Amazon/EC2/ProductCode.pm
 %%SITE_PERL%%/Net/Amazon/EC2/ProductInstanceResponse.pm
 %%SITE_PERL%%/Net/Amazon/EC2/ReservationInfo.pm
-%%SITE_PERL%%/Net/Amazon/EC2/RunInstance.pm
 %%SITE_PERL%%/Net/Amazon/EC2/RunningInstances.pm
 %%SITE_PERL%%/Net/Amazon/EC2/SecurityGroup.pm
 %%SITE_PERL%%/Net/Amazon/EC2/TerminateInstancesResponse.pm