CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Nov  6 12:24:35 UTC 2021

Modified Files:
        pkgsrc/lang/py39-html-docs: Makefile distinfo
        pkgsrc/lang/python39: PLIST dist.mk distinfo
        pkgsrc/lang/python39/patches: patch-Makefile.pre.in patch-setup.py

Log Message:
python39 py39-html-docs: updated to 3.9.8

Python 3.9.8

Core and Builtins
bpo-30570: Fixed a crash in issubclass() from infinite recursion when searching pathological __bases__ tuples.
bpo-45494: Fix parser crash when reporting errors involving invalid continuation characters. Patch by Pablo Galindo.
bpo-45385: Fix reference leak from descr_check. Patch by Dong-hee Na.
bpo-45167: Fix deepcopying of types.GenericAlias objects.
bpo-44219: Release the GIL while performing isatty system calls on arbitrary file descriptors. In particular, this affects os.isatty(), os.device_encoding() and io.TextIOWrapper. By extension, 
io.open() in text mode is also affected. This change solves a deadlock in os.isatty(). Patch by Vincent Michel in bpo-44219.
bpo-44959: Added fallback to extension modules with ‘.sl’ suffix on HP-UX
bpo-44050: Extensions that indicate they use global state (by setting m_size to -1) can again be used in multiple interpreters. This reverts to behavior of Python 3.8.
bpo-45121: Fix issue where Protocol.__init__ raises RecursionError when it’s called directly or via super(). Patch provided by Yurii Karabas.
bpo-45083: When the interpreter renders an exception, its name now has a complete qualname. Previously only the class name was concatenated to the module name, which sometimes resulted in an 
incorrect full name being displayed.

(This issue impacted only the C code exception rendering, the traceback module was using qualname already).
Library
bpo-45678: Fix bug in Python 3.9 that meant functools.singledispatchmethod failed to properly wrap the attributes of the target method. Patch by Alex Waygood.
bpo-45679: Fix caching of multi-value typing.Literal. Literal[True, 2] is no longer equal to Literal[1, 2].
bpo-45438: Fix typing.Signature string representation for generic builtin types.
bpo-45581: sqlite3.connect() now correctly raises MemoryError if the underlying SQLite API signals memory error. Patch by Erlend E. Aasland.
bpo-39679: Fix bug in functools.singledispatchmethod that caused it to fail when attempting to register a classmethod() or staticmethod() using type annotations. Patch contributed by Alex Waygood.
bpo-45515: Add references to zoneinfo in the datetime documentation, mostly replacing outdated references to dateutil.tz. Change by Paul Ganssle.
bpo-45467: Fix incremental decoder and stream reader in the “raw-unicode-escape” codec. Previously they failed if the escape sequence was split.
bpo-45461: Fix incremental decoder and stream reader in the “unicode-escape” codec. Previously they failed if the escape sequence was split.
bpo-45239: Fixed email.utils.parsedate_tz() crashing with UnboundLocalError on certain invalid input instead of returning None. Patch by Ben Hoyt.
bpo-44904: Fix bug in the doctest module that caused it to fail if a docstring included an example with a classmethod property. Patch by Alex Waygood.
bpo-45406: Make inspect.getmodule() catch FileNotFoundError raised by :’func:inspect.getabsfile, and return None to indicate that the module could not be determined.
bpo-45262: Prevent use-after-free in asyncio. Make sure the cached running loop holder gets cleared on dealloc to prevent use-after-free in get_running_loop
bpo-45386: Make xmlrpc.client more robust to C runtimes where the underlying C strftime function results in a ValueError when testing for year formatting options.
bpo-45371: Fix clang rpath issue in distutils. The UnixCCompiler now uses correct clang option to add a runtime library directory (rpath) to a shared library.
bpo-20028: Improve error message of csv.Dialect when initializing. Patch by Vajrasky Kok and Dong-hee Na.
bpo-45343: Update bundled pip to 21.2.4 and setuptools to 58.1.0
bpo-41710: On Unix, if the sem_clockwait() function is available in the C library (glibc 2.30 and newer), the threading.Lock.acquire() method now uses the monotonic clock (time.CLOCK_MONOTONIC) for 
the timeout, rather than using the system clock (time.CLOCK_REALTIME), to not be affected by system clock changes. Patch by Victor Stinner.
bpo-45328: Fixed http.client.HTTPConnection to work properly in OSs that don’t support the TCP_NODELAY socket option.
bpo-1596321: Fix the threading._shutdown() function when the threading module was imported first from a thread different than the main thread: no longer log an error at Python exit.
bpo-45274: Fix a race condition in the Thread.join() method of the threading module. If the function is interrupted by a signal and the signal handler raises an exception, make sure that the thread 
remains in a consistent state to prevent a deadlock. Patch by Victor Stinner.
bpo-45238: Fix unittest.IsolatedAsyncioTestCase.debug(): it runs now asynchronous methods and callbacks.
bpo-36674: unittest.TestCase.debug() raises now a unittest.SkipTest if the class or the test method are decorated with the skipping decorator.
bpo-45235: Fix an issue where argparse would not preserve values in a provided namespace when using a subparser with defaults.
bpo-45234: Fixed a regression in copyfile(), copy(), copy2() raising FileNotFoundError when source is a directory, which should raise IsADirectoryError
bpo-45228: Fix stack buffer overflow in parsing J1939 network address.
bpo-45192: Fix the tempfile._infer_return_type function so that the dir argument of the tempfile functions accepts an object implementing the os.PathLike protocol.

