- Update to version 0.6.4.1

PR:		134296
Submitted by:	Ports Fury

3 files changed, 54 insertions, 48 deletions

diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index ec7e2d0497f4..12eb5ae3fd2b 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -6,35 +6,32 @@
 #
 
 PORTNAME=	excelerator
-PORTVERSION=	0.6.3a
+PORTVERSION=	0.6.4.1
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pyexcelerator
+MASTER_SITES=	SF/pyexcelerator
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyexcelerator-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Python library for generating Excel 97/2000/XP/2003 files
 
+USE_ZIP=	yes
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	pyExcelerator
-USE_ZIP=	yes
-WRKSRC=	${WRKDIR}/pyExcelerator-${PORTVERSION}
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	CHANGES.txt LICENSE.txt README.txt THANKS.txt TODO.txt
-.endif
+DOCSDIR=	${PREFIX}/share/doc/py-excelerator
+EXAMPLESDIR=	${PREFIX}/share/examples/py-excelerator
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
-.endfor
-
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	@${FIND} ${WRKSRC}/examples -type f -depth 1 -exec ${INSTALL_DATA} {} ${EXAMPLESDIR} \;
+	${INSTALL_DATA} ${WRKSRC}/examples/*.bmp ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/py-excelerator/distinfo b/textproc/py-excelerator/distinfo
index c25614fa48dc..0b094a61a79c 100644
--- a/textproc/py-excelerator/distinfo
+++ b/textproc/py-excelerator/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyexcelerator-0.6.3a.zip) = 0a532bc5d6438e277a3ae20b3f29d867
-SHA256 (pyexcelerator-0.6.3a.zip) = f2a4362b389958c1fc02ae200cf87ab34cf01dbdaa0ce0402f5ebffb39a63e60
-SIZE (pyexcelerator-0.6.3a.zip) = 266911
+MD5 (pyexcelerator-0.6.4.1.zip) = 2b49954d2647c846df9bb24cac0980ca
+SHA256 (pyexcelerator-0.6.4.1.zip) = df8236873c4e0a102e1661a475b9d5a40da85e8d12e91a4454eb0f646651173e
+SIZE (pyexcelerator-0.6.4.1.zip) = 173654
diff --git a/textproc/py-excelerator/pkg-plist b/textproc/py-excelerator/pkg-plist
index af512a46af76..a0f501a0f50d 100644
--- a/textproc/py-excelerator/pkg-plist
+++ b/textproc/py-excelerator/pkg-plist
@@ -1,6 +1,3 @@
-%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.py
-%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.pyc
-%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.pyo
 %%PYTHON_SITELIBDIR%%/pyExcelerator/BIFFRecords.py
 %%PYTHON_SITELIBDIR%%/pyExcelerator/BIFFRecords.pyc
 %%PYTHON_SITELIBDIR%%/pyExcelerator/BIFFRecords.pyo
@@ -58,33 +55,45 @@
 %%PYTHON_SITELIBDIR%%/pyExcelerator/__init__.py
 %%PYTHON_SITELIBDIR%%/pyExcelerator/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pyExcelerator/__init__.pyo
-%%PORTDOCS%%%%EXAMPLESDIR%%/blanks.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/big-16Mb.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/big-35Mb.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/col_width.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/dates.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/format.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/formulas.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/formula_names.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/hyperlinks.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/image.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/merged.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/merged0.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/merged1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/mini.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/num_formats.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/numbers.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/outline.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/panes.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/parse-fmla.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/protection.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/python.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/row_styles.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/row_styles_empty.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/sst.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/unicode0.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/unicode1.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/unicode2.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/wsprops.py
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.py
+%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.pyc
+%%PYTHON_SITELIBDIR%%/pyExcelerator/antlr.pyo
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/THANKS.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/big-16Mb.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/big-35Mb.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blanks.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/col_width.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dates.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/format.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/formula_names.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/formulas.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyperlinks.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/merged.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/merged0.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/merged1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mini.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/num_formats.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/numbers.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/outline.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panes.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parse-fmla.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protection.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/row_styles.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/row_styles_empty.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sst.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unicode0.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unicode1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unicode2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wsprops.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xls2csv.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xls2html.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xls2txt.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/pyExcelerator