- Update to 1.302015

- Use real PORTVERSION
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Update CONFLICTS_INSTALL
- Add NO_ARCH

Changes:	http://search.cpan.org/dist/Test-Simple/Changes

65 files changed, 135 insertions, 72 deletions

diff --git a/databases/p5-DBICx-MapMaker/Makefile b/databases/p5-DBICx-MapMaker/Makefile
index f5d0ef02e9fd..4a43f9d30693 100644
--- a/databases/p5-DBICx-MapMaker/Makefile
+++ b/databases/p5-DBICx-MapMaker/Makefile
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index 1674f0757a8c..4c5a0f390980 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index fdc1f4e25ad7..b81c80b8a321 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -39,7 +39,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-perlbrew/Makefile b/devel/p5-App-perlbrew/Makefile
index e318644a5ced..f25538d88f66 100644
--- a/devel/p5-App-perlbrew/Makefile
+++ b/devel/p5-App-perlbrew/Makefile
@@ -38,7 +38,7 @@ BUILD_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
 RUN_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
 TEST_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker \
 		p5-File-Temp>=0.23.04:devel/p5-File-Temp \
-		p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+		p5-Test-Simple>=1.001002: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 5866af14bdfc..ec0ab2d27c9b 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 466f0d797c62..510f0a47b024 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 6dabf74503a3..d4cf005fe78d 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 92d604166e12..db761f7204a2 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 30b3c7082f69..469d68210a66 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 b985a47b2a23..46b1e816ffe4 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 94c24e56743f..a1159e997eac 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 e99466baa563..20013332a5ea 100644
--- a/devel/p5-Hash-Diff/Makefile
+++ b/devel/p5-Hash-Diff/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Return the difference between two hashes as a hash
 
 RUN_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
 BUILD_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
-TEST_DEPENDS=	p5-Test-Simple>=0.98:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +19,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 10c00e686a7a..250b3b1f590f 100644
--- a/devel/p5-IO-Handle-Util/Makefile
+++ b/devel/p5-IO-Handle-Util/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 26745d865143..71a090024ae8 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -27,7 +27,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 00362389eb91..708d51b47863 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 60976fd0d44f..37d2b122ff4a 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -29,7 +29,7 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 2e1cde2b02b9..87e235dabfcc 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -31,7 +31,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 4fe69d1f0b2a..e2ff86dabf7d 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -30,7 +30,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 e8370a5398b8..c0068efd0ae8 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -30,7 +30,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 4db8357fbb19..5a0d3c787d44 100644
--- a/devel/p5-MooseX-Types-PortNumber/Makefile
+++ b/devel/p5-MooseX-Types-PortNumber/Makefile
@@ -25,7 +25,7 @@ regression-test: build
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 64bfd6252628..8df07c00823c 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -26,7 +26,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 622ca2a83679..644fc0146004 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -28,7 +28,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index 0c67922dde5c..8e391150a7bd 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index d82b70722f03..4eb6e3f18321 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -21,8 +21,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001002:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Parallel-ForkManager/Makefile b/devel/p5-Parallel-ForkManager/Makefile
index bafec3eb2232..cdd239f00cb5 100644
--- a/devel/p5-Parallel-ForkManager/Makefile
+++ b/devel/p5-Parallel-ForkManager/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1.001:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Path-FindDev/Makefile b/devel/p5-Path-FindDev/Makefile
index b70ba02f62b7..45f163bc9936 100644
--- a/devel/p5-Path-FindDev/Makefile
+++ b/devel/p5-Path-FindDev/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-CPAN-Meta>0:devel/p5-CPAN-Meta \
 		p5-CPAN-Meta-Requirements>2.120:devel/p5-CPAN-Meta-Requirements \
