-use USE_PYTHON

-update to 0.6.5. This is a bug fix release only, according to the
 original announcement

5 files changed, 18 insertions, 50 deletions

diff --git a/textproc/pyxml/Makefile b/textproc/pyxml/Makefile
index 39b1fccce39..412c5f561a9 100644
--- a/textproc/pyxml/Makefile
+++ b/textproc/pyxml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/07 12:14:59 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2001/05/14 16:27:08 drochner Exp $
 #
 
-DISTNAME=	PyXML-0.6.4
+DISTNAME=	PyXML-0.6.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyxml/}
 
@@ -12,22 +12,10 @@ COMMENT=	collection of libraries to process XML with Python
 DEPENDS+=	python>=2.0:../../lang/python
 DEPENDS+=	expat-*:../../textproc/expat
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
-IGNORE="${PKGNAME} needs dynamic loading"
-.endif
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-EVAL_PREFIX+=	PYPREFIX=python
-
-do-build:
-	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup.py build)
-
-post-build:
-	(eval `${PYPREFIX}/bin/python ${FILESDIR}/printpypath.py` && \
-	${SED} "s|PYINC|$${PYINC}|g;s|PYSITELIB|$${PYSITELIB}|g" \
-	<${PKGDIR}/PLIST >${PLIST_SRC})
-
-do-install:
-	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup.py install)
+USE_PYTHON=	yes
+PYDISTUTILSPKG=	yes
+PYBINMODULE=	yes
+PYSETUPBUILDARGS+=	--with-libexpat=${LOCALBASE}
+PYSETUPBUILDARGS+=	--ldflags=-Wl,-R${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/pyxml/distinfo b/textproc/pyxml/distinfo
index 45e9358d937..45b25a5f43a 100644
--- a/textproc/pyxml/distinfo
+++ b/textproc/pyxml/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:05:06 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/14 16:27:08 drochner Exp $
 
-SHA1 (PyXML-0.6.4.tar.gz) = 79c8fa9fd0b873f59274ede88a346e0971379afd
-Size (PyXML-0.6.4.tar.gz) = 490224 bytes
-SHA1 (patch-aa) = 0655ed76e77acd01db9c3fb6beeeee3d5d4855eb
+SHA1 (PyXML-0.6.5.tar.gz) = 56deaecacada4400adbd0d79bb93f39969bcb37c
+Size (PyXML-0.6.5.tar.gz) = 498302 bytes
diff --git a/textproc/pyxml/files/printpypath.py b/textproc/pyxml/files/printpypath.py
deleted file mode 100644
index aa53572f19c..00000000000
--- a/textproc/pyxml/files/printpypath.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from distutils.sysconfig import get_python_inc
-from distutils.sysconfig import get_python_lib
-
-print "PYINC=" + get_python_inc(0, "")
-print "PYSITELIB=" + get_python_lib(0, 0, "")
diff --git a/textproc/pyxml/patches/patch-aa b/textproc/pyxml/patches/patch-aa
deleted file mode 100644
index 808e2b93d63..00000000000
--- a/textproc/pyxml/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/07 12:14:59 drochner Exp $
-
---- setup.py.orig	Sun Feb 25 19:14:48 2001
-+++ setup.py	Wed Mar  7 10:52:05 2001
-@@ -56,7 +56,7 @@
-         return 0
- 
- def get_expat_prefix():
--    for p in ("/usr", "/usr/local"):
-+        p = os.getenv("PREFIX")
-         incs = os.path.join(p, "include")
-         libs = os.path.join(p, "lib")
-         if os.path.isfile(os.path.join(incs, "expat.h")) \
-@@ -99,6 +99,7 @@
-                       define_macros=define_macros,
-                       include_dirs=include_dirs,
-                       library_dirs=library_dirs,
-+                      runtime_library_dirs=library_dirs,
-                       libraries=libraries,
-                       sources=sources
-                       ))
diff --git a/textproc/pyxml/pkg/PLIST b/textproc/pyxml/pkg/PLIST
index 54965a1a7f8..e2f8bb58ec6 100644
--- a/textproc/pyxml/pkg/PLIST
+++ b/textproc/pyxml/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/07 12:14:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/14 16:27:09 drochner Exp $
+bin/xmlproc_parse
+bin/xmlproc_val
 PYSITELIB/_xmlplus/__init__.py
 PYSITELIB/_xmlplus/__init__.pyc
 PYSITELIB/_xmlplus/_checkversion.py
@@ -202,6 +204,8 @@ PYSITELIB/_xmlplus/dom/javadom.py
 PYSITELIB/_xmlplus/dom/javadom.pyc
 PYSITELIB/_xmlplus/dom/minidom.py
 PYSITELIB/_xmlplus/dom/minidom.pyc
+PYSITELIB/_xmlplus/dom/minitraversal.py
+PYSITELIB/_xmlplus/dom/minitraversal.pyc
 PYSITELIB/_xmlplus/dom/pulldom.py
 PYSITELIB/_xmlplus/dom/pulldom.pyc
 PYSITELIB/_xmlplus/marshal/__init__.py
@@ -222,6 +226,8 @@ PYSITELIB/_xmlplus/parsers/sgmllib.pyc
 PYSITELIB/_xmlplus/parsers/sgmlop.so
 PYSITELIB/_xmlplus/parsers/xmlproc/__init__.py
 PYSITELIB/_xmlplus/parsers/xmlproc/__init__.pyc
+PYSITELIB/_xmlplus/parsers/xmlproc/_outputters.py
+PYSITELIB/_xmlplus/parsers/xmlproc/_outputters.pyc
 PYSITELIB/_xmlplus/parsers/xmlproc/catalog.py
 PYSITELIB/_xmlplus/parsers/xmlproc/catalog.pyc
 PYSITELIB/_xmlplus/parsers/xmlproc/charconv.py
@@ -306,6 +312,7 @@ PYSITELIB/_xmlplus/unicode/utf8_iso.py
 PYSITELIB/_xmlplus/unicode/utf8_iso.pyc
 PYSITELIB/_xmlplus/utils/__init__.py
 PYSITELIB/_xmlplus/utils/__init__.pyc
+PYSITELIB/_xmlplus/utils/boolean.so
 PYSITELIB/_xmlplus/utils/iso8601.py
 PYSITELIB/_xmlplus/utils/iso8601.pyc
 PYSITELIB/_xmlplus/utils/qp_xml.py