3 files changed, 10 insertions, 61 deletions

diff --git a/graphics/p5-GraphViz2/Makefile b/graphics/p5-GraphViz2/Makefile
index 723c365e25b1..955cdde53606 100644
--- a/graphics/p5-GraphViz2/Makefile
+++ b/graphics/p5-GraphViz2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	GraphViz2
-PORTVERSION=	2.24
+PORTVERSION=	2.25
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSAVAGE
@@ -42,12 +42,17 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz \
 		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
+TEST_DEPENDS=	p5-Test-Pod>=1.45:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Version>=0:${PORTSDIR}/devel/p5-Test-Version
 
 OPTIONS_DEFINE=	EXAMPLES
 
 USE_PERL5=	5.14.2+ configure
-USES=		perl5
+USES=		perl5 shebangfix
+
+PORTEXAMPLES=	*
+
+SHEBANG_FILES=	scripts/generate.png.sh scripts/generate.svg.sh scripts/pod2html.sh
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/p5-GraphViz2/distinfo b/graphics/p5-GraphViz2/distinfo
index ac8c6d0a8885..e1767c36e450 100644
--- a/graphics/p5-GraphViz2/distinfo
+++ b/graphics/p5-GraphViz2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GraphViz2-2.24.tgz) = d8ee4d3dfdcfc46253c0c27399da8d58a9a8ff01a454b3da071d9ac69864bff2
-SIZE (GraphViz2-2.24.tgz) = 198617
+SHA256 (GraphViz2-2.25.tgz) = 5291fba02e93d8823d41709b50230cb03b8e788966e7ad518697ab4820ee8ed6
+SIZE (GraphViz2-2.25.tgz) = 198728
diff --git a/graphics/p5-GraphViz2/pkg-plist b/graphics/p5-GraphViz2/pkg-plist
index 22aef8547e53..14b9ba98e724 100644
--- a/graphics/p5-GraphViz2/pkg-plist
+++ b/graphics/p5-GraphViz2/pkg-plist
@@ -12,61 +12,6 @@
 %%SITE_PERL%%/GraphViz2/Parse/Yapp.pm
 %%SITE_PERL%%/GraphViz2/Utils.pm
 %%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.1.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html.labels.2.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jointed.edges.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macro.1.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macro.2.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macro.3.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macro.4.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macro.5.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.data.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.html.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.isa.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.recdescent.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.regexp.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.stt.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse.xml.bare.pl
-%%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.frames.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub.graph.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sub.sub.graph.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trivial.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unnamed.sub.graph.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.1.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.2.pl
 %%PERL5_MAN3%%/GraphViz2.3.gz
 %%PERL5_MAN3%%/GraphViz2::Config.3.gz
 %%PERL5_MAN3%%/GraphViz2::DBI.3.gz
@@ -80,7 +25,6 @@
 %%PERL5_MAN3%%/GraphViz2::Parse::Yacc.3.gz
 %%PERL5_MAN3%%/GraphViz2::Parse::Yapp.3.gz
 %%PERL5_MAN3%%/GraphViz2::Utils.3.gz
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz2
 @dirrm %%SITE_PERL%%/GraphViz2/Parse
 @dirrm %%SITE_PERL%%/GraphViz2/Data