 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2023/11/23 12:43:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2024/01/13 04:24:28 riastradh Exp $
 .include "dist.mk"
 PKGNAME=	python310-${PY_DISTVERSION}
 PKGREVISION=	4
 CATEGORIES=	lang python
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 LICENSE=	python-software-foundation
 CONFLICTS+=	python-[0-9]*
 @@ -28,26 +28,27 @@ SUPERSEDES+=	py310-sqlite3-[0-9]*
 PLIST_AWK=		-f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=		PYVERS=310
 PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.pyc$$/ {
 PRINT_PLIST_AWK+=	sub(/__pycache__\//, "")
 PRINT_PLIST_AWK+=	sub(/\.cpython-310/, "")}
 PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
 PRINT_PLIST_AWK+=	sub(/.opt-[12].pyc$$/, ".pyo")}
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-readline=readline # XXX editline?
 CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-ffi
 CONFIGURE_ARGS+=	--without-ensurepip
 CONFIGURE_ENV+=		OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=		ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 PKGCONFIG_OVERRIDE+=	Misc/python.pc.in Misc/python-embed.pc.in
 # NetBSD-8 curses has enough support for py-curses
 USE_CURSES=		getsyx wide
 # But we build as ncurses still to get the full feature set easily
 FAKE_NCURSES=		yes
 PTHREAD_OPTS+=	require

 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.27 2023/11/10 09:48:40 nia Exp $
+$NetBSD: distinfo,v 1.28 2024/01/13 04:24:28 riastradh Exp $
 BLAKE2s (Python-3.10.13.tar.xz) = c714daeb2437980ce940e76db70f037d844bcddc06dddb6ac966cef281a2b514
 SHA512 (Python-3.10.13.tar.xz) = 7579772e501486b2b07f78142082dee1e99c7643640098860ac0cf2ca87daf7588b0c00b1db1960146b37f56a6ed98fd08297c25c9a19b612cf6e6a258984da8
 Size (Python-3.10.13.tar.xz) = 19663088 bytes
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 8a91e8f4f86517a62408c3a10ed5eb50c4091fbf
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Lib_test_test__shutil.py) = 2eb724d490544e77610a19a07dc0f9336dba3e2f
 SHA1 (patch-Makefile.pre.in) = 932a89313e8f26c435675f2487eb2141876a5f5a
 SHA1 (patch-Modules_clinic_posixmodule.c.h) = 3729243da6b4df47a956db9b784b056189c6403e
 SHA1 (patch-Modules_posixmodule.c) = 1a1b866c9190fda8ca9c547085614b0f1d5469e1
 SHA1 (patch-Modules_socketmodule.c) = 3e2db474b4ef08edd25528465605fff1d3d0f61b
 SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = b8efa178380fe48da4a0bf2bfa906851a314824e
 SHA1 (patch-configure) = 8ffe98e51407d10e46e7d1531f2e0e0b58e1cfa6
 SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = 5ab776a53ad361fdea9004817a7157743ab42db7
+SHA1 (patch-setup.py) = 5d1907202ad38286b92f41a553f34cf87c965213

 @@ -1,24 +1,27 @@
-$NetBSD: patch-setup.py,v 1.7 2023/10/23 06:36:00 wiz Exp $
+$NetBSD: patch-setup.py,v 1.8 2024/01/13 04:24:28 riastradh 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.
 Don't search for modules in PREFIX. Fixes build failure when py-setuptools
   are installed.
 Enable cross-build by setting sys._home and sys.path to build directory
 Disable circuitous readline detection which tries to outsmart pkgsrc's
 static choice of libreadline and (fake-)ncurses and trips over its elven
 shoelaces when cross-compiling.
---- setup.py.orig	2022-03-23 20:12:04.000000000 +0000
+--- setup.py.orig	2023-08-24 12:46:25.000000000 +0000
 +++ setup.py
 @@ -1,5 +1,11 @@
  # Autodetecting setup.py script for building the Python extensions
 +import sys
 +sys._home = __file__[:-len('/setup.py')]
 +sys.path.append(__file__[:-len('/setup.py')] + '/Lib')
 +with open('pybuilddir.txt') as pybuilddir:
 +    sys.path.append(__file__[:-len('/setup.py')] + '/' + next(pybuilddir))
