- Revert ports/165605 as requested by portmgr@

Note: devel/p5-B-Size and devel/p5-Devel-Arena
where intentionally not restored.

PR:             ports/165605
Approved by:    portmgr (bapt)
Feature safe:   yes (I sure hope so)

19 files changed, 151 insertions, 20 deletions

diff --git a/databases/p5-BSON/Makefile b/databases/p5-BSON/Makefile
index 0f940ea4bca0..b60ec0b4c405 100644
--- a/databases/p5-BSON/Makefile
+++ b/databases/p5-BSON/Makefile
@@ -37,4 +37,10 @@ MAN3=		BSON.3 \
 		BSON::Time.3 \
 		BSON::Timestamp.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501200
+TEST_DEPENDS+=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Cache-Memcached-Fast/Makefile b/databases/p5-Cache-Memcached-Fast/Makefile
index 0412dcebf363..9de0310dd9ec 100644
--- a/databases/p5-Cache-Memcached-Fast/Makefile
+++ b/databases/p5-Cache-Memcached-Fast/Makefile
@@ -19,4 +19,11 @@ PERL_CONFIGURE=	yes
 
 MAN3=	Cache::Memcached::Fast.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+BUILD_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Class-DBI-Lite/Makefile b/databases/p5-Class-DBI-Lite/Makefile
index 5332917b8307..fe151c6d9145 100644
--- a/databases/p5-Class-DBI-Lite/Makefile
+++ b/databases/p5-Class-DBI-Lite/Makefile
@@ -40,4 +40,10 @@ MAN3=		Class::DBI::Lite.3 \
 		Class::DBI::Lite::TableInfo.3 \
 		Class::DBI::Lite::Tutorial.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+TEST_DEPENDS+=	p5-Test-Simple>=0.77:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 63e2257ad1e4..2a973a33df6e 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -36,4 +36,11 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-version>=0:${PORTSDIR}/devel/p5-version
+RUN_DEPENDS+=	p5-version>=0:${PORTSDIR}/devel/p5-version
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index 2b2f5db177ab..fbc653206a53 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -33,10 +33,20 @@ MAN3=	DBIx::Class::EncodedColumn.3 \
 	DBIx::Class::EncodedColumn::Crypt::OpenPGP.3 \
 	DBIx::Class::EncodedColumn::Digest.3
 
+post-extract:
+	@${PERL} -i -ne 'print unless m,^build_requires, || m,^feature, .. m,;,' ${WRKSRC}/Makefile.PL
+
 OPTIONS=	SHA "Digest::SHA Support" On \
 		BLOWFISH "Blowfish Support?" On \
 		OPENPGP "Crypt::OpenPGP (gpg) Support" On
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SHA)
+. if ${PERL_LEVEL} < 501000
+RUN_DEPENDS+=	p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
+. endif
+.endif
 .if defined(WITH_BLOWFISH)
 RUN_DEPENDS+=	p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish
 .endif
@@ -45,7 +55,4 @@ RUN_DEPENDS+=	p5-Crypt-OpenPGP>=0:${PORTSDIR}/security/p5-Crypt-OpenPGP \
 		p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP
 .endif
 
-post-extract:
-	@${PERL} -i -ne 'print unless m,^build_requires, || m,^feature, .. m,;,' ${WRKSRC}/Makefile.PL
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-Class-QueryProfiler/Makefile b/databases/p5-DBIx-Class-QueryProfiler/Makefile
index a373d9fe1744..f7965212df84 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/Makefile
+++ b/databases/p5-DBIx-Class-QueryProfiler/Makefile
@@ -26,4 +26,12 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DBIx::Class::QueryProfiler.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+
+BUILD_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+RUN_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index e784b00db498..2a28425b2af8 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -117,4 +117,10 @@ USE_PGSQL=	yes
 USE_SQLITE=	yes
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501200
+TEST_DEPENDS+=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
index 05696c8fa0ea..9b2581d47d26 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
@@ -55,6 +55,13 @@ MAN3=	DBIx::Class::Schema::PopulateMore.3 \
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-Module-Pluggable>=3.9:${PORTSDIR}/devel/p5-Module-Pluggable \
+		p5-parent>=0:${PORTSDIR}/devel/p5-parent
+RUN_DEPENDS+=	p5-Module-Pluggable>=3.9:${PORTSDIR}/devel/p5-Module-Pluggable \
+		p5-parent>=0:${PORTSDIR}/devel/p5-parent
+.endif
+
 .if ${PERL_LEVEL} < 501400
 TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
 .endif
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index b66d739e0c3d..ed490b0809d7 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -187,4 +187,15 @@ MAN3=	DBIx::Class.3 \
 RUN_DEPENDS+=	p5-SQL-Translator>=0.09.004:${PORTSDIR}/databases/p5-SQL-Translator
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-File-Temp>=0.22:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	p5-File-Path>=2.07:${PORTSDIR}/devel/p5-File-Path
+.endif
+
+.if ${PERL_LEVEL} < 501200
+TEST_DEPENDS+=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index a1e554721b39..b732c11d7c47 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for logging queries for DBI
 