Patch by Kyungmin Lee.
bpo-45160: When tracing a tkinter variable used by a ttk OptionMenu, callbacks are no longer made twice.
bpo-35474: Calling mimetypes.guess_all_extensions() with strict=False no longer affects the result of the following call with strict=True. Also, mutating the returned list no longer affects the 
global state.
bpo-45166: typing.get_type_hints() now works with Final wrapped in ForwardRef.
bpo-45097: Remove deprecation warnings about the loop argument in asyncio incorrectly emitted in cases when the user does not pass the loop argument.
bpo-45081: Fix issue when dataclasses that inherit from typing.Protocol subclasses have wrong __init__. Patch provided by Yurii Karabas.
bpo-24444: Fixed an error raised in argparse help display when help for an option is set to 1+ blank spaces or when choices arg is an empty container.
bpo-45021: Fix a potential deadlock at shutdown of forked children when using concurrent.futures module
bpo-45030: Fix integer overflow in pickling and copying the range iterator.
bpo-39039: tarfile.open raises ReadError when a zlib error occurs during file extraction.
bpo-44594: Fix an edge case of ExitStack and AsyncExitStack exception chaining. They will now match with block behavior when __context__ is explicitly set to None when the exception is in flight.
Documentation
bpo-45726: Improve documentation for functools.singledispatch() and functools.singledispatchmethod.
bpo-45680: Amend the docs on GenericAlias objects to clarify that non-container classes can also implement __class_getitem__. Patch contributed by Alex Waygood.
bpo-45655: Add a new “relevant PEPs” section to the top of the documentation for the typing module. Patch by Alex Waygood.
bpo-45604: Add level argument to multiprocessing.log_to_stderr function docs.
bpo-45464: Mention in the documentation of Built-in Exceptions that inheriting from multiple exception types in a single subclass is not recommended due to possible memory layout incompatibility.
bpo-45449: Add note about PEP 585 in collections.abc.
bpo-45516: Add protocol description to the importlib.abc.Traversable documentation.
bpo-20692: Add Programming FAQ entry explaining that int literal attribute access requires either a space after or parentheses around the literal.
bpo-45216: Remove extra documentation listing methods in difflib. It was rendering twice in pydoc and was outdated in some places.
Tests
bpo-45578: Add tests for dis.distb()
bpo-45577: Add subtests for all pickle protocols in test_zoneinfo.
bpo-43592: test.libregrtest now raises the soft resource limit for the maximum number of file descriptors when the default is too low for our test suite as was often the case on macOS.
bpo-40173: Fix test.support.import_helper.import_fresh_module().
bpo-45280: Add a test case for empty typing.NamedTuple.
bpo-45269: Cover case when invalid markers type is supplied to c_make_encoder.
bpo-45209: Fix UserWarning: resource_tracker warning in _test_multiprocessing._TestSharedMemory.test_shared_memory_cleaned_after_process_termination
bpo-45195: Fix test_readline.test_nonascii(): sometimes, the newline character is not written at the end, so don’t expect it in the output. Patch by Victor Stinner.
bpo-45156: Fixes infinite loop on unittest.mock.seal() of mocks created by create_autospec().
bpo-45042: Fixes that test classes decorated with @hashlib_helper.requires_hashdigest were skipped all the time.
Build
bpo-43158: setup.py now uses values from configure script to build the _uuid extension module. Configure now detects util-linux’s libuuid, too.
bpo-45571: Modules/Setup now use PY_CFLAGS_NODIST instead of PY_CFLAGS to compile shared modules.
bpo-45532: Update sys.version to use main as fallback information. Patch by Jeong YunWon.
bpo-45405: Prevent internal configure error when running configure with recent versions of non-Apple clang. Patch by David Bohman.
bpo-45220: Avoid building with the Windows 11 SDK previews automatically. This may be overridden by setting the DefaultWindowsSDKVersion environment variable before building.
Windows
bpo-45337: venv now warns when the created environment may need to be accessed at a different path, due to redirections, links or junctions. It also now correctly installs or upgrades components when 
the alternate path is required.
macOS
bpo-44828: Avoid tkinter file dialog failure on macOS 12 Monterey when using the Tk 8.6.11 provided by python.org macOS installers. Patch by Marc Culler of the Tk project.
IDLE
bpo-45296: On Windows, change exit/quit message to suggest Ctrl-D, which works, instead of <Ctrl-Z Return>, which does not work in IDLE.
C API
bpo-44687: BufferedReader.peek() no longer raises ValueError when the entire file has already been buffered.
bpo-44751: Remove crypt.h include from the public Python.h header.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/py39-html-docs/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/py39-html-docs/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python39/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python39/dist.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python39/patches/patch-Makefile.pre.in
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python39/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/py39-html-docs/Makefile
diff -u pkgsrc/lang/py39-html-docs/Makefile:1.8 pkgsrc/lang/py39-html-docs/Makefile:1.9
--- pkgsrc/lang/py39-html-docs/Makefile:1.8     Wed Sep  1 13:53:58 2021
+++ pkgsrc/lang/py39-html-docs/Makefile Sat Nov  6 12:24:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2021/09/01 13:53:58 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/11/06 12:24:35 adam Exp $
 