++
  import argparse
  import importlib._bootstrap
  import importlib.machinery
 @@ -54,81 +57,147 @@ Enable cross-build by setting sys._home
 +def grep_headers_for(function, headers):
 +    for header in headers:
 +        try:
 +            with open(header, 'r') as f:
 +                if function in f.read():
 +                    return True
 +        except UnicodeDecodeError:
 +            pass
 +    return False
++
  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
-@@ -823,15 +841,15 @@ class PyBuildExt(build_ext):
+@@ -822,15 +840,15 @@ class PyBuildExt(build_ext):
                          add_dir_to_list(dir_list, directory)
      def configure_compiler(self):
 -        # Ensure that /usr/local is always used, but the local build
 -        # directories (i.e. '.' and 'Include') must be first.  See issue
 -        # 10520.
 -        if not CROSS_COMPILING:
 -            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 -        # only change this for cross builds for 3.3, issues on Mageia
 -        if CROSS_COMPILING:
 -            self.add_cross_compiling_paths()
 +        # Add the buildlink directories for pkgsrc
 +        if os.environ.get('BUILDLINK_DIR'):
 +            dir = os.environ['BUILDLINK_DIR']
 +            libdir = dir + '/lib'
 +            incdir = dir + '/include'
 +            if libdir not in self.compiler.library_dirs:
 +                self.compiler.library_dirs.insert(0, libdir)
 +            if incdir not in self.compiler.include_dirs:
 +                self.compiler.include_dirs.insert(0, incdir)
          self.add_multiarch_paths()
          self.add_ldflags_cppflags()
-@@ -879,6 +897,9 @@ class PyBuildExt(build_ext):
+@@ -878,6 +896,9 @@ class PyBuildExt(build_ext):
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
          if MACOS:
 +            self.inc_dirs.append(macosx_sdk_root() + '/usr/include')
 +            self.lib_dirs.append(macosx_sdk_root() + '/usr/lib')
++
              # 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.
-@@ -1106,8 +1127,6 @@ class PyBuildExt(build_ext):
+@@ -1067,71 +1088,10 @@ class PyBuildExt(build_ext):
-         # use the same library for the readline and curses modules.
+     def detect_readline_curses(self):
-         if 'curses' in readline_termcap_library:
+         # readline
-             curses_library = readline_termcap_library
+         readline_termcap_library = ""
 -        curses_library = ""
 -        # Cannot use os.popen here in py3k.
 -        tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
 -        if not os.path.exists(self.build_temp):
 -            os.makedirs(self.build_temp)
 -        # Determine if readline is already linked against curses or tinfo.
 -        if sysconfig.get_config_var('HAVE_LIBREADLINE'):
 -            if sysconfig.get_config_var('WITH_EDITLINE'):
 -                readline_lib = 'edit'
 -            else:
 -                readline_lib = 'readline'
 -            do_readline = self.compiler.find_library_file(self.lib_dirs,
 -                readline_lib)
 -            if CROSS_COMPILING:
 -                ret = run_command("%s -d %s | grep '(NEEDED)' > %s"
 -                                % (sysconfig.get_config_var('READELF'),
 -                                   do_readline, tmpfile))
 -            elif find_executable('ldd'):
 -                ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
 -            else:
 -                ret = 1
 -            if ret == 0:
 -                with open(tmpfile) as fp:
 -                    for ln in fp:
 -                        if 'curses' in ln:
 -                            readline_termcap_library = re.sub(
 -                                r'.*lib(n?cursesw?)\.so.*', r'\1', ln
 -                            ).rstrip()
 -                            break
 -                        # termcap interface split out from ncurses
 -                        if 'tinfo' in ln:
 -                            readline_termcap_library = 'tinfo'
 -                            break
 -            if os.path.exists(tmpfile):
 -                os.unlink(tmpfile)
 -        else:
 -            do_readline = False
 -        # Issue 7384: If readline is already linked against curses,
 -        # use the same library for the readline and curses modules.
 -        if 'curses' in readline_termcap_library:
 -            curses_library = readline_termcap_library
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
 -            curses_library = 'ncursesw'
