CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul  1 14:48:31 UTC 2021

Modified Files:
        pkgsrc/cad/py-gds: Makefile
        pkgsrc/devel/py-boost: Makefile

Log Message:
Ensure PYTHON_VERSIONS_INCOMPATIBLE is set before pyversion.mk is included


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/cad/py-gds/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-boost/Makefile

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

Modified files:

Index: pkgsrc/cad/py-gds/Makefile
diff -u pkgsrc/cad/py-gds/Makefile:1.15 pkgsrc/cad/py-gds/Makefile:1.16
--- pkgsrc/cad/py-gds/Makefile:1.15     Tue Jun 29 08:41:59 2021
+++ pkgsrc/cad/py-gds/Makefile  Thu Jul  1 14:48:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/06/29 08:41:59 nia Exp $
+# $NetBSD: Makefile,v 1.16 2021/07/01 14:48:31 nia Exp $
 
 DISTNAME=      gdspy-1.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,6 +12,8 @@ HOMEPAGE=     https://github.com/heitzmann/g
 COMMENT=       Python module for creating GDSII stream files
 LICENSE=       boost-license
 
+PYTHON_VERSIONS_INCOMPATIBLE=  36 # py-numpy
+
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
@@ -19,8 +21,6 @@ DEPENDS+=     ${PYPKGPREFIX}-future-[0-9]*:.
 
 USE_LANGUAGES+=        c c++
 
-PYTHON_VERSIONS_INCOMPATIBLE=  36 # py-numpy
-
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-boost/Makefile
diff -u pkgsrc/devel/py-boost/Makefile:1.15 pkgsrc/devel/py-boost/Makefile:1.16
--- pkgsrc/devel/py-boost/Makefile:1.15 Tue Jun 29 08:41:59 2021
+++ pkgsrc/devel/py-boost/Makefile      Thu Jul  1 14:48:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/06/29 08:41:59 nia Exp $
+# $NetBSD: Makefile,v 1.16 2021/07/01 14:48:31 nia Exp $
 
 BOOST_PACKAGE=         python
 BOOST_COMMENT=         (Boost.Python binary library)
@@ -14,6 +14,8 @@ BJAM_ARGS+=           --user-config=${WRKSRC}/use
 BJAM_ARGS+=            --with-python
 MAKE_ENV+=             BOOST_BUILD_PATH=${WRKSRC}
 
+PYTHON_VERSIONS_INCOMPATIBLE=  36 # py-numpy
+
 .include "../../devel/boost-jam/bjam.mk"
 .include "../../lang/python/pyversion.mk"
 
@@ -30,7 +32,5 @@ PLIST_SUBST+= PYVER=${_PYTHON_VERSION}
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-lutil
 
-PYTHON_VERSIONS_INCOMPATIBLE=  36 # py-numpy
-
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"