Update to 0.25, clean port files.

Approved by:	markm

4 files changed, 75 insertions, 64 deletions

diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index c26ed1d0e87e..08aef6ecf015 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Spreadsheet-WriteExcel
-PORTVERSION=	0.34
+PORTVERSION=	0.35
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Spreadsheet
@@ -17,6 +17,8 @@ MAINTAINER=	skv@protey.ru
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+PLIST_SUB=	DOCSDIR="share/doc/${PORTNAME}" \
+		EXAMPLESDIR="share/examples/${PORTNAME}"
 PERL_CONFIGURE=	yes
 
 MAN3=		Spreadsheet::WriteExcel.3 \
@@ -39,11 +41,14 @@ pre-configure:
 
 post-install:
 .ifndef(NOPORTDOCS)
-		@${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-		@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
-		${INSTALL_DATA} ${WRKSRC}/examples/* \
-			${PREFIX}/share/examples/${PORTNAME}
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/republic.bmp ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-WriteExcel/distinfo b/textproc/p5-Spreadsheet-WriteExcel/distinfo
index 509605c6638e..ab1dbfe1d239 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/distinfo
+++ b/textproc/p5-Spreadsheet-WriteExcel/distinfo
@@ -1 +1 @@
-MD5 (Spreadsheet-WriteExcel-0.34.tar.gz) = 9cc6e4432b8787f62cf05c94dd096526
+MD5 (Spreadsheet-WriteExcel-0.35.tar.gz) = f387d1d85524e8e7ff35c2b274072c46
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-descr b/textproc/p5-Spreadsheet-WriteExcel/pkg-descr
index 63bccde19484..04c84c758411 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-descr
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-descr
@@ -2,3 +2,6 @@ Spreadsheet::WriteExcel - Write formatted text and numbers to a
 cross-platform Excel binary file.
 
 WWW: http://search.cpan.org/search?module=Spreadsheet::WriteExcel
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index 64c858a20d0a..fa607088a3e6 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -9,63 +9,66 @@ 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%%/%%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/demo.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/images.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/protection.pl
-%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/regions.pl
-%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/republic.bmp
-%%PORTDOCS%%share/examples/Spreadsheet-WriteExcel/sales.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
+%%PORTDOCS%%%%DOCSDIR%%/WriteExcel.html
+%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%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%%/regions.gif
+%%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%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/bigfile.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/cgi.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/chess.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/comments.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/convertA1.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/copyformat.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/csv2xls.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/datecalc1.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/datecalc2.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/easter_egg.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/filehandle.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/formats.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/function_locale.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/hyperlink1.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/hyperlink2.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/images.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/lecxe.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/merge1.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/merge2.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/merge3.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/mod_perl.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/panes.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/protection.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/regions.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/republic.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/sales.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/stats.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/stats_ext.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/stocks.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/tab2xls.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/textwrap.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/win32ole.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/write_arrays.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/writeA1.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/writemany.pl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
 @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