Reassign databases/ perl modules to perl@.

Also:
- Sort plists
- Sort DEPENDS
- Add TEST_DEPENDS where necessary
- p5-Class-DBI-DDL: switch to USE_PERL5=configure
- Remove unnecessary or unusual stuff from pkg-descr's
- Regenerate patches using makepatch where necessary
- Based on the description from p5-DBIx-Password (most of which I've
  excised), it isn't clear whether this module even works when it's
  built non-interactive
- p5-DBIx-Simple: Make all the OPTIONS dependencies BUILD_DEPENDS
  as well
- p5-T2: Fails 'make test' (as it did before). The module isn't even
  present on CPAN or Meta::CPAN, and should probably be considered
  for deletion

26 files changed, 126 insertions, 131 deletions

diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index 5272a55a73b3..da3e823f5d3f 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate massive sorted CDB files simply
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/cdbmake:${PORTSDIR}/databases/cdb \
diff --git a/databases/p5-CDB_File-Generator/pkg-plist b/databases/p5-CDB_File-Generator/pkg-plist
index 4b4bf608e4d2..09f2849b982b 100644
--- a/databases/p5-CDB_File-Generator/pkg-plist
+++ b/databases/p5-CDB_File-Generator/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/CDB_File::Generator.3.gz
 %%SITE_PERL%%/CDB_File/Generator.pm
+%%PERL5_MAN3%%/CDB_File::Generator.3.gz
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 11260e36b26a..cf283dce085e 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -8,13 +8,14 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DDL for Class-DBI
 
-RUN_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-DDL/pkg-plist b/databases/p5-Class-DBI-DDL/pkg-plist
index 1cdc948b8d89..ce7603963618 100644
--- a/databases/p5-Class-DBI-DDL/pkg-plist
+++ b/databases/p5-Class-DBI-DDL/pkg-plist
@@ -1,4 +1,4 @@
-%%PERL5_MAN3%%/Class::DBI::DDL.3.gz
-%%PERL5_MAN3%%/Class::DBI::DDL::Pg.3.gz
-%%SITE_PERL%%/Class/DBI/DDL.pm
 %%SITE_PERL%%/Class/DBI/DDL/Pg.pm
+%%SITE_PERL%%/Class/DBI/DDL.pm
+%%PERL5_MAN3%%/Class::DBI::DDL::Pg.3.gz
+%%PERL5_MAN3%%/Class::DBI::DDL.3.gz
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index 4b3c76819769..80aadd1c8c4e 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for MySQL
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-mysql/pkg-descr b/databases/p5-Class-DBI-mysql/pkg-descr
index 31abb21d203a..3a09707fe9a5 100644
--- a/databases/p5-Class-DBI-mysql/pkg-descr
+++ b/databases/p5-Class-DBI-mysql/pkg-descr
@@ -1,5 +1,3 @@
-Class::DBI::mysql - Extensions to Class::DBI for MySQL
-
 This is an extension to Class::DBI, containing several functions and
 optimisations for the MySQL database. Instead of setting Class::DBI as
 your base class, use this instead.
diff --git a/databases/p5-Class-DBI-mysql/pkg-plist b/databases/p5-Class-DBI-mysql/pkg-plist
index 6dc65462b731..bc041c019bcb 100644
--- a/databases/p5-Class-DBI-mysql/pkg-plist
+++ b/databases/p5-Class-DBI-mysql/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Class::DBI::mysql.3.gz
 %%SITE_PERL%%/Class/DBI/mysql.pm
+%%PERL5_MAN3%%/Class::DBI::mysql.3.gz
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index e4a4b3102d19..f485d9d545b9 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBD independent class
 
 BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-DBIx-AnyDBD/pkg-plist b/databases/p5-DBIx-AnyDBD/pkg-plist
index 6cd6bfb29543..8e18341fa797 100644
--- a/databases/p5-DBIx-AnyDBD/pkg-plist
+++ b/databases/p5-DBIx-AnyDBD/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/DBIx::AnyDBD.3.gz
 %%SITE_PERL%%/DBIx/AnyDBD.pm
+%%PERL5_MAN3%%/DBIx::AnyDBD.3.gz
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
index caabd7044048..ead5c5101f67 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
@@ -8,11 +8,13 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds syntactic sugar to skip the fancy objects
 
 BUILD_DEPENDS=	p5-DBIx-Class>=0.04001:${PORTSDIR}/databases/p5-DBIx-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/files/patch-Makefile.PL b/databases/p5-DBIx-Class-ResultSet-HashRef/files/patch-Makefile.PL