-         # Issue 36210: OSS provided ncurses does not link on AIX
+-        # Issue 36210: OSS provided ncurses does not link on AIX
-         # Use IBM supplied 'curses' for successful build of _curses
+-        # Use IBM supplied 'curses' for successful build of _curses
-         elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
+-        elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1211,8 +1230,7 @@ class PyBuildExt(build_ext):
+-            curses_library = 'curses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
 -            curses_library = 'ncurses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
 -            curses_library = 'curses'
 +        curses_library = "ncurses"
 +        do_readline = True
 +        readline_lib = 'readline'
 -        if MACOS:
 -            os_release = int(os.uname()[2].split('.')[0])
 -            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
 -            if (dep_target and
 -                    (tuple(int(n) for n in dep_target.split('.')[0:2])
 -                        < (10, 5) ) ):
 -                os_release = 8
 -            if os_release < 9:
 -                # MacOSX 10.4 has a broken readline. Don't try to build
 -                # the readline module unless the user has installed a fixed
 -                # readline package
 -                if find_file('readline/rlconf.h', self.inc_dirs, []) is None:
 -                    do_readline = False
          if do_readline:
              if MACOS and os_release < 9:
                  # In every directory on the search path search for a dynamic
@@ -1213,8 +1173,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
 -        if (curses_enabled and not skip_curses_panel and
 -                self.compiler.find_library_file(self.lib_dirs, panel_library)):
 +        if curses_enabled and not skip_curses_panel:
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1457,6 +1475,31 @@ class PyBuildExt(build_ext):
+@@ -1459,6 +1418,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
 +            # Top half based on find_file
 +            def find_ndbm_h(dirs):
 +                ret = None
 +                if MACOS:
 +                    sysroot = macosx_sdk_root()
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if MACOS and is_macosx_sdk_path(dir):
 +                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f):
 @@ -140,43 +209,43 @@ Enable cross-build by setting sys._home
 +                        line = input.readline()
 +                        if not line:
 +                            break
 +                        if re.search('This file is part of GDBM', line):
 +                            ret = None
 +                            break
 +                    input.close()
 +                    break
 +                return ret
++
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1468,7 +1511,7 @@ class PyBuildExt(build_ext):
+@@ -1470,7 +1454,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
 -                    if find_file("ndbm.h", self.inc_dirs, []) is not None:
 +                    if find_ndbm_h(self.inc_dirs) is not None:
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -2328,10 +2371,7 @@ class PyBuildExt(build_ext):
+@@ -2333,10 +2317,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
 -            include_dirs = [os.path.abspath(os.path.join(self.srcdir,
 -                                                         'Modules',
 -                                                         '_decimal',
 -                                                         'libmpdec'))]
 +            include_dirs = ['Modules/_decimal/libmpdec']
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2747,7 +2787,7 @@ def main():
+@@ -2752,7 +2733,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
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 +          scripts = ["Tools/scripts/pydoc3",
                       "Tools/scripts/2to3"]
+         )

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.23 2023/12/28 13:12:24 thor Exp $
+# $NetBSD: Makefile,v 1.24 2024/01/13 04:24:28 riastradh Exp $
 .include "dist.mk"
 PKGNAME=	python311-${PY_DISTVERSION}
 CATEGORIES=	lang python
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 LICENSE=	python-software-foundation
 CONFLICTS+=	python-[0-9]*
 CONFLICTS+=	py311-cElementTree-[0-9]*
 @@ -28,26 +28,27 @@ PLIST_AWK=		-f ${PKGSRCDIR}/lang/python/
 PLIST_AWK_ENV+=		PYVERS=311
 PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.pyc$$/ {
 PRINT_PLIST_AWK+=	sub(/__pycache__\//, "")
 PRINT_PLIST_AWK+=	sub(/\.cpython-311/, "")}
 PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
 PRINT_PLIST_AWK+=	sub(/.opt-[12].pyc$$/, ".pyo")}
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 USE_CC_FEATURES+=	c11
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-readline=readline # XXX editline?
 CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-ffi
 CONFIGURE_ARGS+=	--without-ensurepip
 CONFIGURE_ENV+=		OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=		ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 PKGCONFIG_OVERRIDE+=	Misc/python.pc.in Misc/python-embed.pc.in
 # NetBSD-8 curses has enough support for py-curses
 USE_CURSES=		getsyx wide
 # But we build as ncurses still to get the full feature set easily
 FAKE_NCURSES=		yes
 PTHREAD_OPTS+=	require

 @@ -1,25 +1,28 @@
