- update to 0.33

- install documentation
- install examples in ${PREFIX}/share/examples/Spreadsheet-WriteExcel (instead
  of inside of ${SITE_PERL}/Spreadsheet/WriteExcel/examples/)
- sort pkg-plist

PR:		30131
Submitted by:	maintainer

3 files changed, 80 insertions, 60 deletions

diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index bd0849f96883..58053a19fd8e 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Spreadsheet-WriteExcel
-PORTVERSION= 	0.31
+PORTVERSION= 	0.33
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Spreadsheet
@@ -19,15 +19,30 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3=		Spreadsheet::WriteExcel::Worksheet.3 \
+MAN3=		Spreadsheet::WriteExcel.3 \
 		Spreadsheet::WriteExcel::BIFFwriter.3 \
-		Spreadsheet::WriteExcel::OLEwriter.3 \
-		Spreadsheet::WriteExcel::Workbook.3 \
-		Spreadsheet::WriteExcel::examples::WorkbookBig.3 \
-		Spreadsheet::WriteExcel.3 \
+		Spreadsheet::WriteExcel::Big.3 \
 		Spreadsheet::WriteExcel::Format.3 \
 		Spreadsheet::WriteExcel::Formula.3 \
-		Spreadsheet::WriteExcel::examples::Big.3
+		Spreadsheet::WriteExcel::OLEwriter.3 \
+		Spreadsheet::WriteExcel::Workbook.3 \
+		Spreadsheet::WriteExcel::WorkbookBig.3 \
+		Spreadsheet::WriteExcel::Worksheet.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+pre-configure:
+		${MV} ${WRKSRC}/WriteExcel/doc	${WRKSRC}
+		${MV} ${WRKSRC}/WriteExcel/examples	${WRKSRC}
+		${PERL} -pi -e 's:WriteExcel/(doc|examples):\1:g' \
+			${WRKSRC}/MANIFEST
+
+post-install:
+.ifndef(NOPORTDOCS)
+		@${MKDIR} ${DOCSDIR}
+		${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+		@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
+		${INSTALL_DATA} ${WRKSRC}/examples/* \
+			${PREFIX}/share/examples/${PORTNAME}
+.endif
+
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-WriteExcel/distinfo b/textproc/p5-Spreadsheet-WriteExcel/distinfo
index a031b49246fb..043875368748 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/distinfo
+++ b/textproc/p5-Spreadsheet-WriteExcel/distinfo
@@ -1 +1 @@
-MD5 (Spreadsheet-WriteExcel-0.31.tar.gz) = 7c01b53fdf2a592896a5a166805cc2f4
+MD5 (Spreadsheet-WriteExcel-0.33.tar.gz) = 3ea08febbe8c6878f3ebb670436149c6
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index 8549553e21ae..1d58193d6e71 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -1,61 +1,66 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/BIFFwriter.pm
+lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/Big.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/Format.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/Formula.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/OLEwriter.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/Workbook.pm
+lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/WorkbookBig.pm
 lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/Worksheet.pm
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/WriteExcel.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/examples.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/index.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/merge1.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/merge2.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/number_formats1.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/number_formats2.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/regions.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/simple.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/stats.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/stocks.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/textwrap.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj.html
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj0503-0004-01.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj0503-0004-02.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj0503-0004-03.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj0503-0004-04.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/tpj0503-0004-05.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc/win32ole.gif
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/Big.pm
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/README.txt
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/WorkbookBig.pm
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/bigfile.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/cgi.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/comments.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/convertA1.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/copyformat.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/csv2xls.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/easter_egg.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/filehandle.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/formats.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/function_locale.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/hyperlink.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/merge1.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/merge2.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/mod_perl.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/ms_time.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/regions.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/simple.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/stats.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/stats_ext.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/stocks.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/tab2xls.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/textwrap.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/win32ole.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/writeA1.pl
-lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples/writemany.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/doc
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel/examples
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/.packlist
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/WriteExcel.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/examples.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/index.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/merge1.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/merge2.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/number_formats1.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/number_formats2.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/regions.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/simple.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/stats.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/stocks.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/textwrap.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj.html
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj0503-0004-01.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj0503-0004-02.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj0503-0004-03.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj0503-0004-04.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/tpj0503-0004-05.gif
+%%PORTDOCS%%share/doc/Spreadsheet-WriteExcel/win32ole.gif
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/README
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/bigfile.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/cgi.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/chess.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/comments.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/convertA1.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/copyformat.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/csv2xls.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/datecalc1.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/datecalc2.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/easter_egg.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/filehandle.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/formats.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/function_locale.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/hyperlink.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/lecxe.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/merge1.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/merge2.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/merge3.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/mod_perl.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/panes.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/regions.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/simple.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/stats.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/stats_ext.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/stocks.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/tab2xls.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/textwrap.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/win32ole.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/writeA1.pl
+%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/writemany.pl
+%%PORTDOCS%%@dirrm share/examples/Spreadsheet-WriteExcel
+%%PORTDOCS%%@dirrm share/doc/Spreadsheet-WriteExcel
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet/WriteExcel
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Spreadsheet 2>/dev/null || true