On 2022/06/08 11:36, Stuart Cassoff wrote:
> Just checked: ok on amd64, PLIST problem on i386.
ah ok, so in that case nothing changed with respect to those.
phew, I didn't fancy debugging that. I propose to either just
ignore that, or maybe add an rm -f, i386 coped without them
so far and it doesn't make much sense to poke too much at a
dead python version.
i've regen'd the diff against -current after I fixed the 3.10
tests problem, i tweaked to remove the BUILD_PKGPATH bit, and
just bumped the relevant subpackages rather than everything.
this one is ok sthen@
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.147
diff -u -p -r1.147 Makefile.inc
--- Makefile.inc 26 May 2022 15:13:55 -0000 1.147
+++ Makefile.inc 8 Jun 2022 15:52:24 -0000
@@ -8,7 +8,7 @@ COMMENT-bsddb = Berkeley db module for P
COMMENT-gdbm = GNU dbm module for Python
COMMENT-idle = IDE for Python
COMMENT-tests = Python test suite
-COMMENT-tkinter = tk GUI module for Python
+COMMENT-tkinter = Python interface to the Tk graphical toolkit
COMMENT-tools = extra tools for Python
VERSION = ${FULL_VERSION:R}
@@ -95,11 +95,16 @@ RUN_DEPENDS-idle = lang/python/${VERSION
WANTLIB-idle =
MODULES += x11/tk
-# Tcl/Tk version needs to be in sync with patch-setup_py's one
+
+.if ${VERSION} == "2.7"
MODTK_VERSION = 8.5
+.else
+MODTK_VERSION = 8.6
+.endif
+
LIB_DEPENDS-tkinter = lang/python/${VERSION},-main \
${MODTK_LIB_DEPENDS}
-WANTLIB-tkinter = X11 pthread python${VERSION} \
+WANTLIB-tkinter = pthread python${VERSION} \
${MODTK_WANTLIB}
AUTOCONF_VERSION = 2.69
@@ -110,7 +115,10 @@ CONFIGURE_ARGS += --with-fpectl \
--with-threads \
--enable-ipv6 \
--with-system-expat \
- --with-system-ffi
+ --with-system-ffi \
+ --with-tcltk-includes='-I${MODTCL_INCDIR}
-I${MODTK_INCDIR} -I${X11BASE}/include' \
+ --with-tcltk-libs='-L${X11BASE}/lib -l${MODTCL_LIB}
-l${MODTK_LIB}'
+
.if ${VERSION} != "2.7"
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
. if ${PROPERTIES:Mlld}
Index: 2.7/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- 2.7/Makefile 28 Mar 2022 15:48:24 -0000 1.76
+++ 2.7/Makefile 8 Jun 2022 15:52:24 -0000
@@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
PORTROACH = limit:^2\.7
-REVISION-main = 7
+REVISION-main = 8
REVISION-idle = 1
REVISION-tests = 1
REVISION-bsddb = 0
REVISION-gdbm = 0
-REVISION-tkinter = 0
+REVISION-tkinter = 1
REVISION-tools = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 2.7/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
retrieving revision 1.16
diff -u -p -r1.16 patch-setup_py
--- 2.7/patches/patch-setup_py 11 Mar 2022 19:29:11 -0000 1.16
+++ 2.7/patches/patch-setup_py 8 Jun 2022 15:52:24 -0000
@@ -84,17 +84,7 @@ Index: setup.py
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1936,8 +1946,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
-- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-- '8.2', '82', '8.1', '81', '8.0', '80']:
-+ for version in ['85']:
- tklib = self.compiler.find_library_file(lib_dirs,
- 'tk' + version)
- tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1980,17 +1989,9 @@ class PyBuildExt(build_ext):
+@@ -1980,17 +1990,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
Index: 2.7/pkg/DESCR-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/DESCR-tkinter,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-tkinter
--- 2.7/pkg/DESCR-tkinter 24 Apr 2011 09:31:46 -0000 1.1.1.1
+++ 2.7/pkg/DESCR-tkinter 8 Jun 2022 15:52:24 -0000
@@ -11,5 +11,5 @@ in C or C++. On most systems such modul
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
Index: 3.10/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- 3.10/Makefile 8 Jun 2022 14:50:03 -0000 1.11
+++ 3.10/Makefile 8 Jun 2022 15:52:24 -0000
@@ -9,7 +9,7 @@ VERSION_SPEC = >=3.10,<3.11
PORTROACH = limit:^3\.10
REVISION = 1
-REVISION-main = 2
+REVISION-main = 3
REVISION-tests = 2
.include <bsd.port.mk>
Index: 3.10/files/CHANGES.OpenBSD
===================================================================
RCS file: /cvs/ports/lang/python/3.10/files/CHANGES.OpenBSD,v
retrieving revision 1.4
diff -u -p -r1.4 CHANGES.OpenBSD
--- 3.10/files/CHANGES.OpenBSD 28 Apr 2022 14:47:56 -0000 1.4
+++ 3.10/files/CHANGES.OpenBSD 8 Jun 2022 15:52:24 -0000
@@ -24,4 +24,4 @@ OpenBSD's version of llvm-ar is installe
compiler as passed to ports builds is /usr/bin/cc.
These changes are available in the OpenBSD CVS repository
-<http://www.openbsd.org/anoncvs.html> in ports/lang/python/3.9.
+<http://www.openbsd.org/anoncvs.html> in ports/lang/python/3.10.
Index: 3.10/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.10/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- 3.10/patches/patch-setup_py 3 Apr 2022 21:33:23 -0000 1.4
+++ 3.10/patches/patch-setup_py 8 Jun 2022 15:52:24 -0000
@@ -19,13 +19,3 @@ Index: setup.py
uuid_libs = ["uuid"]
else:
uuid_libs = []
-@@ -2116,8 +2118,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
-- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-- '8.2', '82', '8.1', '81', '8.0', '80']:
-+ for version in ['85']:
- tklib = self.compiler.find_library_file(self.lib_dirs,
- 'tk' + version)
- tcllib = self.compiler.find_library_file(self.lib_dirs,
Index: 3.10/pkg/DESCR-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/3.10/pkg/DESCR-tkinter,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-tkinter
--- 3.10/pkg/DESCR-tkinter 1 Nov 2021 14:16:09 -0000 1.1.1.1
+++ 3.10/pkg/DESCR-tkinter 8 Jun 2022 15:52:24 -0000
@@ -11,5 +11,5 @@ in C or C++. On most systems such modul
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
Index: 3.8/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.8/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- 3.8/Makefile 28 Apr 2022 14:47:56 -0000 1.31
+++ 3.8/Makefile 8 Jun 2022 15:52:24 -0000
@@ -8,6 +8,6 @@ SHARED_LIBS = python3.8 0.0
VERSION_SPEC = >=3.8,<3.9
PORTROACH = limit:^3\.8
-REVISION = 1
+REVISION = 2
.include <bsd.port.mk>
Index: 3.8/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.8/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- 3.8/patches/patch-setup_py 3 Apr 2022 21:30:12 -0000 1.5
+++ 3.8/patches/patch-setup_py 8 Jun 2022 15:52:24 -0000
@@ -19,13 +19,3 @@ Index: setup.py
uuid_libs = ['uuid']
else:
uuid_libs = []
-@@ -1847,8 +1849,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
-- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-- '8.2', '82', '8.1', '81', '8.0', '80']:
-+ for version in ['85']:
- tklib = self.compiler.find_library_file(self.lib_dirs,
- 'tk' + version)
- tcllib = self.compiler.find_library_file(self.lib_dirs,
Index: 3.8/pkg/DESCR-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/DESCR-tkinter,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-tkinter
--- 3.8/pkg/DESCR-tkinter 7 Nov 2019 16:14:09 -0000 1.1
+++ 3.8/pkg/DESCR-tkinter 8 Jun 2022 15:52:24 -0000
@@ -11,5 +11,5 @@ in C or C++. On most systems such modul
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
Index: 3.9/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- 3.9/Makefile 26 May 2022 16:28:19 -0000 1.24
+++ 3.9/Makefile 8 Jun 2022 15:52:24 -0000
@@ -8,6 +8,8 @@ SHARED_LIBS = python3.9 0.0
VERSION_SPEC = >=3.9,<3.10
PORTROACH = limit:^3\.9
+REVISION-tkinter = 0
+
# This is the MODPY_DEFAULT_VERSION_3 version of Python:
# - override "@comment" setting so that bin/python3 etc are installed
PY_DEFAULTONLY =
Index: 3.9/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-setup_py
--- 3.9/patches/patch-setup_py 3 Apr 2022 21:32:06 -0000 1.7
+++ 3.9/patches/patch-setup_py 8 Jun 2022 15:52:24 -0000
@@ -19,13 +19,3 @@ Index: setup.py
uuid_libs = ["uuid"]
else:
uuid_libs = []
-@@ -1997,8 +1999,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
-- for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
-- '8.2', '82', '8.1', '81', '8.0', '80']:
-+ for version in ['85']:
- tklib = self.compiler.find_library_file(self.lib_dirs,
- 'tk' + version)
- tcllib = self.compiler.find_library_file(self.lib_dirs,
Index: 3.9/pkg/DESCR-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/DESCR-tkinter,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-tkinter
--- 3.9/pkg/DESCR-tkinter 5 Oct 2020 20:48:12 -0000 1.1.1.1
+++ 3.9/pkg/DESCR-tkinter 8 Jun 2022 15:52:24 -0000
@@ -11,5 +11,5 @@ in C or C++. On most systems such modul
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
