diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index eede557ac73..62edaf5fb8d 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/22 08:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2012/04/08 21:49:58 sthen Exp $
 
-COMMENT= 	MVC Web Application Framework
+COMMENT=	MVC Web Application Framework
 
 MODULES=	cpan
-DISTNAME=	Catalyst-Runtime-5.80024
+DISTNAME=	Catalyst-Runtime-5.90006
 CATEGORIES=	www
 USE_GROFF =	Yes
 
@@ -17,11 +17,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+BUILD_DEPENDS=	devel/p5-Task-Weaken
+
 RUN_DEPENDS=	devel/p5-namespace-autoclean \
 		devel/p5-namespace-clean \
 		devel/p5-B-Hooks-EndOfScope>=0.08 \
 		devel/p5-Class-C3-Adopt-NEXT>=0.07 \
-		devel/p5-Class-Data-Inheritable \
+		devel/p5-Class-Load \
 		devel/p5-Class-MOP>=1.03 \
 		devel/p5-Data-Dump \
 		devel/p5-Data-OptList \
@@ -29,28 +31,35 @@ RUN_DEPENDS=	devel/p5-namespace-autoclean \
 		devel/p5-MRO-Compat \
 		devel/p5-Moose>=1.08 \
 		devel/p5-MooseX-Emulate-Class-Accessor-Fast>=0.00903 \
-		devel/p5-MooseX-Getopt \
-		devel/p5-MooseX-MethodAttributes>=0.19 \
-		devel/p5-MooseX-Role-WithOverloading \
+		devel/p5-MooseX-Getopt>=0.30 \
+		devel/p5-MooseX-MethodAttributes>=0.25 \
+		devel/p5-MooseX-Role-WithOverloading>=0.09 \
 		devel/p5-MooseX-Types \
 		devel/p5-MooseX-Types-Common \
+		devel/p5-MooseX-Types-LoadableClass \
 		devel/p5-Path-Class>=0.09 \
+		www/p5-Plack \
+		www/p5-Plack-Middleware-ReverseProxy \
+		www/p5-Plack-Test-ExternalServer \
 		devel/p5-Sub-Exporter \
-		devel/p5-Task-Weaken \
 		devel/p5-Tree-Simple \
 		devel/p5-Tree-Simple-VisitorFactory \
+		devel/p5-Try-Tiny \
 		textproc/p5-String-RewritePrefix \
 		textproc/p5-Text-SimpleTable \
 		www/p5-CGI-Simple \
+		www/p5-HTML-Parser \
 		www/p5-HTTP-Body \
 		www/p5-URI \
 		www/p5-HTTP-Request-AsCGI>=1.0 \
 		www/p5-libwww>=5.805
 
-REGRESS_DEPENDS=devel/p5-Pod-Coverage \
+REGRESS_DEPENDS=devel/p5-Class-Data-Inheritable \
+		devel/p5-MooseX-Daemonize \
 		devel/p5-Test-Exception \
-		devel/p5-Test-Pod \
-		devel/p5-Test-Pod-Coverage
+		devel/p5-YAML \
+		www/fcgi \
+		www/p5-Starman
 
 MAKE_ENV=	TEST_POD=Yes
 
