Clean up the rest of the perl@ Makefiles a bit.

- Remove dependencies on modules distributed as part of perl core
- Remove references to FreeBSD < 8 and perl < 5.16
- Ensure that DOCS and EXAMPLES options exist for ports installing
  PORTDOCS or PORTEXAMPLES
- Reduce unnecessary inclusions of bsd.port.options.mk by using
  OPTIONS helpers and the like
- Fix some cases where dependencies were only assigned to BUILD_DEPENDS
- Fix a few of the cases where dependencies were only assigned to RUN_DEPENDS.
  This one happens in many, many ports. I only applied it in cases where
  it interfered with 'make test' but it should maybe be done more generally.
- Mute ${MKDIR} in installation
- Parethesize compound commands
- In www/p5-URI-Fetch, remove the ZLIB option that wasn't used

12 files changed, 18 insertions, 32 deletions

diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 96ac6656ecd4..17ae138e284c 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Data-FormValidator
 PORTVERSION=	4.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Validates user input (usually from an HTML form) based
 
-BUILD_DEPENDS=	p5-CGI.pm>=3.48:${PORTSDIR}/www/p5-CGI.pm \
+BUILD_DEPENDS=	p5-CGI>=3.48:${PORTSDIR}/www/p5-CGI \
 		p5-Date-Calc>=5.0:${PORTSDIR}/devel/p5-Date-Calc \
 		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
 		p5-File-MMagic>=1.17:${PORTSDIR}/devel/p5-File-MMagic \
diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile
index dba2315fee4a..d1c16add9bdf 100644
--- a/textproc/p5-DocSet/Makefile
+++ b/textproc/p5-DocSet/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	DocSet
 PORTVERSION=	0.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:STAS
@@ -13,6 +13,7 @@ COMMENT=	Documentation projects builder in HTML, PS, and PDF formats
 
 BUILD_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM \
 		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-SuperForm/Makefile b/textproc/p5-HTML-SuperForm/Makefile
index 630038b56eba..1595aebab022 100644
--- a/textproc/p5-HTML-SuperForm/Makefile
+++ b/textproc/p5-HTML-SuperForm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	HTML form generator
 USES=		perl5
 USE_PERL5=	configure
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-extract:
 	@${RM} ${WRKSRC}/lib/HTML/SuperForm.pm.orig
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index 385a7f4dc8e7..a6d5a16d0bc7 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	LaTeX-Table
 PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,12 +17,10 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Moose>=0.76:${PORTSDIR}/devel/p5-Moose \
 		p5-Moose-Policy>=0:${PORTSDIR}/devel/p5-Moose-Policy \
-		p5-version>=0:${PORTSDIR}/devel/p5-version \
 		p5-LaTeX-Encode>=0:${PORTSDIR}/textproc/p5-LaTeX-Encode \
 		p5-LaTeX-Driver>=0:${PORTSDIR}/textproc/p5-LaTeX-Driver \
 		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
 		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-autodie>=2.06:${PORTSDIR}/devel/p5-autodie \
 		p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
 		p5-MooseX-FollowPBP>=0.03:${PORTSDIR}/devel/p5-MooseX-FollowPBP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/textproc/p5-MKDoc-XML/Makefile b/textproc/p5-MKDoc-XML/Makefile
index 55b75516b921..71dc05a9fe30 100644
--- a/textproc/p5-MKDoc-XML/Makefile
+++ b/textproc/p5-MKDoc-XML/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MKDoc-XML
 PORTVERSION=	0.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BPOSTLE
@@ -12,9 +12,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The MKDoc XML Toolkit
 
-BUILD_DEPENDS=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index a8659f864b8c..b46ef7dbd1ff 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML documents to PDF
 
-BUILD_DEPENDS=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy \
-		p5-Graphics-ColorNames>=0:${PORTSDIR}/graphics/p5-Graphics-ColorNames \
+BUILD_DEPENDS=	p5-Graphics-ColorNames>=0:${PORTSDIR}/graphics/p5-Graphics-ColorNames \
+		p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy \
 		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2 \
+		p5-PDF-Writer>=0.05:${PORTSDIR}/textproc/p5-PDF-Writer \
 		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-PDF-Writer>=0.05:${PORTSDIR}/textproc/p5-PDF-Writer
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index e8d65b407bbf..4b87cae702e5 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -20,9 +20,6 @@ USES=		perl5
 USE_PERL5=	configure patch
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	# suck all DOCSDIR
 
 post-patch:
@@ -35,6 +32,5 @@ post-build:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PerlPoint-Converters/pkg-plist b/textproc/p5-PerlPoint-Converters/pkg-plist
index bf336216ca16..11cd36f85017 100644
--- a/textproc/p5-PerlPoint-Converters/pkg-plist
+++ b/textproc/p5-PerlPoint-Converters/pkg-plist
@@ -1,12 +1,12 @@
 bin/pp2html
 bin/pp2latex
-%%PERL5_MAN3%%/Bundle::PerlPoint.3.gz
-%%PERL5_MAN3%%/PerlPoint::Converters.3.gz
-%%PERL5_MAN3%%/PerlPoint::Tags::HTML.3.gz
-%%PERL5_MAN3%%/PerlPoint::Tags::LaTeX.3.gz
 %%SITE_PERL%%/Bundle/PerlPoint.pm
 %%SITE_PERL%%/PerlPoint/Converters.pm
 %%SITE_PERL%%/PerlPoint/Tags/HTML.pm
 %%SITE_PERL%%/PerlPoint/Tags/LaTeX.pm
+%%PERL5_MAN3%%/Bundle::PerlPoint.3.gz
+%%PERL5_MAN3%%/PerlPoint::Converters.3.gz
+%%PERL5_MAN3%%/PerlPoint::Tags::HTML.3.gz
+%%PERL5_MAN3%%/PerlPoint::Tags::LaTeX.3.gz
 man/man1/pp2html.1.gz
 man/man1/pp2latex.1.gz
diff --git a/textproc/p5-Pod-WikiDoc/Makefile b/textproc/p5-Pod-WikiDoc/Makefile
index b0fe08525d94..a815a7aa948c 100644
--- a/textproc/p5-Pod-WikiDoc/Makefile
+++ b/textproc/p5-Pod-WikiDoc/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
 		p5-Parse-RecDescent>=1.967.006:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl
 
-USES=	perl5
+USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Reader/Makefile b/textproc/p5-XML-Reader/Makefile
index 1913cc53ce36..667d8e966326 100644
--- a/textproc/p5-XML-Reader/Makefile
+++ b/textproc/p5-XML-Reader/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 OPTIONS_DEFINE=	PP
-PP_DESC=	Use XML::Parsepp
+PP_DESC=	Use Pure Perl XML Parser (instead of compiled)
 
 PP_RUN_DEPENDS=		p5-XML-Parsepp>=0:${PORTSDIR}/textproc/p5-XML-Parsepp
 PP_RUN_DEPENDS_OFF=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index 3a136c94ad4f..cc0ad9fecf1d 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -28,13 +28,9 @@ PORTDOCS=	Changes README
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index 612cd2d6e837..19f630f63e79 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -22,10 +22,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
-
 test: build
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>