3 files changed, 36 insertions, 27 deletions

diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index c4449915c5c6..ed9dae027e2c 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	GraphViz2
-PORTVERSION=	2.09
+PORTVERSION=	2.18
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSAVAGE
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	A wrapper for AT&T Graphviz
+COMMENT=	Wrapper for AT&T Graphviz
 
 LICENSE=	ART20
 
@@ -19,23 +19,31 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz \
 		p5-Capture-Tiny>=0.10:${PORTSDIR}/devel/p5-Capture-Tiny \
 		p5-Class-ISA>=0.36:${PORTSDIR}/devel/p5-Class-ISA \
 		p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
+		p5-Config-Tiny>=2.14:${PORTSDIR}/devel/p5-Config-Tiny \
 		p5-DBI>=1.616:${PORTSDIR}/databases/p5-DBI \
 		p5-Data-Section-Simple>=0.02:${PORTSDIR}/devel/p5-Data-Section-Simple \
+		p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple \
+		p5-File-HomeDir>=0.99:${PORTSDIR}/devel/p5-File-HomeDir \
+		p5-File-Slurp>=9999.19:${PORTSDIR}/devel/p5-File-Slurp \
 		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
 		p5-HTML-Entities-Interpolate>=1.04:${PORTSDIR}/textproc/p5-HTML-Entities-Interpolate \
 		p5-HTML-Tree>=4.2:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Hash-FieldHash>=0.10:${PORTSDIR}/devel/p5-Hash-FieldHash \
-		p5-IPC-Run>=0.90:${PORTSDIR}/devel/p5-IPC-Run \
+		p5-HTTP-Tiny>=0.012:${PORTSDIR}/www/p5-HTTP-Tiny \
+		p5-IPC-Run3>=0.046:${PORTSDIR}/devel/p5-IPC-Run3 \
 		p5-Log-Handler>=0.71:${PORTSDIR}/devel/p5-Log-Handler \
+		p5-Moo>=1.002000:${PORTSDIR}/devel/p5-Moo \
 		p5-Parse-RecDescent>=1.965.001:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Perl6-Slurp>=0.03:${PORTSDIR}/devel/p5-Perl6-Slurp \
+		p5-Path-Tiny>=0.025:${PORTSDIR}/devel/p5-Path-Tiny \
+		p5-PathTools>=3.3300:${PORTSDIR}/devel/p5-PathTools \
+		p5-Perl6-Slurp>=0.05.1003:${PORTSDIR}/devel/p5-Perl6-Slurp \
+		p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils \
 		p5-Set-Array>=0.23:${PORTSDIR}/devel/p5-Set-Array \
 		p5-Text-Xslate>=1.2000:${PORTSDIR}/textproc/p5-Text-Xslate \
-		p5-TimeDate>=1.20:${PORTSDIR}/devel/p5-TimeDate \
 		p5-Tree-DAG_Node>=1.06:${PORTSDIR}/devel/p5-Tree-DAG_Node \
 		p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-XML-Bare>=0:${PORTSDIR}/textproc/p5-XML-Bare \
-		p5-XML-Tiny>=2.06:${PORTSDIR}/textproc/p5-XML-Tiny
+		p5-XML-Tiny>=2.06:${PORTSDIR}/textproc/p5-XML-Tiny \
+		p5-parent>=0.225:${PORTSDIR}/devel/p5-parent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Pod>=1.45:${PORTSDIR}/devel/p5-Test-Pod
 
@@ -44,10 +52,11 @@ OPTIONS_DEFINE=	EXAMPLES
 PERL_CONFIGURE=	5.14.2+
 
 MAN3=		GraphViz2.3 \
+		GraphViz2::Config.3 \
 		GraphViz2::DBI.3 \
 		GraphViz2::Data::Grapher.3 \
+		GraphViz2::Filer.3 \
 		GraphViz2::Parse::ISA.3 \