-		p5-Test-Simple>=1.001.003:devel/p5-Test-Simple
+		p5-Test-Simple>=1.001003:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index 00f8fb2d5f8f..a7b5f96f3c5a 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 036f82cfa30a..88b91be548f9 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-BinaryData/Makefile b/devel/p5-Test-BinaryData/Makefile
index 26fa4ec676c4..6f6eb22a52df 100644
--- a/devel/p5-Test-BinaryData/Makefile
+++ b/devel/p5-Test-BinaryData/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Bits/Makefile b/devel/p5-Test-Bits/Makefile
index 542308847a2b..a4b2956a32b2 100644
--- a/devel/p5-Test-Bits/Makefile
+++ b/devel/p5-Test-Bits/Makefile
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
index 356933b1aa70..3d304a67d90a 100644
--- a/devel/p5-Test-CleanNamespaces/Makefile
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -34,7 +34,7 @@ PLIST_FILES=	%%SITE_PERL%%/Test/CleanNamespaces.pm \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Deep/Makefile b/devel/p5-Test-Deep/Makefile
index c53e996bcb01..3e33e31b58b0 100644
--- a/devel/p5-Test-Deep/Makefile
+++ b/devel/p5-Test-Deep/Makefile
@@ -24,8 +24,8 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-File/Makefile b/devel/p5-Test-File/Makefile
index 23545d39b0c3..c5d7be0f2c6d 100644
--- a/devel/p5-Test-File/Makefile
+++ b/devel/p5-Test-File/Makefile
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502104
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001006:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001006:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Filename/Makefile b/devel/p5-Test-Filename/Makefile
index 501297f6d06f..8131acbb65e9 100644
--- a/devel/p5-Test-Filename/Makefile
+++ b/devel/p5-Test-Filename/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index c15c50944e3f..f6eed9b41627 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index fb5551ed2949..3b1b1998c835 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS+=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index ac3cb5a67f95..2baf8889d48c 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index 3a9f55335b8b..66a188b46f3c 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Simple
-PORTVERSION=	1.001.014
+PORTVERSION=	1.302015
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Basic utilities for writing tests in perl
@@ -14,8 +13,9 @@ COMMENT=	Basic utilities for writing tests in perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-CONFLICTS=	p5-Test-Tester-[0-9]* p5-Test-use-ok-[0-9]*
+CONFLICTS_INSTALL=	p5-Test2-[0-9]* p5-Test-Tester-[0-9]* p5-Test-use-ok-[0-9]*
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/devel/p5-Test-Simple/distinfo b/devel/p5-Test-Simple/distinfo
index 15f764e0aa52..1a0eeda3f753 100644
--- a/devel/p5-Test-Simple/distinfo
+++ b/devel/p5-Test-Simple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Test-Simple-1.001014.tar.gz) = 55a414ce89eb7a5e9e84186f286b002054f10ae8ef4f8f2d61bb710e7549f16b
-SIZE (Test-Simple-1.001014.tar.gz) = 127212
+SHA256 (Test-Simple-1.302015.tar.gz) = d4ac67ad324d70fd97570ee3b3c253b6f64077652714bdd70790af9ec80672a5
+SIZE (Test-Simple-1.302015.tar.gz) = 231281
diff --git a/devel/p5-Test-Simple/pkg-plist b/devel/p5-Test-Simple/pkg-plist
index 7e1019a5637f..66868fbe602a 100644
--- a/devel/p5-Test-Simple/pkg-plist
+++ b/devel/p5-Test-Simple/pkg-plist
@@ -1,8 +1,10 @@
 %%SITE_PERL%%/Test/Builder.pm
+%%SITE_PERL%%/Test/Builder/Formatter.pm
 %%SITE_PERL%%/Test/Builder/IO/Scalar.pm
 %%SITE_PERL%%/Test/Builder/Module.pm
 %%SITE_PERL%%/Test/Builder/Tester.pm
 %%SITE_PERL%%/Test/Builder/Tester/Color.pm
+%%SITE_PERL%%/Test/Builder/TodoDiag.pm
 %%SITE_PERL%%/Test/More.pm
 %%SITE_PERL%%/Test/Simple.pm
 %%SITE_PERL%%/Test/Tester.pm
@@ -11,12 +13,74 @@
 %%SITE_PERL%%/Test/Tester/Delegate.pm
 %%SITE_PERL%%/Test/Tutorial.pod
 %%SITE_PERL%%/Test/use/ok.pm
+%%SITE_PERL%%/Test2.pm
+%%SITE_PERL%%/Test2/API.pm
+%%SITE_PERL%%/Test2/API/Breakage.pm
+%%SITE_PERL%%/Test2/API/Context.pm
+%%SITE_PERL%%/Test2/API/Instance.pm
+%%SITE_PERL%%/Test2/API/Stack.pm
+%%SITE_PERL%%/Test2/Event.pm
+%%SITE_PERL%%/Test2/Event/Bail.pm
+%%SITE_PERL%%/Test2/Event/Diag.pm
+%%SITE_PERL%%/Test2/Event/Exception.pm
+%%SITE_PERL%%/Test2/Event/Note.pm
+%%SITE_PERL%%/Test2/Event/Ok.pm
+%%SITE_PERL%%/Test2/Event/Plan.pm
+%%SITE_PERL%%/Test2/Event/Skip.pm
+%%SITE_PERL%%/Test2/Event/Subtest.pm
+%%SITE_PERL%%/Test2/Event/Waiting.pm
+%%SITE_PERL%%/Test2/Formatter.pm
+%%SITE_PERL%%/Test2/Formatter/TAP.pm
+%%SITE_PERL%%/Test2/Hub.pm
+%%SITE_PERL%%/Test2/Hub/Interceptor.pm
+%%SITE_PERL%%/Test2/Hub/Interceptor/Terminator.pm
+%%SITE_PERL%%/Test2/Hub/Subtest.pm
+%%SITE_PERL%%/Test2/IPC.pm
+%%SITE_PERL%%/Test2/IPC/Driver.pm
+%%SITE_PERL%%/Test2/IPC/Driver/Files.pm
+%%SITE_PERL%%/Test2/Transition.pod
+%%SITE_PERL%%/Test2/Util.pm
+%%SITE_PERL%%/Test2/Util/ExternalMeta.pm
+%%SITE_PERL%%/Test2/Util/HashBase.pm
+%%SITE_PERL%%/Test2/Util/Trace.pm
 %%SITE_PERL%%/ok.pm
