https://docs.python.org/release/3.11.1/whatsnew/changelog.html#python-3-11-1
This pulls the workaround for Python 3.11 from python.port.mk. They seem to
have fixed the problem where pip3.10 shows up (although the issue is still
open...)
Tests pass and it builds fine on amd64 and sparc64.
ok?
--Kurt
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile.inc
--- Makefile.inc 6 Dec 2022 15:55:58 -0000 1.154
+++ Makefile.inc 16 Dec 2022 23:43:39 -0000
@@ -198,9 +198,6 @@ post-install:
.else
rm -f ${PREFIX}/bin/pip3 # in devel/py-pip for default Python version
.endif
-.if ${VERSION} == "3.11"
- rm ${PREFIX}/bin/pip3.10 #
https://github.com/python/cpython/issues/98682
-.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/python${VERSION}
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
Index: 3.11/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- 3.11/Makefile 6 Dec 2022 15:58:08 -0000 1.4
+++ 3.11/Makefile 16 Dec 2022 23:43:39 -0000
@@ -3,11 +3,10 @@
# requirement of the PSF license, if it constitutes a change to
# Python itself.
-FULL_VERSION = 3.11.0
+FULL_VERSION = 3.11.1
SHARED_LIBS = python3.11 0.0
VERSION_SPEC = >=3.11,<3.12
PORTROACH = limit:^3\.11
-REVISION-main = 1
CONFIGURE_ENV += ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR}
-I${X11BASE}/include" \
Index: 3.11/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- 3.11/distinfo 31 Oct 2022 22:05:43 -0000 1.1.1.1
+++ 3.11/distinfo 16 Dec 2022 23:43:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.0.tgz) = ZEJOluJFerusiZuQ+VMJhbUe7ykFlR/r2TXw5zQUyus=
-SIZE (Python-3.11.0.tgz) = 26333656
+SHA256 (Python-3.11.1.tgz) = uu1RjiazN9TYEFZ5yvaMXDJjDXAmFPwXTpjLlcRr36Q=
+SIZE (Python-3.11.1.tgz) = 26394378
Index: 3.11/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.11/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure_ac
--- 3.11/patches/patch-configure_ac 31 Oct 2022 22:05:43 -0000 1.1.1.1
+++ 3.11/patches/patch-configure_ac 16 Dec 2022 23:43:39 -0000
@@ -16,7 +16,7 @@ Index: configure.ac
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
-@@ -1086,6 +1086,7 @@ AC_MSG_CHECKING([for multiarch])
+@@ -1096,6 +1096,7 @@ AC_MSG_CHECKING([for multiarch])
AS_CASE([$ac_sys_system],
[Darwin*], [MULTIARCH=""],
[FreeBSD*], [MULTIARCH=""],
@@ -24,21 +24,23 @@ Index: configure.ac
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
)
AC_SUBST([MULTIARCH])
-@@ -1799,11 +1800,11 @@ esac
+@@ -1835,13 +1836,13 @@ esac
[AC_MSG_RESULT(no)])
if test "$Py_LTO" = 'true' ; then
case $CC in
- *clang*)
+ *clang*|cc)
- dnl flag to disable lto during linking
LDFLAGS_NOLTO="-fno-lto"
+ dnl Clang linker requires -flto in order to link objects with LTO
information.
+ dnl Thin LTO is faster and works for object files with full LTO
information, too.
+
AX_CHECK_COMPILE_FLAG([-flto=thin],[LDFLAGS_NOLTO="-flto=thin"],[LDFLAGS_NOLTO="-flto"])
AC_SUBST(LLVM_AR)
- AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
+ AC_PATH_TOOL(LLVM_AR, ar, '', ${llvm_path})
AC_SUBST(LLVM_AR_FOUND)
if test -n "${LLVM_AR}" -a -x "${LLVM_AR}"
then
-@@ -1918,7 +1919,7 @@ then
+@@ -1956,7 +1957,7 @@ then
fi
LLVM_PROF_ERR=no
case $CC in
@@ -47,7 +49,7 @@ Index: configure.ac
# Any changes made here should be reflected in the GCC+Darwin case below
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
-@@ -3838,11 +3839,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
+@@ -3876,11 +3877,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
dnl
found_tcltk=no
for _QUERY in \
Index: 3.11/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- 3.11/pkg/PLIST-main 1 Nov 2022 16:18:22 -0000 1.2
+++ 3.11/pkg/PLIST-main 16 Dec 2022 23:43:40 -0000
@@ -1879,7 +1879,7 @@ lib/python3.11/ensurepip/__pycache__/_un
lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.opt-2.pyc
lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.pyc
lib/python3.11/ensurepip/_bundled/
-lib/python3.11/ensurepip/_bundled/pip-22.3-py3-none-any.whl
+lib/python3.11/ensurepip/_bundled/pip-22.3.1-py3-none-any.whl
lib/python3.11/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
lib/python3.11/ensurepip/_uninstall.py
lib/python3.11/enum.py
@@ -2641,15 +2641,15 @@ lib/python3.11/site-packages/_distutils_
lib/python3.11/site-packages/_distutils_hack/override.py
lib/python3.11/site-packages/distutils-precedence.pth
lib/python3.11/site-packages/pip/
-lib/python3.11/site-packages/pip-22.3.dist-info/
-lib/python3.11/site-packages/pip-22.3.dist-info/INSTALLER
-lib/python3.11/site-packages/pip-22.3.dist-info/LICENSE.txt
-lib/python3.11/site-packages/pip-22.3.dist-info/METADATA
-lib/python3.11/site-packages/pip-22.3.dist-info/RECORD
-lib/python3.11/site-packages/pip-22.3.dist-info/REQUESTED
-lib/python3.11/site-packages/pip-22.3.dist-info/WHEEL
-lib/python3.11/site-packages/pip-22.3.dist-info/entry_points.txt
-lib/python3.11/site-packages/pip-22.3.dist-info/top_level.txt
+lib/python3.11/site-packages/pip-22.3.1.dist-info/
+lib/python3.11/site-packages/pip-22.3.1.dist-info/INSTALLER
+lib/python3.11/site-packages/pip-22.3.1.dist-info/LICENSE.txt
+lib/python3.11/site-packages/pip-22.3.1.dist-info/METADATA
+lib/python3.11/site-packages/pip-22.3.1.dist-info/RECORD
+lib/python3.11/site-packages/pip-22.3.1.dist-info/REQUESTED
+lib/python3.11/site-packages/pip-22.3.1.dist-info/WHEEL
+lib/python3.11/site-packages/pip-22.3.1.dist-info/entry_points.txt
+lib/python3.11/site-packages/pip-22.3.1.dist-info/top_level.txt
lib/python3.11/site-packages/pip/__init__.py
lib/python3.11/site-packages/pip/__main__.py
lib/python3.11/site-packages/pip/__pip-runner__.py
Index: 3.11/pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-tests,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tests
--- 3.11/pkg/PLIST-tests 1 Nov 2022 16:18:23 -0000 1.2
+++ 3.11/pkg/PLIST-tests 16 Dec 2022 23:43:41 -0000
@@ -807,9 +807,6 @@ lib/python3.11/test/__pycache__/test_cal
lib/python3.11/test/__pycache__/test_call.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_call.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_call.cpython-311.pyc
-lib/python3.11/test/__pycache__/test_capi.cpython-311.opt-1.pyc
-lib/python3.11/test/__pycache__/test_capi.cpython-311.opt-2.pyc
-lib/python3.11/test/__pycache__/test_capi.cpython-311.pyc
lib/python3.11/test/__pycache__/test_cgi.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_cgi.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_cgi.cpython-311.pyc
@@ -1173,9 +1170,6 @@ lib/python3.11/test/__pycache__/test_gen
lib/python3.11/test/__pycache__/test_genexps.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_genexps.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_genexps.cpython-311.pyc
-lib/python3.11/test/__pycache__/test_getargs2.cpython-311.opt-1.pyc
-lib/python3.11/test/__pycache__/test_getargs2.cpython-311.opt-2.pyc
-lib/python3.11/test/__pycache__/test_getargs2.cpython-311.pyc
lib/python3.11/test/__pycache__/test_getopt.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_getopt.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_getopt.cpython-311.pyc
@@ -1677,9 +1671,6 @@ lib/python3.11/test/__pycache__/test_str
lib/python3.11/test/__pycache__/test_struct.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_struct.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_struct.cpython-311.pyc
-lib/python3.11/test/__pycache__/test_structmembers.cpython-311.opt-1.pyc
-lib/python3.11/test/__pycache__/test_structmembers.cpython-311.opt-2.pyc
-lib/python3.11/test/__pycache__/test_structmembers.cpython-311.pyc
lib/python3.11/test/__pycache__/test_structseq.cpython-311.opt-1.pyc
lib/python3.11/test/__pycache__/test_structseq.cpython-311.opt-2.pyc
lib/python3.11/test/__pycache__/test_structseq.cpython-311.pyc
@@ -2690,7 +2681,6 @@ lib/python3.11/test/test_bz2.py
lib/python3.11/test/test_c_locale_coercion.py
lib/python3.11/test/test_calendar.py
lib/python3.11/test/test_call.py
-lib/python3.11/test/test_capi.py
lib/python3.11/test/test_cgi.py
lib/python3.11/test/test_cgitb.py
lib/python3.11/test/test_charmapcodec.py
@@ -2952,7 +2942,6 @@ lib/python3.11/test/test_genericalias.py
lib/python3.11/test/test_genericclass.py
lib/python3.11/test/test_genericpath.py
lib/python3.11/test/test_genexps.py
-lib/python3.11/test/test_getargs2.py
lib/python3.11/test/test_getopt.py
lib/python3.11/test/test_getpass.py
lib/python3.11/test/test_getpath.py
@@ -3776,7 +3765,6 @@ lib/python3.11/test/test_stringprep.py
lib/python3.11/test/test_strptime.py
lib/python3.11/test/test_strtod.py
lib/python3.11/test/test_struct.py
-lib/python3.11/test/test_structmembers.py
lib/python3.11/test/test_structseq.py
lib/python3.11/test/test_subclassinit.py
lib/python3.11/test/test_subprocess.py
@@ -3993,6 +3981,16 @@ lib/python3.11/test/tracedmodules/__pyca
lib/python3.11/test/tracedmodules/__pycache__/testmod.cpython-311.opt-2.pyc
lib/python3.11/test/tracedmodules/__pycache__/testmod.cpython-311.pyc
lib/python3.11/test/tracedmodules/testmod.py
+lib/python3.11/test/typinganndata/
+lib/python3.11/test/typinganndata/__init__.py
+lib/python3.11/test/typinganndata/__pycache__/
+lib/python3.11/test/typinganndata/__pycache__/__init__.cpython-311.opt-1.pyc
+lib/python3.11/test/typinganndata/__pycache__/__init__.cpython-311.opt-2.pyc
+lib/python3.11/test/typinganndata/__pycache__/__init__.cpython-311.pyc
+lib/python3.11/test/typinganndata/__pycache__/ann_module9.cpython-311.opt-1.pyc
+lib/python3.11/test/typinganndata/__pycache__/ann_module9.cpython-311.opt-2.pyc
+lib/python3.11/test/typinganndata/__pycache__/ann_module9.cpython-311.pyc
+lib/python3.11/test/typinganndata/ann_module9.py
lib/python3.11/test/win_console_handler.py
lib/python3.11/test/xmltestdata/
lib/python3.11/test/xmltestdata/c14n-20/