-VERS=          3.9.7
+VERS=          3.9.8
 DISTNAME=      python-${VERS}-docs-html
 PKGNAME=       py39-html-docs-${VERS}
 CATEGORIES=    lang python

Index: pkgsrc/lang/py39-html-docs/distinfo
diff -u pkgsrc/lang/py39-html-docs/distinfo:1.10 pkgsrc/lang/py39-html-docs/distinfo:1.11
--- pkgsrc/lang/py39-html-docs/distinfo:1.10    Tue Oct 26 10:51:51 2021
+++ pkgsrc/lang/py39-html-docs/distinfo Sat Nov  6 12:24:35 2021
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:51:51 nia Exp $
+$NetBSD: distinfo,v 1.11 2021/11/06 12:24:35 adam Exp $
 
-BLAKE2s (python-3.9.7-docs-html.tar.bz2) = fa6080dc57edeef32be7a0d1d0f48b530a6ed40d44fbe8c2b516e226f55dccb2
-SHA512 (python-3.9.7-docs-html.tar.bz2) = 50b08fe5475bddf21568e7a9692d0e83d1107c7918e02ba6da9e6416dbbaa8b2227911bb1757c79491ed6f11f3f6aa9bd4d666840ae8cbf98cfc9511d8103b65
-Size (python-3.9.7-docs-html.tar.bz2) = 6953294 bytes
+BLAKE2s (python-3.9.8-docs-html.tar.bz2) = bab2d3341a7f59f27f532d18ba213f3ea0a96599c5e17892c98a197ad59b59bd
+SHA512 (python-3.9.8-docs-html.tar.bz2) = fc1405a56df583d961f7073efdb504eb58a8c405db069d46932106502d467d039acf8334721c4777b5a6100c3beb78643f223b54c29dbaf0e1915a46bca326bc
+Size (python-3.9.8-docs-html.tar.bz2) = 6959296 bytes

Index: pkgsrc/lang/python39/PLIST
diff -u pkgsrc/lang/python39/PLIST:1.7 pkgsrc/lang/python39/PLIST:1.8
--- pkgsrc/lang/python39/PLIST:1.7      Wed Sep  1 13:53:58 2021
+++ pkgsrc/lang/python39/PLIST  Sat Nov  6 12:24:34 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/09/01 13:53:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/11/06 12:24:34 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1419,8 +1419,8 @@ lib/python${PY_VER_SUFFIX}/ensurepip/__m
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/__init__.pyo
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/pip-21.2.4-py3-none-any.whl
+lib/python${PY_VER_SUFFIX}/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.py
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyc
 lib/python${PY_VER_SUFFIX}/ensurepip/_uninstall.pyo
