 @@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.45 2022/11/23 16:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.46 2023/03/29 09:04:02 wiz Exp $
 PKGNAME=	${PYPKGPREFIX}-sqlite3-${PY_DISTVERSION}
 PKGREVISION=	23
 CATEGORIES=	databases python
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.python.org/
 COMMENT=	Built-in sqlite support for Python 2.5 and up
 USE_GCC_RUNTIME=	yes
 # part of python itself; using egg.mk will install a useless egg
 PYDISTUTILSPKG=		yes
 PY_SETUP_SUBST+=	SQLITE_PREFIX=${BUILDLINK_PREFIX.sqlite3}
 PYSETUPINSTALLARGS+=	--install-lib ${PREFIX}/${PYLIB}/lib-dynload
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py311"
+.if ${PYTHON_VERSION} == 311
 SUBST_CLASSES+=		py311
 SUBST_FILES.py311+=	setup.py
 SUBST_SED.py311+=	-e "s+'_sqlite/cache.c',+'_sqlite/blob.c',+"
 SUBST_STAGE.py311=	pre-build
 .endif
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.13 2023/03/02 12:40:45 adam Exp $
+# $NetBSD: Makefile,v 1.14 2023/03/29 09:04:02 wiz Exp $
 DISTNAME=	frozendict-2.3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/frozendict/}
 MAINTAINER=	kethzer.dr@gmail.com
 HOMEPAGE=	https://github.com/slezica/python-frozendict
 COMMENT=	Immutable wrapper around dictionaries
 LICENSE=	mit
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 PLIST_VARS=	c
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py311"
+.if ${PYTHON_VERSION} == 311
 # as of 2.3.4, python 3.11 is not supported
 # do not build C extension for now
 PYSETUPARGS=	py
 .else
 PLIST.c=	yes
 .endif
 DISTUTILS_BUILDDIR_IN_TEST_ENV=	yes
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,38 +1,38 @@
-# $NetBSD: Makefile,v 1.21 2022/08/24 09:25:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/03/29 09:04:02 wiz Exp $
 DISTNAME=	nose-1.3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/nose/}
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	https://nose.readthedocs.io/
 COMMENT=	Unittest-based testing framework for python
 LICENSE=	gnu-lgpl-v2.1
 USE_LANGUAGES=	# none
 USE_PKG_RESOURCES=	yes
 # only needed for a plugin
 PYTHON_VERSIONED_DEPENDENCIES+=	coverage:test
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/nosetests ${DESTDIR}${PREFIX}/bin/nosetests-${PYVERSSUFFIX} || ${TRUE}
 	${MV} ${DESTDIR}${PREFIX}/man/man1/nosetests.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nosetests${PYVERSSUFFIX}.1
 .include "../../lang/python/egg.mk"
-.if ${PYPKGPREFIX} == "py27"
+.if ${PYTHON_VERSION} == 207
 # only work with python 2.x
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} selftest.py
 .else
 pre-build:
 	cd ${WRKSRC} && 2to3-${PYVERSSUFFIX} -w --no-diffs nose
 .endif
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.11 2022/09/18 11:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/03/29 09:04:02 wiz Exp $
 DISTNAME=	cyclonedx-python-lib-3.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cyclonedx-python-lib/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/CycloneDX/cyclonedx-python-lib
 COMMENT=	Python library for generating CycloneDX SBOMs
 LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-packageurl>=0.9:../../devel/py-packageurl
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=47.0.0:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.4.0:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-toml>=0.10.0:../../textproc/py-toml
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py37"
+.if ${PYTHON_VERSION} == 307
 DEPENDS+=	${PYPKGPREFIX}-importlib-metadata>=3.4:../../devel/py-importlib-metadata
 .endif
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2023/03/12 13:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2023/03/29 09:04:02 wiz Exp $
 DISTNAME=	keyring-23.13.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/keyring/}
 MAINTAINER=	pkgsrc.gnome@gmail.com
 HOMEPAGE=	https://github.com/jaraco/keyring
 COMMENT=	Store and access your passwords safely
 LICENSE=	python-software-foundation
 DEPENDS+=	${PYPKGPREFIX}-jaraco.classes>=0:../../devel/py-jaraco.classes
 @@ -16,30 +16,30 @@ DEPENDS+=	${PYPKGPREFIX}-jeepney>=0.4.2:
 DEPENDS+=	${PYPKGPREFIX}-secretstorage>=3.2:../../security/py-secretstorage
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=3.4.1:../../devel/py-setuptools_scm
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 TEST_DEPENDS+=	${PYPKGPREFIX}-test>=6:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py37" || ${PYPKGPREFIX} == "py38" || ${PYPKGPREFIX} == "py39" || ${PYPKGPREFIX} == "py310" || ${PYPKGPREFIX} == "py311"
+.if ${PYTHON_VERSION} < 312
 DEPENDS+=	${PYPKGPREFIX}-importlib-metadata>=4.11.4:../../devel/py-importlib-metadata
 .endif