-$NetBSD: patch-setup.py,v 1.2 2023/10/23 06:36:00 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2024/01/13 04:24:28 riastradh 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.
 Don't search for modules in PREFIX. Fixes build failure when py-setuptools
   are installed.
 Enable cross-build by setting sys._home and sys.path to build directory
 Module _crypt might need -lcrypt (taken from Python 3.10).
 Disable circuitous readline detection which tries to outsmart pkgsrc's
 static choice of libreadline and (fake-)ncurses and trips over its elven
 shoelaces when cross-compiling.
---- setup.py.orig	2022-10-24 17:35:39.000000000 +0000
+--- setup.py.orig	2023-12-04 17:56:29.000000000 +0000
 +++ setup.py
 @@ -1,5 +1,11 @@
  # Autodetecting setup.py script for building the Python extensions
 +import sys
 +sys._home = __file__[:-len('/setup.py')]
 +sys.path.append(__file__[:-len('/setup.py')] + '/Lib')
 +with open('pybuilddir.txt') as pybuilddir:
 +    sys.path.append(__file__[:-len('/setup.py')] + '/' + next(pybuilddir))
++
  import argparse
  import importlib._bootstrap
  import importlib.machinery
 @@ -90,59 +93,125 @@ Module _crypt might need -lcrypt (taken
          self.add_multiarch_paths()
          self.add_ldflags_cppflags()
 @@ -899,6 +917,9 @@ class PyBuildExt(build_ext):
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
          if MACOS:
 +            self.inc_dirs.append(macosx_sdk_root() + '/usr/include')
 +            self.lib_dirs.append(macosx_sdk_root() + '/usr/lib')
++
              # 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.
-@@ -1074,8 +1095,6 @@ class PyBuildExt(build_ext):
+@@ -1036,71 +1057,10 @@ class PyBuildExt(build_ext):
-         # use the same library for the readline and curses modules.
+     def detect_readline_curses(self):
-         if 'curses' in readline_termcap_library:
+         # readline
-             curses_library = readline_termcap_library
+         readline_termcap_library = ""
 -        curses_library = ""
 -        # Cannot use os.popen here in py3k.
 -        tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
 -        if not os.path.exists(self.build_temp):
 -            os.makedirs(self.build_temp)
 -        # Determine if readline is already linked against curses or tinfo.
 -        if sysconfig.get_config_var('HAVE_LIBREADLINE'):
 -            if sysconfig.get_config_var('WITH_EDITLINE'):
 -                readline_lib = 'edit'
 -            else:
 -                readline_lib = 'readline'
 -            do_readline = self.compiler.find_library_file(self.lib_dirs,
 -                readline_lib)
 -            if CROSS_COMPILING:
 -                ret = run_command("%s -d %s | grep '(NEEDED)' > %s"
 -                                % (sysconfig.get_config_var('READELF'),
 -                                   do_readline, tmpfile))
 -            elif find_executable('ldd'):
 -                ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
 -            else:
 -                ret = 1
 -            if ret == 0:
 -                with open(tmpfile) as fp:
 -                    for ln in fp:
 -                        if 'curses' in ln:
 -                            readline_termcap_library = re.sub(
 -                                r'.*lib(n?cursesw?)\.so.*', r'\1', ln
 -                            ).rstrip()
 -                            break
 -                        # termcap interface split out from ncurses
 -                        if 'tinfo' in ln:
 -                            readline_termcap_library = 'tinfo'
 -                            break
 -            if os.path.exists(tmpfile):
 -                os.unlink(tmpfile)
 -        else:
 -            do_readline = False
 -        # Issue 7384: If readline is already linked against curses,
 -        # use the same library for the readline and curses modules.
 -        if 'curses' in readline_termcap_library:
 -            curses_library = readline_termcap_library
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
 -            curses_library = 'ncursesw'
-         # Issue 36210: OSS provided ncurses does not link on AIX
+-        # Issue 36210: OSS provided ncurses does not link on AIX
-         # Use IBM supplied 'curses' for successful build of _curses
+-        # Use IBM supplied 'curses' for successful build of _curses
-         elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
+-        elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1166,8 +1185,7 @@ class PyBuildExt(build_ext):
+-            curses_library = 'curses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
 -            curses_library = 'ncurses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
 -            curses_library = 'curses'
 +        curses_library = "ncurses"
 +        do_readline = True
 +        readline_lib = 'readline'
 -        if MACOS:
 -            os_release = int(os.uname()[2].split('.')[0])
 -            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
 -            if (dep_target and
 -                    (tuple(int(n) for n in dep_target.split('.')[0:2])
 -                        < (10, 5) ) ):
 -                os_release = 8
 -            if os_release < 9:
 -                # MacOSX 10.4 has a broken readline. Don't try to build
 -                # the readline module unless the user has installed a fixed
 -                # readline package
 -                if find_file('readline/rlconf.h', self.inc_dirs, []) is None:
 -                    do_readline = False
          if do_readline:
              readline_libs = [readline_lib]
              if readline_termcap_library:
@@ -1169,8 +1129,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
 -        if (curses_enabled and not skip_curses_panel and
 -                self.compiler.find_library_file(self.lib_dirs, panel_library)):
 +        if curses_enabled and not skip_curses_panel:
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1176,7 +1194,11 @@ class PyBuildExt(build_ext):
+@@ -1179,7 +1138,11 @@ class PyBuildExt(build_ext):
              self.missing.append('_curses_panel')
      def detect_crypt(self):
 -        self.addext(Extension('_crypt', ['_cryptmodule.c']))
 +        if self.compiler.find_library_file(self.lib_dirs, 'crypt'):
 +            libs = ['crypt']
 +        else:
 +            libs = []
 +        self.addext(Extension('_crypt', ['_cryptmodule.c'], libraries=libs))
      def detect_dbm_gdbm(self):
          # Modules that provide persistent dictionary-like semantics.  You will
-@@ -1199,6 +1221,31 @@ class PyBuildExt(build_ext):
+@@ -1202,6 +1165,31 @@ class PyBuildExt(build_ext):
          # The standard Unix dbm module:
          if not CYGWIN:
 +            # Top half based on find_file
 +            def find_ndbm_h(dirs):
 +                ret = None
 +                if MACOS:
 +                    sysroot = macosx_sdk_root()
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if MACOS and is_macosx_sdk_path(dir):
 +                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f):
 @@ -154,22 +223,22 @@ Module _crypt might need -lcrypt (taken
 +                        line = input.readline()
 +                        if not line:
 +                            break
 +                        if re.search('This file is part of GDBM', line):
 +                            ret = None
 +                            break
 +                    input.close()
 +                    break
 +                return ret
++
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1616,7 +1663,7 @@ def main():
+@@ -1619,7 +1607,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
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 +          scripts = ["Tools/scripts/pydoc3",
                       "Tools/scripts/2to3"]
+         )

 @@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.37 2023/11/10 09:48:39 nia Exp $
