Update to version 0.6.6

4 files changed, 29 insertions, 19 deletions

diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 807faf25f8e6..53a836f06d58 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		xml
-PORTVERSION=		0.6.5
+PORTVERSION=		0.6.6
 CATEGORIES=		textproc python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyxml
@@ -26,8 +26,8 @@ USE_PYTHON=		yes
 .include <bsd.port.pre.mk>
 
 CPIO=			cpio --quiet -pdum -R
-DOCDIR=			${PREFIX}/share/doc/py-xml
-EGDIR=			${PREFIX}/share/examples/py-xml
+DOCSDIR=		${PREFIX}/share/doc/py-xml
+EXAMPLESDIR=		${PREFIX}/share/examples/py-xml
 .if ${PYTHON_VERSION} == "python1.5"
 PLIST_SUB+=		PACKAGE_DIR=xml
 .else
@@ -43,15 +43,15 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCDIR}
+	@ ${MKDIR} ${DOCSDIR}
 .for docfile in ANNOUNCE CREDITS LICENCE README* TODO
-	@ ${INSTALL_MAN} ${WRKSRC}/${docfile} ${DOCDIR}
+	@ ${INSTALL_MAN} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 	@ cd ${WRKSRC}/doc && find * \
-	  | ${CPIO} ${MANOWN}:${MANGRP} ${DOCDIR}
-	@ ${MKDIR} ${EGDIR}
+	  | ${CPIO} ${MANOWN}:${MANGRP} ${DOCSDIR}
+	@ ${MKDIR} ${EXAMPLESDIR}
 	@ cd ${WRKSRC} && find demo test \
-	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EGDIR}
+	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-xml/distinfo b/textproc/py-xml/distinfo
index 72cb1bcf352e..fdb5fadbcc9b 100644
--- a/textproc/py-xml/distinfo
+++ b/textproc/py-xml/distinfo
@@ -1 +1 @@
-MD5 (PyXML-0.6.5.tar.gz) = 366c2405b1427f7997b2bd25a00ecbfe
+MD5 (PyXML-0.6.6.tar.gz) = 6b65207c842dd06e30b67a3a932b7051
diff --git a/textproc/py-xml/pkg-descr b/textproc/py-xml/pkg-descr
index 20e681a18adc..b5fc8953a8b8 100644
--- a/textproc/py-xml/pkg-descr
+++ b/textproc/py-xml/pkg-descr
@@ -1,13 +1,12 @@
-From the README:
-  This is the Python XML package.  The distribution contains a
-  validating XML parser, an implementation of the SAX and DOM
-  programming interfaces, an interface to the Expat parser (and the
-  Expat parser itself), and a C helper module that can speed up
-  xmllib.py by a factor of 5.  There's even documentation!
+This is the Python XML package.  The distribution contains a
+validating XML parser, an implementation of the SAX and DOM
+programming interfaces, an interface to the Expat parser (and the
+Expat parser itself), and a C helper module that can speed up
+xmllib.py by a factor of 5.  There's even documentation!
 
-Version 0.6.5 is to be considered a beta release.
+The current version is still to be considered a beta release.
 
 WWW: http://www.python.org/sigs/xml-sig/
 
--- Jacques Vidrine <nectar@FreeBSD.ORG>   (original port)
--- Johann Visagie  <johann@egenetics.com> (current maintainer)
+-- Jacques Vidrine <nectar@FreeBSD.ORG> (original port)
+-- Johann Visagie  <wjv@FreeBSD.org>    (current maintainer)
diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist
index a7d831fe5d82..d3628ae3a71f 100644
--- a/textproc/py-xml/pkg-plist
+++ b/textproc/py-xml/pkg-plist
@@ -12,6 +12,7 @@
 %%PORTDOCS%%share/doc/py-xml/README.pyexpat
 %%PORTDOCS%%share/doc/py-xml/README.sgmlop
 %%PORTDOCS%%share/doc/py-xml/TODO
+%%PORTDOCS%%share/doc/py-xml/package-summary.txt
 %%PORTDOCS%%share/doc/py-xml/xml-howto.tex
 %%PORTDOCS%%share/doc/py-xml/xml-howto.txt
 %%PORTDOCS%%share/doc/py-xml/xml-ref.tex
@@ -104,6 +105,7 @@
 %%PORTDOCS%%share/examples/py-xml/test/dom/borrowed/af_20000919.py
 %%PORTDOCS%%share/examples/py-xml/test/dom/borrowed/af_20000922.py
 %%PORTDOCS%%share/examples/py-xml/test/dom/borrowed/nc_20000921.py
+%%PORTDOCS%%share/examples/py-xml/test/dom/borrowed/uo_20010713.py
 %%PORTDOCS%%share/examples/py-xml/test/dom/ext/TestSuite.py
 %%PORTDOCS%%share/examples/py-xml/test/dom/ext/bigTest.html
 %%PORTDOCS%%share/examples/py-xml/test/dom/ext/mulit-single.html
@@ -235,6 +237,9 @@
 %%PORTDOCS%%share/examples/py-xml/test/xmlval_illformed.dtd
 bin/xmlproc_parse
 bin/xmlproc_val
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/FtCore.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/FtCore.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/FtCore.pyo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/__init__.pyo
@@ -333,6 +338,9 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/XHtmlPrinter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/c14n.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/c14n.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/c14n.pyo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/HtmlLib.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/HtmlLib.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/HtmlLib.pyo
@@ -556,6 +564,9 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/marshal/wddx.pyo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/marshal/xmlrpc.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/marshal/xmlrpc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/marshal/xmlrpc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/ns.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/ns.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/ns.pyo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/parsers/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/parsers/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/parsers/__init__.pyo
@@ -723,6 +734,7 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/utils/qp_xml.pyo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/en_US
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/de/LC_MESSAGES
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/de
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom
 %%PORTDOCS%%@dirrm share/examples/py-xml/test/output
 %%PORTDOCS%%@dirrm share/examples/py-xml/test/dom/html
 %%PORTDOCS%%@dirrm share/examples/py-xml/test/dom/ext
@@ -743,5 +755,4 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/utils/qp_xml.pyo
 %%PORTDOCS%%@dirrm share/doc/py-xml/xmlproc
 %%PORTDOCS%%@dirrm share/doc/py-xml/4DOM
 %%PORTDOCS%%@dirrm share/doc/py-xml
-@unexec rmdir %D/lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom 2>/dev/null || true
 @unexec rmdir %D/lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%% 2>/dev/null || true