diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index c7431b2c86e3..07078a64fadd 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -1,726 +1,726 @@
 # Provide support for Python related ports. This includes detecting Python
 # interpreters, ports providing package and modules for python as well as
 # consumer ports requiring Python at build or run time.
 #
 # Feature:	python
 # Usage:	USES=python[:version-spec][,arg,...]
 # Valid ARGS:	<version-spec>, patch, build, run, test, env
 #
 # version-spec 	Declarative specification for the Python version(s) the
 #		port supports. Subsets and ranges can be specified:
 #
 #			* <version>
 #			* <minimum-version>-<maximum-version>
 #			* <minimum-version>+
 #			* -<maximum-version>
 #
 #		Examples:
 #
 #			USES=python:2.7		# Supports Python 2.7 Only
 #			USES=python:3.6+	# Supports Python 3.6 or later
 #			USES=python:3.6-3.9	# Supports Python 3.6 to 3.9
 #			USES=python:-3.8	# Supports Python up to 3.8
 #			USES=python		# Supports 3.6+
 #
 # NOTE:	<version-spec> should be as specific as possible, matching the versions
 #	upstream declares support for, without being incorrect. In particular,
 #	USES=python *without* a <version-spec> means 3.6+,
 #	including unreleased versions, which is probably incorrect.
 #
 #	Not specifying a <version-spec> should only be used when a more specific
 #	<version-spec> cannot be specified due to syntax limitations, for
 #	example: 2.7,3.4-3.6, but even in this case, X.Y+ (2.7+), or -X.Y (-3.6)
 #	is preferred and likely more correct.
 #
 # patch		Python is needed at patch time. Adds dependency to PATCH_DEPENDS.
 # build		Python is needed at build time. Adds dependency to BUILD_DEPENDS.
 # run		Python is needed at run time. Adds dependency to RUN_DEPENDS.
 # test		Python is needed at test time. Adds dependency to TEST_DEPENDS.
 # env		Does not depend on Python but needs the environment set up. This
 #		is mainly used when depending on flavored python ports, or when a
 #		correct PYTHON_CMD is required.  It has the same effect as setting
 #		PYTHON_NO_DEPENDS.
 #
 # If build, run and test are omitted, Python will be added as BUILD_DEPENDS,
 # RUN_DEPENDS and TEST_DEPENDS.
 # patch is independant, it does not prevent the default build/run/test
 # dependency.
 # env or PYTHON_NO_DEPENDS can be set to not add any dependencies.
 #
 # Exported variables:
 #
 # PYTHON_VERSION	- The chosen Python interpreter including the version,
 #			  e.g. python2.7, python3.5, etc.
 #
 # Variables, which can be set by the port:
 #
 # USE_PYTHON		- A list of additional features and functionality to
 #			  enable. Supported features are:
 #
 #	concurrent 	- Indicates that the port can be installed for
 #			  different python versions at the same time. The port
 #			  is supposed to use a unique prefix for certain
 #			  directories using USES=uniquefiles:dirs (see the
 #			  uniquefiles.mk Uses for details about the
 #			  directories), if set to yes. Binaries receive an
 #			  additional suffix, based on ${PYTHON_VER}.
 #
 #			  The values for the uniquefiles USES are set as
 #			  follows:
 #
 #				UNIQUE_PREFIX=  ${PYTHON_PKGNAMEPREFIX}
 #				UNIQUE_SUFFIX=  -${PYTHON_VER}
 #
 #			  If the port is installed for the current default
 #			  python version, scripts and binaries in
 #
 #				${PREFIX}/bin
 #				${PREFIX}/sbin
 #				${PREFIX}/libexec
 #
 #			  are linked from the prefixed version to the
 #			  prefix-less original name, e.g.
 #			  bin/foo-2.7 --> bin/foo.
 #
 #	cython		- Depend on lang/cython at build-time.
 #
 #	cython_run	- Depend on lang/cython at run-time.
 #
 #	flavors		- Force creation of flavors for Python 2 and 3 default
 #			  versions, where applicable.
 #
 #	noflavors	- Disable automatic creation of flavors if they would
 #			  otherwise be created and they are not wanted.
 #
 #	allflavors 	- Generate flavors for all possible versions and not
 #			  simply the default ones.  Only to be used for py-*
 #			  ports that are part of the Python distribution, but
 #			  kept as separate ports.
 #
 #	optsuffix	- Set PKGNAMESUFFIX to PYTHON_PKGNAMESUFFIX if not the
 #			  default python version.
 #
 #	distutils	- Use distutils as do-configure, do-build and
 #			  do-install targets. implies flavors.
 #
 #	autoplist	- Automatically generates the packaging list for a
 #			  port that uses distutils when defined.
 #			  requires: distutils
 #
 #	py3kplist	- Automatically generates Python 3.x compatible
 #			  __pycache__ entries from a Python 2.x packaging list
 #			  when defined. Use this for ports that do *not* use
 #			  standard Python packaging mechanisms such as
 #			  distutils, and support *both* Python 2.x and 3.x.
 #			  Not needed, if USE_PYTHON=autoplist is set.
 #
 #	pythonprefix	- Says that the port installs in ${PYTHONBASE} instead
 #			  of ${PREFIX}.
 #
 #	noegginfo	- Skip an egg-info entry from plist, if defined.
 #
 # PYTHON_CMD		- Python's command line file name, including the
 #			  version number (used for dependencies).
 #			  default: ${PYTHONBASE}/bin/${PYTHON_VERSION}
 #
 # PYSETUP		- Name of the setup script used by the distutils
 #			  package.
 #			  default: setup.py
 #
 # PYDISTUTILS_PKGNAME
 #			- Internal name in the distutils for egg-info.
 #			  default: ${PORTNAME}
 #
 # PYDISTUTILS_PKGVERSION
 #			- Internal version in the distutils for egg-info.
 #			  default: ${PORTVERSION}
 #
 # PYDISTUTILS_CONFIGURE_TARGET
 #			- Pass this command to distutils on configure stage.
 #			  default: config
 #
 # PYDISTUTILS_BUILD_TARGET
 #			- Pass this command to distutils on build stage.
 #			  default: build
 #
 # PYDISTUTILS_INSTALL_TARGET
 #			- Pass this command to distutils on install stage.
 #			  default: install
 #
 # PYDISTUTILS_CONFIGUREARGS
 #			- Arguments to config with distutils.
 #			  default: <empty>
 #
 # PYDISTUTILS_BUILDARGS
 #			- Arguments to build with distutils.
 #			  default: <empty>
 #
 # PYDISTUTILS_INSTALLARGS
 #			- Arguments to install with distutils.
 #			  default: -c -O1 --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR}
 #
 # PYDISTUTILS_EGGINFO
 #			- Canonical name for egg-info.
 #			  default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
 #
 # The following variables can be read by ports and must not be modified:
 #
 # PYTHONBASE		- The installation prefix of the chosen Python
 #			  interpreter, e.g. /usr/local
 #
 # PYTHON_DISTVERSION
 #			- Version number suitable for ${DISTVERSION}.
 #
 # PYTHON_PORTSDIR	- The port directory of the chosen Python interpreter
 #
 # PYTHON_REL		- The release number of the chosen Python interpreter
 #			  without dots, e.g. 20706, 30401, ...
 #
 # PYTHON_SUFFIX		- The major-minor release number of the chosen Python
 #			  interpreter without dots, e.g. 27, 36, ...
 #			  Used for prefixes and suffixes.
 #
 # PYTHON_MAJOR_VER	- The major release version of the chosen Python
 #			  interpreter, e.g. 2, 3, ...
 #
 # PYTHON_VER		- The major-minor release version of the chosen Python
 #			  interpreter, e.g. 2.7, 3.6, ...
 #
 # PYTHON_ABIVER		- Additional ABI flags set by the chosen Python
 #			  interpreter, e.g. md
 #
 # PYTHON_INCLUDEDIR	- Location of the Python include files.
 #			  default: ${PYTHONBASE}/include/${PYTHON_VERSION}
 #
 # PYTHON_LIBDIR		- Base of the python library tree
 #			  default: ${PYTHONBASE}/lib/${PYTHON_VERSION}
 #
 # PYTHON_SITELIBDIR	- Location of the site-packages tree. Don't change,
 #			  unless you know what you do.
 #			  default: ${PYTHON_LIBDIR}/site-packages
 #
 # There are PREFIX-clean variants of the PYTHON_*DIR variables above.
 # They are meant to be used by ports instead of the above variables, so the
 # ports respect ${PREFIX} (unless USE_PYTHON=pythonprefix is specified).
 #
 # PYTHONPREFIX_INCLUDEDIR	default: ${PREFIX}/include/${PYTHON_VERSION}
 # PYTHONPREFIX_LIBDIR		default: ${PREFIX}/lib/${PYTHON_VERSION}
 # PYTHONPREFIX_SITELIBDIR	default: ${PYTHONPREFIX_LIBDIR}/site-packages
 #
 # PYTHON_PLATFORM	- Python's idea of the OS release.
 #			  This is faked with ${OPSYS} and ${OSREL} until we
 #			  find out how to delay defining a variable until
 #			  after a certain target has been built.
 #
 # PYTHON_PKGNAMEPREFIX
 #			- Use this as a ${PKGNAMEPREFIX} to distinguish
 #			  packages for different Python versions.
 #			  default: py${PYTHON_SUFFIX}-
 #
 # PYTHON_PKGNAMESUFFIX
 #			- Use this as a ${PKGNAMESUFFIX} to distinguish
 #			  packages for different Python versions.
 #			  default: -py${PYTHON_SUFFIX}
 #
 # Using USES=python also will add some useful entries to PLIST_SUB:
 #
 #	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;}
 #	PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
 #	PYTHON_PLATFORM=${PYTHON_PLATFORM}
 #	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 #	PYTHON_SUFFIX=${PYTHON_SUFFIX}
 #	PYTHON_VER=${PYTHON_VER}
 #	PYTHON_VERSION=${PYTHON_VERSION}
 #
 # and PYTHON2 and PYTHON3 will be set according to the Python version:
 #
 #	PYTHON2="" PYTHON3="@comment " for Python 2.x
 #	PYTHON2="@comment " PYTHON3="" for Python 3.x
 #
 # PYDISTUTILS_INSTALLNOSINGLE
 #			- Deprecated without replacement
 #
 # MAINTAINER: python@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PYTHON_MK)
 _INCLUDE_USES_PYTHON_MK=	yes
 
 # What Python version and what Python interpreters are currently supported?
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
 _PYTHON_VERSIONS=		3.8 3.9 3.7 3.6 3.10 2.7 # preferred first
 _PYTHON_PORTBRANCH=		3.8		# ${_PYTHON_VERSIONS:[1]}
 _PYTHON_BASECMD=		${LOCALBASE}/bin/python
 _PYTHON_RELPORTDIR=		lang/python
 
 # List all valid USE_PYTHON features here
 _VALID_PYTHON_FEATURES=	allflavors autoplist concurrent cython cython_run \
 			distutils flavors noegginfo noflavors optsuffix \
 			py3kplist pythonprefix
 _INVALID_PYTHON_FEATURES=
 .for var in ${USE_PYTHON}
 .  if empty(_VALID_PYTHON_FEATURES:M${var})
 _INVALID_PYTHON_FEATURES+=	${var}
 .  endif
 .endfor
 .if !empty(_INVALID_PYTHON_FEATURES)
 IGNORE=	uses unknown USE_PYTHON features: ${_INVALID_PYTHON_FEATURES}
 .endif
 
 # Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
 .for var in ${USE_PYTHON}
 _PYTHON_FEATURE_${var:C/=.*$//:tu}=	${var:C/.*=//:S/,/ /g}
 .endfor
 
 # distutils automatically generates flavors depending on the supported
 # versions.
 .if defined(_PYTHON_FEATURE_DISTUTILS)
 _PYTHON_FEATURE_FLAVORS=	yes
 .endif
 
 .if defined(_PYTHON_FEATURE_NOFLAVORS)
 .undef _PYTHON_FEATURE_FLAVORS
 .endif
 
 # Make sure that no dependency or some other environment variable
 # pollutes the build/run dependency detection
 .undef _PYTHON_BUILD_DEP
 .undef _PYTHON_RUN_DEP
 .undef _PYTHON_TEST_DEP
 _PYTHON_ARGS=		${python_ARGS:S/,/ /g}
 .if ${_PYTHON_ARGS:Mpatch}
 _PYTHON_PATCH_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Npatch}
 .endif
 .if ${_PYTHON_ARGS:Mbuild}
 _PYTHON_BUILD_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nbuild}
 .endif
 .if ${_PYTHON_ARGS:Mrun}
 _PYTHON_RUN_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nrun}
 .endif
 .if ${_PYTHON_ARGS:Mtest}
 _PYTHON_TEST_DEP=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Ntest}
 .endif
 .if ${_PYTHON_ARGS:Menv}
 PYTHON_NO_DEPENDS=	yes
 _PYTHON_ARGS:=		${_PYTHON_ARGS:Nenv}
 .endif
 
 # The port does not specify a build, run or test dependency, assume all are
 # required.
 .if !defined(_PYTHON_BUILD_DEP) && !defined(_PYTHON_RUN_DEP) && \
     !defined(_PYTHON_TEST_DEP) && !defined(PYTHON_NO_DEPENDS)
 _PYTHON_BUILD_DEP=	yes
 _PYTHON_RUN_DEP=	yes
 _PYTHON_TEST_DEP=	yes
 .endif
 
 .if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
 WARNING+=	"PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
 .endif
 
 .if ${_PYTHON_ARGS} == 2.7
 DEV_WARNING+=		"lang/python27 reached End of Life and will be removed on 2020-12-31, consider converting to a modern version of python"
 .elif ${_PYTHON_ARGS} == 2
 DEV_ERROR+=		"USES=python:2 is no longer supported, use USES=python:2.7"
 .elif ${_PYTHON_ARGS} == 3
 DEV_ERROR+=		"USES=python:3 is no longer supported, use USES=python:3.6+ or an appropriate version range"
 .endif  # ${_PYTHON_ARGS} == 2.7
 
 _PYTHON_VERSION:=	${PYTHON_DEFAULT}
 
 .if empty(_PYTHON_ARGS)
 _PYTHON_ARGS=	3.6+
 .endif
 
 # Validate Python version whether it meets the version restriction.
 _PYTHON_VERSION_CHECK:=		${_PYTHON_ARGS:C/^([1-9]\.[1-9]?[0-9])$/\1-\1/}
 _PYTHON_VERSION_MINIMUM_TMP:=	${_PYTHON_VERSION_CHECK:C/([1-9]\.[1-9]?[0-9])[-+].*/\1/}
 _PYTHON_VERSION_MINIMUM:=	${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MINIMUM_TMP:M[1-9].[1-9][0-9]}
 _PYTHON_VERSION_MAXIMUM_TMP:=	${_PYTHON_VERSION_CHECK:C/.*-([1-9]\.[1-9]?[0-9])/\1/}
 _PYTHON_VERSION_MAXIMUM:=	${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}${_PYTHON_VERSION_MAXIMUM_TMP:M[1-9].[1-9][0-9]}
 
 # At this point we should have no argument left in ${_PYTHON_ARGS}
 # except a version spec
 _V1=		[1-9].[0-9]
 _V2=		[1-9].[1-9][0-9]
 _PYTHON_ARGS:=	${_PYTHON_ARGS:N${_V1}-${_V1}:N${_V1}-${_V2}:N${_V2}-${_V2}:N${_V1}:N${_V2}:N${_V1}+:N${_V2}+:N-${_V1}:N-${_V2}}
 .if !empty(_PYTHON_ARGS)
 IGNORE=	uses unknown USES=python arguments: ${_PYTHON_ARGS}
 .endif
 
 # Pattern to convert python versions (X.Y or X.YY) to comparable format X.YY
 _VC=		C/^([1-9]\.)([0-9])$$/\10\2/
 
 .undef _PYTHON_VERSION_NONSUPPORTED
 .if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MINIMUM} at least
 .elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
 .endif
 
 # If we have an unsupported version of Python, try another.
 .if defined(_PYTHON_VERSION_NONSUPPORTED)
 .undef _PYTHON_VERSION
 .for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
 .if !defined(_PYTHON_VERSION) && \
 	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
 		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
 		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
 _PYTHON_VERSION=	${ver}
 .endif
 .endfor
 .if !defined(_PYTHON_VERSION)
 IGNORE=		needs an unsupported version of Python
 .endif
 .endif	# defined(_PYTHON_VERSION_NONSUPPORTED)
 
 # Automatically generates FLAVORS if empty
 .if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
 .  undef _VALID_PYTHON_VERSIONS
 .  for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
 .    if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
 		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
 		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
 .      if empty(_VALID_PYTHON_VERSIONS:M${ver})
 _VALID_PYTHON_VERSIONS+=	${ver}
 .      endif
 .    endif
 .  endfor
 # Get all possible flavors depending on version requirements
 .  if defined(_VALID_PYTHON_VERSIONS)
 _ALL_PYTHON_FLAVORS=	${_VALID_PYTHON_VERSIONS:S/.//:S/^/py/}
 .  else
 _ALL_PYTHON_FLAVORS=	${_PYTHON_VERSIONS:S/.//:S/^/py/}
 .  endif
 # Decide how many flavors we want.  By default, only generate the default
 # versions.
 .  if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS)
 FLAVORS=	${_ALL_PYTHON_FLAVORS}
 .  else
 .    for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT}
 _f=	py${_v:S/.//}
 .      if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
 .if !empty(FLAVORS)
 FLAVORS:=	${FLAVORS} ${_f}
 .else
 FLAVORS:=	${_f}
 .endif
 .      endif
 .    endfor
 .  endif
 .  if !empty(FLAVORS) && empty(FLAVOR)
 FLAVOR=	${FLAVORS:[1]}
 .  endif
 .endif
 
 .if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
 _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
 .endif
 
 .if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT}
 .if defined(_PYTHON_FEATURE_OPTSUFFIX)
 DEV_WARNING+=	"USE_PYTHON=optsuffix is deprecated, consider migrating to using unconditional PKGNAMESUFFIX or PKGNAMEPREFIX"
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 .endif
 .endif
 
 # To avoid having dependencies with @ and empty flavor:
 # _PYTHON_VERSION is either set by (first that matches):
 # - If using Python flavors, from the current Python flavor
 # - If using a version restriction (USES=python:3.6+), from the first
 #   acceptable default Python version.
 # - From PYTHON_DEFAULT
 PY_FLAVOR=	py${_PYTHON_VERSION:S/.//}
 
 PYTHON_VERSION=	python${_PYTHON_VERSION}
 
 # Got the correct python version, set some publicly accessible variables
 PYTHON_VER=		${_PYTHON_VERSION}
 PYTHON_SUFFIX=		${_PYTHON_VERSION:S/.//g}
 PYTHON_MAJOR_VER=	${PYTHON_VER:R}
 PYTHON_REL=		# empty
 PYTHON_ABIVER=		# empty
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
 
 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
 .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
 .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
 .endif
 # Create a 5 integer version string, prefixing 0 to the minor and patch
 # tokens if it's a single character. Only use the the first 3 tokens of
 # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
 # any Python port (lang/pythonXY)
 PYTHON_REL=	${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\1/:S/.//g}
 
 # Might be overridden by calling ports
 PYTHON_CMD?=		${_PYTHON_BASECMD}${_PYTHON_VERSION}
 .if ${PYTHON_VER} != 2.7
 .if exists(${PYTHON_CMD}-config)
 PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
 .elif ${PYTHON_REL} < 30800
 # Default ABI flags for lang/python3[67] ports
 PYTHON_ABIVER=		m
 .endif
 .endif
 
 .if ${PYTHON_REL} >= 30807
 PYTHON_EXT_SUFFIX=	.cpython-${PYTHON_SUFFIX}
 .else
 PYTHON_EXT_SUFFIX=	# empty
 .endif
 
 .if ${PYTHON_MAJOR_VER} == 2
 DEPRECATED?=	Uses Python 2.7 which is EOLed upstream
 EXPIRATION_DATE?=	2020-12-31
 .endif
 
 .if !defined(PYTHONBASE)
 PYTHONBASE!=	(${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
 			2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
 .endif
 _EXPORTED_VARS+=	PYTHONBASE
 
 PYTHON_INCLUDEDIR=	${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER}
 PYTHON_LIBDIR=		${PYTHONBASE}/lib/python${_PYTHON_VERSION}
 PYTHON_PLATFORM=	${OPSYS:tl}${OSREL:C/\.[0-9.]*//}
 PYTHON_SITELIBDIR=	${PYTHON_LIBDIR}/site-packages
 PYTHON_PKGNAMEPREFIX=	py${PYTHON_SUFFIX}-
 PYTHON_PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
 
 PYTHONPREFIX_INCLUDEDIR=	${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};}
 PYTHONPREFIX_LIBDIR=		${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}
 PYTHONPREFIX_SITELIBDIR=	${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
 
 # Used for recording the installed files.
 _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
 
 # Ports bound to a certain python version SHOULD
 # - use the PYTHON_PKGNAMEPREFIX
 # - use directories using the PYTHON_PKGNAMEPREFIX
 # - install binaries using the required PYTHON_VER, with
 #   the default python version creating a symlink to the original binary
 #   name (for staging-aware ports).
 #
 # What makes a port 'bound' to a certain python version?
 # - it installs data into PYTHON_SITELIBDIR, PYTHON_INCLUDEDIR, ...
 # - it links against libpython*.so
 # - it uses USE_PYTHON=distutils
 #
 
 .if defined(_PYTHON_FEATURE_CYTHON)
 BUILD_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .endif
 
 .if defined(_PYTHON_FEATURE_CYTHON_RUN)
 RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .endif
 
 .if defined(_PYTHON_FEATURE_CONCURRENT)
 .if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3*} || ${_PYTHON_VERSION_MAXIMUM:M2*})
 DEV_WARNING+=	"USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
 .endif
 _USES_POST+=		uniquefiles:dirs
 .if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
 UNIQUE_DEFAULT_LINKS=	yes
 .elif !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION} == ${PYTHON_DEFAULT}
 UNIQUE_DEFAULT_LINKS=	yes
 .else
 UNIQUE_DEFAULT_LINKS=	no
 .endif
 UNIQUE_PREFIX=		${PYTHON_PKGNAMEPREFIX}
 UNIQUE_SUFFIX=		-${PYTHON_VER}
 UNIQUE_SUFFIX_TYPES+=	SUFFIX_MAN
 UNIQUE_SUFFIX_MAN_WITH_EXT=	.[1-9ln]
 UNIQUE_SUFFIX_MAN_EXTRA_EXT=	.gz
 
 .if defined(_PYTHON_FEATURE_AUTOPLIST)
 _UNIQUE_FIND_SUFFIX_FILES=	${SED} -e 's|^${PREFIX}/||' ${_PYTHONPKGLIST} ${TMPPLIST}
 .else
 _UNIQUE_FIND_SUFFIX_FILES=	${SED} -e 's|^${PREFIX}/||' ${TMPPLIST} 2>/dev/null
 .endif
 UNIQUE_FIND_SUFFIX_FILES+=	${_UNIQUE_FIND_SUFFIX_FILES} | \
 				${EGREP} -he '^bin/.*$$|^sbin/.*$$|^libexec/.*$$'
 UNIQUE_FIND_SUFFIX_MAN_FILES+=	${_UNIQUE_FIND_SUFFIX_FILES} | \
 				${EGREP} -he '^man/man[1-9ln]/.*$$|^share/man/man[1-9ln]/.*$$'
 .endif # defined(_PYTHON_FEATURE_CONCURRENT)
 
 _CURRENTPORT:=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 .if defined(_PYTHON_FEATURE_DISTUTILS) && \
 	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools &&\
 	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools44
 .if ${PYTHON_VER} == 2.7
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
 .else
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 .endif
 .endif
 
 # distutils support
 PYSETUP?=		setup.py
 PYDISTUTILS_SETUP?=	-c \
 	"import sys; import setuptools; \
 	__file__='${PYSETUP}'; sys.argv[0]='${PYSETUP}'; \
 	exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"
 PYDISTUTILS_CONFIGUREARGS?=	# empty
 PYDISTUTILS_BUILDARGS?=		# empty
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
 .if defined(_PYTHON_FEATURE_DISTUTILS)
 . if !defined(PYDISTUTILS_INSTALLNOSINGLE)
 PYDISTUTILS_INSTALLARGS+=	--single-version-externally-managed
 . endif
 PYDISTUTILS_INSTALLARGS+=	--root=${STAGEDIR}
 .endif
 PYDISTUTILS_INSTALLARGS:=	--record ${_PYTHONPKGLIST} \
 		${PYDISTUTILS_INSTALLARGS}
 
 PYDISTUTILS_PKGNAME?=	${PORTNAME}
 PYDISTUTILS_PKGVERSION?=${PORTVERSION}
 PYDISTUTILS_EGGINFO?=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
 PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .if !defined(_PYTHON_FEATURE_NOEGGINFO) && \
 	!defined(_PYTHON_FEATURE_AUTOPLIST) && \
 	defined(_PYTHON_FEATURE_DISTUTILS) && \
 	defined(PYTHON_REL)
 _USES_stage+=	933:add-plist-egginfo
 add-plist-egginfo:
 . for egginfo in ${PYDISTUTILS_EGGINFO}
 	if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \
 		${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while read f; do \
 			${ECHO_CMD} ${PYDISTUTILS_EGGINFODIR:S;^${STAGEDIR}${PREFIX}/;;}/${egginfo}/$${f} >> ${TMPPLIST}; \
 		done; \
 	fi;
 . endfor
 .endif
 
 .if defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
 _RELSITELIBDIR=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
 _RELLIBDIR=		${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}
 
 _USES_stage+=	934:add-plist-pymod
 add-plist-pymod:
 	@${SED} -e 's|^"\(.*\)"$$|\1|' \
 		-e 's|^${STAGEDIR}${PREFIX}/||' \
 		-e 's|^${PREFIX}/||' \
 		-e 's|^\(man/.*man[0-9]\)/\(.*\.[0-9]\)$$|\1/\2.gz|' \
 		-e 's|^\(share/man/.*man[0-9]\)/\(.*\.[0-9]\)$$|\1/\2.gz|' \
 		-e 's|[[:alnum:]|[:space:]]*/\.\./*||g; s|/\./|/|g' \
 		${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
 
 .else
 .if ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
 # When Python version is 3.2+ we rewrite all the filenames
 # of TMPPLIST that end with .py[co], so that they conform
 # to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
 PYMAGICTAG=		${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
 _USES_stage+=	935:add-plist-python
 add-plist-python:
 	@${AWK} '\
 		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.pyc$$/,  "." mt "&"); sub(/\.pyo$$/, "." mt "." pyo); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
 		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
 		/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
 		{print} \
 		' \
 		pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
 		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
 	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
 .endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
 .endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)
 
 # Fix for programs that build python from a GNU auto* environment
 CONFIGURE_ENV+=	PYTHON="${PYTHON_CMD}"
 
 # By default CMake picks up the highest available version of Python package.
 # Enforce the version required by the port or the default.
 CMAKE_ARGS+=	-DPython_ADDITIONAL_VERSIONS=${PYTHON_VER}
 
 # Python 3rd-party modules
 PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
 PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}
 
 # Common Python modules that can be needed but only for some versions of Python.
 .if ${PYTHON_REL} < 30500
 .else
 PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
 .endif
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
-PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
+PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.9:devel/mercurial@${PY_FLAVOR}
 .else
-PY_MERCURIAL=	mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
+PY_MERCURIAL=	mercurial>=5.9:devel/mercurial@${PY_FLAVOR}
 .endif
 
 CMAKE_ARGS+=	-DBOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX}
 PY_BOOST_LIB=	boost_python${PYTHON_SUFFIX}
 PY_BOOST=	lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR}
 
 # dependencies
 .for _stage in PATCH BUILD RUN TEST
 .  if defined(_PYTHON_${_stage}_DEP)
 ${_stage}_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 .  endif
 .endfor
 
 # set $PREFIX as Python's one
 .if defined(_PYTHON_FEATURE_PYTHONPREFIX)
 PREFIX=		${PYTHONBASE}
 .endif
 
 # Substitutions for pkg-plist
 # Use a short form of the PYTHONPREFIX_*DIR variables; we don't need the
 # base directory in the plist file.
 PLIST_SUB+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
 		PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
 		PYTHON_PLATFORM=${PYTHON_PLATFORM} \
 		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
 		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 .if ${PYTHON_REL} < 30000
 PLIST_SUB+=	PYTHON2="" PYTHON3="@comment "
 .else
 PLIST_SUB+=	PYTHON2="@comment " PYTHON3=""
 .endif
 
 _USES_POST+=	python
 .endif # _INCLUDE_USES_PYTHON_MK
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
 _INCLUDE_USES_PYTHON_POST_MK=	yes
 
 # py-distutils support
 PYDISTUTILS_CONFIGURE_TARGET?=	config
 PYDISTUTILS_BUILD_TARGET?=	build
 PYDISTUTILS_INSTALL_TARGET?=	install
 
 .if defined(_PYTHON_FEATURE_DISTUTILS)
 LDSHARED?=	${CC} -shared
 MAKE_ENV+=	LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE=
 
 .if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
 do-configure:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})
 .endif
 
 .if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
 .endif
 
 .if !target(do-install)
 do-install:
 	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
 .endif
 .endif # defined(_PYTHON_FEATURE_DISTUTILS)
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 03b9cd935938..44857b1420c6 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -1,50 +1,51 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 
 PORTNAME=	zim
 DISTVERSION=	0.73.5
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://www.zim-wiki.org/downloads/
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Desktop wiki editor
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gnome python:3.3+ shared-mime-info
 USE_GNOME=	gtk30 pygobject3
 USE_PYTHON=	autoplist distutils noflavors
 
 INSTALLS_ICONS=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
 			MERCURIAL SCROT
 
 DITAA_DESC=		Diagram editor support
 DITAA_RUN_DEPENDS=	ditaa:graphics/ditaa
 GIT_DESC=		Version control for notebooks using git
 GIT_RUN_DEPENDS=	git:devel/git
 GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GNUR_DESC=		Support of plot editor based on GNU R
 GNUR_RUN_DEPENDS=	R:math/R
 GRAPHVIZ_RUN_DEPENDS=	fdp:graphics/graphviz
 LATEX_USE=		tex=latex:run
 MERCURIAL_DESC=		Version control for notebooks using hg
 MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
 SCROT_DESC=		Screenshot taking and inserting support
 SCROT_RUN_DEPENDS=	scrot:graphics/scrot
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/.command.install /s|distutils|setuptools| ; \
 		 s|share/man|man|' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 79c9c47d2ec2..156569027afe 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	57f8d0171423.patch:-p1 # https://github.com/glandium/git-cinnabar/pull/277
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:3.6+,run shebangfix
 TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 MAKE_ENV=	${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!}
 MAKE_ARGS=	SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!}
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${WRKSRC}/git-core
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/hgreviewboard/Makefile b/devel/hgreviewboard/Makefile
index 06c26420ab9f..241f9b767699 100644
--- a/devel/hgreviewboard/Makefile
+++ b/devel/hgreviewboard/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	hgreviewboard
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	https://bitbucket.org/ccaughie/hgreviewboard/get/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTVERSION}
 DIST_SUBDIR=	hgreviewboard
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mercurial reviewboard extension
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PY_MERCURIAL} \
 		rbt:devel/rbtools
 
 WRKSRC=		${WRKDIR}/ccaughie-hgreviewboard-e461a0baf62d
 USES=		python
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/import simplejson/import json as simplejson/' \
 		${WRKSRC}/reviewboard.py
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/reviewboard
 	${INSTALL_DATA} ${WRKSRC}/__init__.py \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/reviewboard
 	${INSTALL_DATA} ${WRKSRC}/reviewboard.py \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/reviewboard
 
 .include <bsd.port.mk>
diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile
index 2e62da7be839..d97a3b91a975 100644
--- a/devel/hgsvn/Makefile
+++ b/devel/hgsvn/Makefile
@@ -1,24 +1,25 @@
 # Created by: Xin LI <delphij@FreeBSD.org>
 
 PORTNAME=	hgsvn
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Scripts to work locally on Subversion checkouts using Mercurial
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	svn:devel/subversion \
 		${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}hglib>0:devel/py-hglib@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
 
 NO_ARCH=	YES
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index f702bfc0625b..1ec1ea0b0f97 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,84 +1,83 @@
 # Created by: Andreas Kohn
 
 PORTNAME=	mercurial
-PORTVERSION=	5.5
-PORTREVISION=	1
+PORTVERSION=	5.9.1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mercurial-scm.org/release/
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, lightweight source control management system
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe python:3.6+ shebangfix
 SHEBANG_FILES=	contrib/hgweb.fcgi hgweb.cgi
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=		CA_BUNDLE DATA DOCS NLS FREEBSD
 OPTIONS_DEFAULT=	CA_BUNDLE DATA
 OPTIONS_SUB=		yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 DATA_SUB_FILES=		pkg-message
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
 NLS_USES=		gettext
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
 		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mq.el \
 		pylintrc \
 		python-hook-examples.py \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 PORTDOCS=	CONTRIBUTORS README.rst
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DATA-on:
 .for d in hgsh vim
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/www
 .for f in ${CONTRIB_FILES}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
 		${STAGEDIR}${DATADIR}/contrib/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/hgweb.cgi ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index d95949d166dd..0cdef6701638 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598899848
