CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Havard Eidnes" <he%netbsd.org@localhost>
Date: Sun, 2 Feb 2025 10:38:05 +0000

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Feb  2 10:38:04 UTC 2025

Modified Files:
        pkgsrc/archivers/py-brotli: Makefile
        pkgsrc/archivers/py-zopfli: Makefile
        pkgsrc/converters/py-simplejson: Makefile
        pkgsrc/databases/py-psycopg2: Makefile
        pkgsrc/devel/py-bitarray: Makefile
        pkgsrc/devel/py-cffi: Makefile
        pkgsrc/devel/py-coverage: Makefile
        pkgsrc/devel/py-cython: Makefile
        pkgsrc/devel/py-debugpy: Makefile
        pkgsrc/devel/py-greenlet: Makefile
        pkgsrc/devel/py-mercurial: Makefile
        pkgsrc/devel/py-msgpack: Makefile
        pkgsrc/devel/py-protobuf: Makefile
        pkgsrc/devel/py-wrapt: Makefile
        pkgsrc/devel/py-zope.interface: Makefile
        pkgsrc/graphics/py-Pillow: Makefile
        pkgsrc/lang/python: egg.mk wheel.mk
        pkgsrc/math/py-gmpy2: Makefile
        pkgsrc/math/py-kiwisolver: Makefile
        pkgsrc/security/py-cryptodome: Makefile
        pkgsrc/sysutils/py-psutil: Makefile
        pkgsrc/textproc/py-lxml: Makefile
        pkgsrc/textproc/py-markupsafe: Makefile
        pkgsrc/textproc/py-regex: Makefile
        pkgsrc/textproc/py-ujson: Makefile
        pkgsrc/www/py-genshi: Makefile
        pkgsrc/www/py-tornado: Makefile
        pkgsrc/www/py-websockets: Makefile
        pkgsrc/x11/py-sip-qt5: Makefile

Log Message:
lang/python and a number of python packages: re-do atomic64.mk issue.

Evidently, python 3.13 brought in the need to support 64-bit atomics.
This means that python extension packages built with C needs to
use mk/atomic64.mk to make -latomic available on the required 32-bit
ports.  Sadly, there is no reliable way to detect in the .mk files
whether the package is using C (or C++), so this change adds an
unconditional include of mk/atomic64.mk when the python version is
equal to or larger than 3.13 for packages using egg.mk or wheel.mk.

This undoes the individual package Makefile inclusions of mk/atomic64.mk
that I've added over the last few days.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/py-brotli/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/py-zopfli/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/converters/py-simplejson/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/databases/py-psycopg2/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/py-bitarray/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/py-cffi/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/py-coverage/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/py-cython/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-debugpy/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/py-greenlet/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/py-msgpack/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-wrapt/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-zope.interface/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/graphics/py-Pillow/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python/wheel.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/py-gmpy2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/py-kiwisolver/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/security/py-cryptodome/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/sysutils/py-psutil/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/textproc/py-lxml/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/py-markupsafe/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/textproc/py-regex/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/py-ujson/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/py-genshi/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/py-tornado/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/py-websockets/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/py-sip-qt5/Makefile

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

Modified files:

