63 files changed, 61 insertions, 454 deletions

diff --git a/archivers/p5-Archive-Extract/Makefile b/archivers/p5-Archive-Extract/Makefile
index 8d4bcfd9efce..4f46b6b8fa6d 100644
--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -16,11 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-IPC-Cmd>=0.64:${PORTSDIR}/devel/p5-IPC-Cmd
-RUN_DEPENDS+=	p5-IPC-Cmd>=0.64:${PORTSDIR}/devel/p5-IPC-Cmd
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/p5-JSON-Any/Makefile b/converters/p5-JSON-Any/Makefile
index 6401015923df..2da40769f92c 100644
--- a/converters/p5-JSON-Any/Makefile
+++ b/converters/p5-JSON-Any/Makefile
@@ -43,10 +43,4 @@ JSON_PP_RUN_DEPENDS=	p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP
 JSON_XS_BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
 JSON_XS_RUN_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index 128ff6d923ae..21e9e217f056 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -20,10 +20,4 @@ TEST_DEPENDS=	\
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index 7e8ad54dba07..99403c14b9cf 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -27,10 +27,4 @@ TEST_DEPENDS=	p5-DBD-SQLite>=1.31:${PORTSDIR}/databases/p5-DBD-SQLite \
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Acme-MetaSyntactic/Makefile b/devel/p5-Acme-MetaSyntactic/Makefile
index 16c5abdb4eaf..7b9563af81e3 100644
--- a/devel/p5-Acme-MetaSyntactic/Makefile
+++ b/devel/p5-Acme-MetaSyntactic/Makefile
@@ -16,10 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-CPAN-Meta-Check/Makefile b/devel/p5-CPAN-Meta-Check/Makefile
index 4802b56a8bbc..15618a3f6328 100644
--- a/devel/p5-CPAN-Meta-Check/Makefile
+++ b/devel/p5-CPAN-Meta-Check/Makefile
@@ -21,11 +21,4 @@ TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata
-RUN_DEPENDS+=	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Class-ErrorHandler/Makefile b/devel/p5-Class-ErrorHandler/Makefile
index c0f9b4757985..0c84ba8285e8 100644
--- a/devel/p5-Class-ErrorHandler/Makefile
+++ b/devel/p5-Class-ErrorHandler/Makefile
@@ -12,11 +12,4 @@ COMMENT=	Base class for error handling
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-CPAN-Meta>=0:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=0:${PORTSDIR}/devel/p5-CPAN-Meta
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index cc8e262e1b67..39eb643a5afc 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -18,10 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Data-Localize/Makefile b/devel/p5-Data-Localize/Makefile
index 9ad190d96189..ca4b07fd8fa9 100644
--- a/devel/p5-Data-Localize/Makefile
+++ b/devel/p5-Data-Localize/Makefile
@@ -19,10 +19,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=	perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Data-RoundRobin/Makefile b/devel/p5-Data-RoundRobin/Makefile
index 033fc5ec8b71..ff4edad23fbd 100644
--- a/devel/p5-Data-RoundRobin/Makefile
+++ b/devel/p5-Data-RoundRobin/Makefile
@@ -13,10 +13,4 @@ COMMENT=	Serve data in a round robin manner
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index a63449273174..76965bef5e2e 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -21,10 +21,4 @@ TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index ce9cc57f5632..92a05672eb59 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -21,11 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 501400
-BUILD_DEPENDS+=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
-RUN_DEPENDS+=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index 7453ee79e3ca..983f7fe929bf 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -25,10 +25,6 @@ USE_PERL5=	configure
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 501400
-RUN_DEPENDS+=	p5-Carp>=1.20:${PORTSDIR}/devel/p5-Carp
-.endif
-
 .if ${PERL_LEVEL} < 501600
 TEST_DEPENDS+=	p5-Time-HiRes>=1.9725:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
diff --git a/devel/p5-Devel-GlobalDestruction/Makefile b/devel/p5-Devel-GlobalDestruction/Makefile
index 0c4caa52355a..0628497a2527 100644
--- a/devel/p5-Devel-GlobalDestruction/Makefile
+++ b/devel/p5-Devel-GlobalDestruction/Makefile
@@ -19,11 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Devel-GlobalDestruction-XS>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction-XS
-RUN_DEPENDS+=	p5-Devel-GlobalDestruction-XS>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction-XS
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Getopt-Compact-WithCmd/Makefile b/devel/p5-Getopt-Compact-WithCmd/Makefile
index da1e2497c6fe..083ff6609048 100644
--- a/devel/p5-Getopt-Compact-WithCmd/Makefile
+++ b/devel/p5-Getopt-Compact-WithCmd/Makefile
@@ -14,17 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
-RUN_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
 		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index faa098706bbb..549c028cb185 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -22,10 +22,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 829ea5c7252d..852c6a18240c 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -23,10 +23,6 @@ USES=		perl5
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
 .if ${PERL_LEVEL} < 501600
 BUILD_DEPENDS+=	p5-base>=2.18:${PORTSDIR}/devel/p5-base
 RUN_DEPENDS+=	p5-base>=2.18:${PORTSDIR}/devel/p5-base
diff --git a/devel/p5-IO-TieCombine/Makefile b/devel/p5-IO-TieCombine/Makefile
index 5bf1eecbd72a..99b35de29ba0 100644
--- a/devel/p5-IO-TieCombine/Makefile
+++ b/devel/p5-IO-TieCombine/Makefile
@@ -13,10 +13,4 @@ COMMENT=	Perl 5 module to produce tied separate but combined variables
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index 7f9440c2b8b4..10c35caf0ab1 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -29,10 +29,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Log-Minimal/Makefile b/devel/p5-Log-Minimal/Makefile
index b3888b3bb139..3e7347350a16 100644
--- a/devel/p5-Log-Minimal/Makefile
+++ b/devel/p5-Log-Minimal/Makefile
@@ -16,10 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index 70c7b96bd0b0..bb61febbf463 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -22,10 +22,4 @@ TEST_DEPENDS=	p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index 0ec708cf6bc5..6a3cd8cd912a 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -27,10 +27,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
index 47ce39001124..3b36b6cf006f 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
@@ -20,10 +20,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index ab1e09597b55..4326d424cd4d 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -21,10 +21,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index b08b8f957079..88026c95cdbc 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -22,10 +22,4 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index 26223d679ec8..687ab4894a7e 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -17,10 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index 2fd580fd8757..62ff2786f518 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -22,12 +22,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.25:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.25:${PORTSDIR}/lang/p5-Scalar-List-Utils
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index a56ff63aaa7d..5c1d105c23b7 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -17,12 +17,4 @@ LICENSE_COMB=	dual
 USES=	perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-ParseTemplate/Makefile b/devel/p5-ParseTemplate/Makefile
index d93ce3dc9b37..ce5eae64ba8e 100644
--- a/devel/p5-ParseTemplate/Makefile
+++ b/devel/p5-ParseTemplate/Makefile
@@ -16,10 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-String-Errf/Makefile b/devel/p5-String-Errf/Makefile
index f925363c1410..d3a6781701a1 100644
--- a/devel/p5-String-Errf/Makefile
+++ b/devel/p5-String-Errf/Makefile
@@ -21,10 +21,4 @@ BUILD_DEPENDS:=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Sub-Exporter/Makefile b/devel/p5-Sub-Exporter/Makefile
index af18a1690b31..5b4055248b5e 100644
--- a/devel/p5-Sub-Exporter/Makefile
+++ b/devel/p5-Sub-Exporter/Makefile
@@ -21,10 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Sub-Install/Makefile b/devel/p5-Sub-Install/Makefile
index b1e1234f3f66..6a43fa1a62fe 100644
--- a/devel/p5-Sub-Install/Makefile
+++ b/devel/p5-Sub-Install/Makefile
@@ -16,10 +16,4 @@ LICENSE_COMB=	dual
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile
index 2bcbb3652e91..c222737b1e4b 100644
--- a/devel/p5-Test-DBIx-Class/Makefile
+++ b/devel/p5-Test-DBIx-Class/Makefile
@@ -36,12 +36,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 1ebb3314209d..b92d6b5c76c9 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -21,10 +21,4 @@ USES=		perl5
 USE_PERL5=	configure
 INSTALL_TARGET=	pure_install
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index 24d56e641fa1..ff9c65421126 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -18,10 +18,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=	perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index 6a30659aef6f..3dc97d5bcb5c 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -25,10 +25,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index ea5fb6e45b21..a7d4fdc496fc 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -22,10 +22,6 @@ USE_PERL5=	configure
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
 .if ${PERL_LEVEL} < 501800
 BUILD_DEPENDS+=	p5-PathTools>=3.4000:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS+=	p5-PathTools>=3.4000:${PORTSDIR}/devel/p5-PathTools
diff --git a/devel/p5-perlbrew/Makefile b/devel/p5-perlbrew/Makefile
index 51d0b0623d36..9ec696e2d4c9 100644
--- a/devel/p5-perlbrew/Makefile
+++ b/devel/p5-perlbrew/Makefile
@@ -29,10 +29,4 @@ TEST_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile
index 27ce5e6f153f..14906ac0c4d8 100644
--- a/dns/p5-POE-Component-Resolver/Makefile
+++ b/dns/p5-POE-Component-Resolver/Makefile
@@ -21,12 +21,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index 86b1c415e419..194be94bd61e 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -33,10 +33,4 @@ TEST_DEPENDS=	p5-Capture-Tiny>=0.08:${PORTSDIR}/devel/p5-Capture-Tiny \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/p5-Math-Random-MT-Auto/Makefile b/math/p5-Math-Random-MT-Auto/Makefile
index 8f6a19f5cc42..34bdbeba987b 100644
--- a/math/p5-Math-Random-MT-Auto/Makefile
+++ b/math/p5-Math-Random-MT-Auto/Makefile
@@ -18,11 +18,4 @@ TEST_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/p5-Net-MAC-Vendor/Makefile b/net/p5-Net-MAC-Vendor/Makefile
index 154c201ec850..b55733865d2f 100644
--- a/net/p5-Net-MAC-Vendor/Makefile
+++ b/net/p5-Net-MAC-Vendor/Makefile
@@ -20,10 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/p5-Unix-Passwd-File/Makefile b/security/p5-Unix-Passwd-File/Makefile
index 96289bd34881..a4f1c34a2b9d 100644
--- a/security/p5-Unix-Passwd-File/Makefile
+++ b/security/p5-Unix-Passwd-File/Makefile
@@ -24,10 +24,4 @@ TEST_DEPENDS=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index 33176e796450..c20e5cc290df 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -26,10 +26,4 @@ TEST_DEPENDS=	p5-Text-TestBase>0:${PORTSDIR}/textproc/p5-Text-TestBase \
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 6de53fe39cb6..950eee21edf9 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -23,10 +23,4 @@ USES=		perl5
 USE_PERL5=	modbuild
 INSTALL_TARGET=	pure_install
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile
index cabbb23f7c1f..d9e62ada4247 100644
--- a/textproc/p5-HTML-HTML5-Parser/Makefile
+++ b/textproc/p5-HTML-HTML5-Parser/Makefile
@@ -24,11 +24,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-HTTP-Tiny>0:${PORTSDIR}/www/p5-HTTP-Tiny
-RUN_DEPENDS+=	p5-HTTP-Tiny>0:${PORTSDIR}/www/p5-HTTP-Tiny
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile
index b95d9be52af1..19f40e3ddcad 100644
--- a/textproc/p5-Hailo/Makefile
+++ b/textproc/p5-Hailo/Makefile
@@ -49,7 +49,6 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	SQLITE PGSQL MYSQL
 OPTIONS_DEFAULT=	SQLITE
 
