Thu Jul 1 14:48:31 2021 UTC ()
Ensure PYTHON_VERSIONS_INCOMPATIBLE is set before pyversion.mk is included


(nia)
diff -r1.15 -r1.16 pkgsrc/cad/py-gds/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/py-boost/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/cad/py-gds/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/py-gds/Makefile 2021/06/29 08:41:59 1.15
+++ pkgsrc/cad/py-gds/Makefile 2021/07/01 14:48:31 1.16
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.15 2021/06/29 08:41:59 nia Exp $ 1# $NetBSD: Makefile,v 1.16 2021/07/01 14:48:31 nia Exp $
2 2
3DISTNAME= gdspy-1.6 3DISTNAME= gdspy-1.6
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= cad python 6CATEGORIES= cad python
7MASTER_SITES= ${MASTER_SITE_PYPI:=g/gdspy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=g/gdspy/}
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/heitzmann/gdspy 11HOMEPAGE= https://github.com/heitzmann/gdspy
12COMMENT= Python module for creating GDSII stream files 12COMMENT= Python module for creating GDSII stream files
13LICENSE= boost-license 13LICENSE= boost-license
14 14
 15PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy
 16
15.include "../../lang/python/pyversion.mk" 17.include "../../lang/python/pyversion.mk"
16.if ${_PYTHON_VERSION} == 27 18.if ${_PYTHON_VERSION} == 27
17DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future 19DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
18.endif 20.endif
19 21
20USE_LANGUAGES+= c c++ 22USE_LANGUAGES+= c c++
21 23
22PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy 
23 
24.include "../../lang/python/egg.mk" 24.include "../../lang/python/egg.mk"
25.include "../../math/py-numpy/buildlink3.mk" 25.include "../../math/py-numpy/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/devel/py-boost/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-boost/Makefile 2021/06/29 08:41:59 1.15
+++ pkgsrc/devel/py-boost/Makefile 2021/07/01 14:48:31 1.16
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.15 2021/06/29 08:41:59 nia Exp $ 1# $NetBSD: Makefile,v 1.16 2021/07/01 14:48:31 nia Exp $
2 2
3BOOST_PACKAGE= python 3BOOST_PACKAGE= python
4BOOST_COMMENT= (Boost.Python binary library) 4BOOST_COMMENT= (Boost.Python binary library)
5BOOST_CONFIG= installed 5BOOST_CONFIG= installed
6 6
7INSTALLATION_DIRS+= lib 7INSTALLATION_DIRS+= lib
8 8
9.include "../../meta-pkgs/boost/Makefile.common" 9.include "../../meta-pkgs/boost/Makefile.common"
10 10
11PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION} 11PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION}
12 12
13BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam 13BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam
14BJAM_ARGS+= --with-python 14BJAM_ARGS+= --with-python
15MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC} 15MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}
16 16
 17PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy
 18
17.include "../../devel/boost-jam/bjam.mk" 19.include "../../devel/boost-jam/bjam.mk"
18.include "../../lang/python/pyversion.mk" 20.include "../../lang/python/pyversion.mk"
19 21
20post-configure: 22post-configure:
21 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \ 23 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \
22 '${PREFIX}/bin/python${PYVERSSUFFIX} : ${PREFIX}/include/python${PYVERSSUFFIX} ;' \ 24 '${PREFIX}/bin/python${PYVERSSUFFIX} : ${PREFIX}/include/python${PYVERSSUFFIX} ;' \
23 >${WRKSRC}/user-config.jam 25 >${WRKSRC}/user-config.jam
24 26
25do-build: bjam-build 27do-build: bjam-build
26 28
27do-install: boost-install-libs 29do-install: boost-install-libs
28 30
29PLIST_SUBST+= PYVER=${_PYTHON_VERSION} 31PLIST_SUBST+= PYVER=${_PYTHON_VERSION}
30 32
31BUILDLINK_TRANSFORM.SunOS+= rm:-lutil 33BUILDLINK_TRANSFORM.SunOS+= rm:-lutil
32 34
33PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-numpy 
34 
35.include "../../math/py-numpy/buildlink3.mk" 35.include "../../math/py-numpy/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"