index 8d98f9f14817..dceb14943479 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/files/patch-Makefile.PL
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	2009-09-15 13:23:11.000000000 -0300
-+++ Makefile.PL	2009-09-15 13:23:16.000000000 -0300
-@@ -13,5 +13,5 @@
+--- Makefile.PL.orig	2009-06-14 17:01:15 UTC
++++ Makefile.PL
+@@ -13,5 +13,5 @@ requires 'DBIx::Class';
  
  test_requires 'Test::More';
  
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
index eb950dffd5fb..d2d4511d4433 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/DBIx::Class::ResultSet::HashRef.3.gz
 %%SITE_PERL%%/DBIx/Class/ResultSet/HashRef.pm
+%%PERL5_MAN3%%/DBIx::Class::ResultSet::HashRef.3.gz
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index 11a5d463bf20..da83a5161c54 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allows you to create a global password file for DB passwords
 
 BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-DBIx-Password/files/patch-batch b/databases/p5-DBIx-Password/files/patch-batch
index 93f4c9153834..5e3050b47c22 100644
--- a/databases/p5-DBIx-Password/files/patch-batch
+++ b/databases/p5-DBIx-Password/files/patch-batch
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	Mon Dec 13 15:13:24 2004
-+++ Makefile.PL	Mon Dec 13 15:14:11 2004
-@@ -24,7 +24,7 @@
+--- Makefile.PL.orig	2007-04-30 21:38:56 UTC
++++ Makefile.PL
+@@ -24,7 +24,7 @@ my %driver_methods = (
  );
  
  print "What is the name of the Virtual User?\n";
diff --git a/databases/p5-DBIx-Password/pkg-descr b/databases/p5-DBIx-Password/pkg-descr
index 93ecc2034a97..5c3d53d7fbeb 100644
--- a/databases/p5-DBIx-Password/pkg-descr
+++ b/databases/p5-DBIx-Password/pkg-descr
@@ -1,15 +1,3 @@
-This module lets you stack handlers so that the next one will handle
-or "filter" the output of previous one.
-
-From README:
-
-    Don't you hate keeping track of database passwords and such
-    throughout your scripts? How about the problem of changing those
-    passwords on a mass scale? This module is one possible solution.
-    When you go to build this module it will ask you to create
-    virtual users. For each user you need to specify the database
-    module to use, the database connect string, the username and the
-    password. You will be prompted to give a name to this virtual
-    user. You can add as many as you like.
+This module keeps track of database passwords.
 
 WWW: http://search.cpan.org/dist/DBIx-Password/
diff --git a/databases/p5-DBIx-Password/pkg-plist b/databases/p5-DBIx-Password/pkg-plist
index 31eac2a7c7c4..e36c4ef3929e 100644
--- a/databases/p5-DBIx-Password/pkg-plist
+++ b/databases/p5-DBIx-Password/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/DBIx::Password.3.gz
 %%SITE_PERL%%/DBIx/Password.pm
+%%PERL5_MAN3%%/DBIx::Password.3.gz
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index f07374d33936..ca4d2be88d12 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -8,13 +8,13 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extends DBI with high-level operations
 
-BUILD_DEPENDS=	p5-DBIx-AnyDBD>=0:${PORTSDIR}/databases/p5-DBIx-AnyDBD \
+BUILD_DEPENDS=	p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
+		p5-Class-MixinFactory>=0:${PORTSDIR}/devel/p5-Class-MixinFactory \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
-		p5-Class-MixinFactory>=0:${PORTSDIR}/devel/p5-Class-MixinFactory
+		p5-DBIx-AnyDBD>=0:${PORTSDIR}/databases/p5-DBIx-AnyDBD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-SQLEngine/pkg-plist b/databases/p5-DBIx-SQLEngine/pkg-plist
index eb26c33e4f5a..03ba990f60cc 100644
--- a/databases/p5-DBIx-SQLEngine/pkg-plist
+++ b/databases/p5-DBIx-SQLEngine/pkg-plist
@@ -1,63 +1,3 @@
-%%PERL5_MAN3%%/DBIx::SQLEngine.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Cache::BasicCache.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Cache::TrivialCache.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::And.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Comparison.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Compound.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Equality.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Greater.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::HashGroup.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Lesser.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Like.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::LiteralSQL.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Not.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Or.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::StringComparison.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Changes.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Comparison.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::ReadMe.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Related.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::ToDo.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::AnyData.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::CSV.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Informix.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::MSSQL.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Mysql.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::NullP.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Oracle.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Pg.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::SQLite.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Sybase.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Sybase::MSSQL.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::DatabaseFlavors.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoAdvancedFeatures.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoColumnTypes.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoComplexJoins.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoJoins.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoLimit.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoPlaceholders.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoSequences.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoUnions.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::PerlDBLib.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::XBase.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Accessors.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Base.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Cache.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Class.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Extras.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Hooks.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::PKey.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Table.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::NextPrev.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::PKeySet.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::Set.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::Column.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::ColumnSet.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::Table.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::TableSet.3.gz
-%%PERL5_MAN3%%/DBIx::SQLEngine::Utility::CloneWithParams.3.gz
 %%SITE_PERL%%/DBIx/SQLEngine.pm
 %%SITE_PERL%%/DBIx/SQLEngine/Cache/BasicCache.pm
 %%SITE_PERL%%/DBIx/SQLEngine/Cache/TrivialCache.pm
