3 files changed, 48 insertions, 43 deletions

diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index dab85e65e64f..572de2042fcf 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Spreadsheet-WriteExcel
-PORTVERSION=	2.25
-PORTREVISION=	1
+PORTVERSION=	2.37
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -28,13 +27,21 @@ MAN3=		Spreadsheet::WriteExcel.3 \
 		Spreadsheet::WriteExcel::BIFFwriter.3 \
 		Spreadsheet::WriteExcel::Big.3 \
 		Spreadsheet::WriteExcel::Chart.3 \
+		Spreadsheet::WriteExcel::Chart::Area.3 \
+		Spreadsheet::WriteExcel::Chart::Bar.3 \
+		Spreadsheet::WriteExcel::Chart::Column.3 \
+		Spreadsheet::WriteExcel::Chart::External.3 \
+		Spreadsheet::WriteExcel::Chart::Line.3 \
+		Spreadsheet::WriteExcel::Chart::Pie.3 \
+		Spreadsheet::WriteExcel::Chart::Scatter.3 \
+		Spreadsheet::WriteExcel::Chart::Stock.3 \
+		Spreadsheet::WriteExcel::Examples.3 \
 		Spreadsheet::WriteExcel::Format.3 \
 		Spreadsheet::WriteExcel::Formula.3 \
 		Spreadsheet::WriteExcel::OLEwriter.3 \
 		Spreadsheet::WriteExcel::Properties.3 \
 		Spreadsheet::WriteExcel::Utility.3 \
 		Spreadsheet::WriteExcel::Workbook.3 \
-		Spreadsheet::WriteExcel::WorkbookBig.3 \
 		Spreadsheet::WriteExcel::Worksheet.3
 
 post-patch:
@@ -44,16 +51,17 @@ post-patch:
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/images
+	@${MKDIR} ${DOCSDIR}/tpj_images
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/tpj_images/* ${DOCSDIR}/tpj_images
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/README \
 		${WRKSRC}/examples/republic.png ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.txt ${EXAMPLESDIR}
-	@${MKDIR} ${EXAMPLESDIR}/charts
-	${INSTALL_DATA} ${WRKSRC}/charts/* ${EXAMPLESDIR}/charts
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-WriteExcel/distinfo b/textproc/p5-Spreadsheet-WriteExcel/distinfo
index 0cd54da94a01..7adf8bc84a12 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/distinfo
+++ b/textproc/p5-Spreadsheet-WriteExcel/distinfo
@@ -1,3 +1,3 @@
-MD5 (Spreadsheet-WriteExcel-2.25.tar.gz) = ad70e5b031c0af60c50a72d8b09240c9
-SHA256 (Spreadsheet-WriteExcel-2.25.tar.gz) = 04f8ba8f1178d57c1bfe8a89db20ee13dfc59782cd65d240dcf52cc937571af2
-SIZE (Spreadsheet-WriteExcel-2.25.tar.gz) = 544162
+MD5 (Spreadsheet-WriteExcel-2.37.tar.gz) = 07e038429dc7d7467c735e467cc1cfbe
+SHA256 (Spreadsheet-WriteExcel-2.37.tar.gz) = 34e0c28d362a5248936a8ff09211c5ade6ae23fe6e7eddf3ad9ff48fca1f7a68
+SIZE (Spreadsheet-WriteExcel-2.37.tar.gz) = 566688
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index fe0641570850..d828bf8d1f36 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -2,38 +2,38 @@
 %%SITE_PERL%%/Spreadsheet/WriteExcel/BIFFwriter.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Big.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Chart.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Area.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Bar.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Column.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/External.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Line.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Pie.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Scatter.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Chart/Stock.pm
+%%SITE_PERL%%/Spreadsheet/WriteExcel/Examples.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Format.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Formula.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/OLEwriter.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Properties.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Utility.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Workbook.pm
-%%SITE_PERL%%/Spreadsheet/WriteExcel/WorkbookBig.pm
 %%SITE_PERL%%/Spreadsheet/WriteExcel/Worksheet.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/.packlist
 bin/chartex
+%%PORTDOCS%%%%DOCSDIR%%/Perl_Journal_Article.html
 %%PORTDOCS%%%%DOCSDIR%%/WriteExcel.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/WriteExcel_Install.html
+%%PORTDOCS%%%%DOCSDIR%%/images/example.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/swe.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/merge1.gif
-%%PORTDOCS%%%%DOCSDIR%%/merge2.gif
 %%PORTDOCS%%%%DOCSDIR%%/number_formats1.html
 %%PORTDOCS%%%%DOCSDIR%%/number_formats2.html
 %%PORTDOCS%%%%DOCSDIR%%/palette.html
-%%PORTDOCS%%%%DOCSDIR%%/regions.gif
-%%PORTDOCS%%%%DOCSDIR%%/rgb5-97.html
-%%PORTDOCS%%%%DOCSDIR%%/simple.gif
-%%PORTDOCS%%%%DOCSDIR%%/stats.gif
-%%PORTDOCS%%%%DOCSDIR%%/stocks.gif
-%%PORTDOCS%%%%DOCSDIR%%/textwrap.gif
-%%PORTDOCS%%%%DOCSDIR%%/tpj.html
-%%PORTDOCS%%%%DOCSDIR%%/tpj0503-0004-01.gif
-%%PORTDOCS%%%%DOCSDIR%%/tpj0503-0004-02.gif
-%%PORTDOCS%%%%DOCSDIR%%/tpj0503-0004-03.gif
-%%PORTDOCS%%%%DOCSDIR%%/tpj0503-0004-04.gif
-%%PORTDOCS%%%%DOCSDIR%%/tpj0503-0004-05.gif
-%%PORTDOCS%%%%DOCSDIR%%/win32ole.gif
+%%PORTDOCS%%%%DOCSDIR%%/tpj_images/tpj0503-0004-01.gif
+%%PORTDOCS%%%%DOCSDIR%%/tpj_images/tpj0503-0004-02.gif
+%%PORTDOCS%%%%DOCSDIR%%/tpj_images/tpj0503-0004-03.gif
+%%PORTDOCS%%%%DOCSDIR%%/tpj_images/tpj0503-0004-04.gif
+%%PORTDOCS%%%%DOCSDIR%%/tpj_images/tpj0503-0004-05.gif
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/a_simple.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/autofilter.pl
@@ -41,20 +41,13 @@ bin/chartex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigfile.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bug_report.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/Chart1.xls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/Chart2.xls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/Chart3.xls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/Chart4.xls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/Chart5.xls
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/chartex.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/charts.pod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/charts.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/demo1.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/demo2.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/demo3.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/demo4.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charts/demo5.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_area.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_bar.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_column.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_line.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_pie.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_scatter.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chart_stock.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chess.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/comments1.pl
@@ -66,6 +59,7 @@ bin/chartex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/date_time.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/datecalc1.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/datecalc2.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/defined_name.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/diag_border.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/easter_egg.pl
@@ -73,6 +67,7 @@ bin/chartex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/formats.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/formula_result.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/function_locale.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gen_examples_pod.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hide_sheet.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyperlink1.pl
@@ -136,10 +131,12 @@ bin/chartex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_handler3.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_handler4.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/write_to_scalar.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/charts
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tpj_images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
+@dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel/Chart
 @dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel
 @dirrmtry %%SITE_PERL%%/Spreadsheet