-		GraphViz2::Parse::Marpa.3 \
 		GraphViz2::Parse::RecDescent.3 \
 		GraphViz2::Parse::Regexp.3 \
 		GraphViz2::Parse::STT.3 \
@@ -56,18 +65,7 @@ MAN3=		GraphViz2.3 \
 		GraphViz2::Parse::Yapp.3 \
 		GraphViz2::Utils.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 501400
-BUILD_DEPENDS+=	p5-HTTP-Tiny>=0.012:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-PathTools>=3.3300:${PORTSDIR}/devel/p5-PathTools \
-		p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		p5-parent>=0.225:${PORTSDIR}/devel/p5-parent
-RUN_DEPENDS+=	p5-HTTP-Tiny>=0.012:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-PathTools>=3.3300:${PORTSDIR}/devel/p5-PathTools \
-		p5-Scalar-List-Utils>=1.23:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		p5-parent>=0.225:${PORTSDIR}/devel/p5-parent
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
@@ -75,4 +73,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/scripts/* ${EXAMPLESDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/p5-GraphViz2/distinfo b/graphics/p5-GraphViz2/distinfo
index 4e2418e815d3..0ff5585bf476 100644
--- a/graphics/p5-GraphViz2/distinfo
+++ b/graphics/p5-GraphViz2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GraphViz2-2.09.tgz) = 44134fa0811597a86a3e4d91973ddc90f19d95f176f67af7a8f0742cd88e5bb6
-SIZE (GraphViz2-2.09.tgz) = 201560
+SHA256 (GraphViz2-2.18.tgz) = 6a30351b46351ec8296ceaf364547fbeb528f97d5951a00b22bd0070ae7df27b
+SIZE (GraphViz2-2.18.tgz) = 189730
diff --git a/graphics/p5-GraphViz2/pkg-plist b/graphics/p5-GraphViz2/pkg-plist
index c75bd0712b55..cefebb685ac0 100644
--- a/graphics/p5-GraphViz2/pkg-plist
+++ b/graphics/p5-GraphViz2/pkg-plist
@@ -1,8 +1,9 @@
 %%SITE_PERL%%/GraphViz2.pm
+%%SITE_PERL%%/GraphViz2/Config.pm
 %%SITE_PERL%%/GraphViz2/DBI.pm
 %%SITE_PERL%%/GraphViz2/Data/Grapher.pm
+%%SITE_PERL%%/GraphViz2/Filer.pm
 %%SITE_PERL%%/GraphViz2/Parse/ISA.pm
-%%SITE_PERL%%/GraphViz2/Parse/Marpa.pm
 %%SITE_PERL%%/GraphViz2/Parse/RecDescent.pm
 %%SITE_PERL%%/GraphViz2/Parse/Regexp.pm
 %%SITE_PERL%%/GraphViz2/Parse/STT.pm
@@ -13,15 +14,19 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz2/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Heawood.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anonymous.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circo.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cluster.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copy.config.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbi.schema.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dependency.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/extract.arrow.shapes.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/extract.attributes.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/extract.node.shapes.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/extract.output.formats.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/find.config.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate.demo.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate.png.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate.sh.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate.svg.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html.labels.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jointed.edges.pl
@@ -33,7 +38,6 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.data.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.html.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.isa.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.marpa.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.recdescent.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.regexp.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.stt.pl
@@ -41,19 +45,26 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.xml.pp.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.yacc.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.yapp.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plaintext.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pod2html.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quote.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rank.sub.graph.1.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rank.sub.graph.2.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rank.sub.graph.3.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rank.sub.graph.4.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/record.1.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/record.2.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/record.3.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/record.4.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/report.nodes.and.edges.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/report.valid.attributes.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sqlite.foreign.keys.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub.graph.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub.sub.graph.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trivial.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.test.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unnamed.sub.graph.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.1.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.2.pl
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz2
 @dirrm %%SITE_PERL%%/GraphViz2/Parse