+$NetBSD: distinfo,v 1.38 2024/01/13 04:24:28 riastradh Exp $
 BLAKE2s (Python-3.9.18.tar.xz) = 429256eb52e94427ae86302633ce8b01ba42d37c44c59e89fa0ae09b721da63f
 SHA512 (Python-3.9.18.tar.xz) = aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7
 Size (Python-3.9.18.tar.xz) = 19673928 bytes
 SHA1 (patch-Lib_ctypes_util.py) = 032cc99ebad93ddddfd89073c60424a952e3faa3
 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-Lib_test_test__shutil.py) = 7b01da9cbfd9b7cd1bb88424d91964cf52ea72df
 SHA1 (patch-Makefile.pre.in) = dd5ff571ac9fe2dc2e41fa678261d8e3648ac908
 SHA1 (patch-Modules___hashopenssl.c) = d7157254630259b2073e67a921edf0dfe151e32a
 SHA1 (patch-Modules___ssl.c) = f241ba148e4c244a641386be5ac07817b03f04f7
 SHA1 (patch-Modules_clinic_posixmodule.c.h) = 66ce8a2fec0ee4df7cb1f814dd4c40d144d1407f
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Modules_posixmodule.c) = cc90b73913f7759efba2e136ff04161444f49f27
 SHA1 (patch-Modules_socketmodule.c) = 5c894f2291cdf0dd355671a1878863e0342207de
 SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = 25609f722ac9c17a49023ddc6882545d9d7798ff
 SHA1 (patch-configure) = 944b8bb9601fd064333305778fb57997ce0ac531
 SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = dab93079027f8ac6a259c9e683d35fe7b66c57e5