-RUN_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	\
+	p5-DBI>0:${PORTSDIR}/databases/p5-DBI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index 1405d2baffce..11c0cff85648 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -39,4 +39,12 @@ PERL_CONFIGURE=	yes
 MAN3=	DBIx::Sunny.3 \
 	DBIx::Sunny::Schema.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+
+BUILD_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+RUN_DEPENDS+=	p5-parent>=0:${PORTSDIR}/devel/p5-parent
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 9880a133c741..439686d3b398 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -32,4 +32,10 @@ MAN3=		DBM::Deep.3 DBM::Deep::Cookbook.3 DBM::Deep::Internals.3 \
 		DBM::Deep::Iterator::File::Index.3 DBM::Deep::Null.3 \
 		DBM::Deep::Engine::File.3 DBM::Deep::Sector::File.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+TEST_DEPENDS+=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index d0d39aa355ae..571bd45cd81b 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -82,4 +82,11 @@ MAN3=	Jifty::DBI.3 \
 	Jifty::DBI::Schema.3 \
 	Jifty::DBI::SchemaGenerator.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-version>=0:${PORTSDIR}/devel/p5-version
+RUN_DEPENDS+=	p5-version>=0:${PORTSDIR}/devel/p5-version
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 59eeae4d099d..f082778c5e71 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -53,4 +53,10 @@ MAN3=		MongoDB.3 \
 		MongoDB::Timestamp.3 \
 		MongoDB::Tutorial.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500809
+TEST_DEPENDS+=	p5-File-Temp>=0.17:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 6da6101012ad..44ec40f1c197 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -27,4 +27,16 @@ PERL_CONFIGURE=	yes
 
 MAN3=		ORLite.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-File-Temp>=0.20:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	p5-File-Temp>=0.20:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.if ${PERL_LEVEL} < 501200
+BUILD_DEPENDS+=	p5-File-Path>=2.08:${PORTSDIR}/devel/p5-File-Path
+RUN_DEPENDS+=	p5-File-Path>=2.08:${PORTSDIR}/devel/p5-File-Path
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index bc864e5b69c3..6c04b8d79715 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -95,4 +95,11 @@ MAN3=	Prophet::Web::Result.3 \
 	Prophet::Replica::sqlite.3 \
 	Prophet::Meta::Types.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
+RUN_DEPENDS+=	p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index b267459489bc..88f4f7490ffc 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -29,4 +29,14 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Redis.3 Redis::Hash.3 Redis::List.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd
+.endif
+
+.if ${PERL_LEVEL} < 501000
+TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index c9afe9452e96..81091d086abc 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -113,6 +113,9 @@ MAN3=		SQL::Translator.3 \
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
+regression-test: build
+	cd ${WRKSRC}/ && ${MAKE} test
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DIAGRAM)
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index 647439e327c4..199a78e50baf 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -35,4 +35,10 @@ MAN1=		sqlw_mail.1 \
 post-patch:
 		${CHMOD} u+w ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500807
+RUN_DEPENDS+=	p5-CGI.pm>=3.10:${PORTSDIR}/www/p5-CGI.pm
+.endif
+
+.include <bsd.port.post.mk>