49 files changed, 65 insertions, 49 deletions

diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
index 6a78345f8b5a..31c396df2abf 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Test::WWW::Mechanize for Catalyst
 
-RUN_DEPENDS=	p5-Catalyst>=5.00:${PORTSDIR}/www/p5-Catalyst \
+RUN_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Test-WWW-Mechanize>=1.04:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
 BUILD_DEPENDS=	${RUN_DEPENDS}
 BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
diff --git a/www/p5-Catalyst-Engine-Apache/Makefile b/www/p5-Catalyst-Engine-Apache/Makefile
index 720eeab80e57..4633f16e66fe 100644
--- a/www/p5-Catalyst-Engine-Apache/Makefile
+++ b/www/p5-Catalyst-Engine-Apache/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Catalyst Apache Engines
 
-BUILD_DEPENDS=	p5-Catalyst>=5.50:${PORTSDIR}/www/p5-Catalyst
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-Catalyst-Enzyme/Makefile b/www/p5-Catalyst-Enzyme/Makefile
index ee4a3580ed77..29cbd2df827b 100644
--- a/www/p5-Catalyst-Enzyme/Makefile
+++ b/www/p5-Catalyst-Enzyme/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	CRUD framework for Catalyst
 
 BUILD_DEPENDS=	\
-	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst \
+	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+	p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 	p5-Catalyst-Model-CDBI>=0.1:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
 	p5-Catalyst-Plugin-DefaultEnd>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-DefaultEnd \
 	p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
diff --git a/www/p5-Catalyst-Example-InstantCRUD/Makefile b/www/p5-Catalyst-Example-InstantCRUD/Makefile
index 9f98e9eb8eba..da63259f1102 100644
--- a/www/p5-Catalyst-Example-InstantCRUD/Makefile
+++ b/www/p5-Catalyst-Example-InstantCRUD/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS=	\
 	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 	p5-HTML-Widget>=0:${PORTSDIR}/www/p5-HTML-Widget \
 	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-	p5-Catalyst>=5.66:${PORTSDIR}/www/p5-Catalyst \
