Upgrade to 0.5.4.

Reviewed by:	nectar

3 files changed, 25 insertions, 85 deletions

diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index fe66a842add8..08921b03e883 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=		py-xml
-PORTVERSION= 		0.5.1
+PORTVERSION= 		0.5.4
 CATEGORIES=		textproc python
 MASTER_SITES=		http://www.python.org/sigs/xml-sig/files/      \
 			ftp://ftp.cdrom.com/pub/python/www.python.org/sigs/xml-sig/files/ \
 			ftp://ftp.kddlabs.co.jp/pub/lang/python/www.python.org/sigs/xml-sig/files/ \
 			ftp://unix.hensa.ac.uk/mirrors/ftp.python.org/pub/www.python.org/sigs/xml-sig/files/ \
 			http://www.nectar.cc/distfiles/
-DISTNAME=		xml-0.5.1
-EXTRACT_SUFX=		.tgz
+DISTNAME=		PyXML-${PORTVERSION}
 
 MAINTAINER=		nectar@FreeBSD.org
 
+BUILD_DEPENDS=		${LOCALBASE}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils
 RUN_DEPENDS=		python:${PORTSDIR}/lang/python
 
 PLIST=			${WRKDIR}/PLIST
@@ -25,16 +25,7 @@ PLIST=			${WRKDIR}/PLIST
 .if !defined(NOPORTDOCS)
 DOCDIR=			share/doc/py-xml
 # Document files to be installed in ${DOCDIR}
-DOCS1=			index.html indices.html pythondoc.css          \
-			xml-howto.txt xml-ref.txt                      \
-			xml.arch.xmlarch.ArchDocHandler.html           \
-			xml.arch.xmlarch.ArchException.html            \
-			xml.arch.xmlarch.ArchParseState.html           \
-			xml.arch.xmlarch.Architecture.html             \
-			xml.arch.xmlarch.AttributeParser.html          \
-			xml.arch.xmlarch.EventTracker.html             \
-			xml.arch.xmlarch.Prettifier.html               \
-			xml.arch.xmlarch.html
+DOCS1=			xml-howto.txt xml-ref.txt
 # Document files to be installed in ${DOCDIR}/xmlproc
 DOCS2=			artikler.css basicapi.gif cmdline.gif          \
 			standard.css xmlproc-catalog-doco.html         \
@@ -52,8 +43,8 @@ INSTALL_DOC=		${INSTALL_DATA} ${WRKSRC}/doc/@DOC             \
 			${ECHO} ${DOCDIR}/@DOC >> ${PLIST}
 .endif
 
-do-configure:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.pre.in boot
+do-build:
+	cd ${WRKSRC} && python setup.py build
 
 pre-install:
 	${CP} ${PKGDIR}/PLIST ${PLIST}
@@ -67,4 +58,7 @@ pre-install:
 	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
+do-install:
+	cd ${WRKSRC} && python setup.py install
+
 .include <bsd.port.mk>
diff --git a/textproc/py-xml/distinfo b/textproc/py-xml/distinfo
index 92b1e8b7c95d..f21d1040668f 100644
--- a/textproc/py-xml/distinfo
+++ b/textproc/py-xml/distinfo
@@ -1 +1 @@
-MD5 (xml-0.5.1.tgz) = 796dbfe951c9e0b9afc32a425d9994b9
+MD5 (PyXML-0.5.4.tar.gz) = 6849aba6d3a08377723452d613a1431d
diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist
index c7939c4062b0..5dc745458401 100644
--- a/textproc/py-xml/pkg-plist
+++ b/textproc/py-xml/pkg-plist
@@ -1,178 +1,124 @@
+lib/python1.5/site-packages/sgmlop.so
 lib/python1.5/site-packages/xml/__init__.py
 lib/python1.5/site-packages/xml/__init__.pyc
-lib/python1.5/site-packages/xml/__init__.pyo
 lib/python1.5/site-packages/xml/_checkversion.py
 lib/python1.5/site-packages/xml/_checkversion.pyc
-lib/python1.5/site-packages/xml/_checkversion.pyo
-lib/python1.5/site-packages/xml/arch/__init__.py
-lib/python1.5/site-packages/xml/arch/__init__.pyc
-lib/python1.5/site-packages/xml/arch/__init__.pyo
-lib/python1.5/site-packages/xml/arch/xmlarch.py
-lib/python1.5/site-packages/xml/arch/xmlarch.pyc
-lib/python1.5/site-packages/xml/arch/xmlarch.pyo
 lib/python1.5/site-packages/xml/dom/__init__.py
 lib/python1.5/site-packages/xml/dom/__init__.pyc
-lib/python1.5/site-packages/xml/dom/__init__.pyo
 lib/python1.5/site-packages/xml/dom/builder.py
 lib/python1.5/site-packages/xml/dom/builder.pyc
-lib/python1.5/site-packages/xml/dom/builder.pyo
 lib/python1.5/site-packages/xml/dom/core.py
 lib/python1.5/site-packages/xml/dom/core.pyc
-lib/python1.5/site-packages/xml/dom/core.pyo
 lib/python1.5/site-packages/xml/dom/esis_builder.py
 lib/python1.5/site-packages/xml/dom/esis_builder.pyc
-lib/python1.5/site-packages/xml/dom/esis_builder.pyo
 lib/python1.5/site-packages/xml/dom/html_builder.py
 lib/python1.5/site-packages/xml/dom/html_builder.pyc
-lib/python1.5/site-packages/xml/dom/html_builder.pyo
 lib/python1.5/site-packages/xml/dom/sax_builder.py
 lib/python1.5/site-packages/xml/dom/sax_builder.pyc
-lib/python1.5/site-packages/xml/dom/sax_builder.pyo
 lib/python1.5/site-packages/xml/dom/transform.py
 lib/python1.5/site-packages/xml/dom/transform.pyc
-lib/python1.5/site-packages/xml/dom/transform.pyo
 lib/python1.5/site-packages/xml/dom/transformer.py
 lib/python1.5/site-packages/xml/dom/transformer.pyc
-lib/python1.5/site-packages/xml/dom/transformer.pyo
 lib/python1.5/site-packages/xml/dom/utils.py
 lib/python1.5/site-packages/xml/dom/utils.pyc
-lib/python1.5/site-packages/xml/dom/utils.pyo
 lib/python1.5/site-packages/xml/dom/walker.py
 lib/python1.5/site-packages/xml/dom/walker.pyc
-lib/python1.5/site-packages/xml/dom/walker.pyo
 lib/python1.5/site-packages/xml/dom/writer.py
 lib/python1.5/site-packages/xml/dom/writer.pyc
-lib/python1.5/site-packages/xml/dom/writer.pyo
 lib/python1.5/site-packages/xml/marshal/__init__.py
 lib/python1.5/site-packages/xml/marshal/__init__.pyc
-lib/python1.5/site-packages/xml/marshal/__init__.pyo
 lib/python1.5/site-packages/xml/marshal/generic.py
 lib/python1.5/site-packages/xml/marshal/generic.pyc
-lib/python1.5/site-packages/xml/marshal/generic.pyo
 lib/python1.5/site-packages/xml/marshal/wddx.py
 lib/python1.5/site-packages/xml/marshal/wddx.pyc
-lib/python1.5/site-packages/xml/marshal/wddx.pyo
 lib/python1.5/site-packages/xml/marshal/xmlrpc.py
 lib/python1.5/site-packages/xml/marshal/xmlrpc.pyc
-lib/python1.5/site-packages/xml/marshal/xmlrpc.pyo
 lib/python1.5/site-packages/xml/parsers/__init__.py
 lib/python1.5/site-packages/xml/parsers/__init__.pyc
-lib/python1.5/site-packages/xml/parsers/__init__.pyo
 lib/python1.5/site-packages/xml/parsers/pyexpat.so
 lib/python1.5/site-packages/xml/parsers/sgmllib.py
 lib/python1.5/site-packages/xml/parsers/sgmllib.pyc
-lib/python1.5/site-packages/xml/parsers/sgmllib.pyo
-lib/python1.5/site-packages/xml/parsers/sgmlop.so
-lib/python1.5/site-packages/xml/parsers/xmllib.py
-lib/python1.5/site-packages/xml/parsers/xmllib.pyc
-lib/python1.5/site-packages/xml/parsers/xmllib.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/__init__.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/__init__.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/__init__.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/catalog.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/catalog.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/catalog.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/charconv.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/charconv.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/charconv.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/dtdparser.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/dtdparser.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/dtdparser.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/errors.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/errors.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/errors.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/namespace.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/namespace.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/namespace.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xcatalog.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xcatalog.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xcatalog.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlapp.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlapp.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmlapp.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmldtd.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmldtd.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmldtd.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlproc.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlproc.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmlproc.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlutils.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlutils.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmlutils.pyo
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlval.py
 lib/python1.5/site-packages/xml/parsers/xmlproc/xmlval.pyc
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmlval.pyo
 lib/python1.5/site-packages/xml/sax/__init__.py
 lib/python1.5/site-packages/xml/sax/__init__.pyc
-lib/python1.5/site-packages/xml/sax/__init__.pyo
 lib/python1.5/site-packages/xml/sax/drivers/__init__.py
 lib/python1.5/site-packages/xml/sax/drivers/__init__.pyc
-lib/python1.5/site-packages/xml/sax/drivers/__init__.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_htmllib.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_htmllib.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_htmllib.pyo
+lib/python1.5/site-packages/xml/sax/drivers/drv_ltdriver.py
+lib/python1.5/site-packages/xml/sax/drivers/drv_ltdriver.pyc
+lib/python1.5/site-packages/xml/sax/drivers/drv_ltdriver_val.py
+lib/python1.5/site-packages/xml/sax/drivers/drv_ltdriver_val.pyc
 lib/python1.5/site-packages/xml/sax/drivers/drv_pyexpat.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_pyexpat.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_pyexpat.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_sgmllib.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_sgmllib.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_sgmllib.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_sgmlop.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_sgmlop.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_sgmlop.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmldc.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmldc.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmldc.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmllib.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmllib.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmllib.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc_val.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc_val.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc_val.pyo
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmltoolkit.py
 lib/python1.5/site-packages/xml/sax/drivers/drv_xmltoolkit.pyc
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmltoolkit.pyo
 lib/python1.5/site-packages/xml/sax/drivers/pylibs.py
 lib/python1.5/site-packages/xml/sax/drivers/pylibs.pyc
-lib/python1.5/site-packages/xml/sax/drivers/pylibs.pyo
 lib/python1.5/site-packages/xml/sax/saxexts.py
 lib/python1.5/site-packages/xml/sax/saxexts.pyc
-lib/python1.5/site-packages/xml/sax/saxexts.pyo
 lib/python1.5/site-packages/xml/sax/saxlib.py
 lib/python1.5/site-packages/xml/sax/saxlib.pyc
-lib/python1.5/site-packages/xml/sax/saxlib.pyo
 lib/python1.5/site-packages/xml/sax/saxutils.py
 lib/python1.5/site-packages/xml/sax/saxutils.pyc
-lib/python1.5/site-packages/xml/sax/saxutils.pyo
+lib/python1.5/site-packages/xml/sax/writer.py
+lib/python1.5/site-packages/xml/sax/writer.pyc
 lib/python1.5/site-packages/xml/unicode/__init__.py
 lib/python1.5/site-packages/xml/unicode/__init__.pyc
-lib/python1.5/site-packages/xml/unicode/__init__.pyo
 lib/python1.5/site-packages/xml/unicode/iso8859.py
 lib/python1.5/site-packages/xml/unicode/iso8859.pyc
-lib/python1.5/site-packages/xml/unicode/iso8859.pyo
 lib/python1.5/site-packages/xml/unicode/wstremul.py
 lib/python1.5/site-packages/xml/unicode/wstremul.pyc
-lib/python1.5/site-packages/xml/unicode/wstremul.pyo
 lib/python1.5/site-packages/xml/unicode/wstring.py
 lib/python1.5/site-packages/xml/unicode/wstring.pyc
-lib/python1.5/site-packages/xml/unicode/wstring.pyo
 lib/python1.5/site-packages/xml/unicode/wstrop.so
 lib/python1.5/site-packages/xml/utils/__init__.py
 lib/python1.5/site-packages/xml/utils/__init__.pyc
-lib/python1.5/site-packages/xml/utils/__init__.pyo
 lib/python1.5/site-packages/xml/utils/iso8601.py
 lib/python1.5/site-packages/xml/utils/iso8601.pyc
-lib/python1.5/site-packages/xml/utils/iso8601.pyo
-@dirrm lib/python1.5/site-packages/xml/arch
-@dirrm lib/python1.5/site-packages/xml/dom
-@dirrm lib/python1.5/site-packages/xml/marshal
-@dirrm lib/python1.5/site-packages/xml/parsers/xmlproc
-@dirrm lib/python1.5/site-packages/xml/parsers
+lib/python1.5/site-packages/xml/utils/qp_xml.py
+lib/python1.5/site-packages/xml/utils/qp_xml.pyc
+@dirrm lib/python1.5/site-packages/xml/utils
+@dirrm lib/python1.5/site-packages/xml/unicode
 @dirrm lib/python1.5/site-packages/xml/sax/drivers
 @dirrm lib/python1.5/site-packages/xml/sax
-@dirrm lib/python1.5/site-packages/xml/unicode
-@dirrm lib/python1.5/site-packages/xml/utils
+@dirrm lib/python1.5/site-packages/xml/parsers/xmlproc
+@dirrm lib/python1.5/site-packages/xml/parsers
+@dirrm lib/python1.5/site-packages/xml/marshal
+@dirrm lib/python1.5/site-packages/xml/dom
 @dirrm lib/python1.5/site-packages/xml