+SHA1 (patch-setup.py) = 185090e3497763ca271316b5ff4df7f1e72d1c14

 @@ -1,24 +1,27 @@
-$NetBSD: patch-setup.py,v 1.10 2023/10/23 06:36:01 wiz Exp $
+$NetBSD: patch-setup.py,v 1.11 2024/01/13 04:24:29 riastradh 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.
 Don't search for modules in PREFIX. Fixes build failure when py-setuptools
   are installed.
 Enable cross-build by setting sys._home and sys.path to build directory
 Disable circuitous readline detection which tries to outsmart pkgsrc's
 static choice of libreadline and (fake-)ncurses and trips over its elven
 shoelaces when cross-compiling.
---- setup.py.orig	2022-03-23 21:12:08.000000000 +0000
+--- setup.py.orig	2023-08-24 17:59:28.000000000 +0000
 +++ setup.py
 @@ -1,5 +1,11 @@
  # Autodetecting setup.py script for building the Python extensions
 +import sys
 +sys._home = __file__[:-len('/setup.py')]
 +sys.path.append(__file__[:-len('/setup.py')] + '/Lib')
 +with open('pybuilddir.txt') as pybuilddir:
 +    sys.path.append(__file__[:-len('/setup.py')] + '/' + next(pybuilddir))
++
  import argparse
  import importlib._bootstrap
  import importlib.machinery
 @@ -90,46 +93,105 @@ Enable cross-build by setting sys._home
          self.add_multiarch_paths()
          self.add_ldflags_cppflags()
 @@ -789,6 +806,9 @@ class PyBuildExt(build_ext):
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
          if MACOS:
 +            self.inc_dirs.append(macosx_sdk_root() + '/usr/include')
 +            self.lib_dirs.append(macosx_sdk_root() + '/usr/lib')
++
              # 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.
-@@ -1006,8 +1026,6 @@ class PyBuildExt(build_ext):
+@@ -971,65 +991,10 @@ class PyBuildExt(build_ext):
          # use the same library for the readline and curses modules.
-         if 'curses' in readline_termcap_library:
+     def detect_readline_curses(self):
-             curses_library = readline_termcap_library
+         # readline
 -        do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline')
 +        do_readline = True
          readline_termcap_library = ""
 -        curses_library = ""
 -        # Cannot use os.popen here in py3k.
 -        tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
 -        if not os.path.exists(self.build_temp):
 -            os.makedirs(self.build_temp)
 -        # Determine if readline is already linked against curses or tinfo.
 -        if do_readline:
 -            if CROSS_COMPILING:
 -                ret = run_command("%s -d %s | grep '(NEEDED)' > %s"
 -                                % (sysconfig.get_config_var('READELF'),
 -                                   do_readline, tmpfile))
 -            elif find_executable('ldd'):
 -                ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
 -            else:
 -                ret = 1
 -            if ret == 0:
 -                with open(tmpfile) as fp:
 -                    for ln in fp:
 -                        if 'curses' in ln:
 -                            readline_termcap_library = re.sub(
 -                                r'.*lib(n?cursesw?)\.so.*', r'\1', ln
 -                            ).rstrip()
 -                            break
 -                        # termcap interface split out from ncurses
 -                        if 'tinfo' in ln:
 -                            readline_termcap_library = 'tinfo'
 -                            break
 -            if os.path.exists(tmpfile):
 -                os.unlink(tmpfile)
 -        # Issue 7384: If readline is already linked against curses,
 -        # use the same library for the readline and curses modules.
 -        if 'curses' in readline_termcap_library:
 -            curses_library = readline_termcap_library
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
 -            curses_library = 'ncursesw'
