Use the CPAN site macro.

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

10 files changed, 12 insertions, 81 deletions

diff --git a/www/p5-Apache-Session-PHP/Makefile b/www/p5-Apache-Session-PHP/Makefile
index e9e696a7ce08..7b696a355fb7 100644
--- a/www/p5-Apache-Session-PHP/Makefile
+++ b/www/p5-Apache-Session-PHP/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Session-PHP
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index 4a5f26dfefac..7aaae6b13689 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Apache-Session-Wrapper
 PORTVERSION=	0.33
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Apache
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -34,11 +33,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-# Depends on devel/p5-Class-Container whichs needs perl 5.6.x or later
-.if ${PERL_LEVEL} < 500600
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index c50b6984ed7e..7bea8c62de6c 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Framework
 PORTVERSION=	0.23
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 41b60634a4ed..199048a1ac48 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	CGI-Untaint
 PORTVERSION=	1.26
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	CGI
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index dbb3079f7637..224e3c9e755b 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Template-JIT
 PORTVERSION=	0.05
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -28,19 +27,9 @@ MAN3=		HTML::Template::JIT.3 HTML::Template::JIT::Compiler.3 \
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES=	${PATCHDIR}/5.005-JIT-Compiler.pm
-.endif
-
 post-patch:
 	@${PERL} -i -pe 's/indent -kr/indent/' \
 			${WRKSRC}/JIT/Compiler.pm
-.if ${PERL_LEVEL} < 500600
-	@${PERL} -i -pe '$$_ = "" if /warnings|5\.006/g;' \
-			-e 's/\bour ([^ ;]+)/use vars qw{$$1};$$1/g;' \
-			${WRKSRC}/Makefile.PL ${WRKSRC}/JIT.pm \
-			${WRKSRC}/JIT/Base.pm ${WRKSRC}/JIT/Compiler.pm
-.endif
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Template-JIT/files/5.005-JIT-Compiler.pm b/www/p5-HTML-Template-JIT/files/5.005-JIT-Compiler.pm
deleted file mode 100644
index 0b1f011e076e..000000000000
--- a/www/p5-HTML-Template-JIT/files/5.005-JIT-Compiler.pm
+++ /dev/null
@@ -1,21 +0,0 @@
---- JIT/Compiler.pm~	Fri May  7 12:58:37 2004
-+++ JIT/Compiler.pm	Fri May  7 12:58:39 2004
-@@ -87,6 +87,18 @@
- use Inline C => Config => OPTIMIZE => "$optimize", DIRECTORY => "$self->{package_dir}" $inline_debug;
- use Inline C => <<'CODE_END';
- 
-+#ifndef SvPV_nolen
-+#   define SvPV_nolen(sv) ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK ? SvPVX(sv) : sv_2pv_nolen(sv))
-+    static char *
-+    sv_2pv_nolen(register SV *sv)
-+    {   
-+        STRLEN n_a;
-+        return sv_2pv(sv, &n_a);
-+    }
-+#endif
-+
-+#define get_hv(name,create) perl_get_hv(name,create)
-+
- END
- 
-   # print out code
diff --git a/www/p5-HTTP-Proxy/Makefile b/www/p5-HTTP-Proxy/Makefile
index 5fb91bc77389..97015ea3666c 100644
--- a/www/p5-HTTP-Proxy/Makefile
+++ b/www/p5-HTTP-Proxy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTTP-Proxy
 PORTVERSION=	0.20
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTTP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -39,10 +38,4 @@ MAN3=		\
 		HTTP::Proxy::HeaderFilter::simple.3 \
 		HTTP::Proxy::HeaderFilter::standard.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		requires perl 5.6.0 or later. Install lang/perl5.8 then try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index a36f96867703..c542963b28c2 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -24,14 +24,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		HTTP::Recorder.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-post-patch:
-	 @${PERL} -pi -e 's/^our (\S+)/use vars qw($$1); $$1/;' \
-			-e '$$_ = "" if /use warnings/;' \
-		      ${WRKSRC}/lib/HTTP/Recorder.pm \
-		      ${WRKSRC}/lib/HTTP/Recorder/Logger.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-MasonX-Profiler/Makefile b/www/p5-MasonX-Profiler/Makefile
index ea53f819308b..3ba568623f0b 100644
--- a/www/p5-MasonX-Profiler/Makefile
+++ b/www/p5-MasonX-Profiler/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MasonX-Profiler
 PORTVERSION=	0.06
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	MasonX
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -23,11 +22,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		MasonX::Profiler.3
 
-.include <bsd.port.pre.mk>
-
-# Depends on devel/p5-Class-Container whichs needs perl 5.6.x or later
-.if ${PERL_LEVEL} < 500600
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-PHP-Session/Makefile b/www/p5-PHP-Session/Makefile
index eef5c240c270..14c1d4dce136 100644
--- a/www/p5-PHP-Session/Makefile
+++ b/www/p5-PHP-Session/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	PHP-Session
 PORTVERSION=	0.26
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	PHP
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org