Index: head/devel/p5-Devel-Cover/Makefile
===================================================================
--- head/devel/p5-Devel-Cover/Makefile	(revision 383516)
+++ head/devel/p5-Devel-Cover/Makefile	(revision 383517)
@@ -1,37 +1,46 @@
 # Created by: mat
 # $FreeBSD$
 
 PORTNAME=	Devel-Cover
-PORTVERSION=	1.17
-PORTREVISION=	1
+PORTVERSION=	1.18
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Code coverage metrics for Perl
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PPI-HTML>=1.07:${PORTSDIR}/textproc/p5-PPI-HTML \
-		p5-Parallel-Iterator>=0:${PORTSDIR}/devel/p5-Parallel-Iterator \
-		p5-Pod-Coverage>=0.06:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
 		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
 
-PORTDOCS=	README
+OPTIONS_DEFINE=	CPANCOVER HTML_REPORTS POD_COVERAGE SYNTAX_HIGHLIGHTING
+OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	DOCS
+CPANCOVER_DESC=			Coverage statistics on CPAN modules
+CPANCOVER_BUILD_DEPENDS=	p5-Parallel-Iterator>=0:${PORTSDIR}/devel/p5-Parallel-Iterator \
+				p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+CPANCOVER_RUN_DEPENDS=		${CPANCOVER_BUILD_DEPENDS}
 
+HTML_REPORTS=			Build HTML reports with p5-HTML-Parser
+HTML_REPORTS_BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+HTML_REPORTS_RUN_DEPENDS=	${HTML_REPORTS_BUILD_DEPENDS}
+
+POD_COVERAGE_DESC=		POD coverage via p5-Pod-Coverage
+POD_COVERAGE_BUILD_DEPENDS=	p5-Pod-Coverage>=0.06:${PORTSDIR}/devel/p5-Pod-Coverage
+POD_COVERAGE_RUN_DEPENDS=	${POD_COVERAGE_BUILD_DEPENDS}
+
+SYNTAX_HIGHLIGHTING_DESC=		Syntax highlighting via p5-PPI-HTML
+SYNTAX_HIGHLIGHTING_BUILD_DEPENDS=	p5-PPI-HTML>=1.07:${PORTSDIR}/textproc/p5-PPI-HTML
+SYNTAX_HIGHLIGHTING_RUN_DEPENDS=	${SYNTAX_HIGHLIGHTING_BUILD_DEPENDS}
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/Cover/Cover.so
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/devel/p5-Devel-Cover/distinfo
===================================================================
--- head/devel/p5-Devel-Cover/distinfo	(revision 383516)
+++ head/devel/p5-Devel-Cover/distinfo	(revision 383517)
@@ -1,2 +1,2 @@
-SHA256 (Devel-Cover-1.17.tar.gz) = d2e5b73dec6b9b9971fc10d27b3996e59bdce1446abd5ae988f9185beff9f5cc
-SIZE (Devel-Cover-1.17.tar.gz) = 204752
+SHA256 (Devel-Cover-1.18.tar.gz) = 95f73ffcabfe6948fd926305958a1116501c0461eeef0aa6e1c8979c79efcb12
+SIZE (Devel-Cover-1.18.tar.gz) = 207365
Index: head/devel/p5-Devel-Cover/pkg-plist
===================================================================
--- head/devel/p5-Devel-Cover/pkg-plist	(revision 383516)
+++ head/devel/p5-Devel-Cover/pkg-plist	(revision 383517)
@@ -1,94 +1,94 @@
 bin/cover
-bin/cpancover
+%%CPANCOVER%%bin/cpancover
 bin/gcov2perl
