3 files changed, 64 insertions, 44 deletions

diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index f7fd5c0ad3e9..8ee09c5f720d 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -6,63 +6,65 @@
 #
 
 PORTNAME=	DBIx-Class
-PORTVERSION=	0.04001
+PORTVERSION=	0.05000
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
-#DISTNAME=       ${PORTNAME}-0.04001
 
 MAINTAINER=	lars@balker.dk
 COMMENT=	Extensible and flexible object <-> relational mapper
 
 BUILD_DEPENDS=	p5-Data-Page>=2.00:${PORTSDIR}/databases/p5-Data-Page \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
 		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-SQL-Abstract>=1.20:${PORTSDIR}/databases/p5-SQL-Abstract \
 		p5-SQL-Abstract-Limit>=0.101:${PORTSDIR}/databases/p5-SQL-Abstract-Limit \
-		p5-DBD-SQLite>=1.08:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-Class-C3>=0.07:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
+		p5-Class-Data-Accessor>=0.01:${PORTSDIR}/devel/p5-Class-Data-Accessor \
+		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
+		p5-DBI>=1.40:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-SQLite>=1.11:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-DBIx-ContextualFetch>=0:${PORTSDIR}/databases/p5-DBIx-ContextualFetch
+		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
 
-MAN3=		DBIx::Class::Storage::DBI.3 \
-		DBIx::Class::PK::Auto::MySQL.3 \
-		DBIx::Class::PK.3 \
-		DBIx::Class.3 \
-		DBIx::Class::PK::Auto::Oracle.3 \
-		DBIx::Class::Exception.3 \
-		DBIx::Class::Relationship::Base.3 \
-		DBIx::Class::PK::Auto::Pg.3 \
-		DBIx::Class::PK::Auto::MSSQL.3 \
-		DBIx::Class::CDBICompat.3 \
-		DBIx::Class::Relationship.3 \
-		DBIx::Class::Core.3 \
-		DBIx::Class::PK::Auto.3 \
-		DBIx::Class::DB.3 \
-		DBIx::Class::Table.3 \
-		DBIx::Class::AccessorGroup.3 \
-		DBIx::Class::Schema.3 \
-		DBIx::Class::PK::Auto::SQLite.3 \
-		DBIx::Class::Test::SQLite.3 \
-		DBIx::Class::Row.3 \
-		DBIx::Class::Manual.3 \
-		DBIx::Class::Manual::Cookbook.3 \
-		DBIx::Class::Manual::FAQ.3 \
-		DBIx::Class::Manual::Intro.3 \
-		DBIx::Class::Manual::Troubleshooting.3 \
-		DBIx::Class::ResultSet.3 \
-		DBIx::Class::UUIDColumns.3 \
-		DBIx::Class::Relationship::BelongsTo.3 \
-		DBIx::Class::ObjectCache.3
+MAN3=	DBIx::Class.3 \
+	DBIx::Class::AccessorGroup.3 \
+	DBIx::Class::CDBICompat.3 \
+	DBIx::Class::Core.3 \
+	DBIx::Class::DB.3 \
+	DBIx::Class::InflateColumn.3 \
+	DBIx::Class::Manual.3 \
+	DBIx::Class::Manual::Cookbook.3 \
+	DBIx::Class::Manual::FAQ.3 \
+	DBIx::Class::Manual::Intro.3 \
+	DBIx::Class::Manual::SchemaIntro.3 \
+	DBIx::Class::Manual::Troubleshooting.3 \
+	DBIx::Class::PK.3 \
+	DBIx::Class::PK::Auto.3 \
+	DBIx::Class::PK::Auto::DB2.3 \
+	DBIx::Class::PK::Auto::MSSQL.3 \
+	DBIx::Class::PK::Auto::MySQL.3 \
+	DBIx::Class::PK::Auto::Oracle.3 \
+	DBIx::Class::PK::Auto::Pg.3 \
+	DBIx::Class::PK::Auto::SQLite.3 \
+	DBIx::Class::Relationship.3 \
+	DBIx::Class::Relationship::Base.3 \
+	DBIx::Class::Relationship::BelongsTo.3 \
+	DBIx::Class::ResultSet.3 \
+	DBIx::Class::ResultSource.3 \
+	DBIx::Class::ResultSource::Table.3 \
+	DBIx::Class::ResultSourceProxy::Table.3 \
+	DBIx::Class::Row.3 \
+	DBIx::Class::Schema.3 \
+	DBIx::Class::Storage::DBI.3 \
+	DBIx::Class::Test::SQLite.3 \
+	DBIx::Class::UUIDColumns.3 \
+	DBIx::Class::Validation.3 \
+	SQL::Translator::Producer::DBIx::Class::File.3
 
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} < 500801
diff --git a/databases/p5-DBIx-Class/distinfo b/databases/p5-DBIx-Class/distinfo
index dfbe07a20635..b2ed5f466dcc 100644
--- a/databases/p5-DBIx-Class/distinfo
+++ b/databases/p5-DBIx-Class/distinfo
@@ -1,3 +1,3 @@
-MD5 (DBIx-Class-0.04001.tar.gz) = 484f05724e4761b69f576550b8e31fc4
-SHA256 (DBIx-Class-0.04001.tar.gz) = 1c62d423696fb578cefeec963208bf2f834ef40911cbf8ea65523a7f70dbfddd
-SIZE (DBIx-Class-0.04001.tar.gz) = 69746
+MD5 (DBIx-Class-0.05000.tar.gz) = fe67220c0e673e007740e99369003d1b
+SHA256 (DBIx-Class-0.05000.tar.gz) = cf1f31e2cae14fcf7a578b2db303be1473d9ded47507afad339c29474c2f498a
+SIZE (DBIx-Class-0.05000.tar.gz) = 96348
diff --git a/databases/p5-DBIx-Class/pkg-plist b/databases/p5-DBIx-Class/pkg-plist
index 197bf10d5268..c835b0c99f79 100644
--- a/databases/p5-DBIx-Class/pkg-plist
+++ b/databases/p5-DBIx-Class/pkg-plist
@@ -28,16 +28,16 @@
 %%SITE_PERL%%/DBIx/Class/Core.pm
 %%SITE_PERL%%/DBIx/Class/Cursor.pm
 %%SITE_PERL%%/DBIx/Class/DB.pm