@@ -2661,6 +2661,12 @@ lib/python${PY_VER_SUFFIX}/test/ann_modu
 lib/python${PY_VER_SUFFIX}/test/ann_module3.py
 lib/python${PY_VER_SUFFIX}/test/ann_module3.pyc
 lib/python${PY_VER_SUFFIX}/test/ann_module3.pyo
+lib/python${PY_VER_SUFFIX}/test/ann_module5.py
+lib/python${PY_VER_SUFFIX}/test/ann_module5.pyc
+lib/python${PY_VER_SUFFIX}/test/ann_module5.pyo
+lib/python${PY_VER_SUFFIX}/test/ann_module6.py
+lib/python${PY_VER_SUFFIX}/test/ann_module6.pyc
+lib/python${PY_VER_SUFFIX}/test/ann_module6.pyo
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-alaw.aifc
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.aiff
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.au
@@ -5273,9 +5279,6 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/__init__.pyo
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.py
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.pyc
-lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.pyo
@@ -5318,9 +5321,6 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.pyo
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.py
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.pyc
-lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.pyo

Index: pkgsrc/lang/python39/dist.mk
diff -u pkgsrc/lang/python39/dist.mk:1.8 pkgsrc/lang/python39/dist.mk:1.9
--- pkgsrc/lang/python39/dist.mk:1.8    Wed Sep  1 13:53:58 2021
+++ pkgsrc/lang/python39/dist.mk        Sat Nov  6 12:24:34 2021
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.8 2021/09/01 13:53:58 adam Exp $
+# $NetBSD: dist.mk,v 1.9 2021/11/06 12:24:34 adam Exp $
 
-PY_DISTVERSION=        3.9.7
+PY_DISTVERSION=        3.9.8
 DISTNAME=      Python-${PY_DISTVERSION}
 EXTRACT_SUFX=  .tar.xz
 DISTINFO_FILE= ${.CURDIR}/../../lang/python39/distinfo

Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.15 pkgsrc/lang/python39/distinfo:1.16
--- pkgsrc/lang/python39/distinfo:1.15  Tue Oct 26 10:51:52 2021
+++ pkgsrc/lang/python39/distinfo       Sat Nov  6 12:24:34 2021
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:51:52 nia Exp $
+$NetBSD: distinfo,v 1.16 2021/11/06 12:24:34 adam Exp $
 
-BLAKE2s (Python-3.9.7.tar.xz) = 17cac6dd4cac64e31ac9294c7620b9d8111f8c90a81b7cc27d0802f99a94a834
-SHA512 (Python-3.9.7.tar.xz) = 55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735
-Size (Python-3.9.7.tar.xz) = 19123232 bytes
+BLAKE2s (Python-3.9.8.tar.xz) = dddad609ad714df8278550753754983ad876500daf2d399dcd38cd0bc9b02266
+SHA512 (Python-3.9.8.tar.xz) = 5d5b46a242525b2e6a7f9c69c63c6d7cd985e1443a7d9b716107e75f14fef7b5c9c2e5e8a90adbbbf5f7a8b90a483d01e18c1732470e6e54b611b5aba9f99fe1
+Size (Python-3.9.8.tar.xz) = 19149464 bytes
 SHA1 (patch-Lib_ctypes_util.py) = 032cc99ebad93ddddfd89073c60424a952e3faa3
 SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 2e65a8dd5dd3fe25957206c062106fa7a6fc4e69
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2
 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
-SHA1 (patch-Makefile.pre.in) = d42f9f5bca1dd663f64122dc95b49111452fe6e8
+SHA1 (patch-Makefile.pre.in) = dd5ff571ac9fe2dc2e41fa678261d8e3648ac908
 SHA1 (patch-Modules___ssl.c) = f241ba148e4c244a641386be5ac07817b03f04f7
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
@@ -18,4 +18,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = d44439b22e8444141e2632b9fd9b1f343b38b712
 SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = 0ea2e4183f7c11ff893ca302aafe8bb9bea80d6c
+SHA1 (patch-setup.py) = 939e4e4f2641ca983b1f3c0328bd549ebf2b338a

