CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Oct 22 11:34:58 UTC 2023

Modified Files:
        pkgsrc/devel/py-SDL2: Makefile
        pkgsrc/devel/py-guppy3: Makefile
        pkgsrc/devel/py-idle: Makefile
        pkgsrc/games/pysolfc: Makefile
        pkgsrc/graphics/py-OpenGL: Makefile
        pkgsrc/x11/py-Tk: Makefile
        pkgsrc/x11/py-qtgraph-qt5: Makefile

Log Message:
py-Tk: disable for Python 3.12

tk will not be a default dependency of the batteries-included Python packages,
and srcdist.mk needs to be switched from distutils to some other method of
installing the modules separately. Until this is done, there is no py-Tk
for Python 3.12.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-SDL2/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-guppy3/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/py-idle/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/games/pysolfc/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/py-OpenGL/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/x11/py-Tk/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-qtgraph-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/devel/py-SDL2/Makefile
diff -u pkgsrc/devel/py-SDL2/Makefile:1.7 pkgsrc/devel/py-SDL2/Makefile:1.8
--- pkgsrc/devel/py-SDL2/Makefile:1.7   Tue Aug  1 23:20:39 2023
+++ pkgsrc/devel/py-SDL2/Makefile       Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/08/01 23:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/10/22 11:34:58 wiz Exp $
 
 DISTNAME=      PySDL2-0.9.16
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/Py//}
@@ -18,7 +18,7 @@ USE_TOOLS+=   pkg-config
 
 TEST_ENV+=     PYSDL2_DLL_PATH=${BUILDLINK_PREFIX.SDL2}/lib
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38 312
 
 BUILDLINK_API_DEPENDS.SDL2+=   SDL2>=2.0.5
 .include "../../devel/SDL2/buildlink3.mk"

Index: pkgsrc/devel/py-guppy3/Makefile
diff -u pkgsrc/devel/py-guppy3/Makefile:1.11 pkgsrc/devel/py-guppy3/Makefile:1.12
--- pkgsrc/devel/py-guppy3/Makefile:1.11        Mon May 15 22:04:35 2023
+++ pkgsrc/devel/py-guppy3/Makefile     Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/05/15 22:04:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/10/22 11:34:58 wiz Exp $
 
 DISTNAME=      guppy3-3.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      mit
 
 DEPENDS+=      ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-idle/Makefile
diff -u pkgsrc/devel/py-idle/Makefile:1.40 pkgsrc/devel/py-idle/Makefile:1.41
--- pkgsrc/devel/py-idle/Makefile:1.40  Wed Mar 29 09:34:07 2023
+++ pkgsrc/devel/py-idle/Makefile       Sun Oct 22 11:34:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/03/29 09:34:07 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2023/10/22 11:34:57 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-idle-${PY_DISTVERSION}
 CATEGORIES=    devel python
@@ -11,6 +11,9 @@ DEPENDS+=     ${PYPKGPREFIX}-Tk-[0-9]*:../..
 
 PY_PATCHPLIST= yes
 
+# srcdist.mk needs to be adapted for distutils removal in 3.12
+PYTHON_VERSIONS_ACCEPTED=      311 310 39 38 27
+
 #
 # With Python-2.3 and up, the Idle code is part of the base library.
 # We just install a wrapper script. Also, threads are required now.

Index: pkgsrc/games/pysolfc/Makefile
diff -u pkgsrc/games/pysolfc/Makefile:1.42 pkgsrc/games/pysolfc/Makefile:1.43
--- pkgsrc/games/pysolfc/Makefile:1.42  Thu Sep 21 08:12:35 2023
+++ pkgsrc/games/pysolfc/Makefile       Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/09/21 08:12:35 dholland Exp $
+# $NetBSD: Makefile,v 1.43 2023/10/22 11:34:58 wiz Exp $
 
 DISTNAME=      PySolFC-2.14.1
 PKGNAME=       ${DISTNAME:tl}
@@ -27,7 +27,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-pycotap-[0
 DEPENDS+=       ${PYPKGPREFIX}-Pillow>=9.4:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312
 
 USE_TOOLS+=    pax
 

Index: pkgsrc/graphics/py-OpenGL/Makefile
diff -u pkgsrc/graphics/py-OpenGL/Makefile:1.41 pkgsrc/graphics/py-OpenGL/Makefile:1.42
--- pkgsrc/graphics/py-OpenGL/Makefile:1.41     Wed Sep 13 17:18:23 2023
+++ pkgsrc/graphics/py-OpenGL/Makefile  Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/09/13 17:18:23 adam Exp $
+# $NetBSD: Makefile,v 1.42 2023/10/22 11:34:58 wiz Exp $
 
 DISTNAME=      PyOpenGL-3.1.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^Py//}
@@ -19,7 +19,7 @@ USE_LANGUAGES=        # none
 
 REPLACE_PYTHON+=       OpenGL/arrays/buffers.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38 312
 
 do-test:
        cd ${WRKSRC} && ${PYTHONBIN} tests/test_core.py

Index: pkgsrc/x11/py-Tk/Makefile
diff -u pkgsrc/x11/py-Tk/Makefile:1.72 pkgsrc/x11/py-Tk/Makefile:1.73
--- pkgsrc/x11/py-Tk/Makefile:1.72      Sun Jan 29 21:18:18 2023
+++ pkgsrc/x11/py-Tk/Makefile   Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2023/01/29 21:18:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2023/10/22 11:34:58 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-Tk-${PY_DISTVERSION}
 PKGREVISION=   7
@@ -18,6 +18,9 @@ PY_SETUP_SUBST+=      TKRTPREFIX=${BUILDLINK_
 PY_SETUP_SUBST+=       X11BASE=${X11BASE}
 PYSETUPINSTALLARGS+=   --install-lib ${PREFIX}/${PYLIB}/lib-dynload
 
+# srcdist.mk needs to be adapted for distutils removal in 3.12
+PYTHON_VERSIONS_ACCEPTED=      311 310 39 38 27
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"

Index: pkgsrc/x11/py-qtgraph-qt5/Makefile
diff -u pkgsrc/x11/py-qtgraph-qt5/Makefile:1.9 pkgsrc/x11/py-qtgraph-qt5/Makefile:1.10
--- pkgsrc/x11/py-qtgraph-qt5/Makefile:1.9      Tue Aug  1 23:20:56 2023
+++ pkgsrc/x11/py-qtgraph-qt5/Makefile  Sun Oct 22 11:34:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/08/01 23:20:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/10/22 11:34:58 wiz Exp $
 
 DISTNAME=      pyqtgraph-0.12.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pyqtgraph/qtgraph-qt5/}
@@ -21,7 +21,7 @@ DEPENDS+=     ${PYPKGPREFIX}-OpenGL-[0-9]*:.
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38 312
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"