-         # Issue 36210: OSS provided ncurses does not link on AIX
+-        # Issue 36210: OSS provided ncurses does not link on AIX
-         # Use IBM supplied 'curses' for successful build of _curses
+-        # Use IBM supplied 'curses' for successful build of _curses
-         elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
+-        elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-@@ -1109,8 +1127,7 @@ class PyBuildExt(build_ext):
+-            curses_library = 'curses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
 -            curses_library = 'ncurses'
 -        elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
 -            curses_library = 'curses'
 +        curses_library = "ncurses"
 -        if MACOS:
 -            os_release = int(os.uname()[2].split('.')[0])
 -            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
 -            if (dep_target and
 -                    (tuple(int(n) for n in dep_target.split('.')[0:2])
 -                        < (10, 5) ) ):
 -                os_release = 8
 -            if os_release < 9:
 -                # MacOSX 10.4 has a broken readline. Don't try to build
 -                # the readline module unless the user has installed a fixed
 -                # readline package
 -                if find_file('readline/rlconf.h', self.inc_dirs, []) is None:
 -                    do_readline = False
          if do_readline:
              if MACOS and os_release < 9:
                  # In every directory on the search path search for a dynamic
@@ -1109,8 +1074,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
 -        if (curses_enabled and not skip_curses_panel and
 -                self.compiler.find_library_file(self.lib_dirs, panel_library)):
 +        if curses_enabled and not skip_curses_panel:
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1361,6 +1378,31 @@ class PyBuildExt(build_ext):
+@@ -1361,6 +1325,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
 +            # Top half based on find_file
 +            def find_ndbm_h(dirs):
 +                ret = None
 +                if MACOS:
 +                    sysroot = macosx_sdk_root()
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if MACOS and is_macosx_sdk_path(dir):
 +                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f):
 @@ -141,43 +203,43 @@ Enable cross-build by setting sys._home
 +                        line = input.readline()
 +                        if not line:
 +                            break
 +                        if re.search('This file is part of GDBM', line):
 +                            ret = None
 +                            break
 +                    input.close()
 +                    break
 +                return ret
++
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1372,7 +1414,7 @@ class PyBuildExt(build_ext):
+@@ -1372,7 +1361,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
 -                    if find_file("ndbm.h", self.inc_dirs, []) is not None:
 +                    if find_ndbm_h(self.inc_dirs) is not None:
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -2209,10 +2251,7 @@ class PyBuildExt(build_ext):
+@@ -2209,10 +2198,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
 -            include_dirs = [os.path.abspath(os.path.join(self.srcdir,
 -                                                         'Modules',
 -                                                         '_decimal',
 -                                                         'libmpdec'))]
 +            include_dirs = ['Modules/_decimal/libmpdec']
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2597,7 +2636,7 @@ def main():
+@@ -2597,7 +2583,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
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 +          scripts = ["Tools/scripts/pydoc3",
                       "Tools/scripts/2to3"]
+         )

 @@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.12 2023/12/11 10:23:42 adam Exp $
+$NetBSD: distinfo,v 1.13 2024/01/13 04:24:28 riastradh Exp $
 BLAKE2s (Python-3.11.7.tar.xz) = bd74ee6c5197164ba2646db27f640928e7a445fb1f6723051faa4a0d14c11549
 SHA512 (Python-3.11.7.tar.xz) = 11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63
 Size (Python-3.11.7.tar.xz) = 20074108 bytes
 SHA1 (patch-Include_pymacro.h) = 271a891892dca1a3aaa3bedcae626a68a36cae0b
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 8a91e8f4f86517a62408c3a10ed5eb50c4091fbf
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Makefile.pre.in) = fdb5794d112f422a1f28aa9f8b179dc05520f9e1
 SHA1 (patch-configure) = a6d9a00ff160581245bc30d1b0d2ec0e9da8fb0b
-SHA1 (patch-setup.py) = a601ce207f5e61d15503c8781e925353d1e516b9
+SHA1 (patch-setup.py) = 874b114febf51181509593a272ad5cdd4acaf3b4