Index: head/lang/python-doc-html/distinfo =================================================================== --- head/lang/python-doc-html/distinfo (revision 540708) +++ head/lang/python-doc-html/distinfo (revision 540709) @@ -1,41 +1,41 @@ -TIMESTAMP = 1591480200 +TIMESTAMP = 1593350505 SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7 SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851 SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2 SIZE (python/python-2.7.18-docs-pdf-a4.tar.bz2) = 11455585 SHA256 (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 0e1259b379982ceb623f25af9a15ab3d9fcd054b5efcb9d5c173404f7b80048a SIZE (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 11455989 SHA256 (python/python-2.7.18-docs-text.tar.bz2) = c2396b36632ecdefa3fbf9f73c80641c315e8d4a515da5e6616f4450e0ca74ff SIZE (python/python-2.7.18-docs-text.tar.bz2) = 1633624 SHA256 (python/python-3.5.9-docs-html.tar.bz2) = b0cfe724c612b563da7e5fceb7b4b70eedd40b2f01b04d199a073090f0908b9f SIZE (python/python-3.5.9-docs-html.tar.bz2) = 5780603 SHA256 (python/python-3.5.9-docs-pdf-a4.tar.bz2) = c8fa8c4f0f313569d3893d9ff9c7fed6564d4d4e961c4f796ee870c1f9e59d75 SIZE (python/python-3.5.9-docs-pdf-a4.tar.bz2) = 10838997 SHA256 (python/python-3.5.9-docs-pdf-letter.tar.bz2) = 75f76df9aa7849a2e453d7b361c843f7fc8019b37cbd9b4f22baa567b35d2e47 SIZE (python/python-3.5.9-docs-pdf-letter.tar.bz2) = 10776220 SHA256 (python/python-3.5.9-docs-text.tar.bz2) = d56ebb09057f27abcb717f21c250a7c84f41e750a009bcf8e1e0850ff269098c SIZE (python/python-3.5.9-docs-text.tar.bz2) = 2058975 -SHA256 (python/python-3.6.10-docs-html.tar.bz2) = 2269cb0693f8838793206353b1e5684d8ba4d77ec7cce07ff7f749170f96e768 -SIZE (python/python-3.6.10-docs-html.tar.bz2) = 5994263 -SHA256 (python/python-3.6.10-docs-pdf-a4.tar.bz2) = 1151a7b6a38e9f167d6f5d9f58071904ee210282580f5a0a30657d99f20074c9 -SIZE (python/python-3.6.10-docs-pdf-a4.tar.bz2) = 13822421 -SHA256 (python/python-3.6.10-docs-pdf-letter.tar.bz2) = 89f80cd44f8595f5f7bb1d5b9e019f21c54ed0b83a15854dcbf922ffad4bb166 -SIZE (python/python-3.6.10-docs-pdf-letter.tar.bz2) = 13822156 -SHA256 (python/python-3.6.10-docs-text.tar.bz2) = 870c2f188f7ebafe0dcdf2438fc0652ec8c866ad8a96f6e2524464bbc347528a -SIZE (python/python-3.6.10-docs-text.tar.bz2) = 2167559 +SHA256 (python/python-3.6.11-docs-html.tar.bz2) = 465b36b188cb5a3e704f1713a1ac91defb0c98cfb6b4658219be0d88e818dc41 +SIZE (python/python-3.6.11-docs-html.tar.bz2) = 6012332 +SHA256 (python/python-3.6.11-docs-pdf-a4.tar.bz2) = b21353d8ecd25af4a52b9c467d2abea9b56b727234a02a62bcd82cf72fcffd67 +SIZE (python/python-3.6.11-docs-pdf-a4.tar.bz2) = 13855082 +SHA256 (python/python-3.6.11-docs-pdf-letter.tar.bz2) = dc04cecb033a921d084a5f3f23d8ead600ad60ced8b7b32129aa3beb7b13bd25 +SIZE (python/python-3.6.11-docs-pdf-letter.tar.bz2) = 13854494 +SHA256 (python/python-3.6.11-docs-text.tar.bz2) = a721595d25cf6dc02052593fcd672e6f96a72aa4ec0fa82c737e2a57c7d5eae5 +SIZE (python/python-3.6.11-docs-text.tar.bz2) = 2167458 SHA256 (python/python-3.7.7-docs-html.tar.bz2) = f9f2a375eaf847ea927edafd0d64aaef76e32db7cfdcafc7d5a198feff48613f SIZE (python/python-3.7.7-docs-html.tar.bz2) = 6259882 SHA256 (python/python-3.7.7-docs-pdf-a4.tar.bz2) = b14cf18f78b8db5e099869256f9cd959056d22e2f98321dd4fa162e32dc1f655 SIZE (python/python-3.7.7-docs-pdf-a4.tar.bz2) = 14184523 SHA256 (python/python-3.7.7-docs-pdf-letter.tar.bz2) = ff6399745e5efdbd7dabff823b5c2e17b3b8a35b3daa6da06b7a81725e452021 SIZE (python/python-3.7.7-docs-pdf-letter.tar.bz2) = 14289660 SHA256 (python/python-3.7.7-docs-text.tar.bz2) = 26231081c1214e2ab1af1001607bafb25ee10ef8671e7f5722782f63e9415bd8 SIZE (python/python-3.7.7-docs-text.tar.bz2) = 2288271 SHA256 (python/python-3.8.3-docs-html.tar.bz2) = 2d792badec2d2146397c53b8f67bc2b1a6f3047a4587f49f410839d30ad0d8c9 SIZE (python/python-3.8.3-docs-html.tar.bz2) = 6556303 SHA256 (python/python-3.8.3-docs-pdf-a4.tar.bz2) = cda93cca155ddca7d788b8396b29a5f4655333f9c781b158974f3a08c1dab481 SIZE (python/python-3.8.3-docs-pdf-a4.tar.bz2) = 14650484 SHA256 (python/python-3.8.3-docs-pdf-letter.tar.bz2) = 7df31d400ebd0dfff81b101396c31cf453e6506b1b80563090f4e96ca8127c20 SIZE (python/python-3.8.3-docs-pdf-letter.tar.bz2) = 14755407 SHA256 (python/python-3.8.3-docs-text.tar.bz2) = 5dc814c6003580554ff1ddb131502b50beedbb15e0be908e0186b134719d85d1 SIZE (python/python-3.8.3-docs-text.tar.bz2) = 2402463 Index: head/lang/python36/Makefile =================================================================== --- head/lang/python36/Makefile (revision 540708) +++ head/lang/python36/Makefile (revision 540709) @@ -1,153 +1,151 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} DISTNAME= Python-${PORTVERSION} DIST_SUBDIR= python # Resolve sinpi name clash with libm (IEEE-754 violation) PATCH_SITES= https://github.com/python/cpython/commit/ PATCHFILES= f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch:-p1 \ - f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch:-p1 \ - 69cdeeb93e0830004a495ed854022425b93b3f3e.patch:-p1 \ - 83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch:-p1 + f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch:-p1 MAINTAINER= python@FreeBSD.org COMMENT= Interpreted object-oriented programming language LICENSE= PSFL USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. PYTHON_VER= ${PYTHON_PORTVERSION:R} PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --without-ensurepip CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # 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=${PORTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS OPTIONS_DEFAULT= LIBFFI PYMALLOC THREADS OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes LIBFFI_DESC= Use libffi 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 LIBFFI_CONFIGURE_ON= --with-system-ffi LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi # 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 THREADS_CONFIGURE_WITH= threads THREADS_LDFLAGS= -lpthread .include "${.CURDIR}/Makefile.version" .include .if ${PORT_OPTIONS:MPYMALLOC} ABIFLAGS:= m${ABIFLAGS} .endif .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 .endif # https://bugs.python.org/issue22521 # https://bugs.python.org/issue23042 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option .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-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 .endif # 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_m_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_m_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_m_freebsd${OSREL:R}_.py @${REINPLACE_CMD} -e 's=/nxb-bin==' \ ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}m/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 Index: head/lang/python36/Makefile.version =================================================================== --- head/lang/python36/Makefile.version (revision 540708) +++ head/lang/python36/Makefile.version (revision 540709) @@ -1,6 +1,6 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.6.10 +PYTHON_PORTVERSION= 3.6.11 Index: head/lang/python36/distinfo =================================================================== --- head/lang/python36/distinfo (revision 540708) +++ head/lang/python36/distinfo (revision 540709) @@ -1,11 +1,7 @@ -TIMESTAMP = 1591492360 -SHA256 (python/Python-3.6.10.tar.xz) = 0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de -SIZE (python/Python-3.6.10.tar.xz) = 17212220 +TIMESTAMP = 1593348993 +SHA256 (python/Python-3.6.11.tar.xz) = 741ebdcbc4e3937a5ff23517dd455ebf7d543ea9fef6f5cf6f46e575d6c4fda4 +SIZE (python/Python-3.6.11.tar.xz) = 17213036 SHA256 (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 44340896504b297bbab06db0bb0a71ddf9f25bbe02ab3dcdfeec2772c957b69f SIZE (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 2542 SHA256 (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = a5cf6ef701d6afb14417232c6723fe2c50d7bf35d87bf6b3e3bcbfa1000a38f9 SIZE (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = 2888 -SHA256 (python/69cdeeb93e0830004a495ed854022425b93b3f3e.patch) = e935493892358bf5a82dd6299fd9d1f0dadb28395bc1d8e0dd031fde0bf4c68c -SIZE (python/69cdeeb93e0830004a495ed854022425b93b3f3e.patch) = 10887 -SHA256 (python/83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch) = f0bf09c945bc3be4cc692452454d2bf4c434a15dcd9c468ad9bcba8d73f3a3dd -SIZE (python/83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch) = 6691