CVS commit: pkgsrc/textproc/py-xml

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 10 20:55:50 UTC 2022

Modified Files:
        pkgsrc/textproc/py-xml: Makefile PLIST

Log Message:
py-xml: convert to egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/py-xml/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-xml/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/py-xml/Makefile
diff -u pkgsrc/textproc/py-xml/Makefile:1.34 pkgsrc/textproc/py-xml/Makefile:1.35
--- pkgsrc/textproc/py-xml/Makefile:1.34        Mon Nov  4 21:43:46 2019
+++ pkgsrc/textproc/py-xml/Makefile     Mon Jan 10 20:55:50 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2019/11/04 21:43:46 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2022/01/10 20:55:50 wiz Exp $
 
 DISTNAME=      PyXML-0.8.4
 PKGNAME=       ${PYPKGPREFIX}-xml-0.8.4
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyxml/}
 
@@ -12,11 +12,9 @@ COMMENT=     Collection of libraries to proc
 
 CONFLICTS+=    PyXML-[0-9]*
 
-BUILDLINK_API_DEPENDS.expat+=  expat>=1.95.6
 PYSETUPBUILDARGS+=             --with-libexpat=${BUILDLINK_DIR}
 PYSETUPBUILDARGS+=             --ldflags="${EXPAT_LDFLAGS}"
 EXPAT_LDFLAGS=                 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
-FIX_RPATH+=                    EXPAT_LDFLAGS
 
 PYTHON_VERSIONS_ACCEPTED=      27 # dead upstream, no plans of porting
 
@@ -25,15 +23,14 @@ PYXML_SCRIPTS=      scripts/xmlproc_parse \
 
 REPLACE_PYTHON+=       xml/dom/ext/c14n.py
 REPLACE_PYTHON+=       xml/dom/html/GenerateHtml.py
+REPLACE_PYTHON+=       ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g}
 
 post-extract:
 .for s in ${PYXML_SCRIPTS}
        ${MV} ${WRKSRC}/${s} ${WRKSRC}/${s}${PYVERSSUFFIX}
 .endfor
 
-REPLACE_PYTHON=        ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g}
-
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-xml/PLIST
diff -u pkgsrc/textproc/py-xml/PLIST:1.5 pkgsrc/textproc/py-xml/PLIST:1.6
--- pkgsrc/textproc/py-xml/PLIST:1.5    Sun Apr  8 20:21:58 2012
+++ pkgsrc/textproc/py-xml/PLIST        Mon Jan 10 20:55:50 2022
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2012/04/08 20:21:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/01/10 20:55:50 wiz Exp $
 bin/xmlproc_parse${PYVERSSUFFIX}
 bin/xmlproc_val${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/_xmlplus/FtCore.py
 ${PYSITELIB}/_xmlplus/FtCore.pyc
 ${PYSITELIB}/_xmlplus/FtCore.pyo