3 files changed, 41 insertions, 13 deletions

diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 469766c5c4cf..05f0ffe0f05a 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	DBIx-Class-Schema-Loader
-PORTVERSION=	0.03012
+PORTVERSION=	0.04000
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBIx
@@ -17,18 +17,17 @@ COMMENT=	Dynamic definition of a DBIx::Class::Schema
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Data-Dump>=1.06:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Lingua-EN-Inflect>=1.89:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
+		p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require \
 		p5-Lingua-EN-Inflect-Number>=1.1:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
 		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
-		p5-Class-Accessor>=0.22:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Accessor>=0.02:${PORTSDIR}/devel/p5-Class-Data-Accessor \
-		p5-Class-C3>=0.11:${PORTSDIR}/devel/p5-Class-C3 \
+		p5-Class-Accessor>=0.30:${PORTSDIR}/devel/p5-Class-Accessor \
+		p5-Class-Data-Accessor>=0.03:${PORTSDIR}/devel/p5-Class-Data-Accessor \
+		p5-Class-C3>=0.18:${PORTSDIR}/devel/p5-Class-C3 \
 		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-DBIx-Class>=0.06003:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
+		p5-DBIx-Class>=0.07006:${PORTSDIR}/databases/p5-DBIx-Class \
 
-PERL_MODBUILD=	yes
+PERL_CONFIGURE=	yes
 
 MAN3=	DBIx::Class::Schema::Loader.3 \
 	DBIx::Class::Schema::Loader::Base.3 \
@@ -38,15 +37,38 @@ MAN3=	DBIx::Class::Schema::Loader.3 \
 	DBIx::Class::Schema::Loader::DBI::SQLite.3 \
 	DBIx::Class::Schema::Loader::DBI::Writing.3 \
 	DBIx::Class::Schema::Loader::DBI::mysql.3 \
+	DBIx::Class::Schema::Loader::DBI::Oracle.3 \
 	DBIx::Class::Schema::Loader::RelBuilder.3
 
 post-extract:
-	@${PERL} -i.bak -ne 'print unless /^\s*(?:recommends|build_requires)/ .. /},$$/' ${WRKSRC}/Build.PL
+	@${PERL} -i.bak -ne 'print unless /^\s*test_requires/ or /^my/ .. /^}\s*$$/' ${WRKSRC}/Makefile.PL
 
+OPTIONS=	SQLITE "SQLite Support" Off \
+		MYSQL "MySQL Support" Off \
+		PG "PostgreSQL Support" Off \
+		ORACLE "Oracle Support (experimental)" Off
+		
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500800
 IGNORE=	requires Perl 5.8. Install lang/perl5.8, and try again
 .endif
 
+.if defined(WITH_SQLITE)
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-DBI>=1.56:${PORTSDIR}/databases/p5-DBI
+.endif
+.if defined(WITH_MYSQL)
+RUN_DEPENDS+=	p5-DBD-mysql>=4.004:${PORTSDIR}/databases/p5-DBD-mysql \
+		p5-DBI>=1.56:${PORTSDIR}/databases/p5-DBI
+.endif
+.if defined(WITH_PG)
+RUN_DEPENDS+=	p5-DBD-Pg>=1.49:${PORTSDIR}/databases/p5-DBD-Pg \
+		p5-DBI>=1.56:${PORTSDIR}/databases/p5-DBI
+.endif
+.if defined(WITH_ORACLE)
+RUN_DEPENDS+=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle \
+		p5-DBI>=1.56:${PORTSDIR}/databases/p5-DBI
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-Class-Schema-Loader/distinfo b/databases/p5-DBIx-Class-Schema-Loader/distinfo
index 38162aef0b08..55af95eaa558 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/distinfo
+++ b/databases/p5-DBIx-Class-Schema-Loader/distinfo
@@ -1,3 +1,3 @@
-MD5 (DBIx-Class-Schema-Loader-0.03012.tar.gz) = 61a77538106198994c37ee1348b783db
-SHA256 (DBIx-Class-Schema-Loader-0.03012.tar.gz) = 93ddb5b1aa93a924b4e39e66ce162c8c54e26265199ad25a52105834ffe786b6
-SIZE (DBIx-Class-Schema-Loader-0.03012.tar.gz) = 31888
+MD5 (DBIx-Class-Schema-Loader-0.04000.tar.gz) = 512c66506bc9c481ec82abae05b259cb
+SHA256 (DBIx-Class-Schema-Loader-0.04000.tar.gz) = 7c82c0a4d63ea3caf8913be8c765c8e153b5825a3656702a546ad12cef68eaf8
+SIZE (DBIx-Class-Schema-Loader-0.04000.tar.gz) = 50261
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
index 4ede7d948301..5bbd10cb547a 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-plist
@@ -2,11 +2,17 @@
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/Base.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/DB2.pm
+%%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/Oracle.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/Pg.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/SQLite.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/Writing.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI/mysql.pm
 %%SITE_PERL%%/DBIx/Class/Schema/Loader/RelBuilder.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema/Loader/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema/Loader
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Schema
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Schema/Loader/DBI
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Schema/Loader
 @dirrmtry %%SITE_PERL%%/DBIx/Class/Schema