-SHA256 (mercurial-5.5.tar.gz) = c1ed28e1534304a7a4981ed59905286d1c56acd5b75755eedd184171a4a782b4
-SIZE (mercurial-5.5.tar.gz) = 7757631
+TIMESTAMP = 1631662513
+SHA256 (mercurial-5.9.1.tar.gz) = 32eff9433c62d781dc93e5a6103327264d897ad2bbce3ecb5d2d78a93cf49f27
+SIZE (mercurial-5.9.1.tar.gz) = 8120006
diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index e343bf4eaf91..216e1187710e 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -1,42 +1,42 @@
 # Created by: J. Giovannangeli
 
 PORTNAME=	opam
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	opam-full-${DISTVERSION}
 
 MAINTAINER=	hannes@mehnert.org
 COMMENT=	Source-based package manager for OCaml
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	curl:ftp/curl \
 		gpatch:devel/patch
 
 USES=		gmake
 USE_OCAML=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-checks
 
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lib-ext all
 
 OPTIONS_DEFINE=		DARCS GIT MERCURIAL RSYNC
 OPTIONS_DEFAULT=	GIT RSYNC
 NO_OPTIONS_SORT=	yes
 
 RSYNC_DESC=		Remote repository synchronized with Rsync
 
 DARCS_RUN_DEPENDS=	darcs:devel/hs-darcs
 GIT_RUN_DEPENDS=	git:devel/git
 MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
 
 .include <bsd.port.mk>