+%%PERL5_MAN3%%/Test2.3.gz
+%%PERL5_MAN3%%/Test2::API.3.gz
+%%PERL5_MAN3%%/Test2::API::Breakage.3.gz
+%%PERL5_MAN3%%/Test2::API::Context.3.gz
+%%PERL5_MAN3%%/Test2::API::Instance.3.gz
+%%PERL5_MAN3%%/Test2::API::Stack.3.gz
+%%PERL5_MAN3%%/Test2::Event.3.gz
+%%PERL5_MAN3%%/Test2::Event::Bail.3.gz
+%%PERL5_MAN3%%/Test2::Event::Diag.3.gz
+%%PERL5_MAN3%%/Test2::Event::Exception.3.gz
+%%PERL5_MAN3%%/Test2::Event::Note.3.gz
+%%PERL5_MAN3%%/Test2::Event::Ok.3.gz
+%%PERL5_MAN3%%/Test2::Event::Plan.3.gz
+%%PERL5_MAN3%%/Test2::Event::Skip.3.gz
+%%PERL5_MAN3%%/Test2::Event::Subtest.3.gz
+%%PERL5_MAN3%%/Test2::Event::Waiting.3.gz
+%%PERL5_MAN3%%/Test2::Formatter.3.gz
+%%PERL5_MAN3%%/Test2::Formatter::TAP.3.gz
+%%PERL5_MAN3%%/Test2::Hub.3.gz
+%%PERL5_MAN3%%/Test2::Hub::Interceptor.3.gz
+%%PERL5_MAN3%%/Test2::Hub::Interceptor::Terminator.3.gz
+%%PERL5_MAN3%%/Test2::Hub::Subtest.3.gz
+%%PERL5_MAN3%%/Test2::IPC.3.gz
+%%PERL5_MAN3%%/Test2::IPC::Driver.3.gz
+%%PERL5_MAN3%%/Test2::IPC::Driver::Files.3.gz
+%%PERL5_MAN3%%/Test2::Transition.3.gz
+%%PERL5_MAN3%%/Test2::Util.3.gz
+%%PERL5_MAN3%%/Test2::Util::ExternalMeta.3.gz
+%%PERL5_MAN3%%/Test2::Util::HashBase.3.gz
+%%PERL5_MAN3%%/Test2::Util::Trace.3.gz
 %%PERL5_MAN3%%/Test::Builder.3.gz
+%%PERL5_MAN3%%/Test::Builder::Formatter.3.gz
 %%PERL5_MAN3%%/Test::Builder::IO::Scalar.3.gz
 %%PERL5_MAN3%%/Test::Builder::Module.3.gz
 %%PERL5_MAN3%%/Test::Builder::Tester.3.gz
 %%PERL5_MAN3%%/Test::Builder::Tester::Color.3.gz
+%%PERL5_MAN3%%/Test::Builder::TodoDiag.3.gz
 %%PERL5_MAN3%%/Test::More.3.gz
 %%PERL5_MAN3%%/Test::Simple.3.gz
 %%PERL5_MAN3%%/Test::Tester.3.gz
