Convert all p5-Test-use-ok dependencies to p5-Test-Simple, but only on

perl < 5.22. For www/p5-Catalyst-Controller-BindLex, change it from a
BUILD/RUN depend to TEST, as it is only used for the test target, and bump
PORTREVISION on that port.

23 files changed, 174 insertions, 63 deletions

diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index d5b8c7046d7f..f496e3faba69 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -31,10 +31,15 @@ BUILD_DEPENDS=	p5-AnyEvent>=5.2:${PORTSDIR}/devel/p5-AnyEvent \
 		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-use-ok>0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Check-ISA/Makefile b/devel/p5-Check-ISA/Makefile
index 47bbed3c1bf1..9c0fa88887d8 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -14,9 +14,14 @@ COMMENT=	DWIM, correct checking of an object's class
 
 RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Context-Preserve/Makefile b/devel/p5-Context-Preserve/Makefile
index 70b471f92a2c..793f0be972b1 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -12,10 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run code after a subroutine call, preserving the context the subroutine
 
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-ArgNames/Makefile b/devel/p5-Devel-ArgNames/Makefile
index c343e7305e29..93ec23451b88 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -13,9 +13,14 @@ COMMENT=	Figure out the names of variables passed into subroutines
 
 BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
 RUN_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Events-Objects/Makefile b/devel/p5-Devel-Events-Objects/Makefile
index c3d28419f05f..732fea60b823 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -16,9 +16,14 @@ BUILD_DEPENDS=	p5-Devel-Events>=0:${PORTSDIR}/devel/p5-Devel-Events \
 		p5-Tie-RefHash-Weak>=0:${PORTSDIR}/devel/p5-Tie-RefHash-Weak \
 		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Events/Makefile b/devel/p5-Devel-Events/Makefile
index c301a0ac6bf1..a95b84bbeca1 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -19,11 +19,16 @@ BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR}/devel/p5-Moose \
 		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index ad43d82c1c07..6922d63cd025 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Class-Tiny>=0:${PORTSDIR}/devel/p5-Class-Tiny \
 		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
 		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index e0e23965f79f..e7f48c10b1e6 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -17,10 +17,15 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-use-ok>0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Hash-Diff/Makefile b/devel/p5-Hash-Diff/Makefile
index e9d2bfe53790..c9c8fa0a390a 100644
--- a/devel/p5-Hash-Diff/Makefile
+++ b/devel/p5-Hash-Diff/Makefile
@@ -14,10 +14,15 @@ COMMENT=	Return the difference between two hashes as a hash
 RUN_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
 BUILD_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
 
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-use-ok>=0.02:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-IO-Handle-Util/Makefile b/devel/p5-IO-Handle-Util/Makefile
index e75fa1a49780..8a335b9c10ea 100644
--- a/devel/p5-IO-Handle-Util/Makefile
+++ b/devel/p5-IO-Handle-Util/Makefile
@@ -15,9 +15,14 @@ RUN_DEPENDS=	\
 	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
 	p5-asa>0:${PORTSDIR}/devel/p5-asa
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index bf550f1946b6..65d7ca8f1ae2 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -19,10 +19,15 @@ BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
 		p5-URI>0:${PORTSDIR}/net/p5-URI \
 		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Runnable/Makefile b/devel/p5-MooseX-Runnable/Makefile
index d0098b6e01b9..ac73456f680c 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -25,10 +25,15 @@ BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index db53c6bd2e59..10e566270b48 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -21,10 +21,15 @@ BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
 		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index 41cd9afab049..7e5b5ed18cde 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43:${PORTSDIR}/devel/p5-DateTime \
 		p5-Olson-Abbreviations>=0.03:${PORTSDIR}/devel/p5-Olson-Abbreviations \
 		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-use-ok>=0.02:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
index b6e217cee65a..ffff947e5c16 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
 		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
 		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-use-ok>=0.02:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile
index e41c66427168..a40819f1b673 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
 		p5-MooseX-Types>=0.30:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-PortNumber/Makefile b/devel/p5-MooseX-Types-PortNumber/Makefile
index f6ea3d66a9b9..74badb1abba3 100644
--- a/devel/p5-MooseX-Types-PortNumber/Makefile
+++ b/devel/p5-MooseX-Types-PortNumber/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,4 +22,10 @@ USE_PERL5=	configure
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile
index 4e26441dfc49..88198cdab17f 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Moose>=0.50:${PORTSDIR}/devel/p5-Moose \
 		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
 		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile
index cb20691a1a9c..bfe429a65a50 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	p5-Moose>=0.40:${PORTSDIR}/devel/p5-Moose \
 		p5-URI-FromHash>=0:${PORTSDIR}/net/p5-URI-FromHash \
 		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
@@ -32,4 +31,8 @@ USES=		perl5
 TEST_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120.900:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
 .endif
 
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index c40b6b9aa0bc..fea6698f5ea9 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -13,9 +13,14 @@ COMMENT=	Subclass to emulate boundless DEC VT102 terminal
 
 BUILD_DEPENDS=	p5-Term-VT102>=0:${PORTSDIR}/devel/p5-Term-VT102
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
 
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Test-TempDir/Makefile b/devel/p5-Test-TempDir/Makefile
index 443797428584..6cbf7932abe9 100644
--- a/devel/p5-Test-TempDir/Makefile
+++ b/devel/p5-Test-TempDir/Makefile
@@ -21,8 +21,7 @@ BUILD_DEPENDS=	p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
 		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
 		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
 DEPRECATED=	Use devel/p5-Test-TempDir-Tiny instead
 EXPIRATION_DATE=2015-06-30
@@ -30,4 +29,10 @@ EXPIRATION_DATE=2015-06-30
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Tie-ToObject/Makefile b/devel/p5-Tie-ToObject/Makefile
index e75883f0becf..4c2ffce86847 100644
--- a/devel/p5-Tie-ToObject/Makefile
+++ b/devel/p5-Tie-ToObject/Makefile
@@ -11,13 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Tie to an existing object
 
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
-
 USES=		perl5
 USE_PERL5=	configure
 
-
 post-extract:
 	@${REINPLACE_CMD} -e '/Test::/d' ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-XS-Object-Magic/Makefile b/devel/p5-XS-Object-Magic/Makefile
index 718e6db2c8bc..cae1d14b89a6 100644
--- a/devel/p5-XS-Object-Magic/Makefile
+++ b/devel/p5-XS-Object-Magic/Makefile
@@ -13,10 +13,15 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Opaque, extensible XS pointer backed objects using sv_magic
 
 BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 502200
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
+.include <bsd.port.post.mk>