+	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+	p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 	p5-Catalyst-View-TT>=0.21:${PORTSDIR}/www/p5-Catalyst-View-TT \
 	p5-Template-Plugin-Class>=0:${PORTSDIR}/www/p5-Template-Plugin-Class \
 	p5-Catalyst-Plugin-DefaultEnd>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-DefaultEnd \
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
index 3a0678e02d48..3dee21ed8452 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Catalyst helper for Scaffolding
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		${SITE_PERL}/Catalyst/Plugin/FormValidator.pm:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
 		${SITE_PERL}/Catalyst/View/TT.pm:${PORTSDIR}/www/p5-Catalyst-View-TT \
 		${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \
diff --git a/www/p5-Catalyst-Log-Log4perl/Makefile b/www/p5-Catalyst-Log-Log4perl/Makefile
index 6487431b7f2b..0fba60709784 100644
--- a/www/p5-Catalyst-Log-Log4perl/Makefile
+++ b/www/p5-Catalyst-Log-Log4perl/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Log::Log4perl logging for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.60:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
index e3cd916a2e1d..46a44b145878 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	CDBI model class for Catalyst that makes things sweeter
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Class/DBI/Sweet.pm:${PORTSDIR}/databases/p5-Class-DBI-Sweet
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Model-CDBI/Makefile b/www/p5-Catalyst-Model-CDBI/Makefile
index c4b1ea8b5d7a..14a6bda706d9 100644
--- a/www/p5-Catalyst-Model-CDBI/Makefile
+++ b/www/p5-Catalyst-Model-CDBI/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	CDBI model class for Catalyst
 
 BUILD_DEPENDS=	${SITE_PERL}/Class/DBI/Loader.pm:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/Makefile b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
index c18be836a2fc..5e4b499d7de8 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Plain/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	DBIx::Class model class for Catalyst, without loader
 
-BUILD_DEPENDS=	p5-Catalyst>=5.00:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-DBIx-Class>=0.01:${PORTSDIR}/databases/p5-DBIx-Class
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Model-DBIC-Schema/Makefile b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
index 75a603a4da00..873528506744 100644
--- a/www/p5-Catalyst-Model-DBIC-Schema/Makefile
+++ b/www/p5-Catalyst-Model-DBIC-Schema/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	DBIx::Class::Schema Model Class
 
 BUILD_DEPENDS=	\
-	p5-Catalyst>=5.64:${PORTSDIR}/www/p5-Catalyst \
+	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+	p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 	p5-Class-Accessor>=0.22:${PORTSDIR}/devel/p5-Class-Accessor \
 	p5-Class-Data-Accessor>=0.02:${PORTSDIR}/devel/p5-Class-Data-Accessor \
 	p5-DBIx-Class>=0.06000:${PORTSDIR}/databases/p5-DBIx-Class \
diff --git a/www/p5-Catalyst-Model-DBIC/Makefile b/www/p5-Catalyst-Model-DBIC/Makefile
index e075a68563a1..e7b87ff705a2 100644
--- a/www/p5-Catalyst-Model-DBIC/Makefile
+++ b/www/p5-Catalyst-Model-DBIC/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	DBIx::Class model class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.00:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
 		p5-DBIx-Class-Loader>=0:${PORTSDIR}/databases/p5-DBIx-Class-Loader
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Model-Oryx/Makefile b/www/p5-Catalyst-Model-Oryx/Makefile
index a30b5bf79157..0b52b7f031d4 100644
--- a/www/p5-Catalyst-Model-Oryx/Makefile
+++ b/www/p5-Catalyst-Model-Oryx/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	hideo@lastamericanempire.com
 COMMENT=	Oryx model component for Catalyst
 
 BUILD_DEPENDS=	${SITE_PERL}/Oryx.pm:${PORTSDIR}/databases/p5-Oryx \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst
+		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Catalyst-Model-Xapian/Makefile b/www/p5-Catalyst-Model-Xapian/Makefile
index ce0f04887208..5a3c60f9eb10 100644
--- a/www/p5-Catalyst-Model-Xapian/Makefile
+++ b/www/p5-Catalyst-Model-Xapian/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Catalyst model for Search::Xapian
 
-BUILD_DEPENDS=	p5-Catalyst>=5.30:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
 		p5-Search-Xapian>=0.9.2.4:${PORTSDIR}/databases/p5-Search-Xapian
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
index 5b7bccf7219e..c08b13f8a762 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	CDBI Authentication for Catalyst
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Catalyst/Model/CDBI.pm:${PORTSDIR}/www/p5-Catalyst-Model-CDBI \
 		${SITE_PERL}/Catalyst/Plugin/Session/FastMmap.pm:${PORTSDIR}/www/p5-Catalyst-Plugin-Session-FastMmap
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
index da2711d24946..f7e003132f6a 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Authentication/authorization on a DBIx::Class/Class::DBI model
 
-BUILD_DEPENDS=	p5-Catalyst>=5.49:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Catalyst-Plugin-Authentication>=0.06:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
 		p5-Catalyst-Plugin-Authorization-Roles>=0.03:${PORTSDIR}/www/p5-Catalyst-Plugin-Authorization-Roles \
 		p5-Set-Object>=1.14:${PORTSDIR}/devel/p5-Set-Object \
diff --git a/www/p5-Catalyst-Plugin-Authentication/Makefile b/www/p5-Catalyst-Plugin-Authentication/Makefile
index 1098997ee828..f86ac1796106 100644
--- a/www/p5-Catalyst-Plugin-Authentication/Makefile
+++ b/www/p5-Catalyst-Plugin-Authentication/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Infrastructure plugin for the Catalyst authentication framework
 
-BUILD_DEPENDS=	p5-Catalyst>=5.49:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
index c3248869a41a..2a257b0f4415 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	ACL support for Catalyst applications
 
-BUILD_DEPENDS=	p5-Catalyst>=5.49:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable \
 		p5-Tree-Simple-VisitorFactory>=0:${PORTSDIR}/devel/p5-Tree-Simple-VisitorFactory
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
index bfcac8803278..98b9f3958d8f 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Role based authorization for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.49:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Catalyst-Plugin-Authentication>=0.03:${PORTSDIR}/www/p5-Catalyst-Plugin-Authentication \
 		p5-Set-Object>=1.14:${PORTSDIR}/devel/p5-Set-Object \
 		p5-Test-MockObject>=1.01:${PORTSDIR}/devel/p5-Test-MockObject \
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
index 504170aa5ecd..5cd1e3fd45a8 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Mmap cache for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile b/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
index 6ee62afdc7b9..f63278aa039a 100644
--- a/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-FileCache/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	File cache for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
index e02de8fa8667..884c572df5b6 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Distributed cache for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
index 61602146304f..286f7481119f 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Sensible default end action
 
-BUILD_DEPENDS=	p5-Catalyst>=5.20:${PORTSDIR}/www/p5-Catalyst
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-Catalyst-Plugin-FillInForm/Makefile b/www/p5-Catalyst-Plugin-FillInForm/Makefile
index e7562d3043c8..3cff000a67a7 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/www/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Automatically fill in forms in Catalyst using HTML::FillInForms
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \
 		${SITE_PERL}/NEXT.pm:${PORTSDIR}/devel/p5-NEXT
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile b/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
index 3d3d4b9d30db..6d599337d85e 100644
--- a/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator-Simple/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Validator for Catalyst with FormValidator::Simple
 
-BUILD_DEPENDS=	p5-Catalyst>=5.30:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Catalyst-Plugin-FormValidator>=0:${PORTSDIR}/www/p5-Catalyst-Plugin-FormValidator \
 		p5-FormValidator-Simple>=0.13:${PORTSDIR}/textproc/p5-FormValidator-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-FormValidator/Makefile b/www/p5-Catalyst-Plugin-FormValidator/Makefile
index bdb7d3831739..c783a1cf9aea 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/www/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	FormValidator for Catalyst
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Data/FormValidator.pm:${PORTSDIR}/textproc/p5-Data-FormValidator
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
index aaa9b070ea40..a508276fc94b 100644
--- a/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
+++ b/www/p5-Catalyst-Plugin-HTML-Widget/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	HTML Widget And Validation Framework
 
-BUILD_DEPENDS=	p5-Catalyst>=5.5:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-HTML-Widget>=0:${PORTSDIR}/www/p5-HTML-Widget
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-I18N/Makefile b/www/p5-Catalyst-Plugin-I18N/Makefile
index 7155b3ff3038..d48a80b22399 100644
--- a/www/p5-Catalyst-Plugin-I18N/Makefile
+++ b/www/p5-Catalyst-Plugin-I18N/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	I18N for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=2.99:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-PageCache/Makefile b/www/p5-Catalyst-Plugin-PageCache/Makefile
index 12c81120e683..92b750db8a56 100644
--- a/www/p5-Catalyst-Plugin-PageCache/Makefile
+++ b/www/p5-Catalyst-Plugin-PageCache/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Cache the output of entire pages
 
-BUILD_DEPENDS=	p5-Catalyst>=5.23:${PORTSDIR}/www/p5-Catalyst
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-Catalyst-Plugin-Pluggable/Makefile b/www/p5-Catalyst-Plugin-Pluggable/Makefile
index 9e81f6911c13..be237e7eb215 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/Makefile
+++ b/www/p5-Catalyst-Plugin-Pluggable/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	A plugin for pluggable Catalyst applications
 
-BUILD_DEPENDS=	p5-Catalyst>=5.50:${PORTSDIR}/www/p5-Catalyst
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Catalyst-Plugin-Prototype/Makefile b/www/p5-Catalyst-Plugin-Prototype/Makefile
index 487f420400a1..1554549677f7 100644
--- a/www/p5-Catalyst-Plugin-Prototype/Makefile
+++ b/www/p5-Catalyst-Plugin-Prototype/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Catalyst plugin for Prototype
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		${SITE_PERL}/HTML/Prototype.pm:${PORTSDIR}/www/p5-HTML-Prototype
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
index 18cc821479ed..801af1b19f78 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/Class/Accessor/Fast.pm:${PORTSDIR}/devel/p5-Class-Accessor \
 		${SITE_PERL}/URI/Find.pm:${PORTSDIR}/textproc/p5-URI-Find \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
index ef4b77b3e9f8..9b21bdea45e9 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Store your sessions in a database
 
-BUILD_DEPENDS=	p5-Catalyst>=5.49:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Catalyst-Plugin-Session>=0.05:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
index c390265d746d..99f5a3a87983 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	File storage backend for session data
 
-BUILD_DEPENDS=	p5-Catalyst>=5.0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Cache-Cache>=1.02:${PORTSDIR}/devel/p5-Cache-Cache \
 		p5-Catalyst-Plugin-Session>=0.01:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
 		p5-Class-Accessor>=0.22:${PORTSDIR}/devel/p5-Class-Accessor \
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
index 18bafe8ca6cf..59e8f8575dde 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Memcached storage backend for session data
 
-BUILD_DEPENDS=	p5-Catalyst>=5.0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
 		p5-Catalyst-Plugin-Session>=0.01:${PORTSDIR}/www/p5-Catalyst-Plugin-Session
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 3b53cb89e3d2..88bb1da361dc 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Generic Catalyst Session plugin
 
-BUILD_DEPENDS=	p5-Catalyst>=5.50:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Test-MockObject>=1.01:${PORTSDIR}/devel/p5-Test-MockObject \
 		p5-Digest>=0:${PORTSDIR}/security/p5-Digest \
 		p5-Object-Signature>=0:${PORTSDIR}/devel/p5-Object-Signature \
diff --git a/www/p5-Catalyst-Plugin-Singleton/Makefile b/www/p5-Catalyst-Plugin-Singleton/Makefile
index c807a073316c..0d2d9c947872 100644
--- a/www/p5-Catalyst-Plugin-Singleton/Makefile
+++ b/www/p5-Catalyst-Plugin-Singleton/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Singleton accessors to context
 
-BUILD_DEPENDS=	p5-Catalyst>=5.20:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-StackTrace/Makefile b/www/p5-Catalyst-Plugin-StackTrace/Makefile
index 4b423a19a6ee..6b506424100f 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/Makefile
+++ b/www/p5-Catalyst-Plugin-StackTrace/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Display a stack trace on the debug screen
 
-BUILD_DEPENDS=	p5-Catalyst>=5.61:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Static/Makefile b/www/p5-Catalyst-Plugin-Static/Makefile
index 4f09d20d9d39..52d638bbb571 100644
--- a/www/p5-Catalyst-Plugin-Static/Makefile
+++ b/www/p5-Catalyst-Plugin-Static/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Serve static files with Catalyst
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		${SITE_PERL}/File/MimeInfo.pm:${PORTSDIR}/devel/p5-File-MimeInfo \
 		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-Plugin-SubRequest/Makefile b/www/p5-Catalyst-Plugin-SubRequest/Makefile
index 2be8e59aa848..682ba6c82975 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/Makefile
+++ b/www/p5-Catalyst-Plugin-SubRequest/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Make subrequests to actions in Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=2.99:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Textile/Makefile b/www/p5-Catalyst-Plugin-Textile/Makefile
index 263767911c8e..9752302b1093 100644
--- a/www/p5-Catalyst-Plugin-Textile/Makefile
+++ b/www/p5-Catalyst-Plugin-Textile/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	Textile for Catalyst
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
 	${SITE_PERL}/Text/Textile.pm:${PORTSDIR}/textproc/p5-Text-Textile
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index 3aa5d9874f3e..a5daad1dabad 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Unicode aware Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/Makefile b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
index c8d1b89d228f..054730e1b550 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/Makefile
+++ b/www/p5-Catalyst-Plugin-XMLRPC/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Dispatch XMLRPC methods with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.64:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
index 3da1a7661210..9036171252f5 100644
--- a/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template-Compiled/Makefile
@@ -17,7 +17,8 @@ COMMENT=	HTML::Template::Compiled View Class
 
 BUILD_DEPENDS=	${SITE_PERL}/HTML/Template/Compiled.pm:${PORTSDIR}/www/p5-HTML-Template-Compiled \
 		${SITE_PERL}/Path/Class.pm:${PORTSDIR}/devel/p5-Path-Class \
-		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst
+		${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Catalyst-View-HTML-Template/Makefile b/www/p5-Catalyst-View-HTML-Template/Makefile
index 3e865d95a9de..314fac8648d3 100644
--- a/www/p5-Catalyst-View-HTML-Template/Makefile
+++ b/www/p5-Catalyst-View-HTML-Template/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kiki@bsdro.org
 COMMENT=	HTML::Template view class for Catalyst
 
-BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	${SITE_PERL}/Catalyst.pm:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index 2a0ec6186e8a..a60db7764ea4 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Catalyst View handler that returns stash data in JSON format
 BUILD_DEPENDS=	p5-Test-Simple>=0.32:${PORTSDIR}/devel/p5-Test-Simple \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	p5-JSON>=1.00:${PORTSDIR}/converters/p5-JSON \
-		p5-Catalyst>=5.60:${PORTSDIR}/www/p5-Catalyst
+		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Catalyst-View-Mason/Makefile b/www/p5-Catalyst-View-Mason/Makefile
index 00d3a986fa0c..38f141c8c5f6 100644
--- a/www/p5-Catalyst-View-Mason/Makefile
+++ b/www/p5-Catalyst-View-Mason/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Mason view class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
index 8e74d6813abb..3d1872f0d14e 100644
--- a/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
+++ b/www/p5-Catalyst-View-TT-ControllerLocal/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Catalyst TT View with template names relative to the Controller
 
-BUILD_DEPENDS=	p5-Catalyst>=0:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-Catalyst-View-TT>=0:${PORTSDIR}/www/p5-Catalyst-View-TT \
 		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Catalyst-View-TT/Makefile b/www/p5-Catalyst-View-TT/Makefile
index 376ceb8b794c..ea8355e73143 100644
--- a/www/p5-Catalyst-View-TT/Makefile
+++ b/www/p5-Catalyst-View-TT/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Template Toolkit view class for Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.50:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+		p5-Catalyst-Devel>=1.00:${PORTSDIR}/www/p5-Catalyst-Devel \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
 		${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
 		${SITE_PERL}/Template/Timer.pm:${PORTSDIR}/www/p5-Template-Timer
diff --git a/www/p5-Task-Catalyst/Makefile b/www/p5-Task-Catalyst/Makefile
index 5ca297a7daae..a798ea0f86dc 100644
--- a/www/p5-Task-Catalyst/Makefile
+++ b/www/p5-Task-Catalyst/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	All you need to start with Catalyst
 
-BUILD_DEPENDS=	p5-Catalyst>=5.65:${PORTSDIR}/www/p5-Catalyst \
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Catalyst-Log-Log4perl>=0.1:${PORTSDIR}/www/p5-Catalyst-Log-Log4perl \
 		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \