Use the CPAN site macro.

Use DISTVERSION in place of DISTNAME where possible.
Remove perl 5.005 shims.

69 files changed, 89 insertions, 312 deletions

diff --git a/devel/p5-Alzabo-GUI-Mason/Makefile b/devel/p5-Alzabo-GUI-Mason/Makefile
index 98660ee118c0..08d3f893a71f 100644
--- a/devel/p5-Alzabo-GUI-Mason/Makefile
+++ b/devel/p5-Alzabo-GUI-Mason/Makefile
@@ -37,10 +37,4 @@ post-install:
 pre-install:
 	@${MKDIR} ${DATADIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		Needs perl 5.6+, install lang/perl5 or lang/perl5.8 and try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index e0a4a35ba935..d5bef3a7962f 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Alzabo
 PORTVERSION=	0.91
 CATEGORIES=	devel databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Alzabo
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -106,9 +105,6 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Stora
 		${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-.if ${PERL_LEVEL} < 500600
-IGNORE=	requires perl 5.6+, install lang/perl5 or lang/perl5.8 and try again
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Attribute-Handlers-Prospective/Makefile b/devel/p5-Attribute-Handlers-Prospective/Makefile
index 4673dd67fde8..1a3bb1e8525a 100644
--- a/devel/p5-Attribute-Handlers-Prospective/Makefile
+++ b/devel/p5-Attribute-Handlers-Prospective/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		Attribute-Handlers-Prospective
 PORTVERSION=		0.01
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Attribute
+MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		mat@FreeBSD.org
@@ -23,10 +22,4 @@ PERL_CONFIGURE=		yes
 
 MAN3=			Attribute::Handlers::Prospective.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		Need perl 5.6.1, try installing lang/perl5
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index 74642bd018a4..ab2567bd7fc8 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		Attribute-Persistent
 PORTVERSION=		1.1
 CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Attribute
+MASTER_SITES=		CPAN
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		mat@FreeBSD.org
@@ -23,10 +22,4 @@ PERL_CONFIGURE=		yes
 
 MAN3=			Attribute::Persistent.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		Need perl 5.6.1, try installing lang/perl5
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index 9ab358bab06b..0559bbe20f13 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	B-Deobfuscate
 PORTVERSION=	0.18
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	B
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -23,10 +22,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		B::Deobfuscate.3 B::Deobfuscate::Dict::Flowers.3 B::Deobfuscate::Dict::PGPHashWords.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601 # textproc/p5-YAML
-IGNORE=		requires perl 5.6.1 or later. Install lang/perl5.8 and try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-B-Keywords/Makefile b/devel/p5-B-Keywords/Makefile
index 404f5a5a78ba..eecd5d036476 100644
--- a/devel/p5-B-Keywords/Makefile
+++ b/devel/p5-B-Keywords/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	B-Keywords
 PORTVERSION=	1.06
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	B
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Class-Accessor-Chained/Makefile b/devel/p5-Class-Accessor-Chained/Makefile
index 1e28cf4a5f36..48c5c3398973 100644
--- a/devel/p5-Class-Accessor-Chained/Makefile
+++ b/devel/p5-Class-Accessor-Chained/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-Accessor-Chained
 PORTVERSION=	0.01
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -23,12 +22,4 @@ PERL_MODBUILD=	yes
 MAN3=		Class::Accessor::Chained.3 \
 		Class::Accessor::Chained::Fast.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-post-patch:
-	${PERL} -pi -e 's/our ([^ ]+)/use vars qw($$1); $$1/;' \
-		${WRKSRC}/lib/Class/Accessor/Chained.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index a824a5d7f732..0ad1c66aa63b 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-AlzaboWrapper
 PORTVERSION=	0.13
 CATEGORIES=	devel databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -33,10 +32,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		Needs perl 5.6+, install lang/perl5 or lang/perl5.8 and try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Class-ObjectTemplate-DB/Makefile b/devel/p5-Class-ObjectTemplate-DB/Makefile
index af326b235d76..b6cc397b4412 100644
--- a/devel/p5-Class-ObjectTemplate-DB/Makefile
+++ b/devel/p5-Class-ObjectTemplate-DB/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-ObjectTemplate-DB
 PORTVERSION=	0.27
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Class-ObjectTemplate/Makefile b/devel/p5-Class-ObjectTemplate/Makefile
index b5ae80b76c2a..f6f7b230a4ed 100644
--- a/devel/p5-Class-ObjectTemplate/Makefile
+++ b/devel/p5-Class-ObjectTemplate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-ObjectTemplate
 PORTVERSION=	0.7
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 33ca7eff10a3..367d5e362446 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -26,10 +26,6 @@ MAN3=		DDS.3 Data::Dump::Streamer.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	requires perl 5.6 or above
-.endif
-
 .if ${PERL_LEVEL} >= 500800
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/PadWalker.pm:${PORTSDIR}/devel/p5-PadWalker
 .endif
diff --git a/devel/p5-Data-Dump/Makefile b/devel/p5-Data-Dump/Makefile
index c3df1a3646d6..53cfa0aa0348 100644
--- a/devel/p5-Data-Dump/Makefile
+++ b/devel/p5-Data-Dump/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-Dump
 PORTVERSION=	1.08
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -28,10 +27,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE="Need at least perl 5.6 to build"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index b6a226517878..d5dbc53a5387 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-Dumper
 PORTVERSION=	2.121
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -17,10 +16,4 @@ COMMENT=	Stringified perl data structures, suitable for both printing and eval
 
 PERL_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE="Need at least perl 5.6.1 to build"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Date-ICal/Makefile b/devel/p5-Date-ICal/Makefile
index 4da5f2348464..e30ce30aa59c 100644
--- a/devel/p5-Date-ICal/Makefile
+++ b/devel/p5-Date-ICal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Date-ICal
 PORTVERSION=	1.72
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Date
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index ea3a876432fb..98b1bfde87c1 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-Christian
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index 8def87c90c13..6787b12f7239 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-FrenchRevolutionary
 PORTVERSION=	0.07
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index 9944af2e1b43..416c933c948c 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-Hebrew
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index 50943652bc07..8b53cff9eb8a 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-Julian
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Calendar-Mayan/Makefile b/devel/p5-DateTime-Calendar-Mayan/Makefile
index 99e5decd20d0..fdf1e4fa0662 100644
--- a/devel/p5-DateTime-Calendar-Mayan/Makefile
+++ b/devel/p5-DateTime-Calendar-Mayan/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-Calendar-Mayan
 PORTVERSION=	0.06.01
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	The Mayan Long Count, Haab, and Tzolkin calendars
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 8a9232e2d73d..6d04592f30e3 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Calendar-Pataphysical
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index cd65a192d641..92f491f77214 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Event-Cron
 PORTVERSION=	0.07
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -24,13 +23,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DateTime::Event::Cron.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /use (5.006|warnings)/g;' \
-		     -e 's/->\$$_->l/->{\$$_}->/g;' \
-		     ${WRKSRC}/lib/DateTime/Event/Cron.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 5546d8d7882d..243f0584600a 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DateTime-Event-Easter
 PORTVERSION=	1.04
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index 4bd1df23db4a..92a652dee148 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Event-ICal
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-NameDay/Makefile b/devel/p5-DateTime-Event-NameDay/Makefile
index 593da3368759..dfbdca2f507f 100644
--- a/devel/p5-DateTime-Event-NameDay/Makefile
+++ b/devel/p5-DateTime-Event-NameDay/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DateTime-Event-NameDay
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index 2ea7c15f2712..f32aaf94aeda 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	DateTime-Event-Random
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	DateTime extension for creating random datetimes
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index c90f566e54c1..2f7c53d24ffa 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-Event-Sunrise
 PORTVERSION=	0.05.01
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	DateTime Objects for sunrise and sunset for a given day
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index 55d34a6f49fa..0278f9d824ce 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Fiscal-Year
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index 0a40c4bea58a..05016e1a8ab0 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-Baby
 PORTVERSION=	1.0100
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-Bork/Makefile b/devel/p5-DateTime-Format-Bork/Makefile
index f2004725bb60..5f47d5719f19 100644
--- a/devel/p5-DateTime-Format-Bork/Makefile
+++ b/devel/p5-DateTime-Format-Bork/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DateTime-Format-Bork
 PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index 06e3f12638fc..c77c372ba7f0 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-Format-DBI
 PORTVERSION=	0.03.1
+DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Find a parser class for a database connection
diff --git a/devel/p5-DateTime-Format-DateManip/Makefile b/devel/p5-DateTime-Format-DateManip/Makefile
index ee2a558e497f..3eb681c7335c 100644
--- a/devel/p5-DateTime-Format-DateManip/Makefile
+++ b/devel/p5-DateTime-Format-DateManip/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-DateManip
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -23,11 +22,4 @@ PERL_MODBUILD=	yes
 
 MAN3=		DateTime::Format::DateManip.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /^use bytes;/' ${WRKSRC}/lib/DateTime/Format/DateManip.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index 282846ad49fa..f91c69599f6b 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-Duration
 PORTVERSION=	1.03a
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index 6e99ecbc15d5..3658e24dd617 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-Epoch
 PORTVERSION=	0.10
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -50,8 +49,4 @@ post-install:
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
 .endif
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	requires at least Perl 5.6 due to dependencies.  Please install lang/perl5.8 and try again
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 8142ff2e0940..7ce5d5874320 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-Format-Excel
 PORTVERSION=	0.29.01
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Convert between DateTime and Excel dates
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index 9de37c079342..7fed4ace8e4d 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	DateTime-Format-HTTP
 PORTVERSION=	0.37
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	HTTP date conversion routines
@@ -25,12 +23,4 @@ PERL_MODBUILD=	yes
 
 MAN3=		DateTime::Format::HTTP.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /use warnings/;' \
-		 ${WRKSRC}/lib/DateTime/Format/HTTP.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index 030921c2e98c..7febf6c2d025 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-Format-IBeat
 PORTVERSION=	0.16.1
+DISTVERSION=	${PORTVERSION:C/\.(.)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Format times in .beat notation
@@ -23,14 +22,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DateTime::Format::IBeat.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if (/use 5.006|use warnings/);' \
-		     -e 's/^our ([^\s;]+)/use vars qw($$1); $$1/;' \
-		     -e 's/\$$dt->\$$_/$$&()/g;' \
-		     ${WRKSRC}/lib/DateTime/Format/IBeat.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-ICal/Makefile b/devel/p5-DateTime-Format-ICal/Makefile
index 74fd8e03608b..90aa04cf22aa 100644
--- a/devel/p5-DateTime-Format-ICal/Makefile
+++ b/devel/p5-DateTime-Format-ICal/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-ICal
 PORTVERSION=	0.08
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 1ef6d324ee87..64b002d37f1d 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-ISO8601
 PORTVERSION=	0.06
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -23,12 +22,4 @@ PERL_MODBUILD=	yes
 
 MAN3=		DateTime::Format::ISO8601.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /use warnings/;' \
-		 ${WRKSRC}/lib/DateTime/Format/ISO8601.pm ${WRKSRC}/t/*.t
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index 77fcec93433c..e11cb341b84a 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-MySQL
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index 4a1ab705eb33..52a09b0d91ba 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DateTime-Format-Pg
 PORTVERSION=	0.16.001
 DISTVERSION=	${PORTVERSION:C/.(...)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -25,12 +24,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DateTime::Format::Pg.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e 's/^our (\@ISA)/use vars qw($$1); $$1/;' \
-		${WRKSRC}/lib/DateTime/Format/Pg.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-Roman/Makefile b/devel/p5-DateTime-Format-Roman/Makefile
index cd50e1af2995..336f4f70b6dc 100644
--- a/devel/p5-DateTime-Format-Roman/Makefile
+++ b/devel/p5-DateTime-Format-Roman/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-Roman
 PORTVERSION=	0.03
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Format-Strptime/Makefile b/devel/p5-DateTime-Format-Strptime/Makefile
index dd49a6c683da..f4f145adb367 100644
--- a/devel/p5-DateTime-Format-Strptime/Makefile
+++ b/devel/p5-DateTime-Format-Strptime/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	DateTime-Format-Strptime
 PORTVERSION=	1.07.00
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 PORTEPOCH=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Parse and format strp and strf time patterns
diff --git a/devel/p5-DateTime-Format-W3CDTF/Makefile b/devel/p5-DateTime-Format-W3CDTF/Makefile
index 1c46ab4a24fd..ab95ed8bcdab 100644
--- a/devel/p5-DateTime-Format-W3CDTF/Makefile
+++ b/devel/p5-DateTime-Format-W3CDTF/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Format-W3CDTF
 PORTVERSION=	0.04
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index 9882bb47380d..ef9227bbd061 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Functions
 PORTVERSION=	0.01
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -22,11 +21,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DateTime::Functions.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /use 5.0/' ${WRKSRC}/Makefile.PL
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-HiRes/Makefile b/devel/p5-DateTime-HiRes/Makefile
index 074c3f9843cc..49e725fc87e8 100644
--- a/devel/p5-DateTime-HiRes/Makefile
+++ b/devel/p5-DateTime-HiRes/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-HiRes
 PORTVERSION=	0.01
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index 2d6e48560cfe..f09512bd1382 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	DateTime-Incomplete
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	An incomplete DateTime, like January 5
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index 1cea6df2fe00..9f5ab38f993e 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DateTime-Locale
 PORTVERSION=	0.34
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index 41e51768ddc7..3da3870855eb 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-Precise
 PORTVERSION=	1.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-TimeZone-Alias/Makefile b/devel/p5-DateTime-TimeZone-Alias/Makefile
index 863b3a7af56c..a830e4ea5c96 100644
--- a/devel/p5-DateTime-TimeZone-Alias/Makefile
+++ b/devel/p5-DateTime-TimeZone-Alias/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	DateTime-TimeZone-Alias
 PORTVERSION=	0.05.01
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Create aliases for DateTime timezones
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index d90aef369a4b..51c1d6805b57 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DateTime-TimeZone-LMT
 PORTVERSION=	1.00
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DateTime
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index e2312fb5d7db..93b15e9f3d7a 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -37,10 +37,6 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	requires at least Perl 5.6 due to dependencies.  Please install lang/perl5.8 and try again
-.endif
-
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 .endif
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index cd7a176385ae..b5243415fe5c 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Devel-Cover
 PORTVERSION=	0.61
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Devel
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -67,9 +66,6 @@ post-install:
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires Perl 5.6.1 or newer. Install lang/perl5.8 and try again
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Profile/Makefile b/devel/p5-Devel-Profile/Makefile
index 8e7e5f4c8479..362fbf9309fe 100644
--- a/devel/p5-Devel-Profile/Makefile
+++ b/devel/p5-Devel-Profile/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Devel-Profile
 PORTVERSION=	1.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Devel
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Devel-Size/Makefile b/devel/p5-Devel-Size/Makefile
index 1c82b3f3aec8..71e4a185f5b7 100644
--- a/devel/p5-Devel-Size/Makefile
+++ b/devel/p5-Devel-Size/Makefile
@@ -27,10 +27,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		Need perl 5.6.1, try installing lang/perl5
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Devel-Trace/Makefile b/devel/p5-Devel-Trace/Makefile
index 668189103e47..da71287570bd 100644
--- a/devel/p5-Devel-Trace/Makefile
+++ b/devel/p5-Devel-Trace/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Devel-Trace
 PORTVERSION=	0.10
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Devel
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Exporter-Lite/Makefile b/devel/p5-Exporter-Lite/Makefile
index 8964a7737f59..df2ea4c74028 100644
--- a/devel/p5-Exporter-Lite/Makefile
+++ b/devel/p5-Exporter-Lite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Exporter-Lite
 PORTVERSION=	0.02
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Exporter
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-IPC-ShareLite/Makefile b/devel/p5-IPC-ShareLite/Makefile
index 85be37334965..222305765ce0 100644
--- a/devel/p5-IPC-ShareLite/Makefile
+++ b/devel/p5-IPC-ShareLite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	IPC-ShareLite
 PORTVERSION=	0.09
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	IPC
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Gettext/Makefile b/devel/p5-Locale-Maketext-Gettext/Makefile
index c53a9b513500..44a0fbed95df 100644
--- a/devel/p5-Locale-Maketext-Gettext/Makefile
+++ b/devel/p5-Locale-Maketext-Gettext/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Locale-Maketext-Gettext
 PORTVERSION=	1.22
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Locale
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 549670e37ffd..d2e4f050f835 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Locale-Maketext-Lexicon
 PORTVERSION=	0.64
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Locale
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -41,13 +40,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /no warnings/;' \
-		-e 's/^our (\S+);/use vars qw{$$1};/;' \
-		${WRKSRC}/lib/Locale/Maketext/Lexicon.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index 736226fccce5..2b11d0353caf 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Locale-Maketext
 PORTVERSION=	1.10
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Locale
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -22,13 +21,4 @@ PERL_CONFIGURE=	YES
 
 MAN3=		Locale::Maketext.3 Locale::Maketext::TPJ13.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	@${ECHO} "Parts of this module require the utf8 pragma which is\
-		not available in your version of Perl.  This module will\
-		not be fully functional. **"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index f8e01207d6f6..aade6aa6270d 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Log-Dispatch
 PORTVERSION=	2.18
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Log
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile
index 8f0846b144ea..a17e2c18a729 100644
--- a/devel/p5-NEXT/Makefile
+++ b/devel/p5-NEXT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	NEXT
 PORTVERSION=	0.60
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	NEXT
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index 2c4cb523b7d6..a54e351f1bda 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Pod-Coverage
 PORTVERSION=	0.18
 CATEGORIES=	devel textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pod
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Set-Crontab/Makefile b/devel/p5-Set-Crontab/Makefile
index cae6efa7da9e..0b4ef8cbe388 100644
--- a/devel/p5-Set-Crontab/Makefile
+++ b/devel/p5-Set-Crontab/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Set-Crontab
 PORTVERSION=	1.00
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Set-Infinite/Makefile b/devel/p5-Set-Infinite/Makefile
index 124eb83f731b..4e41b7e80b62 100644
--- a/devel/p5-Set-Infinite/Makefile
+++ b/devel/p5-Set-Infinite/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	Set-Infinite
 PORTVERSION=	0.61
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Set
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Set::Infinite - Sets of intervals
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index 0502ab3de189..98c2fa900d14 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Test-Cmd
 PORTVERSION=	1.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Test
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile
index 1da1ec102ad2..4018571de18e 100644
--- a/devel/p5-Test-Tester/Makefile
+++ b/devel/p5-Test-Tester/Makefile
@@ -35,12 +35,6 @@ post-install:
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/Test/Builder.pm:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-.if ${PERL_LEVEL} < 500601
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if /(use|no) warnings/g;' \
-		${WRKSRC}/lib/Test/Tester.pm ${WRKSRC}/lib/Test/Tester/Delegate.pm \
-		${WRKSRC}/t/*
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile
index bf0330682ce4..b7443ed60353 100644
--- a/devel/p5-Time-Local/Makefile
+++ b/devel/p5-Time-Local/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Time-Local
 PORTVERSION=	1.17
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Time
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/devel/p5-UNIVERSAL-exports/Makefile b/devel/p5-UNIVERSAL-exports/Makefile
index effe85c013e3..0397f391868a 100644
--- a/devel/p5-UNIVERSAL-exports/Makefile
+++ b/devel/p5-UNIVERSAL-exports/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	UNIVERSAL-exports
 PORTVERSION=	0.05
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	UNIVERSAL
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org