@@ -119,3 +59,63 @@
 %%SITE_PERL%%/DBIx/SQLEngine/Schema/TableSet.pm
 %%SITE_PERL%%/DBIx/SQLEngine/Utility/CloneWithParams.pm
 %%SITE_PERL%%/DBIx/test_cfg.pl
+%%PERL5_MAN3%%/DBIx::SQLEngine.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Cache::BasicCache.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Cache::TrivialCache.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::And.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Comparison.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Compound.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Equality.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Greater.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::HashGroup.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Lesser.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Like.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::LiteralSQL.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Not.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::Or.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Criteria::StringComparison.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Changes.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Comparison.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::ReadMe.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::Related.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Docs::ToDo.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::AnyData.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::CSV.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Informix.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::MSSQL.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Mysql.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::NullP.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Oracle.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Pg.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::SQLite.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Sybase.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Sybase::MSSQL.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::DatabaseFlavors.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoAdvancedFeatures.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoColumnTypes.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoComplexJoins.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoJoins.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoLimit.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoPlaceholders.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoSequences.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::NoUnions.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::Trait::PerlDBLib.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Driver::XBase.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Accessors.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Base.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Cache.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Class.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Extras.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Hooks.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::PKey.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Record::Table.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::NextPrev.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::PKeySet.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::RecordSet::Set.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::Column.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::ColumnSet.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::Table.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Schema::TableSet.3.gz
+%%PERL5_MAN3%%/DBIx::SQLEngine::Utility::CloneWithParams.3.gz
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index e933d81e4c24..a3ec7453ecb4 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -8,13 +8,14 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simplified object oriented interface to Perl DBI
 
-BUILD_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI ${TEST_DEPENDS}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 
-OPTIONS_DEFINE=	SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE
+OPTIONS_DEFINE=		SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE
 SQL_INTERP_DESC=	Interpolate Perl variables into SQL
 SQL_ABSTRACT_DESC=	Generate SQL from Perl data structures
 DBIX_XHTML_TABLE_DESC=	Create XHTML tables from SQL queries
@@ -23,9 +24,13 @@ TEXT_TABLE_DESC=	Create plain text table from data
 USES=		perl5
 USE_PERL5=	configure
 