Index: pkgsrc/lang/python39/patches/patch-Makefile.pre.in
diff -u pkgsrc/lang/python39/patches/patch-Makefile.pre.in:1.1 pkgsrc/lang/python39/patches/patch-Makefile.pre.in:1.2
--- pkgsrc/lang/python39/patches/patch-Makefile.pre.in:1.1      Sat Oct 10 20:20:12 2020
+++ pkgsrc/lang/python39/patches/patch-Makefile.pre.in  Sat Nov  6 12:24:35 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.pre.in,v 1.1 2020/10/10 20:20:12 adam Exp $
+$NetBSD: patch-Makefile.pre.in,v 1.2 2021/11/06 12:24:35 adam Exp $
 
 Use only one optimisation level; needed for PLIST and setuptools compatibility.
 Do not build/install libpython3.so.
 Simplify _sysconfigdata to include only platform name.
 Swap targets libinstall and libainstall, to byte-compile python-config.py.
 
---- Makefile.pre.in.orig       2019-08-29 21:59:20.000000000 +0000
+--- Makefile.pre.in.orig       2021-11-05 19:21:41.000000000 +0000
 +++ Makefile.pre.in
 @@ -100,7 +100,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
@@ -15,8 +15,8 @@ Swap targets libinstall and libainstall,
 +PY_LDFLAGS=   -L. $(CONFIGURE_LDFLAGS) $(LDFLAGS)
  PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
  NO_AS_NEEDED= @NO_AS_NEEDED@
- SGI_ABI=      @SGI_ABI@
-@@ -222,7 +222,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
+ CCSHARED=     @CCSHARED@
+@@ -232,7 +232,7 @@ DIST=              $(DISTFILES) $(DISTDIRS)
  LIBRARY=      @LIBRARY@
  LDLIBRARY=      @LDLIBRARY@
  BLDLIBRARY=     @BLDLIBRARY@
@@ -25,7 +25,7 @@ Swap targets libinstall and libainstall,
  DLLLIBRARY=   @DLLLIBRARY@
  LDLIBRARYDIR=   @LDLIBRARYDIR@
  INSTSONAME=   @INSTSONAME@
-@@ -923,8 +923,6 @@ regen-opcode-targets:
+@@ -984,8 +984,6 @@ regen-opcode-targets:
                $(srcdir)/Python/opcode_targets.h.new
        $(UPDATE_FILE) $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/opcode_targets.h.new
  
@@ -34,7 +34,7 @@ Swap targets libinstall and libainstall,
  
  Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_external.h \
                $(srcdir)/Python/importlib_zipimport.h
-@@ -934,7 +932,7 @@ Python/frozen.o: $(srcdir)/Python/import
+@@ -995,7 +993,7 @@ Python/frozen.o: $(srcdir)/Python/import
  # an include guard, so we can't use a pipeline to transform its output.
  Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
        $(MKDIR_P) Include
@@ -43,7 +43,7 @@ Swap targets libinstall and libainstall,
        : sed in-place edit with POSIX-only tools
        sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
        mv $@.tmp $@
-@@ -944,7 +942,7 @@ Python/import.o: $(srcdir)/Include/pydtr
+@@ -1005,7 +1003,7 @@ Python/import.o: $(srcdir)/Include/pydtr
  Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
  
  Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
@@ -52,7 +52,7 @@ Swap targets libinstall and libainstall,
  
  Objects/typeobject.o: Objects/typeslots.inc
  
-@@ -1187,7 +1185,7 @@ altinstall: commoninstall
+@@ -1269,7 +1267,7 @@ altinstall: commoninstall
        fi
  
  commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
@@ -61,7 +61,7 @@ Swap targets libinstall and libainstall,
                sharedinstall oldsharedinstall altmaninstall \
                @FRAMEWORKALTINSTALLLAST@
  
-@@ -1246,7 +1244,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1328,7 +1326,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
                if test -n "$(PY3LIBRARY)"; then \
                        $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
                fi; \
@@ -71,7 +71,7 @@ Swap targets libinstall and libainstall,
        fi
        if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
                rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
-@@ -1443,7 +1442,7 @@ libinstall:      build_all $(srcdir)/Modules/
+@@ -1542,7 +1541,7 @@ libinstall:      build_all $(srcdir)/Modules/
                        esac; \
                done; \
        done
@@ -80,7 +80,7 @@ Swap targets libinstall and libainstall,
                $(DESTDIR)$(LIBDEST); \
        $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
        if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
-@@ -1461,11 +1460,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1560,11 +1559,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
                $(DESTDIR)$(LIBDEST)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -92,7 +92,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -j0 -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-@@ -1474,10 +1468,6 @@ libinstall:     build_all $(srcdir)/Modules/