diff --git a/devel/py-hglib/Makefile b/devel/py-hglib/Makefile
index b96601024170..2f096ac18591 100644
--- a/devel/py-hglib/Makefile
+++ b/devel/py-hglib/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	hglib
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Library with a fast, convenient interface to Mercurial
 
 LICENSE=	MIT
 
 RUN_DEPENDS+=	${PY_MERCURIAL}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index 19c4ec257f99..6d5f80cc6d07 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	setuptools_scm
 PORTVERSION=	4.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Setuptools plugin to manage your versions by scm tags
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		git:devel/git \
 		${PY_MERCURIAL}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		TOML
 OPTIONS_DEFAULT=	TOML
 
 TOML_DESC=		Support for parsing pyproject.toml files [PEP 517/518]
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index ede2c9805994..0b605c23a244 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	tortoisehg
-DISTVERSION=	5.9.0
+DISTVERSION=	5.9.1
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PY_MERCURIAL}
 RUN_DEPENDS=	${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.5+
 USE_PYQT=	core gui network qscintilla2 xml
 USE_PYTHON=	distutils autoplist
 
 USE_GITLAB=	yes
 GL_SITE=	https://foss.heptapod.net
 GL_ACCOUNT=	mercurial/tortoisehg
 GL_PROJECT=	thg
-GL_COMMIT=	58b751b1987b29c9468ed60080374a93a76828a6
+GL_COMMIT=	a79b3966df14445c75186e56ece5e1964e1f8376
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude thg-${GL_COMMIT}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-on:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-off:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tortoisehg
 	${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
 
 .include <bsd.port.post.mk>
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index e2a8e62d5138..8c3629cc4680 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631021541
-SHA256 (mercurial/tortoisehg-thg-58b751b1987b29c9468ed60080374a93a76828a6_GL0.tar.gz) = 4a1b247c9db5f55baf10a98824ff83de9a2199404f46676d91b6d6cab21794aa
-SIZE (mercurial/tortoisehg-thg-58b751b1987b29c9468ed60080374a93a76828a6_GL0.tar.gz) = 8641988
+TIMESTAMP = 1631662987
+SHA256 (mercurial/tortoisehg-thg-a79b3966df14445c75186e56ece5e1964e1f8376_GL0.tar.gz) = 6ea1c69fc101ab172073090d284b313277acb6e2fcfa030a51259ace7f4bd44d
+SIZE (mercurial/tortoisehg-thg-a79b3966df14445c75186e56ece5e1964e1f8376_GL0.tar.gz) = 8642071
diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
index 013b0bdcff6d..4dc6df488821 100644
--- a/ports-mgmt/portshaker/Makefile
+++ b/ports-mgmt/portshaker/Makefile
@@ -1,52 +1,52 @@
 # Created by: Romain Tartiere <romain@blogreen.org>
 
 PORTNAME?=	portshaker
 PORTVERSION=	1.0.19
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	ports-mgmt
 
 MAINTAINER?=	romain@FreeBSD.org
 COMMENT?=	Maintain ports tree using multiple sources
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	smortex
 GH_PROJECT=	portshaker
 
 .if ${PORTNAME} == "portshaker"
 OPTIONS_DEFINE=		GIT MERCURIAL RSYNC SUBVERSION
 OPTIONS_DEFAULT=	RSYNC SUBVERSION
 RSYNC_DESC=	rsync support
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
 WITH_SUBVERSION_VER?=   114
 .if ${WITH_SUBVERSION_VER} == 114
 SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
 .elif ${WITH_SUBVERSION_VER} == LTS
 SUBVERSION_RUN_DEPENDS=	svn:devel/subversion-lts
 .endif
 GIT_RUN_DEPENDS=	git:devel/git
 MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
 .else
 OPTIONS_DEFINE=	BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
 OPTIONS_DEFAULT=	BSDSHARP
 BSDSHARP_DESC=		Enable BSD-sharp ports
 ENLIGHTENMENT_DESC=	Enable Enlightnement ports
 GECKO_DESC=		Enable Gecko ports
 HASKELL_DESC=		Enable Haskell ports
 MARCUSCOM_DESC=		Enable GNOME development ports
 TEXLIVE_DESC=		Enable TeXLive ports (Experimental)
 XORG_DESC=		Enable Xorg development ports
 BSDSHARP_MAKE_ENV=	WITH_BSDSHARP=1
 ENLIGHTENMENT_MAKE_ENV=	WITH_ENLIGHTENMENT=1
 GECKO_MAKE_ENV=		WITH_GECKO=1
 HASKELL_MAKE_ENV=	WITH_HASKELL=1
 MARCUSCOM_MAKE_ENV=	WITH_MARCUSCOM=1
 TEXLIVE_MAKE_ENV=	WITH_TEXLIVE=1
 XORG_MAKE_ENV=		WITH_XORG=1
 .endif
 
 .include <bsd.port.mk>