diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 4b828477d089..e9052a9ffbc1 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,31 +1,31 @@
-TIMESTAMP = 1749085883
+TIMESTAMP = 1749087559
SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 20445e9a571cacdd350f702f0980e4dc559b6ff81f1d69affe9b0a862fef2f0e
SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4634932
SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = dbac6953e48aac341351067ba0938393e415b10bf48ac8cbbc7247deaf13ab67
SIZE (python/python-2.7.18-docs-pdf-a4.tar.bz2) = 11486967
SHA256 (python/python-2.7.18-docs-text.tar.bz2) = c86f5b5a2bd8f90158523efd350198d6cde7353965ef5a6ca5e54e5174af47f2
SIZE (python/python-2.7.18-docs-text.tar.bz2) = 1631043
SHA256 (python/python-3.10.18-docs-html.tar.bz2) = acf6a9cc3afd5a748b2142b9e1e86e974dd71ae0abdf47e79f7b809b8d30c823
SIZE (python/python-3.10.18-docs-html.tar.bz2) = 7462926
SHA256 (python/python-3.10.18-docs-pdf-a4.tar.bz2) = 7865a143f4a173ac30984ef3396ec04a34f7c58b5c52d52872bc5acc59ab70e5
SIZE (python/python-3.10.18-docs-pdf-a4.tar.bz2) = 16768269
SHA256 (python/python-3.10.18-docs-text.tar.bz2) = 5d9d5e8f0d20b02772c50e8f70ba6f236c1ce4f1d0b2bc291243475e677ec24b
SIZE (python/python-3.10.18-docs-text.tar.bz2) = 2678237
SHA256 (python/python-3.11.12-docs-html.tar.bz2) = 43eb8c160873d3f0d4966962862273496f62409ab02b3a3a3f563f930066325b
SIZE (python/python-3.11.12-docs-html.tar.bz2) = 7994774
SHA256 (python/python-3.11.12-docs-pdf-a4.tar.bz2) = 551c8147a92747bebdff497549f4d95703149460b213760349794e2b5a6aabfe
SIZE (python/python-3.11.12-docs-pdf-a4.tar.bz2) = 17602805
SHA256 (python/python-3.11.12-docs-text.tar.bz2) = 489685da36206b2c36a47623c83429eab9acd3ffdf1ba9c2350311c6c23df924
SIZE (python/python-3.11.12-docs-text.tar.bz2) = 2841995
-SHA256 (python/python-3.12.10-docs-html.tar.bz2) = 16347781a36c25042c3b0472cdc25a952ee3ecf1953c8448a854dc83763ebbb0
-SIZE (python/python-3.12.10-docs-html.tar.bz2) = 8428154
-SHA256 (python/python-3.12.10-docs-pdf-a4.tar.bz2) = b99c6f03ce31f4b480711f3dfbe580f96ebb95cfb22f3e4fa21cb374739c777e
-SIZE (python/python-3.12.10-docs-pdf-a4.tar.bz2) = 18702001
-SHA256 (python/python-3.12.10-docs-text.tar.bz2) = 04b4381836c6663f1d8bcb2acc9072de8f440203f920fb152f3c73fc5683fd3b
-SIZE (python/python-3.12.10-docs-text.tar.bz2) = 2909399
+SHA256 (python/python-3.12.11-docs-html.tar.bz2) = 20785e40d6a3d161c125aa83332290805b8910b68571c93571188a5164339774
+SIZE (python/python-3.12.11-docs-html.tar.bz2) = 8438004
+SHA256 (python/python-3.12.11-docs-pdf-a4.tar.bz2) = adc28efc7f4425cfe5ea18306c9e3a693eaa1b08da17c286bd721094d5eeb27d
+SIZE (python/python-3.12.11-docs-pdf-a4.tar.bz2) = 18705372
+SHA256 (python/python-3.12.11-docs-text.tar.bz2) = f682495b444bd09b00ca6e18607db3f87787691cf01492bb8b2d5d583a387967
+SIZE (python/python-3.12.11-docs-text.tar.bz2) = 2912019
SHA256 (python/python-3.9.23-docs-html.tar.bz2) = 7e299c24b164d87600ded5d67fb6bbc793881fa6eac938950516169abaa403e1
SIZE (python/python-3.9.23-docs-html.tar.bz2) = 7012126
SHA256 (python/python-3.9.23-docs-pdf-a4.tar.bz2) = 27f38e33382ad58a2e28ad552e8c38410bd162556515b234864f789b763ec2f0
SIZE (python/python-3.9.23-docs-pdf-a4.tar.bz2) = 15766111
SHA256 (python/python-3.9.23-docs-text.tar.bz2) = 05c50b0e7c65a4e727cb4d7cae152730e690935cf8420d4320cc49c924372d3f
SIZE (python/python-3.9.23-docs-text.tar.bz2) = 2555981
diff --git a/lang/python312/Makefile b/lang/python312/Makefile
index f5f87217109c..c5ddd8cc78af 100644
--- a/lang/python312/Makefile
+++ b/lang/python312/Makefile
@@ -1,164 +1,160 @@
PORTNAME= python
DISTVERSION= ${PYTHON_DISTVERSION}
-PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
-PATCH_SITES= https://github.com/python/cpython/commit/
-PATCHFILES= 4398b788ffc1f954a2c552da285477d42a571292.patch:-p1
-
MAINTAINER= python@FreeBSD.org
COMMENT= Interpreted object-oriented programming language
WWW= https://www.python.org/
LICENSE= PSFL
LIB_DEPENDS= libffi.so:devel/libffi
USES= compiler:c11 cpe ncurses pathfix pkgconfig \
python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R}
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \
Lib/test/ziptestdata/exe_with_zip \
Lib/test/ziptestdata/header.sh
DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
CONFIGURE_ARGS+= --enable-shared --without-ensurepip
CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
TEST_TARGET= buildbottest
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
SUB_FILES= pkg-message
SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
PLIST_SUB= ABI=${ABIFLAGS} \
DISTVERSION=${DISTVERSION} \
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC
OPTIONS_EXCLUDE_riscv64= LTO
OPTIONS_EXCLUDE_powerpc64le= LTO
OPTIONS_RADIO= HASH
OPTIONS_RADIO_HASH= FNV SIPHASH
OPTIONS_SUB= yes
LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version
NLS_DESC= Enable gettext support for the locale module
PYMALLOC_DESC= Enable specialized mallocs
HASH_DESC= Hash Algorithm (PEP-456)
FNV_DESC= Modified Fowler-Noll-Vo Algorithm
SIPHASH_DESC= SipHash24 Algorithm
FNV_CONFIGURE_ON= --with-hash-algorithm=fnv
SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24
DEBUG_CONFIGURE_WITH= pydebug
IPV6_CONFIGURE_ENABLE= ipv6
LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
LTO_CONFIGURE_ON= --with-lto
# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
# Upstream Issue: https://bugs.python.org/issue6299
NLS_USES= gettext
NLS_CPPFLAGS= -I${LOCALBASE}/include
NLS_LIBS= -L${LOCALBASE}/lib -lintl
NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
PYMALLOC_CONFIGURE_WITH= pymalloc
.include "${.CURDIR}/Makefile.version"
.include
.if ${PORT_OPTIONS:MDEBUG}
ABIFLAGS:= d${ABIFLAGS}
.endif
.if !empty(ABIFLAGS)
PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \
bin/python${PYTHON_VER}${ABIFLAGS}-config \
libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \
libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc
.endif
# See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
PLIST_SUB+= NO_NIS="@comment "
DISABLED_EXTENSIONS+= nis
.else
PLIST_SUB+= NO_NIS=""
.endif
.if ${SSL_DEFAULT:Mlibressl*}
EXTRA_PATCHES+= ${PATCHDIR}/libressl
CONFIGURE_ENV+= ac_cv_working_openssl_hashlib=yes
.endif
.include
# llvm17 with -flto=thin makes Programs/_freeze_module crash on armv7; workaround
# cf. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276249
.if ${ARCH} == armv7 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 170 && \
${COMPILER_VERSION} < 180
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N${LTO_CONFIGURE_ON}}
.endif
post-patch:
# disable the detection of includes and library from e2fsprogs-libuuid,
# which introduces hidden dependency and breaks build
@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
# disable detection of multiarch as it breaks with clang >= 13, which adds a
# major.minor version number in -print-multiarch output, confusing Python
@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure
# Apply DISABLED_EXTENSIONS
@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local
. for _module in ${DISABLED_EXTENSIONS}
@${ECHO_CMD} ${_module} >> ${WRKSRC}/Modules/Setup.local
. endfor
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975
.endif
${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1
# This code block exists for the qemu-user enabled cross build environment.
# When using this environment in poudriere, CC is not set to the default
# of /usr/bin/cc and a cross-compile toolchain is used. We need to hand
# edit this so that the run time configuration for python matches what the
# FreeBSD base system provides. sbruno 02Aug2017
.if ${CC} == /nxb-bin/usr/bin/cc
@${REINPLACE_CMD} -e 's=/nxb-bin==' \
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
@cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py
@${REINPLACE_CMD} -e 's=/nxb-bin==' \
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile
.endif
for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
${STRIP_CMD} $$i; done # Strip shared extensions
${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
.include
diff --git a/lang/python312/Makefile.version b/lang/python312/Makefile.version
index f6919a2ecc67..cbdea9bcc065 100644
--- a/lang/python312/Makefile.version
+++ b/lang/python312/Makefile.version
@@ -1,7 +1,7 @@
# Mk/Uses/python.mk includes this file, don't remove it!
# Do not forget to
# 1. Update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
# 2. Remove PORTREVISION in Makefile
-PYTHON_DISTVERSION= 3.12.10
+PYTHON_DISTVERSION= 3.12.11
diff --git a/lang/python312/distinfo b/lang/python312/distinfo
index 13ee274c387e..84171e35f36a 100644
--- a/lang/python312/distinfo
+++ b/lang/python312/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1748373679
-SHA256 (python/Python-3.12.10.tar.xz) = 07ab697474595e06f06647417d3c7fa97ded07afc1a7e4454c5639919b46eaea
-SIZE (python/Python-3.12.10.tar.xz) = 20520960
-SHA256 (python/4398b788ffc1f954a2c552da285477d42a571292.patch) = 16fab1f509849e6e28faf12f78f931a192366b7300d4da00fc8d610c9d322d71
-SIZE (python/4398b788ffc1f954a2c552da285477d42a571292.patch) = 24040
+TIMESTAMP = 1749086121
+SHA256 (python/Python-3.12.11.tar.xz) = c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb
+SIZE (python/Python-3.12.11.tar.xz) = 20525812