3 files changed, 31 insertions, 42 deletions

diff --git a/graphics/p5-Chart-Clicker/Makefile b/graphics/p5-Chart-Clicker/Makefile
index 0a9859f967e8..793a9ad73afc 100644
--- a/graphics/p5-Chart-Clicker/Makefile
+++ b/graphics/p5-Chart-Clicker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Chart-Clicker
-PORTVERSION=	1.4.2
+PORTVERSION=	2.05
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,49 +15,47 @@ MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	Powerful, extensible charting
 
 BUILD_DEPENDS=	p5-Moose>=0.25:${PORTSDIR}/devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
 		p5-Module-Install>=0.64:${PORTSDIR}/devel/p5-Module-Install \
 		p5-Cairo>=1.000:${PORTSDIR}/graphics/p5-Cairo \
-		p5-DateTime-Set>=0.25:${PORTSDIR}/devel/p5-DateTime-Set
+		p5-DateTime-Set>=0.25:${PORTSDIR}/devel/p5-DateTime-Set \
+		p5-Geometry-Primitive>=0:${PORTSDIR}/graphics/p5-Geometry-Primitive \
+		p5-Graphics-Primitive>=0:${PORTSDIR}/graphics/p5-Graphics-Primitive \
+		p5-Graphics-Primitive-Driver-Cairo>=0:${PORTSDIR}/graphics/p5-Graphics-Primitive-Driver-Cairo \
+		p5-Layout-Manager>=0:${PORTSDIR}/graphics/p5-Layout-Manager
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
-MAN3=		Chart::Clicker.3 Chart::Clicker::Axis.3 \
-    		Chart::Clicker::Axis::DateTime.3 \
+MAN3=		Chart::Clicker.3 \
+		Chart::Clicker::Axis.3 \
+		Chart::Clicker::Axis::DateTime.3 \
+		Chart::Clicker::Component.3 \
+		Chart::Clicker::Container.3 \
+		Chart::Clicker::Context.3 \
 		Chart::Clicker::Data::DataSet.3 \
 		Chart::Clicker::Data::Marker.3 \
 		Chart::Clicker::Data::Range.3 \
 		Chart::Clicker::Data::Series.3 \
+		Chart::Clicker::Data::Series::Size.3 \
 		Chart::Clicker::Decoration.3 \
 		Chart::Clicker::Decoration::Glass.3 \
 		Chart::Clicker::Decoration::Grid.3 \
-		Chart::Clicker::Decoration::Label.3 \
 		Chart::Clicker::Decoration::Legend.3 \
 		Chart::Clicker::Decoration::LegendItem.3 \
 		Chart::Clicker::Decoration::MarkerOverlay.3 \
 		Chart::Clicker::Decoration::Plot.3 \
-		Chart::Clicker::Drawing.3 \
-		Chart::Clicker::Drawing::Border.3 \
-		Chart::Clicker::Drawing::Color.3 \
 		Chart::Clicker::Drawing::ColorAllocator.3 \
-		Chart::Clicker::Drawing::Component.3 \
-		Chart::Clicker::Drawing::Container.3 \
-		Chart::Clicker::Drawing::Dimension.3 \
-		Chart::Clicker::Drawing::Font.3 \
-		Chart::Clicker::Drawing::Insets.3 \
-		Chart::Clicker::Drawing::Point.3 \
-		Chart::Clicker::Drawing::Stroke.3 \
+		Chart::Clicker::Positioned.3 \
+		Chart::Clicker::Renderer.3 \
 		Chart::Clicker::Renderer::Area.3 \
 		Chart::Clicker::Renderer::Bar.3 \
-		Chart::Clicker::Renderer::Base.3 \
+		Chart::Clicker::Renderer::Bubble.3 \
 		Chart::Clicker::Renderer::Line.3 \
 		Chart::Clicker::Renderer::Measurement.3 \
 		Chart::Clicker::Renderer::Pie.3 \
 		Chart::Clicker::Renderer::Point.3 \
 		Chart::Clicker::Renderer::StackedBar.3 \