Index: pkgsrc/archivers/py-brotli/Makefile
diff -u pkgsrc/archivers/py-brotli/Makefile:1.7 pkgsrc/archivers/py-brotli/Makefile:1.8
--- pkgsrc/archivers/py-brotli/Makefile:1.7     Thu Jan 16 16:41:28 2025
+++ pkgsrc/archivers/py-brotli/Makefile Sun Feb  2 10:38:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/01/16 16:41:28 he Exp $
+# $NetBSD: Makefile,v 1.8 2025/02/02 10:38:01 he Exp $
 
 DISTNAME=      Brotli-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,5 +17,4 @@ USE_LANGUAGES=        c c++
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/egg.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/py-zopfli/Makefile
diff -u pkgsrc/archivers/py-zopfli/Makefile:1.8 pkgsrc/archivers/py-zopfli/Makefile:1.9
--- pkgsrc/archivers/py-zopfli/Makefile:1.8     Sat Jan 18 19:52:47 2025
+++ pkgsrc/archivers/py-zopfli/Makefile Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/01/18 19:52:47 he Exp $
+# $NetBSD: Makefile,v 1.9 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      zopfli-0.2.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -23,5 +23,4 @@ do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/py-simplejson/Makefile
diff -u pkgsrc/converters/py-simplejson/Makefile:1.53 pkgsrc/converters/py-simplejson/Makefile:1.54
--- pkgsrc/converters/py-simplejson/Makefile:1.53       Tue Jan 21 15:35:41 2025
+++ pkgsrc/converters/py-simplejson/Makefile    Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2025/01/21 15:35:41 he Exp $
+# $NetBSD: Makefile,v 1.54 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      simplejson-3.19.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,4 @@ LICENSE=      mit
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-psycopg2/Makefile
diff -u pkgsrc/databases/py-psycopg2/Makefile:1.61 pkgsrc/databases/py-psycopg2/Makefile:1.62
--- pkgsrc/databases/py-psycopg2/Makefile:1.61  Sat Jan 18 19:40:04 2025
+++ pkgsrc/databases/py-psycopg2/Makefile       Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2025/01/18 19:40:04 he Exp $
+# $NetBSD: Makefile,v 1.62 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      psycopg2-2.9.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,5 +15,4 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 .include "../../lang/python/wheel.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-bitarray/Makefile
diff -u pkgsrc/devel/py-bitarray/Makefile:1.40 pkgsrc/devel/py-bitarray/Makefile:1.41
--- pkgsrc/devel/py-bitarray/Makefile:1.40      Wed Jan 22 13:30:04 2025
+++ pkgsrc/devel/py-bitarray/Makefile   Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2025/01/22 13:30:04 he Exp $
+# $NetBSD: Makefile,v 1.41 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      bitarray-2.9.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,5 +18,4 @@ do-test:
        ${SETENV} ${TEST_ENV} ${PYTHONBIN} -c 'import bitarray; bitarray.test()'
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-cffi/Makefile
diff -u pkgsrc/devel/py-cffi/Makefile:1.59 pkgsrc/devel/py-cffi/Makefile:1.60
--- pkgsrc/devel/py-cffi/Makefile:1.59  Sat Jan 18 10:09:21 2025
+++ pkgsrc/devel/py-cffi/Makefile       Sun Feb  2 10:38:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2025/01/18 10:09:21 he Exp $
+# $NetBSD: Makefile,v 1.60 2025/02/02 10:38:01 he Exp $
 
 DISTNAME=      cffi-1.17.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -21,5 +21,4 @@ USE_TOOLS+=   pkg-config
 
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-coverage/Makefile
diff -u pkgsrc/devel/py-coverage/Makefile:1.65 pkgsrc/devel/py-coverage/Makefile:1.66
--- pkgsrc/devel/py-coverage/Makefile:1.65      Tue Jan 21 15:32:31 2025
+++ pkgsrc/devel/py-coverage/Makefile   Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2025/01/21 15:32:31 he Exp $
+# $NetBSD: Makefile,v 1.66 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      coverage-7.6.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -28,5 +28,4 @@ post-install:
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-cython/Makefile
diff -u pkgsrc/devel/py-cython/Makefile:1.97 pkgsrc/devel/py-cython/Makefile:1.98
--- pkgsrc/devel/py-cython/Makefile:1.97        Sat Jan 18 18:55:08 2025
+++ pkgsrc/devel/py-cython/Makefile     Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2025/01/18 18:55:08 he Exp $
+# $NetBSD: Makefile,v 1.98 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      cython-3.0.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -41,5 +41,4 @@ pre-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-debugpy/Makefile
diff -u pkgsrc/devel/py-debugpy/Makefile:1.17 pkgsrc/devel/py-debugpy/Makefile:1.18
--- pkgsrc/devel/py-debugpy/Makefile:1.17       Sun Jan 26 15:34:48 2025
+++ pkgsrc/devel/py-debugpy/Makefile    Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2025/01/26 15:34:48 he Exp $
+# $NetBSD: Makefile,v 1.18 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      debugpy-1.8.12
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -33,5 +33,4 @@ post-install:
        ${MV} debugpy debugpy-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-greenlet/Makefile