diff --git a/www/p5-Catalyst-Runtime/distinfo b/www/p5-Catalyst-Runtime/distinfo
index 92cf8f43548..861b32429ce 100644
--- a/www/p5-Catalyst-Runtime/distinfo
+++ b/www/p5-Catalyst-Runtime/distinfo
@@ -1,5 +1,5 @@
-MD5 (Catalyst-Runtime-5.80024.tar.gz) = 4zYTPhGAgJwCeVYm7AwE2A==
-RMD160 (Catalyst-Runtime-5.80024.tar.gz) = fZLNyjYOFBCpSkiMnqtiawUg8y8=
-SHA1 (Catalyst-Runtime-5.80024.tar.gz) = sMLdqf+BoXk9mkC2S4j4cluwb98=
-SHA256 (Catalyst-Runtime-5.80024.tar.gz) = x0uWhV8nlTApabUaJdLY2iFnPLFYgRFCI3rU5iDo2Js=
-SIZE (Catalyst-Runtime-5.80024.tar.gz) = 247549
+MD5 (Catalyst-Runtime-5.90006.tar.gz) = ECB1nE8PRwlfSyKG5xSYMw==
+RMD160 (Catalyst-Runtime-5.90006.tar.gz) = WX/dfHybQTy65JeQ9saYe2T9K4g=
+SHA1 (Catalyst-Runtime-5.90006.tar.gz) = dYzHRnrc95sNV6jxsIoaZ6eqtww=
+SHA256 (Catalyst-Runtime-5.90006.tar.gz) = XHTfXtjRaWJqEV/QJonU0yKcgEXV81+f4QrTwtiTTgU=
+SIZE (Catalyst-Runtime-5.90006.tar.gz) = 263561
diff --git a/www/p5-Catalyst-Runtime/pkg/PLIST b/www/p5-Catalyst-Runtime/pkg/PLIST
index 2c3aee14962..e179945c891 100644
--- a/www/p5-Catalyst-Runtime/pkg/PLIST
+++ b/www/p5-Catalyst-Runtime/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2010/07/02 04:37:36 jim Exp $
+@comment $OpenBSD: PLIST,v 1.10 2012/04/08 21:49:58 sthen Exp $
 @conflict p5-Catalyst-Manual-<5.701003
 bin/catalyst.pl
 ${P5SITE}/Catalyst/
@@ -24,9 +24,8 @@ ${P5SITE}/Catalyst/DispatchType/Regex.pm
 ${P5SITE}/Catalyst/Dispatcher.pm
 ${P5SITE}/Catalyst/Engine/
 ${P5SITE}/Catalyst/Engine.pm
-${P5SITE}/Catalyst/Engine/CGI.pm
-${P5SITE}/Catalyst/Engine/FastCGI.pm
 ${P5SITE}/Catalyst/Engine/HTTP.pm
+${P5SITE}/Catalyst/EngineLoader.pm
 ${P5SITE}/Catalyst/Exception/
 ${P5SITE}/Catalyst/Exception.pm
 ${P5SITE}/Catalyst/Exception/Basic.pm
@@ -35,6 +34,7 @@ ${P5SITE}/Catalyst/Exception/Go.pm
 ${P5SITE}/Catalyst/Exception/Interface.pm
 ${P5SITE}/Catalyst/Log.pm
 ${P5SITE}/Catalyst/Model.pm
+${P5SITE}/Catalyst/PSGI.pod
 ${P5SITE}/Catalyst/Request/
 ${P5SITE}/Catalyst/Request.pm
 ${P5SITE}/Catalyst/Request/Upload.pm
@@ -73,9 +73,7 @@ ${P5SITE}/Catalyst/View.pm
 @man man/man3p/Catalyst::DispatchType::Regex.3p
 @man man/man3p/Catalyst::Dispatcher.3p
 @man man/man3p/Catalyst::Engine.3p
-@man man/man3p/Catalyst::Engine::CGI.3p
-@man man/man3p/Catalyst::Engine::FastCGI.3p
-@man man/man3p/Catalyst::Engine::HTTP.3p
+@man man/man3p/Catalyst::EngineLoader.3p
 @man man/man3p/Catalyst::Exception.3p
 @man man/man3p/Catalyst::Exception::Basic.3p
 @man man/man3p/Catalyst::Exception::Detach.3p
@@ -83,6 +81,7 @@ ${P5SITE}/Catalyst/View.pm
 @man man/man3p/Catalyst::Exception::Interface.3p
 @man man/man3p/Catalyst::Log.3p
 @man man/man3p/Catalyst::Model.3p
+@man man/man3p/Catalyst::PSGI.3p
 @man man/man3p/Catalyst::Request.3p
 @man man/man3p/Catalyst::Request::Upload.3p
 @man man/man3p/Catalyst::Response.3p