-DBIX_XHTML_TABLE_RUN_DEPENDS=	p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table
-SQL_ABSTRACT_RUN_DEPENDS=	p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
-SQL_INTERP_RUN_DEPENDS=	p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp
-TEXT_TABLE_RUN_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+DBIX_XHTML_TABLE_BUILD_DEPENDS=	p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table
+DBIX_XHTML_TABLE_RUN_DEPENDS=	${DBIX_XHTML_TABLE_BUILD_DEPENDS}
+SQL_ABSTRACT_BUILD_DEPENDS=	p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+SQL_ABSTRACT_RUN_DEPENDS=	${SQL_ABSTRACT_BUILD_DEPENDS}
+SQL_INTERP_BUILD_DEPENDS=	p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp
+SQL_INTERP_RUN_DEPENDS=		${SQL_INTERP_BUILD_DEPENDS}
+TEXT_TABLE_BUILD_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+TEXT_TABLE_RUN_DEPENDS=		${TEXT_TABLE_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index e305dffc5e44..b5ab212759ab 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -8,11 +8,11 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for creating XML from existing DBI datasources
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-DBIx-XML_RDB/pkg-plist b/databases/p5-DBIx-XML_RDB/pkg-plist
index 322a63f38620..6ab876d19b7b 100644
--- a/databases/p5-DBIx-XML_RDB/pkg-plist
+++ b/databases/p5-DBIx-XML_RDB/pkg-plist
@@ -1,6 +1,6 @@
 bin/sql2xml.pl
 bin/xml2sql.pl
-%%PERL5_MAN3%%/DBIx::XML_RDB.3.gz
 %%SITE_PERL%%/DBIx/XML_RDB.pm
 %%SITE_PERL%%/DBIx/sql2xml.pl
 %%SITE_PERL%%/DBIx/xml2sql.pl
+%%PERL5_MAN3%%/DBIx::XML_RDB.3.gz
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index 7749e4053463..2785ec34cdcb 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	CPAN:XSAWYERX
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Memcached-based session backend for Dancer
 
 BUILD_DEPENDS=	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 2ad3e3579f2c..da7227256ccc 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -9,18 +9,19 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 extremely light weight SQLite-specific ORM
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-DBI>=1.60.7:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>=1.27:${PORTSDIR}/databases/p5-DBD-SQLite \
+BUILD_DEPENDS=	p5-DBD-SQLite>=1.27:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-DBI>=1.60.7:${PORTSDIR}/databases/p5-DBI \
 		p5-File-Remove>=1.40:${PORTSDIR}/devel/p5-File-Remove \
 		p5-Params-Util>=0.33:${PORTSDIR}/devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Script>=1.06:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
+		p5-Test-Script>=1.06:${PORTSDIR}/devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Redis-hiredis/Makefile b/databases/p5-Redis-hiredis/Makefile
index 2b8792bfb5d8..74e6d667175e 100644
--- a/databases/p5-Redis-hiredis/Makefile
+++ b/databases/p5-Redis-hiredis/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEOPHENIX
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple wrapper around hiredis C client
 
 USES=		perl5
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index 8c6e97320b4a..04e84b295551 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -9,16 +9,16 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SAMV
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object Relational mapping system
 
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
+BUILD_DEPENDS=	p5-Class-Tangram>=0:${PORTSDIR}/devel/p5-Class-Tangram \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Tangram>=0:${PORTSDIR}/databases/p5-Tangram \
-		p5-Class-Tangram>=0:${PORTSDIR}/devel/p5-Class-Tangram
+		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
+		p5-Tangram>=0:${PORTSDIR}/databases/p5-Tangram
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/databases/p5-T2/pkg-plist b/databases/p5-T2/pkg-plist
index c7b1ba365255..37bb31ad59ec 100644
--- a/databases/p5-T2/pkg-plist
+++ b/databases/p5-T2/pkg-plist
@@ -2,14 +2,6 @@ bin/t2-db-info.pl
 bin/t2-fsck-schema.pl
 bin/t2-migrate-db.pl
 bin/t2-write-js.pl
-%%PERL5_MAN3%%/T2.3.gz
-%%PERL5_MAN3%%/T2::Association.3.gz
-%%PERL5_MAN3%%/T2::Attribute.3.gz
-%%PERL5_MAN3%%/T2::Class.3.gz
-%%PERL5_MAN3%%/T2::DBSetup.3.gz
-%%PERL5_MAN3%%/T2::Method.3.gz
-%%PERL5_MAN3%%/T2::Schema.3.gz
-%%PERL5_MAN3%%/T2::Storage.3.gz
 %%SITE_PERL%%/T2.pm
 %%SITE_PERL%%/T2/Association.pm
 %%SITE_PERL%%/T2/Attribute.pm
@@ -18,3 +10,11 @@ bin/t2-write-js.pl
 %%SITE_PERL%%/T2/Method.pm
 %%SITE_PERL%%/T2/Schema.pm
 %%SITE_PERL%%/T2/Storage.pm
+%%PERL5_MAN3%%/T2.3.gz
+%%PERL5_MAN3%%/T2::Association.3.gz
+%%PERL5_MAN3%%/T2::Attribute.3.gz
+%%PERL5_MAN3%%/T2::Class.3.gz
+%%PERL5_MAN3%%/T2::DBSetup.3.gz
+%%PERL5_MAN3%%/T2::Method.3.gz
+%%PERL5_MAN3%%/T2::Schema.3.gz
+%%PERL5_MAN3%%/T2::Storage.3.gz