diff -u pkgsrc/devel/py-greenlet/Makefile:1.28 pkgsrc/devel/py-greenlet/Makefile:1.29
--- pkgsrc/devel/py-greenlet/Makefile:1.28      Sun Jan 19 16:58:53 2025
+++ pkgsrc/devel/py-greenlet/Makefile   Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2025/01/19 16:58:53 he Exp $
+# $NetBSD: Makefile,v 1.29 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      greenlet-3.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -26,5 +26,4 @@ USE_CXX_FEATURES+=    c++11
 GCC_REQD+=             8
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.104 pkgsrc/devel/py-mercurial/Makefile:1.105
--- pkgsrc/devel/py-mercurial/Makefile:1.104    Sun Jan 26 16:00:33 2025
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2025/01/26 16:00:33 he Exp $
+# $NetBSD: Makefile,v 1.105 2025/02/02 10:38:04 he Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -55,5 +55,4 @@ do-test:
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-msgpack/Makefile
diff -u pkgsrc/devel/py-msgpack/Makefile:1.37 pkgsrc/devel/py-msgpack/Makefile:1.38
--- pkgsrc/devel/py-msgpack/Makefile:1.37       Mon Jan 20 10:57:59 2025
+++ pkgsrc/devel/py-msgpack/Makefile    Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2025/01/20 10:57:59 he Exp $
+# $NetBSD: Makefile,v 1.38 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      msgpack-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,5 +15,4 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 USE_LANGUAGES= c c++
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.82 pkgsrc/devel/py-protobuf/Makefile:1.83
--- pkgsrc/devel/py-protobuf/Makefile:1.82      Mon Jan 20 10:58:59 2025
+++ pkgsrc/devel/py-protobuf/Makefile   Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2025/01/20 10:58:59 he Exp $
+# $NetBSD: Makefile,v 1.83 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      protobuf-5.29.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,5 +18,4 @@ USE_LANGUAGES+=               c c++
 MAKE_ENV+=     PROTOC=${PREFIX}/bin/protoc
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-wrapt/Makefile
diff -u pkgsrc/devel/py-wrapt/Makefile:1.22 pkgsrc/devel/py-wrapt/Makefile:1.23
--- pkgsrc/devel/py-wrapt/Makefile:1.22 Sat Jan 18 19:45:20 2025
+++ pkgsrc/devel/py-wrapt/Makefile      Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2025/01/18 19:45:20 he Exp $
+# $NetBSD: Makefile,v 1.23 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      wrapt-1.17.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,4 @@ LICENSE=      2-clause-bsd
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-zope.interface/Makefile
diff -u pkgsrc/devel/py-zope.interface/Makefile:1.13 pkgsrc/devel/py-zope.interface/Makefile:1.14
--- pkgsrc/devel/py-zope.interface/Makefile:1.13        Sat Jan 18 19:49:58 2025
+++ pkgsrc/devel/py-zope.interface/Makefile     Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/01/18 19:49:58 he Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      zope.interface-7.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,5 +18,4 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-zope.event
 TEST_DEPENDS+= ${PYPKGPREFIX}-zope.testing-[0-9]*:../../devel/py-zope.testing
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-Pillow/Makefile
diff -u pkgsrc/graphics/py-Pillow/Makefile:1.87 pkgsrc/graphics/py-Pillow/Makefile:1.88
--- pkgsrc/graphics/py-Pillow/Makefile:1.87     Thu Jan 16 20:47:42 2025
+++ pkgsrc/graphics/py-Pillow/Makefile  Sun Feb  2 10:38:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2025/01/16 20:47:42 he Exp $
+# $NetBSD: Makefile,v 1.88 2025/02/02 10:38:01 he Exp $
 
 DISTNAME=      pillow-11.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^p/P/}
@@ -32,5 +32,4 @@ DISTUTILS_BUILDDIR_IN_TEST_ENV=       yes
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.45 pkgsrc/lang/python/egg.mk:1.46
--- pkgsrc/lang/python/egg.mk:1.45      Tue Jan  7 19:35:08 2025
+++ pkgsrc/lang/python/egg.mk   Sun Feb  2 10:38:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.45 2025/01/07 19:35:08 riastradh Exp $
+# $NetBSD: egg.mk,v 1.46 2025/02/02 10:38:01 he Exp $
 #
 # The method used in this Makefile fragment is obsolete.
 # Please use wheel.mk instead.