-%%PERL5_MAN3%%/Devel::Cover.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Annotation::Git.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Annotation::Random.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Annotation::Svk.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Branch.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Collection.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition_and_2.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition_and_3.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition_or_2.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition_or_3.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Condition_xor_4.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Criterion.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::Digests.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::File.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::IO.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::IO::JSON.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::IO::Sereal.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::IO::Storable.3.gz
-%%PERL5_MAN3%%/Devel::Cover::DB::Structure.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Dumper.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Html_Common.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Op.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Pod.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Compilation.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Html.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Html_basic.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Html_minimal.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Html_subtle.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Json.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Sort.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Text.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Text2.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Report::Vim.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Statement.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Subroutine.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Test.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Time.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Truth_Table.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Tutorial.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Util.3.gz
-%%PERL5_MAN3%%/Devel::Cover::Web.3.gz
 %%SITE_ARCH%%/Devel/Cover.pm
 %%SITE_ARCH%%/Devel/Cover/Annotation/Git.pm
 %%SITE_ARCH%%/Devel/Cover/Annotation/Random.pm
 %%SITE_ARCH%%/Devel/Cover/Annotation/Svk.pm
 %%SITE_ARCH%%/Devel/Cover/Branch.pm
 %%SITE_ARCH%%/Devel/Cover/Collection.pm
 %%SITE_ARCH%%/Devel/Cover/Condition.pm
 %%SITE_ARCH%%/Devel/Cover/Condition_and_2.pm
 %%SITE_ARCH%%/Devel/Cover/Condition_and_3.pm
 %%SITE_ARCH%%/Devel/Cover/Condition_or_2.pm
 %%SITE_ARCH%%/Devel/Cover/Condition_or_3.pm
 %%SITE_ARCH%%/Devel/Cover/Condition_xor_4.pm
 %%SITE_ARCH%%/Devel/Cover/Criterion.pm
 %%SITE_ARCH%%/Devel/Cover/DB.pm
 %%SITE_ARCH%%/Devel/Cover/DB/Digests.pm
 %%SITE_ARCH%%/Devel/Cover/DB/File.pm
 %%SITE_ARCH%%/Devel/Cover/DB/IO.pm
 %%SITE_ARCH%%/Devel/Cover/DB/IO/JSON.pm
 %%SITE_ARCH%%/Devel/Cover/DB/IO/Sereal.pm
 %%SITE_ARCH%%/Devel/Cover/DB/IO/Storable.pm
 %%SITE_ARCH%%/Devel/Cover/DB/Structure.pm
 %%SITE_ARCH%%/Devel/Cover/Dumper.pm
 %%SITE_ARCH%%/Devel/Cover/Html_Common.pm
 %%SITE_ARCH%%/Devel/Cover/Inc.pm
 %%SITE_ARCH%%/Devel/Cover/Op.pm
 %%SITE_ARCH%%/Devel/Cover/Pod.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Compilation.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Html.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Html_basic.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Html_minimal.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Html_subtle.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Json.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Sort.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Text.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Text2.pm
 %%SITE_ARCH%%/Devel/Cover/Report/Vim.pm
 %%SITE_ARCH%%/Devel/Cover/Statement.pm
 %%SITE_ARCH%%/Devel/Cover/Subroutine.pm
 %%SITE_ARCH%%/Devel/Cover/Test.pm
 %%SITE_ARCH%%/Devel/Cover/Time.pm
 %%SITE_ARCH%%/Devel/Cover/Truth_Table.pm
 %%SITE_ARCH%%/Devel/Cover/Tutorial.pod
 %%SITE_ARCH%%/Devel/Cover/Util.pm
 %%SITE_ARCH%%/Devel/Cover/Web.pm
 %%SITE_ARCH%%/auto/Devel/Cover/Cover.so
+%%PERL5_MAN3%%/Devel::Cover.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Annotation::Git.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Annotation::Random.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Annotation::Svk.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Branch.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Collection.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition_and_2.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition_and_3.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition_or_2.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition_or_3.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Condition_xor_4.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Criterion.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::Digests.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::File.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::IO.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::IO::JSON.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::IO::Sereal.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::IO::Storable.3.gz
+%%PERL5_MAN3%%/Devel::Cover::DB::Structure.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Dumper.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Html_Common.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Op.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Pod.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Compilation.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Html.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Html_basic.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Html_minimal.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Html_subtle.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Json.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Sort.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Text.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Text2.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Report::Vim.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Statement.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Subroutine.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Test.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Time.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Truth_Table.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Tutorial.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Util.3.gz
+%%PERL5_MAN3%%/Devel::Cover::Web.3.gz
 man/man1/cover.1.gz
 man/man1/cpancover.1.gz
 man/man1/gcov2perl.1.gz