Use the CPAN site macro.

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

11 files changed, 13 insertions, 41 deletions

diff --git a/databases/p5-Class-DBI-AbstractSearch/Makefile b/databases/p5-Class-DBI-AbstractSearch/Makefile
index f9dff43e4529..8a64e9097fd5 100644
--- a/databases/p5-Class-DBI-AbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-AbstractSearch/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-AbstractSearch
 PORTVERSION=	0.07
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-BaseDSN/Makefile b/databases/p5-Class-DBI-BaseDSN/Makefile
index 4f951dc330e2..eb6604e3b6ed 100644
--- a/databases/p5-Class-DBI-BaseDSN/Makefile
+++ b/databases/p5-Class-DBI-BaseDSN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-BaseDSN
 PORTVERSION=	1.22
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-FromCGI/Makefile b/databases/p5-Class-DBI-FromCGI/Makefile
index 81ad82c50081..69d4d6ef5a9b 100644
--- a/databases/p5-Class-DBI-FromCGI/Makefile
+++ b/databases/p5-Class-DBI-FromCGI/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-FromCGI
 PORTVERSION=	1.00
 CATEGORIES=	databases www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Oracle/Makefile b/databases/p5-Class-DBI-Oracle/Makefile
index adc797da6e93..6f0a2534b121 100644
--- a/databases/p5-Class-DBI-Oracle/Makefile
+++ b/databases/p5-Class-DBI-Oracle/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Oracle
 PORTVERSION=	0.51
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Pager/Makefile b/databases/p5-Class-DBI-Pager/Makefile
index 579852737f89..8a6c08e7a201 100644
--- a/databases/p5-Class-DBI-Pager/Makefile
+++ b/databases/p5-Class-DBI-Pager/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Pager
 PORTVERSION=	0.08
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-Replication/Makefile b/databases/p5-Class-DBI-Replication/Makefile
index 8628074c7f5e..f0246f931945 100644
--- a/databases/p5-Class-DBI-Replication/Makefile
+++ b/databases/p5-Class-DBI-Replication/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-Replication
 PORTVERSION=	0.01
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-SAK/Makefile b/databases/p5-Class-DBI-SAK/Makefile
index c18d1ff249ea..98eb8bbda2f8 100644
--- a/databases/p5-Class-DBI-SAK/Makefile
+++ b/databases/p5-Class-DBI-SAK/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-SAK
 PORTVERSION=	1.4
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Class-DBI-SQLite/Makefile b/databases/p5-Class-DBI-SQLite/Makefile
index 0b737ccd3136..32eba2532781 100644
--- a/databases/p5-Class-DBI-SQLite/Makefile
+++ b/databases/p5-Class-DBI-SQLite/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-SQLite
 PORTVERSION=	0.11
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -36,10 +35,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500503
-IGNORE=	requires 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/databases/p5-Class-DBI-ToSax/Makefile b/databases/p5-Class-DBI-ToSax/Makefile
index 8598ecc8f56b..804f99d27431 100644
--- a/databases/p5-Class-DBI-ToSax/Makefile
+++ b/databases/p5-Class-DBI-ToSax/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Class-DBI-ToSax
 PORTVERSION=	0.10
 CATEGORIES=	databases textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Class
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -25,15 +24,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Class::DBI::ToSax.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-# I really begin to hate either perl programmers or 5.005_03 ;)
-post-patch:
-	@${PERL} -pi -e '$$_ = "" if (/use 5.006|use warnings/);' \
-		     -e 's/^our ([^\s;]+)/use vars qw($$1); $$1/;' \
-		     -e 's/\$$self->\$$col/$$&()/g;' \
-		     ${WRKSRC}/lib/Class/DBI/ToSax.pm ${WRKSRC}/Makefile.PL
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/p5-DBD-PgSPI/Makefile b/databases/p5-DBD-PgSPI/Makefile
index 8cfcf02e8610..2891e5df2893 100644
--- a/databases/p5-DBD-PgSPI/Makefile
+++ b/databases/p5-DBD-PgSPI/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	DBD-PgSPI
 PORTVERSION=	0.02
 PORTREVISION=	2
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	DBD
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/databases/p5-Data-Page/Makefile b/databases/p5-Data-Page/Makefile
index f70560f3b385..9f7268334809 100644
--- a/databases/p5-Data-Page/Makefile
+++ b/databases/p5-Data-Page/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Data-Page
 PORTVERSION=	2.00
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Data
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org