@@ -40,6 +40,10 @@ PRINT_PLIST_AWK+=    { gsub(/${PYVERSSUFFIX
 
 USE_PKG_RESOURCES?=    no
 
+.if ${PYTHON_VERSION} >= 313
+.include "../../mk/atomic64.mk"
+.endif
+
 # py-setuptools needs to be bootstrapped from python itself, without using
 # py-setuptools.
 BOOTSTRAP_SETUPTOOLS?= no

Index: pkgsrc/lang/python/wheel.mk
diff -u pkgsrc/lang/python/wheel.mk:1.18 pkgsrc/lang/python/wheel.mk:1.19
--- pkgsrc/lang/python/wheel.mk:1.18    Sat Feb  1 15:40:43 2025
+++ pkgsrc/lang/python/wheel.mk Sun Feb  2 10:38:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: wheel.mk,v 1.18 2025/02/01 15:40:43 gdt Exp $
+# $NetBSD: wheel.mk,v 1.19 2025/02/02 10:38:01 he Exp $
 #
 # Build and install Python wheels
 #
@@ -79,3 +79,6 @@ do-test:
 .endif
 
 .include "../../lang/python/extension.mk"
+.if ${PYTHON_VERSION} >= 313
+.include "../../mk/atomic64.mk"
+.endif

Index: pkgsrc/math/py-gmpy2/Makefile
diff -u pkgsrc/math/py-gmpy2/Makefile:1.7 pkgsrc/math/py-gmpy2/Makefile:1.8
--- pkgsrc/math/py-gmpy2/Makefile:1.7   Sun Jan 26 16:13:20 2025
+++ pkgsrc/math/py-gmpy2/Makefile       Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/01/26 16:13:20 he Exp $
+# $NetBSD: Makefile,v 1.8 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      gmpy2-2.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/a/alpha/}
@@ -20,5 +20,4 @@ BUILDLINK_API_DEPENDS.mpcomplex?=     mpcomp
 .include "../../math/mpcomplex/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-kiwisolver/Makefile
diff -u pkgsrc/math/py-kiwisolver/Makefile:1.12 pkgsrc/math/py-kiwisolver/Makefile:1.13
--- pkgsrc/math/py-kiwisolver/Makefile:1.12     Sat Jan 18 19:03:28 2025
+++ pkgsrc/math/py-kiwisolver/Makefile  Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/01/18 19:03:28 he Exp $
+# $NetBSD: Makefile,v 1.13 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      kiwisolver-1.4.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,5 +20,4 @@ PYTHON_VERSIONS_INCOMPATIBLE= 39
 BUILDLINK_API_DEPENDS.py-cppy+=        ${PYPKGPREFIX}-cppy>=1.3.0
 .include "../../devel/py-cppy/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-cryptodome/Makefile
diff -u pkgsrc/security/py-cryptodome/Makefile:1.56 pkgsrc/security/py-cryptodome/Makefile:1.57
--- pkgsrc/security/py-cryptodome/Makefile:1.56 Sun Jan 19 16:53:53 2025
+++ pkgsrc/security/py-cryptodome/Makefile      Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2025/01/19 16:53:53 he Exp $
+# $NetBSD: Makefile,v 1.57 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      pycryptodome-3.21.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -30,5 +30,4 @@ PLIST_SUBST+= SOEXT="abi3.so"
 
 BUILDLINK_API_DEPENDS.gmp+=    gmp>=5.0
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/py-psutil/Makefile
diff -u pkgsrc/sysutils/py-psutil/Makefile:1.57 pkgsrc/sysutils/py-psutil/Makefile:1.58
--- pkgsrc/sysutils/py-psutil/Makefile:1.57     Sun Jan 19 17:01:11 2025
+++ pkgsrc/sysutils/py-psutil/Makefile  Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2025/01/19 17:01:11 he Exp $
+# $NetBSD: Makefile,v 1.58 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      psutil-6.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -28,5 +28,4 @@ PLIST_SUBST+= SYSTEM=${OPSYS:tl}
 #      cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m psutil.tests
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-lxml/Makefile
diff -u pkgsrc/textproc/py-lxml/Makefile:1.114 pkgsrc/textproc/py-lxml/Makefile:1.115
--- pkgsrc/textproc/py-lxml/Makefile:1.114      Sat Jan 18 19:36:41 2025
+++ pkgsrc/textproc/py-lxml/Makefile    Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2025/01/18 19:36:41 he Exp $
+# $NetBSD: Makefile,v 1.115 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      lxml-5.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -41,5 +41,4 @@ BUILDLINK_API_DEPENDS.libxml2+=       libxml2>
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxslt+=        libxslt>=1.1.34
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-markupsafe/Makefile
diff -u pkgsrc/textproc/py-markupsafe/Makefile:1.23 pkgsrc/textproc/py-markupsafe/Makefile:1.24
--- pkgsrc/textproc/py-markupsafe/Makefile:1.23 Sat Jan 18 19:43:28 2025
+++ pkgsrc/textproc/py-markupsafe/Makefile      Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2025/01/18 19:43:28 he Exp $
+# $NetBSD: Makefile,v 1.24 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      markupsafe-3.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,5 +15,4 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 WHEEL_NAME=    MarkupSafe-${PKGVERSION_NOREV}
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-regex/Makefile
diff -u pkgsrc/textproc/py-regex/Makefile:1.59 pkgsrc/textproc/py-regex/Makefile:1.60
--- pkgsrc/textproc/py-regex/Makefile:1.59      Sun Jan 19 17:04:01 2025
+++ pkgsrc/textproc/py-regex/Makefile   Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2025/01/19 17:04:01 he Exp $
+# $NetBSD: Makefile,v 1.60 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      regex-2024.11.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -17,5 +17,4 @@ do-test:
        ${PYTHONBIN} -m regex.test_regex
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-ujson/Makefile
diff -u pkgsrc/textproc/py-ujson/Makefile:1.23 pkgsrc/textproc/py-ujson/Makefile:1.24
--- pkgsrc/textproc/py-ujson/Makefile:1.23      Sun Jan 26 15:44:36 2025
+++ pkgsrc/textproc/py-ujson/Makefile   Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2025/01/26 15:44:36 he Exp $
+# $NetBSD: Makefile,v 1.24 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      ujson-5.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,5 +18,4 @@ USE_LANGUAGES=        c c++
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-genshi/Makefile
diff -u pkgsrc/www/py-genshi/Makefile:1.27 pkgsrc/www/py-genshi/Makefile:1.28
--- pkgsrc/www/py-genshi/Makefile:1.27  Sat Jan 18 18:59:41 2025
+++ pkgsrc/www/py-genshi/Makefile       Sun Feb  2 10:38:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2025/01/18 18:59:41 he Exp $
+# $NetBSD: Makefile,v 1.28 2025/02/02 10:38:02 he Exp $
 
 DISTNAME=      Genshi-0.7.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -21,5 +21,4 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-tornado/Makefile
diff -u pkgsrc/www/py-tornado/Makefile:1.39 pkgsrc/www/py-tornado/Makefile:1.40
--- pkgsrc/www/py-tornado/Makefile:1.39 Sun Jan 19 16:56:06 2025
+++ pkgsrc/www/py-tornado/Makefile      Sun Feb  2 10:38:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2025/01/19 16:56:06 he Exp $
+# $NetBSD: Makefile,v 1.40 2025/02/02 10:38:03 he Exp $
 
 DISTNAME=      tornado-6.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,5 +13,4 @@ LICENSE=      apache-2.0
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-websockets/Makefile
diff -u pkgsrc/www/py-websockets/Makefile:1.28 pkgsrc/www/py-websockets/Makefile:1.29
--- pkgsrc/www/py-websockets/Makefile:1.28      Sun Jan 26 15:48:45 2025
+++ pkgsrc/www/py-websockets/Makefile   Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2025/01/26 15:48:45 he Exp $
+# $NetBSD: Makefile,v 1.29 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      websockets-14.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -16,5 +16,4 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 # 9 errors
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/py-sip-qt5/Makefile
diff -u pkgsrc/x11/py-sip-qt5/Makefile:1.13 pkgsrc/x11/py-sip-qt5/Makefile:1.14
--- pkgsrc/x11/py-sip-qt5/Makefile:1.13 Mon Jan 27 11:52:23 2025
+++ pkgsrc/x11/py-sip-qt5/Makefile      Sun Feb  2 10:38:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/01/27 11:52:23 he Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/02 10:38:04 he Exp $
 
 DISTNAME=      pyqt5_sip-12.16.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pyqt5_sip/sip-qt5/}
@@ -17,5 +17,4 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 USE_LANGUAGES= c c++
 
 .include "../../lang/python/wheel.mk"
-.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/textproc/py-rapidfuzz
Next by Date: CVS commit: pkgsrc/x11/py-qt6
Previous by Thread: CVS commit: pkgsrc/textproc/py-rapidfuzz
Next by Thread: CVS commit: pkgsrc/x11/py-qt6
Indexes:

Home | Main Index | Thread Index | Old Index