svn commit: r390494 - in head: databases/p5-DBICx-MapMaker databases/p5-DBICx-TestDatabase devel/p5-AnyEvent-Subprocess devel/p5-Check-ISA devel/p5-Context-Preserve devel/p5-Devel-ArgNames devel/p5...

Adam Weinberger adamw at FreeBSD.org
Wed Jun 24 16:29:36 UTC 2015


Author: adamw
Date: Wed Jun 24 16:29:25 2015
New Revision: 390494
URL: https://svnweb.freebsd.org/changeset/ports/390494

Log:
  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.

Modified:
  head/databases/p5-DBICx-MapMaker/Makefile
  head/databases/p5-DBICx-TestDatabase/Makefile
  head/devel/p5-AnyEvent-Subprocess/Makefile
  head/devel/p5-Check-ISA/Makefile
  head/devel/p5-Context-Preserve/Makefile
  head/devel/p5-Devel-ArgNames/Makefile
  head/devel/p5-Devel-Events-Objects/Makefile
  head/devel/p5-Devel-Events/Makefile
  head/devel/p5-Devel-PartialDump/Makefile
  head/devel/p5-Event-Join/Makefile
  head/devel/p5-Hash-Diff/Makefile
  head/devel/p5-IO-Handle-Util/Makefile
  head/devel/p5-JSON-RPC-Common/Makefile
  head/devel/p5-MooseX-Runnable/Makefile
  head/devel/p5-MooseX-Traits/Makefile
  head/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
  head/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
  head/devel/p5-MooseX-Types-DateTime/Makefile
  head/devel/p5-MooseX-Types-PortNumber/Makefile
  head/devel/p5-MooseX-Types-Set-Object/Makefile
  head/devel/p5-MooseX-Types-URI/Makefile
  head/devel/p5-Term-VT102-Boundless/Makefile
  head/devel/p5-Test-TempDir/Makefile
  head/devel/p5-Tie-ToObject/Makefile
  head/devel/p5-XS-Object-Magic/Makefile
  head/security/p5-Crypt-Random-Source/Makefile
  head/www/p5-CGI-Cookie-Splitter/Makefile
  head/www/p5-Catalyst-Controller-BindLex/Makefile
  head/www/p5-Catalyst-Controller-RateLimit/Makefile
  head/www/p5-Catalyst-Controller-RequestToken/Makefile
  head/www/p5-Catalyst-Model-Adaptor/Makefile
  head/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
  head/www/p5-Catalyst-Plugin-Unicode/Makefile
  head/www/p5-Catalyst-View-Templated/Makefile
  head/www/p5-HTML-FromANSI/Makefile
  head/www/p5-Template-Plugin-JSON/Makefile

Modified: head/databases/p5-DBICx-MapMaker/Makefile
==============================================================================
--- head/databases/p5-DBICx-MapMaker/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/databases/p5-DBICx-MapMaker/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -16,9 +16,14 @@ RUN_DEPENDS=	p5-Moose>=0.39:${PORTSDIR}/
 BUILD_DEPENDS=	p5-DBIx-Class>=0.07003:${PORTSDIR}/databases/p5-DBIx-Class \
 		p5-DBICx-TestDatabase>=0.02:${PORTSDIR}/databases/p5-DBICx-TestDatabase \
 		p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose
-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>

