3 files changed, 33 insertions, 9 deletions

diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index 42ac0d77d0b9..1a181f6aa39c 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	DBIx-Class
-PORTVERSION=	0.07006
+PORTVERSION=	0.08001
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBIx
@@ -15,19 +15,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lbr@FreeBSD.org
 COMMENT=	Extensible and flexible object <-> relational mapper
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-PathTools>=3.19:${PORTSDIR}/devel/p5-PathTools \
 		p5-Data-Page>=2.00:${PORTSDIR}/databases/p5-Data-Page \
 		p5-SQL-Abstract>=1.20:${PORTSDIR}/databases/p5-SQL-Abstract \
 		p5-SQL-Abstract-Limit>=0.101:${PORTSDIR}/databases/p5-SQL-Abstract-Limit \
 		p5-Class-C3>=0.13:${PORTSDIR}/devel/p5-Class-C3 \
-		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-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
-BUILD_DEPENDS=	${RUN_DEPENDS}
+		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
+		p5-Class-Accessor-Grouped>=0.05002:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
+		p5-JSON>=1.00:${PORTSDIR}/converters/p5-JSON
 
-PERL_MODBUILD=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=	dbicadmin.1
 MAN3=	DBIx::Class.3 \
@@ -36,8 +37,10 @@ MAN3=	DBIx::Class.3 \
 	DBIx::Class::Core.3 \
 	DBIx::Class::Cursor.3 \
 	DBIx::Class::DB.3 \
+	DBIx::Class::Exception.3 \
 	DBIx::Class::InflateColumn.3 \
 	DBIx::Class::InflateColumn::DateTime.3 \
+	DBIx::Class::InflateColumn::File.3 \
 	DBIx::Class::Manual.3 \
 	DBIx::Class::Manual::Component.3 \
 	DBIx::Class::Manual::Cookbook.3 \
@@ -60,15 +63,19 @@ MAN3=	DBIx::Class.3 \
 	DBIx::Class::Relationship.3 \
 	DBIx::Class::Relationship::Base.3 \
 	DBIx::Class::Relationship::BelongsTo.3 \
+	DBIx::Class::ResultClass::HashRefInflator.3 \
 	DBIx::Class::ResultSet.3 \
 	DBIx::Class::ResultSetColumn.3 \
 	DBIx::Class::ResultSetManager.3 \
 	DBIx::Class::ResultSource.3 \
 	DBIx::Class::ResultSource::Table.3 \
+	DBIx::Class::ResultSourceHandle.3 \
 	DBIx::Class::ResultSourceProxy::Table.3 \
 	DBIx::Class::Row.3 \
 	DBIx::Class::Schema.3 \
+	DBIx::Class::Schema::Versioned.3 \
 	DBIx::Class::Serialize::Storable.3 \
+	DBIx::Class::Storage.3 \
 	DBIx::Class::Storage::DBI.3 \
 	DBIx::Class::Storage::DBI::Cursor.3 \
 	DBIx::Class::Storage::DBI::DB2.3 \
@@ -78,7 +85,10 @@ MAN3=	DBIx::Class.3 \
 	DBIx::Class::Storage::DBI::ODBC.3 \
 	DBIx::Class::Storage::DBI::ODBC::DB2_400_SQL.3 \
 	DBIx::Class::Storage::DBI::Oracle.3 \
+	DBIx::Class::Storage::DBI::Oracle::Generic.3 \
+	DBIx::Class::Storage::DBI::Oracle::WhereJoins.3 \
 	DBIx::Class::Storage::DBI::Pg.3 \
+	DBIx::Class::Storage::DBI::Replication.3 \
 	DBIx::Class::Storage::DBI::SQLite.3 \
 	DBIx::Class::Storage::DBI::Sybase.3 \
 	DBIx::Class::Storage::DBI::Sybase::MSSQL.3 \
@@ -89,7 +99,7 @@ MAN3=	DBIx::Class.3 \
 	SQL::Translator::Producer::DBIx::Class::File.3
 
 post-extract:
-	@${PERL} -i.bak -ne 'print unless /^\s*build_requires/ .. /},$$/' ${WRKSRC}/Build.PL
+	@${PERL} -i.bak -ne 'print unless /^\s*build_requires/' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} < 500801
diff --git a/databases/p5-DBIx-Class/distinfo b/databases/p5-DBIx-Class/distinfo
index d70833ff082b..912c52461a78 100644
--- a/databases/p5-DBIx-Class/distinfo
+++ b/databases/p5-DBIx-Class/distinfo
@@ -1,3 +1,3 @@
-MD5 (DBIx-Class-0.07006.tar.gz) = 472615f7e2103cb31fc98903995340b9
-SHA256 (DBIx-Class-0.07006.tar.gz) = e1388eebe228d73b67cd51fbe6d5b6ab00fdd2362667281c4e50e8a437945fae
-SIZE (DBIx-Class-0.07006.tar.gz) = 190307
+MD5 (DBIx-Class-0.08001.tar.gz) = 60f85fea90445c550cfa90f20e2a21f4
+SHA256 (DBIx-Class-0.08001.tar.gz) = 0395c95dbdd6ba043083bf97cabb0eb7e94867d144318241509b90295e2e3c7e
+SIZE (DBIx-Class-0.08001.tar.gz) = 294538
diff --git a/databases/p5-DBIx-Class/pkg-plist b/databases/p5-DBIx-Class/pkg-plist
index c0b04d938eb6..d382ea1e89aa 100644
--- a/databases/p5-DBIx-Class/pkg-plist
+++ b/databases/p5-DBIx-Class/pkg-plist
@@ -29,8 +29,10 @@ bin/dbicadmin
 %%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/InflateColumn/DateTime.pm
+%%SITE_PERL%%/DBIx/Class/InflateColumn/File.pm
 %%SITE_PERL%%/DBIx/Class/Manual.pod
 %%SITE_PERL%%/DBIx/Class/Manual/Component.pod
 %%SITE_PERL%%/DBIx/Class/Manual/Cookbook.pod
@@ -60,16 +62,19 @@ bin/dbicadmin
 %%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/ResultClass/HashRefInflator.pm
 %%SITE_PERL%%/DBIx/Class/ResultSet.pm
 %%SITE_PERL%%/DBIx/Class/ResultSetColumn.pm
 %%SITE_PERL%%/DBIx/Class/ResultSetManager.pm
 %%SITE_PERL%%/DBIx/Class/ResultSetProxy.pm
 %%SITE_PERL%%/DBIx/Class/ResultSource.pm
 %%SITE_PERL%%/DBIx/Class/ResultSource/Table.pm
+%%SITE_PERL%%/DBIx/Class/ResultSourceHandle.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/Schema/Versioned.pm
 %%SITE_PERL%%/DBIx/Class/Serialize/Storable.pm
 %%SITE_PERL%%/DBIx/Class/Storage.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI.pm
@@ -81,7 +86,10 @@ bin/dbicadmin
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/ODBC.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/ODBC/DB2_400_SQL.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/Oracle.pm
+%%SITE_PERL%%/DBIx/Class/Storage/DBI/Oracle/Generic.pm
+%%SITE_PERL%%/DBIx/Class/Storage/DBI/Oracle/WhereJoins.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/Pg.pm
+%%SITE_PERL%%/DBIx/Class/Storage/DBI/Replication.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/SQLite.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/Sybase.pm
 %%SITE_PERL%%/DBIx/Class/Storage/DBI/Sybase/MSSQL.pm
@@ -91,6 +99,9 @@ bin/dbicadmin
 %%SITE_PERL%%/DBIx/Class/UTF8Columns.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBIx/Class.pm
 %%SITE_PERL%%/SQL/Translator/Producer/DBIx/Class/File.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
 @dirrmtry %%SITE_PERL%%/SQL/Translator/Producer/DBIx/Class
 @dirrmtry %%SITE_PERL%%/SQL/Translator/Producer/DBIx
 @dirrmtry %%SITE_PERL%%/SQL/Translator/Producer
@@ -100,12 +111,15 @@ bin/dbicadmin
 @dirrmtry %%SITE_PERL%%/SQL
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Test
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI/Sybase
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI/Oracle
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI/ODBC
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Storage
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Serialize
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Schema
 @dirrmtry %%SITE_PERL%%/DBIx/Class/ResultSourceProxy
 @dirrmtry %%SITE_PERL%%/DBIx/Class/ResultSource
+@dirrmtry %%SITE_PERL%%/DBIx/Class/ResultClass
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Relationship
 @dirrmtry %%SITE_PERL%%/DBIx/Class/PK/Auto
 @dirrmtry %%SITE_PERL%%/DBIx/Class/PK