diff --git a/devel/p5-Test-Spelling/Makefile b/devel/p5-Test-Spelling/Makefile
index 2dd90ed29b64..4dd1364008bb 100644
--- a/devel/p5-Test-Spelling/Makefile
+++ b/devel/p5-Test-Spelling/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile
index 375260a6ab8f..fd1bcbe24220 100644
--- a/devel/p5-Test-Timer/Makefile
+++ b/devel/p5-Test-Timer/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Trap/Makefile b/devel/p5-Test-Trap/Makefile
index 486983cf3929..8205326a41b1 100644
--- a/devel/p5-Test-Trap/Makefile
+++ b/devel/p5-Test-Trap/Makefile
@@ -24,7 +24,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=  p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=  p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Version/Makefile b/devel/p5-Test-Version/Makefile
index 296943a508da..fb7d83d8f2ab 100644
--- a/devel/p5-Test-Version/Makefile
+++ b/devel/p5-Test-Version/Makefile
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-WWW-Declare/Makefile b/devel/p5-Test-WWW-Declare/Makefile
index a7680f618244..9a94d0fbcf5e 100644
--- a/devel/p5-Test-WWW-Declare/Makefile
+++ b/devel/p5-Test-WWW-Declare/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Warnings/Makefile b/devel/p5-Test-Warnings/Makefile
index fe881f0b38f9..dd333ae5c352 100644
--- a/devel/p5-Test-Warnings/Makefile
+++ b/devel/p5-Test-Warnings/Makefile
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 e1f7de0f3652..073ff0f8f40c 100644
--- a/devel/p5-Tie-ToObject/Makefile
+++ b/devel/p5-Tie-ToObject/Makefile
@@ -20,7 +20,7 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 7b38cf8eb65c..0ce66e132009 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile
index 57f4b2779f0e..9a0dca09db15 100644
--- a/devel/p5-Type-Tiny/Makefile
+++ b/devel/p5-Type-Tiny/Makefile
@@ -50,7 +50,7 @@ XS_RUN_DEPENDS=		p5-Type-Tiny-XS>=0.010:devel/p5-Type-Tiny-XS
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014: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 73968ddd0efd..7b9c38804ff5 100644
--- a/devel/p5-XS-Object-Magic/Makefile
+++ b/devel/p5-XS-Object-Magic/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 post-install:
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 25277da64411..f1a4d66f48c9 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Crypt-Random-Source/Makefile b/security/p5-Crypt-Random-Source/Makefile
index 5290f0e36f14..5f12445a01ea 100644
--- a/security/p5-Crypt-Random-Source/Makefile
+++ b/security/p5-Crypt-Random-Source/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index a0ae9a8947f1..a78985753c6f 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Tree/Makefile b/textproc/p5-Pod-Tree/Makefile
index ecb88a8734fe..f831c5375117 100644
--- a/textproc/p5-Pod-Tree/Makefile
+++ b/textproc/p5-Pod-Tree/Makefile
@@ -33,7 +33,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Application-Plugin-Session/Makefile b/www/p5-CGI-Application-Plugin-Session/Makefile
index 15a37a4d9cad..d37a8d42bca9 100644
--- a/www/p5-CGI-Application-Plugin-Session/Makefile
+++ b/www/p5-CGI-Application-Plugin-Session/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-CGI-Application>=3.21:www/p5-CGI-Application \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-CGI-Simple>=0:www/p5-CGI-Simple \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
-		p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+		p5-Test-Simple>=1.001002:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/www/p5-CGI-Cookie-Splitter/Makefile b/www/p5-CGI-Cookie-Splitter/Makefile
index 1d323eee13e6..8c2e010e3f80 100644
--- a/www/p5-CGI-Cookie-Splitter/Makefile
+++ b/www/p5-CGI-Cookie-Splitter/Makefile
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-BindLex/Makefile b/www/p5-Catalyst-Controller-BindLex/Makefile
index 73e1d83df9f3..db42702c4e1d 100644
--- a/www/p5-Catalyst-Controller-BindLex/Makefile
+++ b/www/p5-Catalyst-Controller-BindLex/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	modbuild
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-RateLimit/Makefile b/www/p5-Catalyst-Controller-RateLimit/Makefile
index f7c8ce83cf14..33499fa287d5 100644
--- a/www/p5-Catalyst-Controller-RateLimit/Makefile
+++ b/www/p5-Catalyst-Controller-RateLimit/Makefile
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Controller-RequestToken/Makefile b/www/p5-Catalyst-Controller-RequestToken/Makefile
index 215b67f8b23a..58f451a3a8bb 100644
--- a/www/p5-Catalyst-Controller-RequestToken/Makefile
+++ b/www/p5-Catalyst-Controller-RequestToken/Makefile
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Model-Adaptor/Makefile b/www/p5-Catalyst-Model-Adaptor/Makefile
index b1a273848f55..ceca8458ae85 100644
--- a/www/p5-Catalyst-Model-Adaptor/Makefile
+++ b/www/p5-Catalyst-Model-Adaptor/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
index c2b00c9d8a02..e62d880d35f8 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-Store-Delegate/Makefile
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-Plugin-Unicode/Makefile b/www/p5-Catalyst-Plugin-Unicode/Makefile
index ba3cf385769b..d8ace7e30e4f 100644
--- a/www/p5-Catalyst-Plugin-Unicode/Makefile
+++ b/www/p5-Catalyst-Plugin-Unicode/Makefile
@@ -26,7 +26,7 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Catalyst-View-Templated/Makefile b/www/p5-Catalyst-View-Templated/Makefile
index d343e02ec0da..be212264472c 100644
--- a/www/p5-Catalyst-View-Templated/Makefile
+++ b/www/p5-Catalyst-View-Templated/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile
index d90742927f75..e6e330dfc085 100644
--- a/www/p5-HTML-FromANSI/Makefile
+++ b/www/p5-HTML-FromANSI/Makefile
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index b5be71f05016..c34d21e950e2 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>