Modified: head/databases/p5-DBICx-TestDatabase/Makefile
==============================================================================
--- head/databases/p5-DBICx-TestDatabase/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/databases/p5-DBICx-TestDatabase/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -21,9 +21,14 @@ BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:${
 RUN_DEPENDS=	p5-DBD-SQLite>=1.12:${PORTSDIR}/databases/p5-DBD-SQLite \
 		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
 		p5-File-Temp>0:${PORTSDIR}/devel/p5-File-Temp
-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>

Modified: head/devel/p5-AnyEvent-Subprocess/Makefile
==============================================================================
--- head/devel/p5-AnyEvent-Subprocess/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-AnyEvent-Subprocess/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -31,10 +31,15 @@ BUILD_DEPENDS=	p5-AnyEvent>=5.2:${PORTSD
 		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>

Modified: head/devel/p5-Check-ISA/Makefile
==============================================================================
--- head/devel/p5-Check-ISA/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Check-ISA/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,9 +14,14 @@ COMMENT=	DWIM, correct checking of an ob
 
 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>

Modified: head/devel/p5-Context-Preserve/Makefile
==============================================================================
--- head/devel/p5-Context-Preserve/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Context-Preserve/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -12,10 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl at 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>

Modified: head/devel/p5-Devel-ArgNames/Makefile
==============================================================================
--- head/devel/p5-Devel-ArgNames/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Devel-ArgNames/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -13,9 +13,14 @@ COMMENT=	Figure out the names of variabl
 
 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>

Modified: head/devel/p5-Devel-Events-Objects/Makefile
==============================================================================
--- head/devel/p5-Devel-Events-Objects/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Devel-Events-Objects/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -16,9 +16,14 @@ BUILD_DEPENDS=	p5-Devel-Events>=0:${PORT
 		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>

Modified: head/devel/p5-Devel-Events/Makefile
==============================================================================
--- head/devel/p5-Devel-Events/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Devel-Events/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -19,11 +19,16 @@ BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR
 		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>

Modified: head/devel/p5-Devel-PartialDump/Makefile
==============================================================================
--- head/devel/p5-Devel-PartialDump/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Devel-PartialDump/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Class-Tiny>=0:${PORTSD
 		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>

Modified: head/devel/p5-Event-Join/Makefile
==============================================================================
--- head/devel/p5-Event-Join/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Event-Join/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -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>

Modified: head/devel/p5-Hash-Diff/Makefile
==============================================================================
--- head/devel/p5-Hash-Diff/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Hash-Diff/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,10 +14,15 @@ COMMENT=	Return the difference between t
 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>

Modified: head/devel/p5-IO-Handle-Util/Makefile
==============================================================================
--- head/devel/p5-IO-Handle-Util/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-IO-Handle-Util/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -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>

Modified: head/devel/p5-JSON-RPC-Common/Makefile
==============================================================================
--- head/devel/p5-JSON-RPC-Common/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-JSON-RPC-Common/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -19,10 +19,15 @@ BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/
 		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>

Modified: head/devel/p5-MooseX-Runnable/Makefile
==============================================================================
--- head/devel/p5-MooseX-Runnable/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Runnable/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -25,10 +25,15 @@ BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSD
 		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>

Modified: head/devel/p5-MooseX-Traits/Makefile
==============================================================================
--- head/devel/p5-MooseX-Traits/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Traits/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -21,10 +21,15 @@ BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSD
 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>

Modified: head/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43:${PORTS
 		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>

Modified: head/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PO
 		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>

Modified: head/devel/p5-MooseX-Types-DateTime/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-DateTime/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-DateTime/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -22,10 +22,15 @@ BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PO
 		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>

Modified: head/devel/p5-MooseX-Types-PortNumber/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-PortNumber/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-PortNumber/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORT
 		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>

Modified: head/devel/p5-MooseX-Types-Set-Object/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-Set-Object/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-Set-Object/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Moose>=0.50:${PORTSDIR
 		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>

Modified: head/devel/p5-MooseX-Types-URI/Makefile
==============================================================================
--- head/devel/p5-MooseX-Types-URI/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-MooseX-Types-URI/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	p5-Moose>=0.40:${PORTSDIR
 		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>

Modified: head/devel/p5-Term-VT102-Boundless/Makefile
==============================================================================
--- head/devel/p5-Term-VT102-Boundless/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Term-VT102-Boundless/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -13,9 +13,14 @@ COMMENT=	Subclass to emulate boundless D
 
 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>

Modified: head/devel/p5-Test-TempDir/Makefile
==============================================================================
--- head/devel/p5-Test-TempDir/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Test-TempDir/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -21,8 +21,7 @@ BUILD_DEPENDS=	p5-Directory-Scratch>=0:$
 		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>

Modified: head/devel/p5-Tie-ToObject/Makefile
==============================================================================
--- head/devel/p5-Tie-ToObject/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-Tie-ToObject/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -11,13 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe at 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>

Modified: head/devel/p5-XS-Object-Magic/Makefile
==============================================================================
--- head/devel/p5-XS-Object-Magic/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/devel/p5-XS-Object-Magic/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -13,10 +13,15 @@ MAINTAINER=	sunpoet at 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>

Modified: head/security/p5-Crypt-Random-Source/Makefile
==============================================================================
--- head/security/p5-Crypt-Random-Source/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/security/p5-Crypt-Random-Source/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Any-Moose>=0.11:${PORT
 		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-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>

Modified: head/www/p5-CGI-Cookie-Splitter/Makefile
==============================================================================
--- head/www/p5-CGI-Cookie-Splitter/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-CGI-Cookie-Splitter/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -16,9 +16,14 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-CGI-Simple>=0:${PORTSDIR}/www/p5-CGI-Simple
 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>

Modified: head/www/p5-Catalyst-Controller-BindLex/Makefile
==============================================================================
--- head/www/p5-Catalyst-Controller-BindLex/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Controller-BindLex/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Controller-BindLex
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NUFFIN
@@ -19,11 +19,16 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:${
 		p5-Array-RefElem>=0:${PORTSDIR}/misc/p5-Array-RefElem \
 		p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
 		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-.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>

Modified: head/www/p5-Catalyst-Controller-RateLimit/Makefile
==============================================================================
--- head/www/p5-Catalyst-Controller-RateLimit/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Controller-RateLimit/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -18,10 +18,15 @@ BUILD_DEPENDS=	p5-Algorithm-FloodControl
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
 
 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>

Modified: head/www/p5-Catalyst-Controller-RequestToken/Makefile
==============================================================================
--- head/www/p5-Catalyst-Controller-RequestToken/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Controller-RequestToken/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -17,9 +17,14 @@ BUILD_DEPENDS=	p5-Catalyst-Action-Render
 		p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
 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>

Modified: head/www/p5-Catalyst-Model-Adaptor/Makefile
==============================================================================
--- head/www/p5-Catalyst-Model-Adaptor/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Model-Adaptor/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,10 +14,15 @@ COMMENT=	Use a plain class as a Catalyst
 RUN_DEPENDS=	p5-Catalyst-Runtime>=0:${PORTSDIR}/www/p5-Catalyst-Runtime \
 		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=	p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
 
 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>

Modified: head/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
==============================================================================
--- head/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -17,9 +17,14 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Catalyst-Plugin-Session>=0.27:${PORTSDIR}/www/p5-Catalyst-Plugin-Session \
 		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat
 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>

Modified: head/www/p5-Catalyst-Plugin-Unicode/Makefile
==============================================================================
--- head/www/p5-Catalyst-Plugin-Unicode/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-Plugin-Unicode/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.70
 		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok
+		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
 
 USES=		perl5
 USE_PERL5=	configure
@@ -24,4 +23,10 @@ USE_PERL5=	configure
 post-extract:
 	@${REINPLACE_CMD} -e '/build_requires/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>

Modified: head/www/p5-Catalyst-View-Templated/Makefile
==============================================================================
--- head/www/p5-Catalyst-View-Templated/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Catalyst-View-Templated/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -17,10 +17,15 @@ BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.70
 		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst \
-		p5-Test-use-ok>=0:${PORTSDIR}/devel/p5-Test-use-ok \
+		p5-Test-WWW-Mechanize-Catalyst>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-Catalyst
 
 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>

Modified: head/www/p5-HTML-FromANSI/Makefile
==============================================================================
--- head/www/p5-HTML-FromANSI/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-HTML-FromANSI/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,9 +14,14 @@ COMMENT=	Mark up ANSI sequences as HTML
 BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Term-VT102-Boundless>=0:${PORTSDIR}/devel/p5-Term-VT102-Boundless
 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>

Modified: head/www/p5-Template-Plugin-JSON/Makefile
==============================================================================
--- head/www/p5-Template-Plugin-JSON/Makefile	Wed Jun 24 16:19:31 2015	(r390493)
+++ head/www/p5-Template-Plugin-JSON/Makefile	Wed Jun 24 16:29:25 2015	(r390494)
@@ -14,9 +14,14 @@ BUILD_DEPENDS=	p5-JSON>=2.12:${PORTSDIR}
 		p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
 		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit
 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>


More information about the svn-ports-all mailing list