diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 98d237d5b477..352df433dc9f 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,49 +1,49 @@
-TIMESTAMP = 1670496535
+TIMESTAMP = 1671067326
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-pdf-letter.tar.bz2) = 565971040db8994630fd5c2447e45c38428cfb22a7845cd2620160daf2c60b1e
SIZE (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 11486126
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.9-docs-html.tar.bz2) = 4670b07e88bebdebb12d0efa596c8d2d050fc75084decb74b1892a60c9d8bb2c
SIZE (python/python-3.10.9-docs-html.tar.bz2) = 7379489
SHA256 (python/python-3.10.9-docs-pdf-a4.tar.bz2) = a22cb40747ec4140e7375bfa5c8889845d34779ed343d310700760c00ab07a36
SIZE (python/python-3.10.9-docs-pdf-a4.tar.bz2) = 16455919
SHA256 (python/python-3.10.9-docs-pdf-letter.tar.bz2) = afb894efe055286d14ff4e36388a56030df5e79ce40cbc92f0f20a15d824c02a
SIZE (python/python-3.10.9-docs-pdf-letter.tar.bz2) = 16565076
SHA256 (python/python-3.10.9-docs-text.tar.bz2) = 88763250601a11db5d652ae674fd2fc89b502070f9905f4ea6ab208033d8b9d7
SIZE (python/python-3.10.9-docs-text.tar.bz2) = 2670982
SHA256 (python/python-3.11.1-docs-html.tar.bz2) = 32949cefd4125a7db02c6ee3a2bc8ea624e971ab2a39d74d3389826927168468
SIZE (python/python-3.11.1-docs-html.tar.bz2) = 7701638
SHA256 (python/python-3.11.1-docs-pdf-a4.tar.bz2) = ac18b6ea8657e392218e2d172a88d1d45ef938af47a70ff390fa3425f795e4a4
SIZE (python/python-3.11.1-docs-pdf-a4.tar.bz2) = 16982843
SHA256 (python/python-3.11.1-docs-pdf-letter.tar.bz2) = f68a90ac22842a06fe7f3152736f69ae1d7ce5eadabae382a4aacd7e3d2c760f
SIZE (python/python-3.11.1-docs-pdf-letter.tar.bz2) = 17105728
SHA256 (python/python-3.11.1-docs-text.tar.bz2) = ad67c599cfc59cb72b6c568ff3ae17a871210cdfaeaa9fcf53b81a26f992aed2
SIZE (python/python-3.11.1-docs-text.tar.bz2) = 2785623
SHA256 (python/python-3.7.16-docs-html.tar.bz2) = 13653ed816e963eb6d7e3f44b8e130abc7abd28005be2743e00514b0dc581ed5
SIZE (python/python-3.7.16-docs-html.tar.bz2) = 6293918
SHA256 (python/python-3.7.16-docs-pdf-a4.tar.bz2) = 402b9af419567b881e7ec902f5a1be030a4f496dfee922f25e008a028363417a
SIZE (python/python-3.7.16-docs-pdf-a4.tar.bz2) = 14563209
-SHA256 (python/python-3.7.16-docs-pdf-letter.tar.bz2) = f60d3f931d76119517a1996104807c2da984d3bf66b76ee86ec0d459e4f62bdd
-SIZE (python/python-3.7.16-docs-pdf-letter.tar.bz2) = 14642985
+SHA256 (python/python-3.7.16-docs-pdf-letter.tar.bz2) = 5d0028719918c4b7c99ee9ce9c448774d909894a5c1145aee21185ae10fbe1d9
+SIZE (python/python-3.7.16-docs-pdf-letter.tar.bz2) = 2663127
SHA256 (python/python-3.7.16-docs-text.tar.bz2) = f66540aca1e8933bc4aee79fd1407b4aa6a8601e9e961300604c3144ce2b949f
SIZE (python/python-3.7.16-docs-text.tar.bz2) = 2288014
SHA256 (python/python-3.8.16-docs-html.tar.bz2) = cdd07f5c29401976fb899e02a1e133b448bc13c05de15db4ca260e0b933ce33b
SIZE (python/python-3.8.16-docs-html.tar.bz2) = 6697934
SHA256 (python/python-3.8.16-docs-pdf-a4.tar.bz2) = 2fdb892a32f263a5229c7f7387fbbcd2181b1ce570402abf081cf73874c3158c
SIZE (python/python-3.8.16-docs-pdf-a4.tar.bz2) = 15078075
SHA256 (python/python-3.8.16-docs-pdf-letter.tar.bz2) = 4e01f1964df8cc224db752393a4b202064b828356a789bf4dbe8ad9125054208
SIZE (python/python-3.8.16-docs-pdf-letter.tar.bz2) = 15191740
SHA256 (python/python-3.8.16-docs-text.tar.bz2) = 2f2609090fdae758e4978525d645a6776598109ffcc2cb6f69d53d3ed6662c37
SIZE (python/python-3.8.16-docs-text.tar.bz2) = 2439494
-SHA256 (python/python-3.9.15-docs-html.tar.bz2) = d47c63f8bd79f5fd303f121ed1195f5c8148bac1a2c7e626b94c5406a49c4fe8
-SIZE (python/python-3.9.15-docs-html.tar.bz2) = 6964615
-SHA256 (python/python-3.9.15-docs-pdf-a4.tar.bz2) = d5f4ef442bcbf1761c29e02a5799936e0809594e82b6cb46d48a6b5393ba5a4f
-SIZE (python/python-3.9.15-docs-pdf-a4.tar.bz2) = 15702142
-SHA256 (python/python-3.9.15-docs-pdf-letter.tar.bz2) = c1c9f4ba69f7a4586da4a966157b830b471dd917cd224e2960dfc00363436eb4
-SIZE (python/python-3.9.15-docs-pdf-letter.tar.bz2) = 15811030
-SHA256 (python/python-3.9.15-docs-text.tar.bz2) = 989d62932234d3b0635217c07c66c79641a6cd186c5d4c52cf352bf9097c13cd
-SIZE (python/python-3.9.15-docs-text.tar.bz2) = 2543729
+SHA256 (python/python-3.9.16-docs-html.tar.bz2) = fc2ae76fba5ee872d9216e6a8b75608a547b29f8d59b1925b1d39a74d9a1aff7
+SIZE (python/python-3.9.16-docs-html.tar.bz2) = 6965048
+SHA256 (python/python-3.9.16-docs-pdf-a4.tar.bz2) = 37799960b40e9a9084ea9a3bc773e94436e1aa4f6cc0e8d43463fdb9520ff1f0
+SIZE (python/python-3.9.16-docs-pdf-a4.tar.bz2) = 15702378
+SHA256 (python/python-3.9.16-docs-pdf-letter.tar.bz2) = 30fa8972d55ba5a221fe4243e2ccdf62f6a6525a9c1923088a92c0b852aef43e
+SIZE (python/python-3.9.16-docs-pdf-letter.tar.bz2) = 15811612
+SHA256 (python/python-3.9.16-docs-text.tar.bz2) = 713ee7de55b89947773cb970a43a2f1c1af17b94a9c50e6af7cf20f0326bb137
+SIZE (python/python-3.9.16-docs-text.tar.bz2) = 2545722
diff --git a/lang/python39/Makefile b/lang/python39/Makefile
index 69fcdef611ea..58d7f7372ab2 100644
--- a/lang/python39/Makefile
+++ b/lang/python39/Makefile
@@ -1,159 +1,158 @@
PORTNAME= python
DISTVERSION= ${PYTHON_DISTVERSION}
-PORTREVISION= 1
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
DISTNAME= Python-${DISTVERSION}
DIST_SUBDIR= python
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 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
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER= ${PYTHON_DISTVERSION:R}
PYTHON_VERSION= python${PYTHON_VER}
PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
CONFIGURE_ARGS+= --enable-shared --without-ensurepip \
--with-system-ffi
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} \
XY=${PYTHON_SUFFIX} \
XYDOT=${PYTHON_VER} \
XYZDOT=${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 PYMALLOC
OPTIONS_EXCLUDE_powerpc64= LTO
OPTIONS_EXCLUDE_riscv64= 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
.if ${ARCH} == sparc64
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
.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
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
@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py
# 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/python39/Makefile.version b/lang/python39/Makefile.version
index ff1b8d38c57f..63cfa1c546b9 100644
--- a/lang/python39/Makefile.version
+++ b/lang/python39/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.9.15
+PYTHON_DISTVERSION= 3.9.16
diff --git a/lang/python39/distinfo b/lang/python39/distinfo
index 188c292bfc5f..56135b6fa1fa 100644
--- a/lang/python39/distinfo
+++ b/lang/python39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665570791
-SHA256 (python/Python-3.9.15.tar.xz) = 12daff6809528d9f6154216950423c9e30f0e47336cb57c6aa0b4387dd5eb4b2
-SIZE (python/Python-3.9.15.tar.xz) = 19712208
+TIMESTAMP = 1671061783
+SHA256 (python/Python-3.9.16.tar.xz) = 22dddc099246dd2760665561e8adb7394ea0cc43a72684c6480f9380f7786439
+SIZE (python/Python-3.9.16.tar.xz) = 19738796