4 files changed, 63 insertions, 51 deletions

diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 2de8d99d5661..c912419d88a0 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		xml
-PORTVERSION=		0.6.3
+PORTVERSION=		0.6.4
 CATEGORIES=		textproc python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}                     \
 			http://www.python.org/sigs/xml-sig/files/      \
@@ -21,61 +21,28 @@ MAINTAINER=		johann@egenetics.com
 BUILD_DEPENDS=		${PYDISTUTILS}
 
 USE_PYTHON=		yes
-PLIST=			${WRKDIR}/PLIST
 
 .include <bsd.port.pre.mk>
 
+CPIO=			cpio --quiet -pdum -R
+DOCDIR=			${PREFIX}/share/doc/py-xml
 .if ${PYTHON_VERSION} == "python1.5"
 PLIST_SUB+=		PACKAGE_DIR=xml
 .else
 PLIST_SUB+=		PACKAGE_DIR=_xmlplus
 .endif
-PLISTS=			${PKGDIR}/pkg-plist
-
-.if !defined(NOPORTDOCS)
-DOCDIR=			share/doc/py-xml
-# Document files to be installed in ${DOCDIR}
-DOCS1=			xml-howto.txt xml-ref.txt
-# Document files to be installed in ${DOCDIR}/xmlproc
-DOCS2=			artikler.css basicapi.gif cmdline.gif          \
-			standard.css wxval.gif                         \
-			xmlproc-catalog-doco.html xmlproc-doco.html    \
-			xmlproc-dtd-doco.html xmlproc-license.html     \
-			xmlproc.html xmlproc_cmdline.html              \
-			xmlproc_dtdparser.html xmlproc_ns.html         \
-			xmlproc_tut.html
-# Document files to be installed in ${DOCDIR}/4DOM
-DOCS3=			4DOM.web Extensions.api Extensions.html        \
-			index.html
-# Complete list of document files
-DOCS=			${DOCS1} ${DOCS2:S|^|xmlproc/|}                \
-			${DOCS3:S|^|4DOM/|}
-
-# Command to install document file and simultaneously add filename
-# to the packing list
-INSTALL_DOC=		${INSTALL_DATA} ${WRKSRC}/doc/@DOC             \
-			${PREFIX}/${DOCDIR}/@DOC &&                    \
-			${ECHO} ${DOCDIR}/@DOC >> ${PLIST}
-.endif
 
 do-build:
-	cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
+	@ (cd ${WRKSRC} && ${PYTHON_CMD} setup.py build)
 
-pre-install:
-	${CAT} ${PLISTS} > ${PLIST}
+do-install:
+	@ (cd ${WRKSRC} && ${PYTHON_CMD} setup.py install)
+
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-	${MKDIR} ${PREFIX}/${DOCDIR}/xmlproc
-	${MKDIR} ${PREFIX}/${DOCDIR}/4DOM
-.for doc in ${DOCS}
-	${INSTALL_DOC:S|@DOC|${doc}|g}
-.endfor
-	${ECHO} @dirrm ${DOCDIR}/xmlproc >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR}/4DOM >> ${PLIST}
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	@ ${MKDIR} ${DOCDIR}
+	@ (cd ${WRKSRC}/doc && find . \
+	  | ${CPIO} ${MANOWN}:${MANGRP} ${DOCDIR})
 .endif
 
-do-install:
-	cd ${WRKSRC} && ${PYTHON_CMD} setup.py install
-
 .include <bsd.port.post.mk>
diff --git a/textproc/py-xml/distinfo b/textproc/py-xml/distinfo
index 60bb5dc0864c..bb1ebf597a04 100644
--- a/textproc/py-xml/distinfo
+++ b/textproc/py-xml/distinfo
@@ -1 +1 @@
-MD5 (PyXML-0.6.3.tar.gz) = c9f9e72daccfbca3c2ab68410e16c231
+MD5 (PyXML-0.6.4.tar.gz) = 2bff3b8b418a2c92204f2dadad6981bb
diff --git a/textproc/py-xml/pkg-descr b/textproc/py-xml/pkg-descr
index 13515c827520..3a137d7e5fe3 100644
--- a/textproc/py-xml/pkg-descr
+++ b/textproc/py-xml/pkg-descr
@@ -5,8 +5,9 @@ From the README:
   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.3 is to be considered a beta release.
+Version 0.6.4 is to be considered a beta release.
 
 WWW: http://www.python.org/sigs/xml-sig/
 
--- Jacques Vidrine <nectar@FreeBSD.ORG>
+-- Jacques Vidrine <nectar@FreeBSD.ORG>   (original port)
+-- Johann Visagie  <johann@egenetics.com> (current maintainer)
diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist
index 62e3e36de5eb..e5c2df856229 100644
--- a/textproc/py-xml/pkg-plist
+++ b/textproc/py-xml/pkg-plist
@@ -1,3 +1,27 @@
+%%PORTDOCS%%share/doc/py-xml/4DOM/4DOM.web
+%%PORTDOCS%%share/doc/py-xml/4DOM/Extensions.api
+%%PORTDOCS%%share/doc/py-xml/4DOM/Extensions.html
+%%PORTDOCS%%share/doc/py-xml/4DOM/Ranges.api
+%%PORTDOCS%%share/doc/py-xml/4DOM/Ranges.html
+%%PORTDOCS%%share/doc/py-xml/4DOM/index.html
+%%PORTDOCS%%share/doc/py-xml/xml-howto.tex
+%%PORTDOCS%%share/doc/py-xml/xml-howto.txt
+%%PORTDOCS%%share/doc/py-xml/xml-ref.tex
+%%PORTDOCS%%share/doc/py-xml/xml-ref.txt
+%%PORTDOCS%%share/doc/py-xml/xmlproc/artikler.css
+%%PORTDOCS%%share/doc/py-xml/xmlproc/basicapi.gif
+%%PORTDOCS%%share/doc/py-xml/xmlproc/cmdline.gif
+%%PORTDOCS%%share/doc/py-xml/xmlproc/standard.css
+%%PORTDOCS%%share/doc/py-xml/xmlproc/wxval.gif
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc-catalog-doco.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc-doco.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc-dtd-doco.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc-license.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc_cmdline.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc_dtdparser.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc_ns.html
+%%PORTDOCS%%share/doc/py-xml/xmlproc/xmlproc_tut.html
 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%%/_checkversion.py
@@ -28,6 +52,8 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Event.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Event.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/FtNode.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/FtNode.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/MessageSource.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/MessageSource.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/NamedNodeMap.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/NamedNodeMap.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/NodeFilter.py
@@ -40,18 +66,24 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Notation.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Notation.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ProcessingInstruction.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ProcessingInstruction.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Range.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Range.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Text.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/Text.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/TreeWalker.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/TreeWalker.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/en_US.py
-lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/en_US.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/de/LC_MESSAGES/4Suite.mo
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/domreg.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/domreg.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/en_US/LC_MESSAGES/4Suite.mo
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/Printer.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/Printer.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/Visitor.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/Visitor.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/XHtml2HtmlPrinter.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/XHtml2HtmlPrinter.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/XHtmlPrinter.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/XHtmlPrinter.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/__init__.py
@@ -68,8 +100,13 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sax2.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sax2.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sax2Lib.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sax2Lib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sgmlop.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/Sgmlop.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/fr_FR/LC_MESSAGES/4Suite.mo
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/GenerateHtml.py
+lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/GenerateHtml.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/HTMLAnchorElement.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/HTMLAnchorElement.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/HTMLAppletElement.py
@@ -184,8 +221,6 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/HTMLUListElement.p
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/HTMLUListElement.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/generateHtml.py
-lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html/generateHtml.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/javadom.py
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/javadom.pyc
 lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/minidom.py
@@ -307,7 +342,16 @@ lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/utils/qp_xml.pyc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/parsers
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/marshal
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/html
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/fr_FR/LC_MESSAGES
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/fr_FR
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext/reader
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/ext
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/dom/en_US/LC_MESSAGES
+@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
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/%%PACKAGE_DIR%%/
+%%PORTDOCS%%@dirrm share/doc/py-xml/xmlproc
+%%PORTDOCS%%@dirrm share/doc/py-xml/4DOM
+%%PORTDOCS%%@dirrm share/doc/py-xml