cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from using Tcl/Tk 8.5 to Tcl/Tk 8.6, 

except for Python-2.7, which stays with 8.5.

Make COMMENTs and DESCRs consistent with Tk.

Fix typo in 3.10/files/CHANGES.OpenBSD.


OKs and thanks to kmos@, sthen@.
This commit is contained in:
stu 2022-06-09 14:49:29 +00:00
parent 8852f15025
commit 9f5da2e414
14 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/python/2.7/Makefile
View File

@ -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

12
lang/python/2.7/patches/patch-setup_py
View File

@ -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')

4
lang/python/2.7/pkg/DESCR-tkinter
View File

@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dynamically loaded.
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.

2
lang/python/3.10/Makefile
View File

@ -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>

2
lang/python/3.10/files/CHANGES.OpenBSD
View File

@ -24,4 +24,4 @@ OpenBSD's version of llvm-ar is installed as /usr/bin/ar, and the
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.

10
lang/python/3.10/patches/patch-setup_py
View File

@ -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,

4
lang/python/3.10/pkg/DESCR-tkinter
View File

@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dynamically loaded.
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.

2
lang/python/3.8/Makefile
View File

@ -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>

10
lang/python/3.8/patches/patch-setup_py
View File

@ -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,

4
lang/python/3.8/pkg/DESCR-tkinter
View File

@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dynamically loaded.
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.

2
lang/python/3.9/Makefile
View File

@ -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 =

10
lang/python/3.9/patches/patch-setup_py
View File

@ -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,

4
lang/python/3.9/pkg/DESCR-tkinter
View File

@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dynamically loaded.
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.

16
lang/python/Makefile.inc
View File

@ -8,7 +8,7 @@ COMMENT-bsddb = Berkeley db module for Python
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},-tkinter \
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}