CVS commit: pkgsrc/textproc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 21 13:19:29 UTC 2019

Modified Files:
        pkgsrc/textproc/py-cElementTree: Makefile
        pkgsrc/textproc/py-expat: Makefile

Log Message:
Fix building with Python 3.8


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-cElementTree/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/py-expat/Makefile

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-cElementTree/Makefile
diff -u pkgsrc/textproc/py-cElementTree/Makefile:1.13 pkgsrc/textproc/py-cElementTree/Makefile:1.14
--- pkgsrc/textproc/py-cElementTree/Makefile:1.13       Sun Aug 28 15:48:35 2016
+++ pkgsrc/textproc/py-cElementTree/Makefile    Mon Oct 21 13:19:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/21 13:19:29 adam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION}
 CATEGORIES=    textproc python
@@ -8,6 +8,10 @@ HOMEPAGE=      http://www.effbot.org/zone/cel
 COMMENT=       C implementation of Python ElementTree API
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Modules/_elementtree.c
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} != 27
+EXTRACT_ELEMENTS+=     ${PYSUBDIR}/Modules/clinic/_elementtree.c.h
+.endif
 
 USE_GCC_RUNTIME=yes
 USE_TOOLS+=    patch

Index: pkgsrc/textproc/py-expat/Makefile
diff -u pkgsrc/textproc/py-expat/Makefile:1.27 pkgsrc/textproc/py-expat/Makefile:1.28
--- pkgsrc/textproc/py-expat/Makefile:1.27      Thu Oct 17 11:52:49 2019
+++ pkgsrc/textproc/py-expat/Makefile   Mon Oct 21 13:19:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/10/17 11:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.28 2019/10/21 13:19:29 adam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-expat-${PY_DISTVERSION}
 CATEGORIES=    textproc python
@@ -8,7 +8,7 @@ HOMEPAGE=       https://www.python.org/
 COMMENT=       Python interface to expat
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Modules/pyexpat.c
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} != 27
 EXTRACT_ELEMENTS+=     ${PYSUBDIR}/Modules/clinic/pyexpat.c.h
 .endif