+@@ -1573,10 +1567,6 @@ libinstall:     build_all $(srcdir)/Modules/
                -j0 -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -103,7 +103,7 @@ Swap targets libinstall and libainstall,
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-@@ -1599,7 +1589,7 @@ sharedinstall: sharedmods
+@@ -1698,7 +1688,7 @@ sharedinstall: sharedmods
                --install-scripts=$(BINDIR) \
                --install-platlib=$(DESTSHARED) \
                --root=$(DESTDIR)/

Index: pkgsrc/lang/python39/patches/patch-setup.py
diff -u pkgsrc/lang/python39/patches/patch-setup.py:1.4 pkgsrc/lang/python39/patches/patch-setup.py:1.5
--- pkgsrc/lang/python39/patches/patch-setup.py:1.4     Tue Dec  8 14:30:40 2020
+++ pkgsrc/lang/python39/patches/patch-setup.py Sat Nov  6 12:24:35 2021
@@ -1,12 +1,11 @@
-$NetBSD: patch-setup.py,v 1.4 2020/12/08 14:30:40 adam Exp $
+$NetBSD: patch-setup.py,v 1.5 2021/11/06 12:24:35 adam Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
 Assume panel_library is correct; this is a fix for ncurses' gnupanel
 which will get transformed to panel in buildlink.
-Also look for uuid/uuid.h.
 
---- setup.py.orig      2020-12-07 14:02:38.000000000 +0000
+--- setup.py.orig      2021-11-05 19:21:41.000000000 +0000
 +++ setup.py
 @@ -30,7 +30,7 @@ except ImportError:
      SUBPROCESS_BOOTSTRAP = True
@@ -43,7 +42,7 @@ Also look for uuid/uuid.h.
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
      and returns a possibly-empty list of additional directories, or None
-@@ -725,15 +735,15 @@ class PyBuildExt(build_ext):
+@@ -728,15 +738,15 @@ class PyBuildExt(build_ext):
                          add_dir_to_list(dir_list, directory)
  
      def configure_compiler(self):
@@ -68,7 +67,7 @@ Also look for uuid/uuid.h.
          self.add_multiarch_paths()
          self.add_ldflags_cppflags()
  
-@@ -781,6 +791,9 @@ class PyBuildExt(build_ext):
+@@ -784,6 +794,9 @@ class PyBuildExt(build_ext):
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
  
          if MACOS:
@@ -78,7 +77,7 @@ Also look for uuid/uuid.h.
              # This should work on any unixy platform ;-)
              # If the user has bothered specifying additional -I and -L flags
              # in OPT and LDFLAGS we might as well use them here.
-@@ -998,8 +1011,6 @@ class PyBuildExt(build_ext):
+@@ -1001,8 +1014,6 @@ class PyBuildExt(build_ext):
          # use the same library for the readline and curses modules.
          if 'curses' in readline_termcap_library:
              curses_library = readline_termcap_library
@@ -87,7 +86,7 @@ Also look for uuid/uuid.h.
          # Issue 36210: OSS provided ncurses does not link on AIX
          # Use IBM supplied 'curses' for successful build of _curses
          elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1101,8 +1112,7 @@ class PyBuildExt(build_ext):
+@@ -1104,8 +1115,7 @@ class PyBuildExt(build_ext):
          # If the curses module is enabled, check for the panel module
          # _curses_panel needs some form of ncurses
          skip_curses_panel = True if AIX else False
@@ -97,7 +96,7 @@ Also look for uuid/uuid.h.
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1353,6 +1363,31 @@ class PyBuildExt(build_ext):
+@@ -1356,6 +1366,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
@@ -129,7 +128,7 @@ Also look for uuid/uuid.h.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1364,7 +1399,7 @@ class PyBuildExt(build_ext):
+@@ -1367,7 +1402,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -138,16 +137,7 @@ Also look for uuid/uuid.h.
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -1764,6 +1799,8 @@ class PyBuildExt(build_ext):
-     def detect_uuid(self):
-         # Build the _uuid module if possible
-         uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
-+        if uuid_incs is None:
-+            uuid_incs = find_file("uuid/uuid.h", self.inc_dirs, [])
-         if uuid_incs is not None:
-             if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
-                 uuid_libs = ['uuid']
-@@ -2200,10 +2237,7 @@ class PyBuildExt(build_ext):
+@@ -2207,10 +2242,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
@@ -159,7 +149,7 @@ Also look for uuid/uuid.h.
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2583,7 +2617,7 @@ def main():
+@@ -2595,7 +2627,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in