switch MODPY_DEFAULT_VERSION_3 to 3.10

openbsd · Nov 13, 2022 · 80fda49 · 80fda49
1 parent f2ea66a
commit 80fda49
Show file tree

Hide file tree

Showing 6 changed files with 1,522 additions and 1,628 deletions.
diff --git a/lang/python/3.10/Makefile b/lang/python/3.10/Makefile
@@ -7,11 +7,17 @@ FULL_VERSION = 3.10.8
 SHARED_LIBS = python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH = limit:^3\.10
-REVISION-main = 2
+REVISION = 3
 
 # -tkinter in 7.2-stable must be kept a higher version than 7.1-stable
 # due to dep changes (Tcl/Tk 8.5 -> 8.6); 7.2-current must be kept at same
 # or higher version than 7.2-stable.
-REVISION-tkinter = 0
+REVISION-tkinter = 3
+
+# This is the MODPY_DEFAULT_VERSION_3 version of Python:
+# - override "@comment" setting so that bin/python3 etc are installed
+PY_DEFAULTONLY =
+# - disable bundled pip in favour of the version from devel/py-pip
+CONFIGURE_ARGS += --with-ensurepip=no
 
 .include <bsd.port.mk>
diff --git a/lang/python/3.10/pkg/PLIST-idle b/lang/python/3.10/pkg/PLIST-idle
@@ -1,6 +1,7 @@
 @option no-default-conflict
 @option is-branch
 @conflict python-idle-${VERSION_SPEC}
+@conflict python-idle->=3,<3.9.15p0
 ${PY_DEFAULTONLY}bin/idle3
 bin/idle3.10
 lib/python3.10/idlelib/