-.include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLITE}
@@ -63,10 +62,4 @@ RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-autodie>=2.08:${PORTSDIR}/devel/p5-autodie
-RUN_DEPENDS+=	p5-autodie>=2.08:${PORTSDIR}/devel/p5-autodie
-TEST_DEPENDS+=	p5-Test-Simple>=0.94:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile
index 4875c8c57c13..1c0cb47a731b 100644
--- a/textproc/p5-Pod-Elemental/Makefile
+++ b/textproc/p5-Pod-Elemental/Makefile
@@ -29,10 +29,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Pod-Eventual/Makefile b/textproc/p5-Pod-Eventual/Makefile
index 180b60deef57..588c862da290 100644
--- a/textproc/p5-Pod-Eventual/Makefile
+++ b/textproc/p5-Pod-Eventual/Makefile
@@ -20,10 +20,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Text-TestBase/Makefile b/textproc/p5-Text-TestBase/Makefile
index 9e96db2e10bc..353a94b4170d 100644
--- a/textproc/p5-Text-TestBase/Makefile
+++ b/textproc/p5-Text-TestBase/Makefile
@@ -20,12 +20,4 @@ TEST_DEPENDS=	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index b55b4a5925e1..e1ad8fa2f2b5 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -25,11 +25,4 @@ RUN_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-Term-ANSIColor>=3:${PORTSDIR}/devel/p5-Term-ANSIColor
-RUN_DEPENDS+=	p5-Term-ANSIColor>=3:${PORTSDIR}/devel/p5-Term-ANSIColor
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Compile/Makefile b/textproc/p5-XML-Compile/Makefile
index d3ced4e34980..b1dd1f9c6449 100644
--- a/textproc/p5-XML-Compile/Makefile
+++ b/textproc/p5-XML-Compile/Makefile
@@ -22,11 +22,4 @@ TEST_DEPENDS=	p5-Test-Deep>=0.095:${PORTSDIR}/devel/p5-Test-Deep \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-MIME-Base64>=3.10:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS+=	p5-MIME-Base64>=3.10:${PORTSDIR}/converters/p5-MIME-Base64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-Application-Server/Makefile b/www/p5-CGI-Application-Server/Makefile
index 11b8d0991a19..54c3c90ede4f 100644
--- a/www/p5-CGI-Application-Server/Makefile
+++ b/www/p5-CGI-Application-Server/Makefile
@@ -29,10 +29,4 @@ TEST_DEPENDS=	p5-CGI-Application>0:${PORTSDIR}/www/p5-CGI-Application \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI.pm/Makefile b/www/p5-CGI.pm/Makefile
index 12419fda3d98..bb844677f725 100644
--- a/www/p5-CGI.pm/Makefile
+++ b/www/p5-CGI.pm/Makefile
@@ -35,10 +35,4 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-Furl/Makefile b/www/p5-Furl/Makefile
index 2ee4e9f0d03b..5ff60e9df8f2 100644
--- a/www/p5-Furl/Makefile
+++ b/www/p5-Furl/Makefile
@@ -27,10 +27,4 @@ TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
 USES=	perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTML-Shakan/Makefile b/www/p5-HTML-Shakan/Makefile
index 0bdb99143a53..90e4b84edc64 100644
--- a/www/p5-HTML-Shakan/Makefile
+++ b/www/p5-HTML-Shakan/Makefile
@@ -30,10 +30,4 @@ TEST_DEPENDS=	\
 USES=	perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTTP-BrowserDetect/Makefile b/www/p5-HTTP-BrowserDetect/Makefile
index 5e61602b9aab..a32e441f9977 100644
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@@ -22,10 +22,4 @@ TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
index b07140bedc27..98aab425feab 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
@@ -16,10 +16,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index 6c2ffb1f1ec4..d50435924f7d 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -26,10 +26,4 @@ TEST_DEPENDS=	p5-Test-POE-Server-TCP>=1.14:${PORTSDIR}/devel/p5-Test-POE-Server-
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-STF-Dispatcher-PSGI/Makefile b/www/p5-STF-Dispatcher-PSGI/Makefile
index 36687fc3bd02..a440157a296e 100644
--- a/www/p5-STF-Dispatcher-PSGI/Makefile
+++ b/www/p5-STF-Dispatcher-PSGI/Makefile
@@ -23,10 +23,4 @@ TEST_DEPENDS=	\
 USES=	perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-WWW-GitHub-Gist/Makefile b/www/p5-WWW-GitHub-Gist/Makefile
index 61f4281a1956..7e2034cb22ef 100644
--- a/www/p5-WWW-GitHub-Gist/Makefile
+++ b/www/p5-WWW-GitHub-Gist/Makefile
@@ -20,11 +20,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-HTTP-Tiny>=0:${PORTSDIR}/www/p5-HTTP-Tiny
-RUN_DEPENDS+=	p5-HTTP-Tiny>=0:${PORTSDIR}/www/p5-HTTP-Tiny
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-WWW-TinySong/Makefile b/www/p5-WWW-TinySong/Makefile
index 55f93c1f6bc9..058c139587ce 100644
--- a/www/p5-WWW-TinySong/Makefile
+++ b/www/p5-WWW-TinySong/Makefile
@@ -18,10 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-Web-Query/Makefile b/www/p5-Web-Query/Makefile
index 6e0830fd342d..353d0d24a413 100644
--- a/www/p5-Web-Query/Makefile
+++ b/www/p5-Web-Query/Makefile
@@ -19,10 +19,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>