Mon Oct 21 13:19:29 2019 UTC ()
Fix building with Python 3.8


(adam)
diff -r1.13 -r1.14 pkgsrc/textproc/py-cElementTree/Makefile
diff -r1.27 -r1.28 pkgsrc/textproc/py-expat/Makefile
cvs diff -r1.13 -r1.14 pkgsrc/textproc/py-cElementTree/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-cElementTree/Makefile 2016/08/28 15:48:35 1.13
+++ pkgsrc/textproc/py-cElementTree/Makefile 2019/10/21 13:19:29 1.14
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2019/10/21 13:19:29 adam Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION} 3PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION}
4CATEGORIES= textproc python 4CATEGORIES= textproc python
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.effbot.org/zone/celementtree.htm 7HOMEPAGE= http://www.effbot.org/zone/celementtree.htm
8COMMENT= C implementation of Python ElementTree API 8COMMENT= C implementation of Python ElementTree API
9 9
10EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c 10EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c
 11.include "../../lang/python/pyversion.mk"
 12.if ${_PYTHON_VERSION} != 27
 13EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/_elementtree.c.h
 14.endif
11 15
12USE_GCC_RUNTIME=yes 16USE_GCC_RUNTIME=yes
13USE_TOOLS+= patch 17USE_TOOLS+= patch
14 18
15PYDISTUTILSPKG= yes 19PYDISTUTILSPKG= yes
16PY_PATCHPLIST= yes 20PY_PATCHPLIST= yes
17PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} 21PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
18PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} 22PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
19 23
20PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload 24PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
21 25
22# ignore errors due to missing files (EXTRACT_ELEMENTS!) 26# ignore errors due to missing files (EXTRACT_ELEMENTS!)
23do-patch: 27do-patch:
cvs diff -r1.27 -r1.28 pkgsrc/textproc/py-expat/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-expat/Makefile 2019/10/17 11:52:49 1.27
+++ pkgsrc/textproc/py-expat/Makefile 2019/10/21 13:19:29 1.28
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.27 2019/10/17 11:52:49 adam Exp $ 1# $NetBSD: Makefile,v 1.28 2019/10/21 13:19:29 adam Exp $
2 2
3PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION} 3PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION}
4CATEGORIES= textproc python 4CATEGORIES= textproc python
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= https://www.python.org/ 7HOMEPAGE= https://www.python.org/
8COMMENT= Python interface to expat 8COMMENT= Python interface to expat
9 9
10EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c 10EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c
11.include "../../lang/python/extension.mk" 11.include "../../lang/python/pyversion.mk"
12.if ${_PYTHON_VERSION} != 27 12.if ${_PYTHON_VERSION} != 27
13EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/pyexpat.c.h 13EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic/pyexpat.c.h
14.endif 14.endif
15 15
16USE_GCC_RUNTIME= yes 16USE_GCC_RUNTIME= yes
17 17
18PYDISTUTILSPKG= yes 18PYDISTUTILSPKG= yes
19PY_PATCHPLIST= yes 19PY_PATCHPLIST= yes
20PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR} 20PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
21PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat} 21PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
22 22
23PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload 23PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
24 24