Index: head/lang/python-doc-html/distinfo
===================================================================
--- head/lang/python-doc-html/distinfo	(revision 566388)
+++ head/lang/python-doc-html/distinfo	(revision 566389)
@@ -1,41 +1,41 @@
 TIMESTAMP = 1608648364
 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.6.12-docs-html.tar.bz2) = 170c3b609be6af1983c12c6f9e2e39c2e660a98c808179fec068e698638e5de0
-SIZE (python/python-3.6.12-docs-html.tar.bz2) = 6077301
-SHA256 (python/python-3.6.12-docs-pdf-a4.tar.bz2) = cf31e03e5705d436e01d2dc42a73f859c72dc431e60ae3c181861aa83dce2239
-SIZE (python/python-3.6.12-docs-pdf-a4.tar.bz2) = 13859846
-SHA256 (python/python-3.6.12-docs-pdf-letter.tar.bz2) = 24090b72a793e5c37a0adfe1826019a862a38fba717a2622a02d263f6adf385c
-SIZE (python/python-3.6.12-docs-pdf-letter.tar.bz2) = 13861573
-SHA256 (python/python-3.6.12-docs-text.tar.bz2) = 33dcdef61154effe7b9cf323d7924fa928696f0046b7f3055e6a8be8eb2e5213
-SIZE (python/python-3.6.12-docs-text.tar.bz2) = 2142045
+SHA256 (python/python-3.6.13-docs-html.tar.bz2) = 13e36aea543d2ab55d116a2c150684214c0be37992d71aba126cdf58d342adac
+SIZE (python/python-3.6.13-docs-html.tar.bz2) = 6016532
+SHA256 (python/python-3.6.13-docs-pdf-a4.tar.bz2) = eb278d548bf1646c85373dde006e42c68d7849c16db2d2a2fbcae9086c4279b5
+SIZE (python/python-3.6.13-docs-pdf-a4.tar.bz2) = 13880742
+SHA256 (python/python-3.6.13-docs-pdf-letter.tar.bz2) = 07cea5aebc2d1ce4043c2f27d5f57001bcdfe647073a210b33f8ac8393fc11ae
+SIZE (python/python-3.6.13-docs-pdf-letter.tar.bz2) = 13880924
+SHA256 (python/python-3.6.13-docs-text.tar.bz2) = ec302149b44cbee0b86bfe6f80f4b4eb45e742d41bb0b9e715aa7a2319f3e173
+SIZE (python/python-3.6.13-docs-text.tar.bz2) = 2168062
 SHA256 (python/python-3.7.9-docs-html.tar.bz2) = 529a1cae4840fe31231915478039081b04700cb2ad488a72ee7a5a452e4935fb
 SIZE (python/python-3.7.9-docs-html.tar.bz2) = 6285801
 SHA256 (python/python-3.7.9-docs-pdf-a4.tar.bz2) = 386bbbec967d479a47fda11ad7f82e76f0b55d8669393516e74df8d3b9005221
 SIZE (python/python-3.7.9-docs-pdf-a4.tar.bz2) = 14240646
 SHA256 (python/python-3.7.9-docs-pdf-letter.tar.bz2) = 82b5eb6fa7200c5f18f93cd0e614a1d8e6a0c2f8b95af2a9bf8fa855a963527a
 SIZE (python/python-3.7.9-docs-pdf-letter.tar.bz2) = 14332368
 SHA256 (python/python-3.7.9-docs-text.tar.bz2) = b1a78d8303f9f334353ed3c3ad619190d4a8907eb137d894c1ffb457e523b518
 SIZE (python/python-3.7.9-docs-text.tar.bz2) = 2291659
 SHA256 (python/python-3.8.8-docs-html.tar.bz2) = 4490001bc4ee47d3f6f7ab1439a386dd2b6e1774b13310e8216368410ddef3d8
 SIZE (python/python-3.8.8-docs-html.tar.bz2) = 6590826
 SHA256 (python/python-3.8.8-docs-pdf-a4.tar.bz2) = 0128dcca570f9be1f64c9082c25cfce64461c057664927223ebed17aba81ae3a
 SIZE (python/python-3.8.8-docs-pdf-a4.tar.bz2) = 14727572
 SHA256 (python/python-3.8.8-docs-pdf-letter.tar.bz2) = f1ad8c10c306695c8880ac5bb33dc71c66faa843547e451ac867f64c7d0acc34
 SIZE (python/python-3.8.8-docs-pdf-letter.tar.bz2) = 14844817
 SHA256 (python/python-3.8.8-docs-text.tar.bz2) = 3619f22ed07209f6cebb68e0da5e1b8c6b8f5ac31c790b11c453b047bd99c383
 SIZE (python/python-3.8.8-docs-text.tar.bz2) = 2416769
 SHA256 (python/python-3.9.2-docs-html.tar.bz2) = f50c03040d48b883180d831704d4ec67a3ec497d932ac6742595665dddf91a2c
 SIZE (python/python-3.9.2-docs-html.tar.bz2) = 6818470
 SHA256 (python/python-3.9.2-docs-pdf-a4.tar.bz2) = 6c44dbf84120f30cf2ab44a98fc36172e848bf227d1c61d2bdcf2d86c9b094cd
 SIZE (python/python-3.9.2-docs-pdf-a4.tar.bz2) = 15284567
 SHA256 (python/python-3.9.2-docs-pdf-letter.tar.bz2) = 9b8542fae842faa1f701360eb996b5c3689fce6c852aaf6e7886bc88b950eec8
 SIZE (python/python-3.9.2-docs-pdf-letter.tar.bz2) = 15392980
 SHA256 (python/python-3.9.2-docs-text.tar.bz2) = e85e12f5032c5a8fb24e6e13cfa77fd5d50f86ea72c1704f28d96ae317c347b7
 SIZE (python/python-3.9.2-docs-text.tar.bz2) = 2498091
Index: head/lang/python36/Makefile
===================================================================
--- head/lang/python36/Makefile	(revision 566388)
+++ head/lang/python36/Makefile	(revision 566389)
@@ -1,152 +1,151 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	2
 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
 
 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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>
Index: head/lang/python36/Makefile.version
===================================================================
--- head/lang/python36/Makefile.version	(revision 566388)
+++ head/lang/python36/Makefile.version	(revision 566389)
@@ -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.12
+PYTHON_PORTVERSION=	3.6.13
Index: head/lang/python36/distinfo
===================================================================
--- head/lang/python36/distinfo	(revision 566388)
+++ head/lang/python36/distinfo	(revision 566389)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1597757441
-SHA256 (python/Python-3.6.12.tar.xz) = 70953a9b5d6891d92e65d184c3512126a15814bee15e1eff2ddcce04334e9a99
-SIZE (python/Python-3.6.12.tar.xz) = 17202980
+TIMESTAMP = 1614091341
+SHA256 (python/Python-3.6.13.tar.xz) = a47a43a53abb42286a2c11965343ff56711b9e64e8d11bf2c6701a4fb8ce1a0f
+SIZE (python/Python-3.6.13.tar.xz) = 17213520
 SHA256 (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 44340896504b297bbab06db0bb0a71ddf9f25bbe02ab3dcdfeec2772c957b69f
 SIZE (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 2542
 SHA256 (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = a5cf6ef701d6afb14417232c6723fe2c50d7bf35d87bf6b3e3bcbfa1000a38f9
 SIZE (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = 2888