3 files changed, 35 insertions, 17 deletions

diff --git a/www/p5-Catalyst-Action-REST/Makefile b/www/p5-Catalyst-Action-REST/Makefile
index d5696b19c8d9..c0121bd0e22d 100644
--- a/www/p5-Catalyst-Action-REST/Makefile
+++ b/www/p5-Catalyst-Action-REST/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	Catalyst-Action-REST
-PORTVERSION=	0.91
+PORTVERSION=	0.95
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:FLORA
+MASTER_SITE_SUBDIR=	CPAN:BOBTFISH
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -18,25 +18,40 @@ COMMENT=	Automated REST Method Dispatching for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80:${PORTSDIR}/www/p5-Catalyst-Runtime \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.80030:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Class-Inspector>=1.13:${PORTSDIR}/devel/p5-Class-Inspector \
+		p5-Data-Serializer>=0.36:${PORTSDIR}/devel/p5-Data-Serializer \
+		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
+		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
+		p5-Moose>=1.03:${PORTSDIR}/devel/p5-Moose \
 		p5-Params-Validate>=0.76:${PORTSDIR}/devel/p5-Params-Validate \
+		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
 		p5-YAML-Syck>=0.67:${PORTSDIR}/textproc/p5-YAML-Syck \
 		p5-libwww>=2.033:${PORTSDIR}/www/p5-libwww \
-		p5-Data-Serializer>=0.36:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-Class-Inspector>=1.13:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find
+		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	--default
 
-MAN3=		Catalyst::Action::Deserialize.3 Catalyst::Action::REST.3 \
+MAN3=		Catalyst::Action::Deserialize.3 \
+		Catalyst::Action::DeserializeMultiPart.3 \
+		Catalyst::Action::REST.3 \
 		Catalyst::Action::REST::ForBrowsers.3 \
-		Catalyst::Action::Serialize.3 Catalyst::Action::SerializeBase.3 \
-		Catalyst::Controller::REST.3 Catalyst::Request::REST.3 \
-		Catalyst::TraitFor::Request::REST.3 \
+		Catalyst::Action::Serialize.3 \
+		Catalyst::Action::SerializeBase.3 \
+		Catalyst::Controller::REST.3 \
+		Catalyst::Request::REST.3 \
 		Catalyst::Request::REST::ForBrowsers.3 \
+		Catalyst::TraitFor::Request::REST.3 \
 		Catalyst::TraitFor::Request::REST::ForBrowsers.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+TEST_DEPENDS+=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Action-REST/distinfo b/www/p5-Catalyst-Action-REST/distinfo
index 795179f19bea..6d0db6725986 100644
--- a/www/p5-Catalyst-Action-REST/distinfo
+++ b/www/p5-Catalyst-Action-REST/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Catalyst-Action-REST-0.91.tar.gz) = 7a4c8f1463e0fb365c1b0df3c038b56200884c5bcfdfd233a05ee89c6ada218b
-SIZE (Catalyst-Action-REST-0.91.tar.gz) = 63990
+SHA256 (Catalyst-Action-REST-0.95.tar.gz) = e473df71d94df0de79e440de83dea6dd64670b915b942636676114db85796d38
+SIZE (Catalyst-Action-REST-0.95.tar.gz) = 68778
diff --git a/www/p5-Catalyst-Action-REST/pkg-plist b/www/p5-Catalyst-Action-REST/pkg-plist
index caec7d6df265..dbf9a18d600e 100644
--- a/www/p5-Catalyst-Action-REST/pkg-plist
+++ b/www/p5-Catalyst-Action-REST/pkg-plist
@@ -1,12 +1,15 @@
 %%SITE_PERL%%/Catalyst/Action/Deserialize.pm
+%%SITE_PERL%%/Catalyst/Action/Deserialize/Callback.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/Data/Serializer.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/JSON.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/View.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/XML/Simple.pm
 %%SITE_PERL%%/Catalyst/Action/Deserialize/YAML.pm
+%%SITE_PERL%%/Catalyst/Action/DeserializeMultiPart.pm
 %%SITE_PERL%%/Catalyst/Action/REST.pm
 %%SITE_PERL%%/Catalyst/Action/REST/ForBrowsers.pm
 %%SITE_PERL%%/Catalyst/Action/Serialize.pm
+%%SITE_PERL%%/Catalyst/Action/Serialize/Callback.pm
 %%SITE_PERL%%/Catalyst/Action/Serialize/Data/Serializer.pm
 %%SITE_PERL%%/Catalyst/Action/Serialize/JSON.pm
 %%SITE_PERL%%/Catalyst/Action/Serialize/JSONP.pm
@@ -22,6 +25,9 @@
 %%SITE_PERL%%/Catalyst/TraitFor/Request/REST.pm
 %%SITE_PERL%%/Catalyst/TraitFor/Request/REST/ForBrowsers.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/REST/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/REST
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request/REST
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor/Request
 @dirrmtry %%SITE_PERL%%/Catalyst/TraitFor
@@ -39,6 +45,3 @@
 @dirrmtry %%SITE_PERL%%/Catalyst/Action/Deserialize
 @dirrmtry %%SITE_PERL%%/Catalyst/Action
 @dirrmtry %%SITE_PERL%%/Catalyst
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action/REST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Action
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst