2 files changed, 135 insertions, 130 deletions

diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index c927980dc2b3..dd26278d77df 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -16,11 +16,18 @@ DISTNAME=		PyXML-${PORTVERSION}
 
 MAINTAINER=		nectar@FreeBSD.org
 
-BUILD_DEPENDS=		${LOCALBASE}/lib/python1.5/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils
-RUN_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
+BUILD_DEPENDS=		${PYDISTUTILS}
 
+USE_PYTHON=		yes
 PLIST=			${WRKDIR}/PLIST
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VERSION} == "python1.5"
+PLISTS=			${PKGDIR}/PLIST.${PYTHON_VERSION}
+.endif
+PLISTS+=		${PKGDIR}/PLIST
+
 .if !defined(NOPORTDOCS)
 DOCDIR=			share/doc/py-xml
 # Document files to be installed in ${DOCDIR}
@@ -43,10 +50,10 @@ INSTALL_DOC=		${INSTALL_DATA} ${WRKSRC}/doc/@DOC             \
 .endif
 
 do-build:
-	cd ${WRKSRC} && python setup.py build
+	cd ${WRKSRC} && ${PYTHON_CMD} setup.py build
 
 pre-install:
-	${CP} ${PKGDIR}/PLIST ${PLIST}
+	${CAT} ${PLISTS} > ${PLIST}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
 	${MKDIR} ${PREFIX}/${DOCDIR}/xmlproc
@@ -58,6 +65,6 @@ pre-install:
 .endif
 
 do-install:
-	cd ${WRKSRC} && python setup.py install
+	cd ${WRKSRC} && ${PYTHON_CMD} setup.py install
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist
index 5dc745458401..5d9a6a098d07 100644
--- a/textproc/py-xml/pkg-plist
+++ b/textproc/py-xml/pkg-plist
@@ -1,124 +1,122 @@
-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/_checkversion.py
-lib/python1.5/site-packages/xml/_checkversion.pyc
-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/builder.py
-lib/python1.5/site-packages/xml/dom/builder.pyc
-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/esis_builder.py
-lib/python1.5/site-packages/xml/dom/esis_builder.pyc
-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/sax_builder.py
-lib/python1.5/site-packages/xml/dom/sax_builder.pyc
-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/transformer.py
-lib/python1.5/site-packages/xml/dom/transformer.pyc
-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/walker.py
-lib/python1.5/site-packages/xml/dom/walker.pyc
-lib/python1.5/site-packages/xml/dom/writer.py
-lib/python1.5/site-packages/xml/dom/writer.pyc
-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/generic.py
-lib/python1.5/site-packages/xml/marshal/generic.pyc
-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/xmlrpc.py
-lib/python1.5/site-packages/xml/marshal/xmlrpc.pyc
-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/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/xmlproc/__init__.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/__init__.pyc
-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/charconv.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/charconv.pyc
-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/errors.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/errors.pyc
-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/xcatalog.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/xcatalog.pyc
-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/xmldtd.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmldtd.pyc
-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/xmlutils.py
-lib/python1.5/site-packages/xml/parsers/xmlproc/xmlutils.pyc
-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/sax/__init__.py
-lib/python1.5/site-packages/xml/sax/__init__.pyc
-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/drv_htmllib.py
-lib/python1.5/site-packages/xml/sax/drivers/drv_htmllib.pyc
-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_sgmllib.py
-lib/python1.5/site-packages/xml/sax/drivers/drv_sgmllib.pyc
-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_xmldc.py
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmldc.pyc
-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_xmlproc.py
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmlproc.pyc
-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_xmltoolkit.py
-lib/python1.5/site-packages/xml/sax/drivers/drv_xmltoolkit.pyc
-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/saxexts.py
-lib/python1.5/site-packages/xml/sax/saxexts.pyc
-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/saxutils.py
-lib/python1.5/site-packages/xml/sax/saxutils.pyc
-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/iso8859.py
-lib/python1.5/site-packages/xml/unicode/iso8859.pyc
-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/wstring.py
-lib/python1.5/site-packages/xml/unicode/wstring.pyc
-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/iso8601.py
-lib/python1.5/site-packages/xml/utils/iso8601.pyc
-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/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
+lib/%%PYTHON_VERSION%%/site-packages/xml/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/_checkversion.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/_checkversion.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/builder.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/builder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/core.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/core.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/esis_builder.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/esis_builder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/html_builder.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/html_builder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/sax_builder.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/sax_builder.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/transform.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/transform.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/transformer.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/transformer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/utils.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/utils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/walker.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/walker.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/writer.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/dom/writer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/generic.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/generic.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/wddx.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/wddx.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/xmlrpc.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/marshal/xmlrpc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/pyexpat.so
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/sgmllib.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/sgmllib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/catalog.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/catalog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/charconv.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/charconv.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/dtdparser.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/dtdparser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/errors.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/errors.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/namespace.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/namespace.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xcatalog.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xcatalog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlapp.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlapp.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmldtd.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmldtd.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlproc.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlproc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlutils.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlval.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc/xmlval.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_htmllib.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_htmllib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_ltdriver.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_ltdriver.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_ltdriver_val.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_ltdriver_val.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_pyexpat.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_pyexpat.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_sgmllib.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_sgmllib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_sgmlop.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_sgmlop.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmldc.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmldc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmllib.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmllib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmlproc.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmlproc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmlproc_val.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmlproc_val.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmltoolkit.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/drv_xmltoolkit.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/pylibs.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers/pylibs.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxexts.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxexts.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxlib.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxlib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxutils.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/saxutils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/writer.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/sax/writer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/iso8859.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/iso8859.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/wstremul.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/wstremul.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/wstring.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/unicode/wstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/iso8601.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/iso8601.pyc
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/qp_xml.py
+lib/%%PYTHON_VERSION%%/site-packages/xml/utils/qp_xml.pyc
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/utils
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/unicode
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/sax/drivers
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/sax
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/parsers/xmlproc
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/parsers
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/marshal
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml/dom
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/xml