CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 29 Mar 2023 09:04:03 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 29 09:04:03 UTC 2023

Modified Files:
        pkgsrc/databases/py-sqlite3: Makefile
        pkgsrc/devel/py-frozendict: Makefile
        pkgsrc/devel/py-nose: Makefile
        pkgsrc/security/py-cyclonedx-python-lib: Makefile
        pkgsrc/security/py-keyring: Makefile
        pkgsrc/security/py-olm: Makefile
        pkgsrc/sysutils/u-boot: u-boot.mk

Log Message:
*: use PYTHON_VERSION instead of comparing PYPKGPREFIX


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/py-sqlite3/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-frozendict/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-nose/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/py-cyclonedx-python-lib/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/py-keyring/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/py-olm/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/u-boot/u-boot.mk

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

Modified files:

Index: pkgsrc/databases/py-sqlite3/Makefile
diff -u pkgsrc/databases/py-sqlite3/Makefile:1.45 pkgsrc/databases/py-sqlite3/Makefile:1.46
--- pkgsrc/databases/py-sqlite3/Makefile:1.45   Wed Nov 23 16:19:43 2022
+++ pkgsrc/databases/py-sqlite3/Makefile        Wed Mar 29 09:04:02 2023
@@ -1,4 +1,4 @@
-# $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
@@ -17,7 +17,7 @@ PYSETUPINSTALLARGS+=  --install-lib ${PRE
 
 .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',+"

Index: pkgsrc/devel/py-frozendict/Makefile
diff -u pkgsrc/devel/py-frozendict/Makefile:1.13 pkgsrc/devel/py-frozendict/Makefile:1.14
--- pkgsrc/devel/py-frozendict/Makefile:1.13    Thu Mar  2 12:40:45 2023
+++ pkgsrc/devel/py-frozendict/Makefile Wed Mar 29 09:04:02 2023
@@ -1,4 +1,4 @@
-# $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}
@@ -18,7 +18,7 @@ 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

Index: pkgsrc/devel/py-nose/Makefile
diff -u pkgsrc/devel/py-nose/Makefile:1.21 pkgsrc/devel/py-nose/Makefile:1.22
--- pkgsrc/devel/py-nose/Makefile:1.21  Wed Aug 24 09:25:56 2022
+++ pkgsrc/devel/py-nose/Makefile       Wed Mar 29 09:04:02 2023
@@ -1,4 +1,4 @@
-# $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}
@@ -25,7 +25,7 @@ post-install:
 
 .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

Index: pkgsrc/security/py-cyclonedx-python-lib/Makefile
diff -u pkgsrc/security/py-cyclonedx-python-lib/Makefile:1.11 pkgsrc/security/py-cyclonedx-python-lib/Makefile:1.12
--- pkgsrc/security/py-cyclonedx-python-lib/Makefile:1.11       Sun Sep 18 11:53:56 2022
+++ pkgsrc/security/py-cyclonedx-python-lib/Makefile    Wed Mar 29 09:04:02 2023
@@ -1,4 +1,4 @@
-# $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}
@@ -20,7 +20,7 @@ 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
 

Index: pkgsrc/security/py-keyring/Makefile
diff -u pkgsrc/security/py-keyring/Makefile:1.31 pkgsrc/security/py-keyring/Makefile:1.32
--- pkgsrc/security/py-keyring/Makefile:1.31    Sun Mar 12 13:58:25 2023
+++ pkgsrc/security/py-keyring/Makefile Wed Mar 29 09:04:02 2023
@@ -1,4 +1,4 @@
-# $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}
@@ -26,10 +26,10 @@ 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
 

Index: pkgsrc/security/py-olm/Makefile
diff -u pkgsrc/security/py-olm/Makefile:1.2 pkgsrc/security/py-olm/Makefile:1.3
--- pkgsrc/security/py-olm/Makefile:1.2 Tue Jan 25 13:12:49 2022
+++ pkgsrc/security/py-olm/Makefile     Wed Mar 29 09:04:03 2023
@@ -1,4 +1,4 @@
-# $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}
@@ -17,7 +17,7 @@ DEPENDS+=     ${PYPKGPREFIX}-cffi>=1.0.0:../
 
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYPKGPREFIX} == "py27"
+.if ${PYTHON_VERSION} == 207
 DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 .endif
 

Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.36 pkgsrc/sysutils/u-boot/u-boot.mk:1.37
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.36       Fri Jul 29 13:47:36 2022
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Wed Mar 29 09:04:03 2023
@@ -1,4 +1,4 @@
-# $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"
 
@@ -40,7 +40,7 @@ PYTHON_FOR_BUILD_ONLY=        yes
 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}

Prev by Date: CVS commit: pkgsrc/math/eigen3
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/math/eigen3
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index