-%%SITE_PERL%%/DBIx/Class/Exception.pm
 %%SITE_PERL%%/DBIx/Class/InflateColumn.pm
 %%SITE_PERL%%/DBIx/Class/Manual.pod
 %%SITE_PERL%%/DBIx/Class/Manual/Troubleshooting.pod
 %%SITE_PERL%%/DBIx/Class/Manual/FAQ.pod
 %%SITE_PERL%%/DBIx/Class/Manual/Intro.pod
+%%SITE_PERL%%/DBIx/Class/Manual/SchemaIntro.pod
 %%SITE_PERL%%/DBIx/Class/Manual/Cookbook.pod
-%%SITE_PERL%%/DBIx/Class/ObjectCache.pm
 %%SITE_PERL%%/DBIx/Class/PK.pm
 %%SITE_PERL%%/DBIx/Class/PK/Auto.pm
+%%SITE_PERL%%/DBIx/Class/PK/Auto/DB2.pm
 %%SITE_PERL%%/DBIx/Class/PK/Auto/MSSQL.pm
 %%SITE_PERL%%/DBIx/Class/PK/Auto/MySQL.pm
 %%SITE_PERL%%/DBIx/Class/PK/Auto/Oracle.pm
@@ -50,18 +50,36 @@
 %%SITE_PERL%%/DBIx/Class/Relationship/CascadeActions.pm
 %%SITE_PERL%%/DBIx/Class/Relationship/HasMany.pm
 %%SITE_PERL%%/DBIx/Class/Relationship/HasOne.pm
+%%SITE_PERL%%/DBIx/Class/Relationship/Helpers.pm
+%%SITE_PERL%%/DBIx/Class/Relationship/ManyToMany.pm
 %%SITE_PERL%%/DBIx/Class/Relationship/ProxyMethods.pm
 %%SITE_PERL%%/DBIx/Class/ResultSet.pm
+%%SITE_PERL%%/DBIx/Class/ResultSetProxy.pm
+%%SITE_PERL%%/DBIx/Class/ResultSource.pm
+%%SITE_PERL%%/DBIx/Class/ResultSource/Table.pm
+%%SITE_PERL%%/DBIx/Class/ResultSourceProxy.pm
+%%SITE_PERL%%/DBIx/Class/ResultSourceProxy/Table.pm
 %%SITE_PERL%%/DBIx/Class/Row.pm
 %%SITE_PERL%%/DBIx/Class/Schema.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/Cursor.pm
-%%SITE_PERL%%/DBIx/Class/Table.pm
 %%SITE_PERL%%/DBIx/Class/Test/SQLite.pm
 %%SITE_PERL%%/DBIx/Class/UUIDColumns.pm
+%%SITE_PERL%%/DBIx/Class/Validation.pm
+%%SITE_PERL%%/SQL/Translator/Parser/DBIx/Class.pm
+%%SITE_PERL%%/SQL/Translator/Producer/DBIx/Class/File.pm
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Producer/DBIx/Class
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Producer/DBIx
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Producer
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Parser/DBIx
+@dirrmtry %%SITE_PERL%%/SQL/Translator/Parser
+@dirrmtry %%SITE_PERL%%/SQL/Translator
+@dirrmtry %%SITE_PERL%%/SQL
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Test
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage
+@dirrmtry %%SITE_PERL%%/DBIx/Class/ResultSourceProxy
+@dirrmtry %%SITE_PERL%%/DBIx/Class/ResultSource
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Relationship
 @dirrmtry %%SITE_PERL%%/DBIx/Class/PK/Auto
 @dirrmtry %%SITE_PERL%%/DBIx/Class/PK