-.if ${PYPKGPREFIX} == "py37" || ${PYPKGPREFIX} == "py38"
+.if ${PYTHON_VERSION} < 309
 DEPENDS+=	${PYPKGPREFIX}-importlib-resources>=0:../../devel/py-importlib-resources
 .endif
 REPLACE_PYTHON+=	keyring/cli.py
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} keyring keyring-${PYVERSSUFFIX} || ${TRUE}
 # 2 failed, 11 passed, 83 skipped
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests

 @@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.2 2022/01/25 13:12:49 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2023/03/29 09:04:03 wiz Exp $
 DISTNAME=	olm-3.2.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	https://gitlab.matrix.org/matrix-org/olm/-/archive/${PKGVERSION_NOREV}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://gitlab.matrix.org/matrix-org/olm/
 COMMENT=	Olm bindings for Python
 LICENSE=	apache-2.0
 WRKSRC=		${WRKDIR}/${DISTNAME}/python
 DEPENDS+=	${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
 DEPENDS+=	${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py27"
+.if ${PYTHON_VERSION} == 207
 DEPENDS+=	${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 .endif
 .include "../../security/olm/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: u-boot.mk,v 1.36 2022/07/29 13:47:36 thorpej Exp $
+# $NetBSD: u-boot.mk,v 1.37 2023/03/29 09:04:03 wiz Exp $
 .include "../../sysutils/u-boot/u-boot-version.mk"
 PKGNAME?=	u-boot-${UBOOT_TARGET}-${UBOOT_VERSION:S/-/./}
 DISTNAME?=	u-boot-${UBOOT_VERSION}
 DISTINFO_FILE?=	${.CURDIR}/../../sysutils/u-boot/distinfo
 CATEGORIES=	sysutils
 EXTRACT_SUFX?=	.tar.bz2
 HOMEPAGE?=	https://www.denx.de/wiki/U-Boot
 MASTER_SITES?=	ftp://ftp.denx.de/pub/u-boot/
 .if !empty(UBOOT_VERSION:M202[0-9].*)
 @@ -30,27 +30,27 @@ COMMENT=	Das U-Boot, the Universal Boot
 LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison flex gmake gsed pkg-config gawk
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/tool.mk"
 # XXX May need to cast a wider net, but at least 2022.04 requires
 # this when building for sunxi.
 .if !empty(UBOOT_VERSION:M202[2-9].*)
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 .endif
-.if ${PYPKGPREFIX} == "py27"
+.if ${PYTHON_VERSION} == 207
 ALL_ENV+=		PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 .else
 ALL_ENV+=		PYTHON3=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 .endif
 ALL_ENV+=		PYTHONLIBPATH=-L${PREFIX}/lib
 .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
 UBOOT_ENV+=	UBOOT_PKGREVISION=nb${PKGREVISION}
 .endif
 MAKE_ENV+=	${UBOOT_ENV}
 INSTALLATION_DIRS+=	share/u-boot/${UBOOT_TARGET}