-		Chart::Clicker::Simple.3 \
-		Chart::Clicker::Shape.3 \
-		Chart::Clicker::Shape::Arc.3 \
-		Chart::Clicker::Shape::Rectangle.3
+		Chart::Clicker::Shape.3
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Chart-Clicker/distinfo b/graphics/p5-Chart-Clicker/distinfo
index 7504506132b4..20218899a363 100644
--- a/graphics/p5-Chart-Clicker/distinfo
+++ b/graphics/p5-Chart-Clicker/distinfo
@@ -1,3 +1,3 @@
-MD5 (Chart-Clicker-1.4.2.tar.gz) = 40fa72557a3806429e762fb2103061e6
-SHA256 (Chart-Clicker-1.4.2.tar.gz) = f827add37b1ede84f3c90a2c68a24acea04544daaa04235c60f201b8d1e96bcc
-SIZE (Chart-Clicker-1.4.2.tar.gz) = 59502
+MD5 (Chart-Clicker-2.05.tar.gz) = bd3291d31f1f31181a7a4dbc4fb4ef57
+SHA256 (Chart-Clicker-2.05.tar.gz) = 328a946b4d2b04311df8acf4aaba99ba17aaf08685489db1f7e200eddcd174fa
+SIZE (Chart-Clicker-2.05.tar.gz) = 53776
diff --git a/graphics/p5-Chart-Clicker/pkg-plist b/graphics/p5-Chart-Clicker/pkg-plist
index c7b09a2e5982..4397eb67e5ff 100644
--- a/graphics/p5-Chart-Clicker/pkg-plist
+++ b/graphics/p5-Chart-Clicker/pkg-plist
@@ -1,50 +1,41 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Clicker/.packlist
 %%SITE_PERL%%/Chart/Clicker.pm
-%%SITE_PERL%%/Chart/document.pl
-%%SITE_PERL%%/Chart/critique.pl
-%%SITE_PERL%%/Chart/Clicker/Shape.pm
-%%SITE_PERL%%/Chart/Clicker/Decoration.pm
-%%SITE_PERL%%/Chart/Clicker/Simple.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing.pm
 %%SITE_PERL%%/Chart/Clicker/Axis.pm
+%%SITE_PERL%%/Chart/Clicker/Component.pm
+%%SITE_PERL%%/Chart/Clicker/Container.pm
+%%SITE_PERL%%/Chart/Clicker/Context.pm
+%%SITE_PERL%%/Chart/Clicker/Decoration.pm
+%%SITE_PERL%%/Chart/Clicker/Positioned.pm
+%%SITE_PERL%%/Chart/Clicker/Renderer.pm
+%%SITE_PERL%%/Chart/Clicker/Shape.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/Legend.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/Glass.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/Plot.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/Grid.pm
-%%SITE_PERL%%/Chart/Clicker/Decoration/Label.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/MarkerOverlay.pm
 %%SITE_PERL%%/Chart/Clicker/Decoration/LegendItem.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Point.pm
-%%SITE_PERL%%/Chart/Clicker/Renderer/Base.pm
+%%SITE_PERL%%/Chart/Clicker/Renderer/Bubble.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Pie.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Bar.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Measurement.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Area.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/StackedBar.pm
 %%SITE_PERL%%/Chart/Clicker/Renderer/Line.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Insets.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Container.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Border.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Stroke.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Component.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Font.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Dimension.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Point.pm
 %%SITE_PERL%%/Chart/Clicker/Drawing/ColorAllocator.pm
-%%SITE_PERL%%/Chart/Clicker/Drawing/Color.pm
-%%SITE_PERL%%/Chart/Clicker/Shape/Rectangle.pm
-%%SITE_PERL%%/Chart/Clicker/Shape/Arc.pm
 %%SITE_PERL%%/Chart/Clicker/Axis/DateTime.pm
 %%SITE_PERL%%/Chart/Clicker/Data/DataSet.pm
 %%SITE_PERL%%/Chart/Clicker/Data/Range.pm
 %%SITE_PERL%%/Chart/Clicker/Data/Marker.pm
 %%SITE_PERL%%/Chart/Clicker/Data/Series.pm
+%%SITE_PERL%%/Chart/Clicker/Data/Series/Size.pm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Clicker
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Shape
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Renderer
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Drawing
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Decoration
+@dirrmtry %%SITE_PERL%%/Chart/Clicker/Data/Series
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Data
 @dirrmtry %%SITE_PERL%%/Chart/Clicker/Axis
 @dirrmtry %%SITE_PERL%%/Chart/Clicker