Apparently 3.9.8 had a major regression in argparse so 3.9.9 has been rushed
out as a hotfix. Glad I hadn't committed 3.9.8 yet.
Here's the 3.9.9 update.
ok?
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 18 Nov 2021 15:45:28 -0000 1.16
+++ Makefile 22 Nov 2021 00:40:10 -0000
@@ -6,13 +6,9 @@
# Python itself.
VERSION = 3.9
-PATCHLEVEL = .7
+PATCHLEVEL = .9
SHARED_LIBS = python3.9 0.0
VERSION_SPEC = >=3.9,<3.10
-#PSUBDIR = python/3.9.0
-
-REVISION-main = 6
-REVISION-idle = 1
# override "@comment" setting for the MODPY_DEFAULT_VERSION_3 version
PY_DEFAULTONLY =
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 1 Sep 2021 17:41:48 -0000 1.6
+++ distinfo 22 Nov 2021 00:40:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.7.tgz) = qDjT+TYNFXBAFCtxXbNPAhjlNTM2lqVWncb4VGBOudE=
-SIZE (Python-3.9.7.tgz) = 25755357
+SHA256 (Python-3.9.9.tgz) = LMe2fB8/ZsVxrMQkec32kdjta0e+4SybaEMEE6F6ROo=
+SIZE (Python-3.9.9.tgz) = 25787134
Index: patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-Makefile_pre_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in 1 Nov 2021 07:43:39 -0000 1.3
+++ patches/patch-Makefile_pre_in 22 Nov 2021 00:40:10 -0000
@@ -3,18 +3,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.3 20
Index: Makefile.pre.in
--- Makefile.pre.in.orig
+++ Makefile.pre.in
-@@ -99,8 +99,8 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_N
- # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
- # be able to build extension modules using the directories specified in the
- # environment variables
--PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS)
$(CPPFLAGS)
--PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
-+PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS)
-+PY_LDFLAGS= $(LDFLAGS)
- PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
- NO_AS_NEEDED= @NO_AS_NEEDED@
- SGI_ABI= @SGI_ABI@
-@@ -674,7 +674,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
+@@ -673,7 +673,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 30 Oct 2021 00:24:16 -0000 1.5
+++ patches/patch-configure_ac 22 Nov 2021 00:40:10 -0000
@@ -16,16 +16,7 @@ Index: configure.ac
# The later defininition of _XOPEN_SOURCE disables certain features
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -727,7 +727,7 @@ then
- fi
-
-
--MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-+MULTIARCH=$(false)
- AC_SUBST(MULTIARCH)
-
- AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
-@@ -743,8 +743,8 @@ cat >> conftest.c <<EOF
+@@ -740,8 +740,8 @@ cat >> conftest.c <<EOF
#undef powerpc
#undef sparc
#undef unix
@@ -36,7 +27,16 @@ Index: configure.ac
#elif defined(__linux__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-gnu
-@@ -2858,18 +2858,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for
SunOS/S
+@@ -883,7 +883,7 @@ fi
+ rm -f conftest.c conftest.out
+
+ if test x$PLATFORM_TRIPLET != xdarwin; then
+- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
++ MULTIARCH=$(false)
+ fi
+ AC_SUBST(MULTIARCH)
+
+@@ -2860,18 +2860,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for
SunOS/S
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
# checks for uuid.h location
@@ -54,5 +54,5 @@ Index: configure.ac
-)
+AC_CHECK_HEADERS([uuid.h])
- # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1
(anno 2007)
- # FreeBSD and OpenBSD provides support as well
+ # check for libuuid from util-linux
+ save_LIBS=$LIBS
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_py
--- patches/patch-setup_py 1 Sep 2021 17:41:48 -0000 1.3
+++ patches/patch-setup_py 22 Nov 2021 00:40:10 -0000
@@ -12,16 +12,16 @@ Index: setup.py
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs))
-@@ -1770,7 +1772,7 @@ class PyBuildExt(build_ext):
- # Build the _uuid module if possible
- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
- if uuid_incs is not None:
-- if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
-+ if self.compiler.find_library_file(self.lib_dirs, 'uuid') and not
HOST_PLATFORM.startswith('openbsd'):
- uuid_libs = ['uuid']
+@@ -1773,7 +1775,7 @@ class PyBuildExt(build_ext):
+ uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
+ uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
+ if uuid_h or uuid_uuid_h:
+- if sysconfig.get_config_var("HAVE_LIBUUID"):
++ if sysconfig.get_config_var("HAVE_LIBUUID") and not
HOST_PLATFORM.startswith('openbsd'):
+ uuid_libs = ["uuid"]
else:
uuid_libs = []
-@@ -1993,8 +1995,7 @@ class PyBuildExt(build_ext):
+@@ -1995,8 +1997,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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 3 Nov 2021 19:07:18 -0000 1.13
+++ pkg/PLIST-main 22 Nov 2021 00:40:11 -0000
@@ -1852,8 +1852,8 @@ lib/python3.9/ensurepip/_bundled/__pycac
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
-lib/python3.9/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/pip-21.2.4-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
lib/python3.9/ensurepip/_uninstall.py
lib/python3.9/enum.py
lib/python3.9/filecmp.py
@@ -2052,9 +2052,9 @@ lib/python3.9/lib-dynload/
@so lib/python3.9/lib-dynload/zlib.cpython-39.so
lib/python3.9/lib2to3/
lib/python3.9/lib2to3/Grammar.txt
-lib/python3.9/lib2to3/Grammar3.9.7.final.0.pickle
+lib/python3.9/lib2to3/Grammar3.9.9.final.0.pickle
lib/python3.9/lib2to3/PatternGrammar.txt
-lib/python3.9/lib2to3/PatternGrammar3.9.7.final.0.pickle
+lib/python3.9/lib2to3/PatternGrammar3.9.9.final.0.pickle
lib/python3.9/lib2to3/__init__.py
lib/python3.9/lib2to3/__main__.py
lib/python3.9/lib2to3/__pycache__/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-tests
--- pkg/PLIST-tests 1 Sep 2021 17:41:48 -0000 1.5
+++ pkg/PLIST-tests 22 Nov 2021 00:40:12 -0000
@@ -531,6 +531,12 @@ lib/python3.9/test/__pycache__/ann_modul
lib/python3.9/test/__pycache__/ann_module3.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/ann_module3.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/ann_module3.cpython-39.pyc
+lib/python3.9/test/__pycache__/ann_module5.cpython-39.opt-1.pyc
+lib/python3.9/test/__pycache__/ann_module5.cpython-39.opt-2.pyc
+lib/python3.9/test/__pycache__/ann_module5.cpython-39.pyc
+lib/python3.9/test/__pycache__/ann_module6.cpython-39.opt-1.pyc
+lib/python3.9/test/__pycache__/ann_module6.cpython-39.opt-2.pyc
+lib/python3.9/test/__pycache__/ann_module6.cpython-39.pyc
lib/python3.9/test/__pycache__/audiotests.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/audiotests.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/audiotests.cpython-39.pyc
@@ -1971,6 +1977,8 @@ lib/python3.9/test/allsans.pem
lib/python3.9/test/ann_module.py
lib/python3.9/test/ann_module2.py
lib/python3.9/test/ann_module3.py
+lib/python3.9/test/ann_module5.py
+lib/python3.9/test/ann_module6.py
lib/python3.9/test/audiodata/
lib/python3.9/test/audiodata/pluck-alaw.aifc
lib/python3.9/test/audiodata/pluck-pcm16.aiff
@@ -3937,16 +3945,12 @@ lib/python3.9/tkinter/test/__pycache__/
lib/python3.9/tkinter/test/__pycache__/__init__.cpython-39.opt-1.pyc
lib/python3.9/tkinter/test/__pycache__/__init__.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/tkinter/test/__pycache__/runtktests.cpython-39.opt-1.pyc
-lib/python3.9/tkinter/test/__pycache__/runtktests.cpython-39.opt-2.pyc
-lib/python3.9/tkinter/test/__pycache__/runtktests.cpython-39.pyc
lib/python3.9/tkinter/test/__pycache__/support.cpython-39.opt-1.pyc
lib/python3.9/tkinter/test/__pycache__/support.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/__pycache__/support.cpython-39.pyc
lib/python3.9/tkinter/test/__pycache__/widget_tests.cpython-39.opt-1.pyc
lib/python3.9/tkinter/test/__pycache__/widget_tests.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/__pycache__/widget_tests.cpython-39.pyc
-lib/python3.9/tkinter/test/runtktests.py
lib/python3.9/tkinter/test/support.py
lib/python3.9/tkinter/test/test_tkinter/
lib/python3.9/tkinter/test/test_tkinter/__init__.py
@@ -4003,9 +4007,6 @@ lib/python3.9/tkinter/test/test_ttk/__py
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-39.opt-1.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_extensions.cpython-39.pyc
-lib/python3.9/tkinter/test/test_ttk/__pycache__/test_functions.cpython-39.opt-1.pyc
-lib/python3.9/tkinter/test/test_ttk/__pycache__/test_functions.cpython-39.opt-2.pyc
-lib/python3.9/tkinter/test/test_ttk/__pycache__/test_functions.cpython-39.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_style.cpython-39.opt-1.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_style.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_style.cpython-39.pyc
@@ -4013,7 +4014,6 @@ lib/python3.9/tkinter/test/test_ttk/__py
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_widgets.cpython-39.opt-2.pyc
lib/python3.9/tkinter/test/test_ttk/__pycache__/test_widgets.cpython-39.pyc
lib/python3.9/tkinter/test/test_ttk/test_extensions.py
-lib/python3.9/tkinter/test/test_ttk/test_functions.py
lib/python3.9/tkinter/test/test_ttk/test_style.py
lib/python3.9/tkinter/test/test_ttk/test_widgets.py
lib/python3.9/tkinter/test/widget_tests.py
