Use the CPAN site macro.

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

13 files changed, 17 insertions, 62 deletions

diff --git a/textproc/p5-HTML-Tidy/Makefile b/textproc/p5-HTML-Tidy/Makefile
index b9ea5a57902b..fed34e73ccc1 100644
--- a/textproc/p5-HTML-Tidy/Makefile
+++ b/textproc/p5-HTML-Tidy/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	HTML-Tidy
 PORTVERSION=	1.08
 CATEGORIES=	textproc www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	HTML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index ac176f989656..2930b5dc7a6e 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	PerlPoint-Converters
 PORTVERSION=	1.02.05
+DISTVERSION=	${PORTVERSION:C/\.(..)$/\1/}
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	PerlPoint
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Convert PerlPoint docs into various formats
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 71bbf649ebd6..f620269a7813 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	PerlPoint-Package
 PORTVERSION=	0.45
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	PerlPoint
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -48,10 +47,4 @@ post-install:
 	@cd ${WRKSRC}/demo; ${FIND} . | ${CPIO} -padm ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		requires perl 5.6.0 or later. Install lang/perl5.8 and try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Pod-Escapes/Makefile b/textproc/p5-Pod-Escapes/Makefile
index f909370668f5..47e0e29f0738 100644
--- a/textproc/p5-Pod-Escapes/Makefile
+++ b/textproc/p5-Pod-Escapes/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Pod-Escapes
 PORTVERSION=	1.04
 CATEGORIES=	textproc devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pod
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/textproc/p5-Pod-Simple/Makefile b/textproc/p5-Pod-Simple/Makefile
index 68f4f3def411..48ccae37bac9 100644
--- a/textproc/p5-Pod-Simple/Makefile
+++ b/textproc/p5-Pod-Simple/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	Pod-Simple
 PORTVERSION=	3.05
 CATEGORIES=	textproc devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pod
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/textproc/p5-String-ShowDiff/Makefile b/textproc/p5-String-ShowDiff/Makefile
index 2b4ce6b15590..b3f7e3044664 100644
--- a/textproc/p5-String-ShowDiff/Makefile
+++ b/textproc/p5-String-ShowDiff/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	String-ShowDiff
 PORTVERSION=	0.03
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	String
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile
index 1724028c57b6..aa70b184d8d2 100644
--- a/textproc/p5-Text-Reflow/Makefile
+++ b/textproc/p5-Text-Reflow/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	Text-Reflow
 PORTVERSION=	1.05
 PORTREVISION=	1
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -25,8 +24,5 @@ MAN3=		Text::Reflow.3
 .if ${PERL_LEVEL} > 500800
 EXTRA_PATCHES=	${PATCHDIR}/5.8-Reflow.pm
 .endif
-.if ${PERL_LEVEL} < 500601
-IGNORE= "Requires perl 5.6.1"
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Text-Reform/Makefile b/textproc/p5-Text-Reform/Makefile
index a1edc1fd7546..eebf3fb6b087 100644
--- a/textproc/p5-Text-Reform/Makefile
+++ b/textproc/p5-Text-Reform/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Text-Reform
 PORTVERSION=	1.11
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Text
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/textproc/p5-XML-DTDParser/Makefile b/textproc/p5-XML-DTDParser/Makefile
index 47d88eeccb8a..4cae7b395181 100644
--- a/textproc/p5-XML-DTDParser/Makefile
+++ b/textproc/p5-XML-DTDParser/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	XML-DTDParser
 PORTVERSION=	2.01
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -27,12 +26,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-post-patch:
-	@${PERL} -pi -e 's/^our ([^\s;]+)/use vars qw($$1); $$1/;' \
-		     ${WRKSRC}/DTDParser.pm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-NodeFilter/Makefile b/textproc/p5-XML-NodeFilter/Makefile
index 35e57a9249ab..d785eb55be9a 100644
--- a/textproc/p5-XML-NodeFilter/Makefile
+++ b/textproc/p5-XML-NodeFilter/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	XML-NodeFilter
 PORTVERSION=	0.01
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index e533f82568df..7a6efb25f27a 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	XML-Smart
 PORTVERSION=	1.6.9
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -31,10 +30,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.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/textproc/p5-XML-Validator-Schema/Makefile b/textproc/p5-XML-Validator-Schema/Makefile
index 246c3e4fc746..3fd652299553 100644
--- a/textproc/p5-XML-Validator-Schema/Makefile
+++ b/textproc/p5-XML-Validator-Schema/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	XML-Validator-Schema
 PORTVERSION=	1.08
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -48,10 +47,4 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-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/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index 466ab797ec29..74f5a0bd85d8 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -32,10 +32,6 @@ MAN3=		XSH.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=		"requires perl 5.6.x or later. Install lang/perl5 and try again"
-.endif
-
 test: build
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test