diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index d7df0080e5f3..622c4f029477 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -1,252 +1,252 @@
 # Handle PyQt related ports
 #
 # Feature:	pyqt
 # Usage:	USES=pyqt:ARGS
 # Valid ARGS:	5, 6
 #
 # MAINTAINER:	kde@FreeBSD.org
 #
 # Internal Port variables for PyQt ports:
 # PYQT_DIST	- This port is part of PyQt5/6 itself. Variables and
 #		targets are then set assuming a certain tarball and
 #		port layout.
 # USE_PYQT	- List of PyQt components to depend on
 #		* foo:build    only build depend
 #		* foo:run      only run depend
 #		* foo:test     only test depend
 #		* foo          build and run depend (default)
 # PYQT_SIPDIR	- where sip files will be installed to
 # PYQT_APIDIR	- where api files will be installed to
 # PYQT_DOCDIR	- where doc files will be installed to
 # PYQT_EXAMPLESDIR	- where examples will be installed to
 
 .if !defined(_INCLUDE_USES_PYQT_MK)
 _INCLUDE_USES_PYQT_MK=	yes
 
 # At the moment we support PyQt bindings versions 5 and 6
 # option is for internal use by the py-sip ports.
 _PYQT_SUPPORTED=        5 6 sip
 
 .  if empty(pyqt_ARGS)
 IGNORE=	pyqt needs a qt-version (${_PYQT_SUPPORTED})
 .  endif
 
 # At the moment we support PyQt bindings versions 5 and 6
 .  for ver in ${_PYQT_SUPPORTED:O:u}
 .    if ${pyqt_ARGS:M${ver}}
 .      if empty(_PYQT_VERSION)
 _PYQT_VERSION=  ${ver}
 .      else
 IGNORE?=        cannot be installed: different PYQT versions specified via pyqt:[${_PYQT_SUPPORTED:S/ //g}]
 .      endif
 .    endif
 .  endfor
 
 .  if empty(_PYQT_VERSION)
 IGNORE?=        USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED})
 _PYQT_VERSION=	0
 .  endif
 
 PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
 
 MASTER_SITES_SIP=	https://pypi.python.org/packages/source/s/sip/
 MASTER_SITES_PYQT5=	https://pypi.python.org/packages/source/P/PyQt5/
 MASTER_SITES_PYQT6=	https://pypi.python.org/packages/source/P/PyQt6/
 MASTER_SITES_PYQT=	${MASTER_SITES_PYQT${_PYQT_VERSION}}
 MASTER_SITES_PYQT5SIP=	https://pypi.python.org/packages/source/P/PyQt5-sip/
 MASTER_SITES_PYQT6SIP=	https://pypi.python.org/packages/source/P/PyQt6-sip/
 MASTER_SITES_PYQTSIP=	${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
 MASTER_SITES_PYQT5CHART=	https://pypi.python.org/packages/source/P/PyQtChart/
 MASTER_SITES_PYQT6CHART=	https://pypi.python.org/packages/source/P/PyQt6-Charts/
 MASTER_SITES_PYQTCHART=		${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
 MASTER_SITES_PYQT5NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
 MASTER_SITES_PYQT6NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQt6-NetworkAuth/
 MASTER_SITES_PYQTNETWORKAUTH=		${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
 MASTER_SITES_PYQTBUILDER=	https://pypi.io/packages/source/P/PyQt-builder/
 MASTER_SITES_PYQT5WEBENGINE=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
 MASTER_SITES_PYQT6WEBENGINE=	https://pypi.python.org/packages/source/P/PyQt6-WebEngine/
 MASTER_SITES_PYQTWEBENGINE=		${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz
 MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
 			GENTOO
 
 # PORTEPOCH is important here, because version-comparisons in *_DEPENDS
 # take it into account (visually, 6.5.1 >= 5.5.3,1, but it isn't).
 # Adding the epoch directly into the version here cannot be done,
 # because the DISTVERSION of each of these ports is obtained from the
 # *_VERSION variable (and PORTEPOCH is set in each individual port).
 #
 # Where noted, the ports are epoched and the py-${comp}-PATH variables,
 # below, should have a suitable epoch appended to the version.
-SIP_VERSION=		6.7.2	# ,1
+SIP_VERSION=		6.7.7	# ,1
 SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.13.3
-PYQT5_VERSION=		5.15.7
-PYQT6_VERSION=		6.4.0
+PYQT5_VERSION=		5.15.9
+PYQT6_VERSION=		6.4.2
 PYQT5CHART_VERSION=	5.15.6
 PYQT6CHART_VERSION=	6.4.0
 PYQT5NETWORKAUTH_VERSION=5.15.5
 PYQT6NETWORKAUTH_VERSION=6.4.0
 PYQT5WEBENGINE_VERSION=	5.15.6
 PYQT6WEBENGINE_VERSION=	6.4.0
-PYQT5SIP_VERSION=	12.11.0
-PYQT6SIP_VERSION=	13.4.0
-PYQTBUILDER_VERSION=	1.14.0
+PYQT5SIP_VERSION=	12.11.1
+PYQT6SIP_VERSION=	13.4.1
+PYQTBUILDER_VERSION=	1.14.1
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
 SIP4_DISTNAME=		sip-${SIP4_VERSION}
 PYQT5_DISTNAME=		PyQt5-${PYQT5_VERSION}
 PYQT6_DISTNAME=		PyQt6-${PYQT6_VERSION}
 PYQT5SIP_DISTNAME=	PyQt5_sip-${PYQT5SIP_VERSION}
 PYQT6SIP_DISTNAME=	PyQt6_sip-${PYQT6SIP_VERSION}
 PYQT5CHART_DISTNAME=	PyQtChart-${PYQT5CHART_VERSION}
 PYQT6CHART_DISTNAME=	PyQt6_Charts-${PYQT6CHART_VERSION}
 PYQT5NETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION}
 PYQT6NETWORKAUTH_DISTNAME=	PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}
 PYQTBUILDER_DISTNAME=	PyQt-builder-${PYQTBUILDER_VERSION}
 PYQT5WEBENGINE_DISTNAME=	PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
 PYQT6WEBENGINE_DISTNAME=	PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}
 PYQT5_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 PYQT6_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 QSCI2_DISTNAME=		QScintilla_src-${QSCI2_VERSION}
 PYQT5_LICENSE=		GPLv3
 PYQT6_LICENSE=		GPLv3
 
 _USE_PYQT_ALL=		pyqt5 pyqt6 chart networkauth webengine
 _USE_SIP_ALL=		sip pysip
 _USE_QSCINTILLA=	qscintilla2
 _USE_PYQTBUILDER=	qtbuilder
 
 # Unversioned variables for the rest of the file
 PYQT_VERSION=		${PYQT${_PYQT_VERSION}_VERSION}
 PYQTCHART_VERSION=	${PYQT${_PYQT_VERSION}CHART_VERSION}
 PYQTNETWORKAUTH_VERSION=${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION}
 PYQTWEBENGINE_VERSION=${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}
 PYQT_RELNAME=		py-qt${_PYQT_VERSION}
 PYQT_PY_RELNAME=	${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION}
 PYQT_MASTERSITES=	${MASTER_SITES_PYQT${_PYQT_VERSION}}
 PYQT_DISTNAME=		${PYQT${_PYQT_VERSION}_DISTNAME}
 PYQTCHART_DISTNAME=	${PYQT${_PYQT_VERSION}CHART_DISTNAME}
 PYQTNETWORKAUTH_DISTNAME=${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME}
 PYQTWEBENGINE_DISTNAME=${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME}
 PYQT_DISTINFO_FILE=	${PYQT${_PYQT_VERSION}_DISTINFO_FILE}
 PYQT_LICENSE=		${PYQT${_PYQT_VERSION}_LICENSE}
 
 # PATH (see note about epochs, above)
 py-sip_PATH=			${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION},1
 py-pysip_PATH=			${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
 py-qscintilla2_PATH=		${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
 py-qtbuilder_PATH=		${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION}
 py-pyqt5_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
 py-pyqt6_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
 py-chart_PATH=			${PYQT_PY_RELNAME}-chart>=${PYQTCHART_VERSION}
 py-networkauth_PATH=		${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION}
 py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
 
 # PORT
 py-sip_PORT=			devel/py-sip
 py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
 py-positioning_PORT=		devel/${PYQT_RELNAME}-positioning
 py-pyqt5_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-pyqt6_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-chart_PORT=			x11-toolkits/${PYQT_RELNAME}-chart
 py-networkauth_PORT=		net/${PYQT_RELNAME}-networkauth
 py-webengine_PORT=		www/${PYQT_RELNAME}-webengine
 
 # The versionned executable of sip
 SIP=		${LOCALBASE}/bin/sip-build-${PYTHON_VER}
 
 # Relative directories
 _VERSION_SUBDIR_REL=	PyQt${_PYQT_VERSION}/${PYTHON_VER}
 _APIDIR_REL=	share/${_VERSION_SUBDIR_REL}/qsci
 _DOCDIR_REL=	share/doc/${_VERSION_SUBDIR_REL}
 _EXAMPLEDIR_REL=	share/examples/${_VERSION_SUBDIR_REL}
 _SIPDIR_REL=		PyQt${_PYQT_VERSION}/bindings
 _DESIGNERDIR_REL=	${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
 _QMLDIR_REL=		${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
 
 # Absolute directories
 PYQT_APIDIR=		${PREFIX}/${_APIDIR_REL}
 PYQT_DOCDIR=		${PREFIX}/${_DOCDIR_REL}
 PYQT_EXAMPLEDIR=	${PREFIX}/${_EXAMPLEDIR_REL}
 PYQT_SIPDIR?=		${PYTHON_SITELIBDIR}/${_SIPDIR_REL}
 PYQT_DESIGNERDIR=	${PREFIX}/${_DESIGNERDIR_REL}
 PYQT_QMLDIR=		${PREFIX}/${_QMLDIR_REL}
 
 PLIST_SUB+=	PYQT_APIDIR=${_APIDIR_REL} \
 		PYQT_DOCDIR=${_DOCDIR_REL} \
 		PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \
 		PYQT_SIPDIR=${PYQT_SIPDIR} \
 		PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
 		PYQT_QMLDIR=${_QMLDIR_REL} \
 		PYQT_SIPVERSION=${SIP_VERSION} \
 		PYQT_QSCIVERSION=${QSCI2_VERSION} \
 		PYQT_PYQTVERSION=${PYQT_VERSION}
 
 .  if defined(PYQT_DIST)
 
 PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
 
 SIP_ARGS=	--qmake ${QMAKE} \
 		--verbose \
 		--no-make \
 		--build-dir build \
 		--protected-is-public \
 		--api-dir ${PYQT_APIDIR}
 .    if ${PORTNAME} == "pyqt"
 SIP_ARGS+=	--confirm-license
 .    endif
 
 .    if ${PORTNAME} == "pyqt"
 .      if !target(post-patch)
 post-patch:
 	${REINPLACE_CMD} -e "s#%%PYQT_DESIGNERDIR%%#${PYQT_DESIGNERDIR}#" ${WRKSRC}/project.py
 	${REINPLACE_CMD} -e "s#%%PYQT_QMLDIR%%#${PYQT_QMLDIR}#" ${WRKSRC}/project.py
 .      endif  # !target(post-patch)
 .    endif
 
 .    if !target(do-build)
 do-build:
 	(cd ${WRKSRC}; ${SIP} ${SIP_ARGS}; ${MAKE} ${_MAKE_JOBS} -C ./build)
 
 .    endif  # !target(do-build)
 
 .    if !target(do-install)
 do-install:
 	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 .    endif  # !target(do-install)
 
 .  endif  # defined(PYQT_DIST)
 
 # Set build, run and test depends -- we need to prefix them internally with "py-"
 # else we conflict with the ones defined in bsd.qt.mk with the same name
 _USE_PYQT_ALL+=				${_USE_SIP_ALL} \
 					${_USE_QSCINTILLA} \
 					${_USE_PYQTBUILDER}
 .  for comp in ${_USE_PYQT_ALL:O:u}
 _USE_PYQT_ALL_SUFFIXED+=		py-${comp} py-${comp}:build py-${comp}:run py-${comp}:test
 py-${comp}_BUILD_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
 py-${comp}_RUN_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
 py-${comp}_TEST_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
 py-${comp}_build_BUILD_DEPENDS?=	${py-${comp}_BUILD_DEPENDS}
 py-${comp}_run_RUN_DEPENDS?=		${py-${comp}_RUN_DEPENDS}
 py-${comp}_test_TEST_DEPENDS?=		${py-${comp}_TEST_DEPENDS}
 .  endfor
 
 _USE_PYQT=      ${USE_PYQT:O:u}
 .  for comp in ${_USE_PYQT}
 .    if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
 BUILD_DEPENDS+=		${py-${comp:S/:/_/}_BUILD_DEPENDS}
 RUN_DEPENDS+=		${py-${comp:S/:/_/}_RUN_DEPENDS}
 TEST_DEPENDS+=		${py-${comp:S/:/_/}_TEST_DEPENDS}
 .    else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
 .    endif
 .  endfor
 
 .endif # defined(_INCLUDE_USES_PYQT_MK)
diff --git a/audio/cadence/Makefile b/audio/cadence/Makefile
index f25be5b34c6f..7c1a32f6e249 100644
--- a/audio/cadence/Makefile
+++ b/audio/cadence/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	cadence
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	bf25db6ebdc6437fce5a60afd203fee169efd068.diff:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of tools useful for audio production
 WWW=		https://kxstudio.linuxaudio.org/Applications:Cadence
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	jackit>0:audio/jack \
 		jack_capture:audio/jack-capture
 
 USES=		compiler:c++11-lang desktop-file-utils gmake localbase pkgconfig \
 		python:3.4+ pyqt:5 qt:5 shebangfix tar:bz2
 SHEBANG_FILES=	src/*.py
 USE_QT=		core gui widgets buildtools:build
 USE_PYQT=	pyqt5 sip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 GH_PROJECT=	Cadence
 
 CXXFLAGS+=	-DJACKBRIDGE_PROPER_CPP11_SUPPORT=yes
 # Give the Makefile the proper versioned binaries of PyQt
 BINARY_ALIAS=	pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@cd ${WRKSRC}/data && ${REINPLACE_CMD} ' \
 		s|#!/bin/bash|#!/bin/sh| ; \
 		s|exec $$PYTHON |exec ${PYTHON_CMD} | ; \
 		s|ps -f -u |ps -U |' \
 		cadence cadence-aloop-daemon cadence-jacksettings cadence-logs \
 		cadence-pulse2jack cadence-pulse2loopback cadence-render \
 		cadence-session-start catarina catia claudia claudia-launcher
 	${REINPLACE_CMD} -e 's|-mtune=generic||' ${WRKSRC}/c++/Makefile.mk
 .if ! ${ARCH} == amd64 && ! ${ARCH} == i386
 	${REINPLACE_CMD} -e 's|-msse -mfpmath=sse||' ${WRKSRC}/c++/Makefile.mk
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index 57cff8ea65ff..2efd0c3d2f3f 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Audio plugin host for Jack and PulseAudio
 WWW=		https://kx.studio/Applications:Carla
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 LIB_DEPENDS=	liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
 		pkgconfig pyqt:5 python:3.4+ qt:5 sdl shared-mime-info shebangfix \
 		tar:bz2 xorg
 USE_PYQT=	pyqt5 sip
 USE_GNOME=	gtk20 gtk30
 USE_QT=		core gui widgets buildtools:build
 USE_GL=		gl
 USE_XORG=	x11
 USE_SDL=	sdl2
 USE_LDCONFIG=	${PREFIX}/lib/carla
 
 CONFLICTS_BUILD=	rtaudio rtmidi
 
 SHEBANG_FILES=	data/carla-single data/carla-bridge-lv2-modgui source/native-plugins/resources/* source/frontend/*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 
 MAKE_ARGS=	HAVE_QT4=false \
 		EXTERNAL_PLUGINS=false \
 		PREFIX=${LOCALBASE}
 # Give the Makefile the proper versioned binaries of PyQt
 BINARY_ALIAS=	pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		FFMPEG FLUIDSYNTH LINUXSAMPLER
 OPTIONS_DEFAULT=	FFMPEG FLUIDSYNTH JACK
 OPTIONS_DEFAULT_amd64=	LINUXSAMPLER
 OPTIONS_DEFAULT_i386=	LINUXSAMPLER
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	JACK PULSEAUDIO
 BACKEND_DESC=		Audio backend
 
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg
 FFMPEG_MAKE_ARGS_OFF=		HAVE_FFMPEG=false
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_MAKE_ARGS_OFF=	HAVE_FLUIDSYNTH=false
 
 LINUXSAMPLER_DESC=		Use LinuxSampler: a software audio sampler
 LINUXSAMPLER_LIB_DEPENDS=	liblinuxsampler.so:audio/linuxsampler
 LINUXSAMPLER_MAKE_ARGS_OFF=	HAVE_LINUXSAMPLER=false
 
 JACK_BUILD_DEPENDS=		jackit>0:audio/jack
 JACK_RUN_DEPENDS=		${LOCALBASE}/lib/libjack.so:audio/jack
 JACK_MAKE_ARGS_OFF=		HAVE_JACK=false
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS_OFF=	HAVE_PULSEAUDIO=false
 
 CFLAGS_powerpc64le=	-DEEL_TARGET_PORTABLE
 CFLAGS_powerpc64=	-DEEL_TARGET_PORTABLE
 CFLAGS_powerpc=	-DEEL_TARGET_PORTABLE
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e ' \
 		s|^PYTHON=.*|PYTHON=${PYTHON_CMD}|; \
 		s|#!/bin/bash|#!/bin/sh|' \
 		${STAGEDIR}${PREFIX}/bin/carla*
 	${RMDIR} ${STAGEDIR}${PREFIX}/share/carla/resources/translations
 
 devel-features: patch
 	@${ECHO} "Developer command: show build features"
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} features
 
 .include <bsd.port.mk>
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index ecac2eec90ba..526ca66f9e3e 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	picard
 PORTVERSION=	2.8.5
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		http://ftp.osuosl.org/pub/musicbrainz/picard/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Next generation MusicBrainz Tagger
 WWW=		https://picard.musicbrainz.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.37:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.14:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.2:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0:www/py-pyjwt@${PY_FLAVOR}
 
 USES=		gettext pyqt:5 python:3.7+ desktop-file-utils
 USE_LOCALE=	en_US.UTF-8
 USE_PYQT=	pyqt5:run sip
 USE_PYTHON=	autoplist distutils noflavors
 
 CONFLICTS_INSTALL=	picard-tools py*-python-picard # bin/picard
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
 
 OPTIONS_DEFINE=		ACOUSTID PLUGINS
 OPTIONS_DEFAULT=	PLUGINS
 
 ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
 PLUGINS_DESC=		Install various plugins to extend functionality
 PLUGINS_RUN_DEPENDS=	picard-plugins>=2.0:audio/picard-plugins
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/picard/util/_astrcmp*.so
 
 .include <bsd.port.mk>
diff --git a/audio/qjackcapture/Makefile b/audio/qjackcapture/Makefile
index bc20083f9b1b..b7f383752708 100644
--- a/audio/qjackcapture/Makefile
+++ b/audio/qjackcapture/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	qjackcapture
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GUI for the jack_capture program using PyQt5
 WWW=		https://github.com/SpotlightKid/qjackcapture
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}natsort>0:devel/py-natsort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjacklib>0:audio/py-pyjacklib@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		jack_capture:audio/jack-capture
 
 USES=		desktop-file-utils gmake pyqt:5 python shebangfix
 USE_PYQT=	pyqt5
 
 SHEBANG_FILES=	qjackcapture/app.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SpotlightKid
 
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
 
 PLIST_SUB=	VER=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile
index 9c6f7cedb86b..8de1552e08e7 100644
--- a/biology/py-ete3/Makefile
+++ b/biology/py-ete3/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	ete3
 DISTVERSION=	3.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for the analysis and visualization of trees
 WWW=		http://etetoolkit.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	distutils concurrent autoplist pytest # some tests fail, see https://github.com/etetoolkit/ete/issues/643
 USE_PYQT=	pyqt5
 
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/cad/cura/Makefile b/cad/cura/Makefile
index f012d7e8a04e..5843af957cca 100644
--- a/cad/cura/Makefile
+++ b/cad/cura/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	Cura
 DISTVERSION=	4.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Slicing application for 3D printers
 WWW=		https://github.com/Ultimaker/Cura/wiki
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	Uranium>0,1:cad/uranium
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
 		qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \
 		qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
 		Uranium>=${DISTVERSION}:cad/uranium \
 		libCharon>=4.13.0:net/libcharon \
 		CuraEngine>=${DISTVERSION}:cad/cura-engine \
 		fdm_materials>=4.13.0:cad/fdm_materials \
 		${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynest2d>=4.12.1:devel/py-pynest2d@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		libArcus>=${DISTVERSION}:net/libarcus \
 		libSavitar>=${DISTVERSION}:devel/libsavitar
 LIB_DEPENDS=	libArcus.so:net/libarcus \
 		libSavitar.so:devel/libsavitar
 
 USES=		cmake gettext shebangfix python:3.5+ pyqt:5 \
 		desktop-file-utils shared-mime-info
 USE_PYQT=	pyqt5
 CMAKE_ARGS+=	-DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" \
 	-DCURA_VERSION=${DISTVERSION}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 NO_ARCH=	yes
 SHEBANG_FILES=	cura_app.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' \
 		${WRKSRC}/CMakeLists.txt
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKSRC}/cura_app.py
 
 .include <bsd.port.mk>
diff --git a/cad/py-cq-editor/Makefile b/cad/py-cq-editor/Makefile
index c8997b7eb248..29772ed8b255 100644
--- a/cad/py-cq-editor/Makefile
+++ b/cad/py-cq-editor/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	cq-editor
 DISTVERSION=	0.1.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	CadQuery GUI editor based on PyQT
 WWW=		https://github.com/CadQuery/CQ-editor/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cadquery>=0:cad/py-cadquery@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/spyder/__init__.py:devel/spyder
 
 USES=		pyqt:5 python:3.6+
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	pyqt5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
 GH_PROJECT=	CQ-editor
 
 .include <bsd.port.mk>
diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile
index 2d7887a64a89..b5c415dc241b 100644
--- a/cad/py-pyfda/Makefile
+++ b/cad/py-pyfda/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	pyfda
 PORTVERSION=	0.1
-PORTREVISION=	10
+PORTREVISION=	11
 DISTVERSIONSUFFIX=	rc6
 CATEGORIES=	cad python devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GUI tool for designing and analysing discrete time filters
 WWW=		https://github.com/chipmuenk/pyFDA
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.7+ pyqt:5
 USE_PYTHON=	distutils autoplist
 USE_PYQT=	pyqt5:run
 NO_ARCH=	yes
 
 post-extract:
 	@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
 	@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e " \
 		s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
 		s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e " \
 		s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
 		${WRKSRC}/pyfda/pyfdax.py
 	@${REINPLACE_CMD} -e " \
 		s|'pyfda.log'|'/tmp/pyfda.log'|" \
 		${WRKSRC}/pyfda/*.conf.sample
 
 post-stage:
 	@${REINPLACE_CMD} -E " \
 		s|(.*\.sample)$$|@sample \1|" \
 		${WRKDIR}/.PLIST.pymodtmp
 
 .include <bsd.port.mk>
diff --git a/cad/uranium/Makefile b/cad/uranium/Makefile
index 50015e2b604f..cf1e7b7bdf54 100644
--- a/cad/uranium/Makefile
+++ b/cad/uranium/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	Uranium
 PORTEPOCH=	1
 DISTVERSION=	4.13.1
+PORTREVISION=	1
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Python framework for 3D printing applications
 WWW=		https://github.com/Ultimaker/Uranium/blob/master/docs/overview.md
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
 
 USES=		cmake gettext python:3.5+ pyqt:5
 USE_PYQT=	pyqt5
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 STRIP=
 NO_ARCH=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uranium/scripts
 	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/uranium/scripts
 
 .include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 11bd639691f2..46b974ea9018 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.4.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 WWW=		https://www.gnuradio.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	volk>0:devel/volk \
 		doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info \
 		shebangfix
 
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5
 USE_WX=		3.2
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PORTMAINVER=${PORTVERSION:C|^([1-9]+)\.([0-9]+)\.([0-9]+).*|\1.\2.\3|}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index b9372d066444..b60f487fcb79 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,154 +1,154 @@
 PORTNAME=	calibre
 PORTVERSION=	6.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/ \
 		https://curl.haxx.se/ca/:cacert
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		cacert.pem:cacert
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTFILES:C/:[^:]+$//:Ncacert.pem}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 WWW=		https://calibre-ebook.com/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpoppler-qt6.so:graphics/poppler-qt6 \
 		libwmflite.so:graphics/libwmf \
 		libchm.so:misc/chmlib \
 		libicudata.so:devel/icu \
 		libpodofo.so:graphics/podofo \
 		libmtp.so:multimedia/libmtp \
 		libfreetype.so:print/freetype2 \
 		libhunspell-1.7.so:textproc/hunspell \
 		libhyphen.so:textproc/hyphen \
 		libstemmer.so:textproc/snowballstemmer \
 		libxkbcommon.so:x11/libxkbcommon \
 		libuchardet.so:textproc/uchardet
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \
 		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
 		MathJax3>0:www/mathjax3
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=0:textproc/py-charset-normalizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		pdftohtml:graphics/poppler-utils \
 		${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
 		liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf\
 		MathJax3>0:www/mathjax3
 
 USES=		desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
 		pkgconfig pyqt:6 python:3.8+ qt:6 shared-mime-info shebangfix \
 		ssl tar:xz xorg
 USE_RC_SUBR=	calibre
 SUB_LIST+=	PYTHON_VERSION=${PYTHON_VERSION}
 USE_PYQT=	pyqt6 pysip qtbuilder sip webengine
 USE_QT=		base
 USE_GL=		egl gl
 USE_GNOME=	glib20
 USE_XORG=	xrender xext x11
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	kovidgoyal:calibre-translations:1688698:translations \
 		LibreOffice:dictionaries:bcf7f04:hypenation
 
 SHEBANG_GLOB=	*.sh *.py *.recipe
 python_OLD_CMD=	"/usr/bin/env  python" ${LOCALBASE}/bin/python3
 MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		FC_LIB_DIR="${LOCALBASE}/lib" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}" \
 		PODOFO_LIB_DIR="${LOCALBASE}/lib" \
 		PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
 		WITH_USB=yes \
 		CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \
 		XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
 		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
 		XDG_UTILS_INSTALL_MODE=system \
 		QMAKE=${QMAKE} \
 		SIP_BIN=${SIP} \
 		SIP_DIR=${PYQT_SIPDIR} \
 		PYTHONDONTWRITEBYTECODE=true
 
 post-extract:
 	@${MV} ${WRKSRC_translations} ${WRKSRC}/src/translations
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/cacert.pem ${WRKSRC}/resources/mozilla-ca-certs.pem
 	@${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 		${WRKSRC}/setup/install.py \
 		${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \
 		${WRKSRC}/src/calibre/gui2/preferences/tweaks.py
 
 do-configure:
 	# do nothing
 
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} bootstrap \
 		--system-liberation_fonts \
 		--path-to-liberation_fonts=${LOCALBASE}/share/fonts/Liberation \
 		--system-mathjax \
 		--path-to-mathjax=${LOCALBASE}/www/MathJax3 \
 		--path-to-hyphenation=${WRKSRC_hypenation} \
 	)
 	@${RMDIR} ${LOCALBASE}/libexec/qt6/locales 2>/dev/null || ${TRUE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor \
 		${STAGEDIR}${PREFIX}/share/applications \
 		${STAGEDIR}${PREFIX}/share/desktop-directories \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	# Create this file to avoid what looks like a bug in xdg-desktop-menu
 	@${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
 	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
 		${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
 update-recent-uas:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} recent_uas)
 	${CP} ${BUILD_WRKSRC}/resources/user-agent-data.json ${FILESDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 0f38e644d2fc..fd7c3a17e557 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	treeline
 PORTVERSION=	3.1.5
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Structured information storage program
 WWW=		https://treeline.bellz.org
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		python:3.7+ pyqt:5 shebangfix
 USE_PYQT=	pyqt5 sip
 
 SHEBANG_FILES=	source/treeline.py
 
 CONFIGURE_ARGS=	-b ${STAGEDIR} -p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/TreeLine
 
 OPTIONS_DEFINE=		DOCS NLS
 SPELL_DESC=		Spell check support
 OPTIONS_SINGLE=		SPELL
 OPTIONS_SINGLE_SPELL=	ASPELL HUNSPELL ISPELL
 OPTIONS_DEFAULT=	ASPELL
 OPTIONS_SUB=		yes
 
 ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 ASPELL_VARS=		SPELL_ENGINE=aspell
 
 HUNSPELL_BUILD_DEPENDS=	hunspell:textproc/hunspell
 HUNSPELL_RUN_DEPENDS=	hunspell:textproc/hunspell
 HUNSPELL_VARS=		SPELL_ENGINE=hunspell
 
 ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_VARS=		SPELL_ENGINE=ispell
 
 NLS_CONFIGURE_OFF=	-s
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%SPELL_ENGINE%%|${SPELL_ENGINE}|' \
 		${WRKSRC}/install.py \
 		${WRKSRC}/source/spellcheck.py
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DATADIR} && ${RM} *.bak *.orig *.pro *.spec)
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 8d6edb6131d1..1844c38bc4aa 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -1,77 +1,77 @@
 .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
 
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 WWW=		https://eric-ide.python-projects.org/index.html
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}-qt5-/}
 
 USES+=		desktop-file-utils python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	flavors
 USE_PYQT=	qscintilla2 webengine \
 		pyqt5
 INSTALL_PY=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
 SHEBANG_FILES=	*.py eric/eric6/*.py eric/scripts/*.py
 SUB_FILES=	eric6.desktop
 MASTERPORT=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts
 
 do-configure:
 	${SED}  -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \
 		-e 's,PREFIX,${PREFIX},' \
 		-e 's,DATADIR,${DATADIR},' \
 		-e 's,LOCALBASE,${LOCALBASE},' \
 		-e 's,DOCSDIR,${DOCSDIR},' \
 		-e 's,EXAMPLESDIR,${EXAMPLESDIR},' \
 		< ${FILESDIR}/config > ${WRKSRC}/eric6config.freebsd
 
 do-install:
 	@(cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_PY})
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}eric6/icons/default/eric.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 	${REINPLACE_CMD} -e 's|${STAGEDIR}|${DATADIR}|g' \
 			 -e 's|${WRKSRC}|${DATADIR}|g' \
 			${STAGEDIR}/${DATADIR}/eric6install.json
 	@${RM}	${STAGEDIR}/${DATADIR}/eric6install.json.bak
 
 .include <bsd.port.mk>
diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile
index 763522590760..9bdd5c90077b 100644
--- a/devel/git-cola/Makefile
+++ b/devel/git-cola/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	git-cola
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Sleek and powerful Git GUI
 WWW=		https://git-cola.github.io/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	git>=0:devel/git
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}QtPy>=1.7.1:devel/py-QtPy@${PY_FLAVOR}
 
 USES=		desktop-file-utils gmake gnome pyqt:5 python qt:5 \
 		shebangfix
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5
 USE_PYTHON=	concurrent distutils
 
 NO_ARCH=	yes
 
 MAKE_ARGS=	prefix=${PREFIX} \
 		PYTHON=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 post-install-DOCS-on:
 		${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/docs/*.rst ${STAGEDIR}${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-qstylizer/Makefile b/devel/py-qstylizer/Makefile
index 169b322631f3..351c3d8c0e82 100644
--- a/devel/py-qstylizer/Makefile
+++ b/devel/py-qstylizer/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	qstylizer
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Qt Stylesheet Generator for PyQt/PySide
 WWW=		https://github.com/blambright/qstylizer/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1,<1:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tinycss2>=0.5,<2:textproc/py-tinycss2@${PY_FLAVOR}
 # pytest-catchlog >=1,<2 does not exist until now :(
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR}
 
 USES=		pyqt:5 pytest python
 # PyPi only has the wheel version
 USE_GITHUB=	yes
 GH_ACCOUNT=	blambright
 
 USE_PYQT=	pyqt5
 USE_PYTHON=	autoplist distutils
 
 MAKE_ENV=	PBR_VERSION=${PORTVERSION}
 
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR}
 DOCS_USES=	gmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python -msphinx|${PYTHON_VERSION} -msphinx|g' \
 		${WRKSRC}/doc/Makefile
 
 do-build-DOCS-on:
 	(cd ${WRKSRC}/doc && ${GMAKE} html)
 
 post-build-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/_build/html/ && ${CP} -R api *.html *.js ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-pyqt/distinfo b/devel/py-qt5-pyqt/distinfo
index 7b7bd7747142..5f1924810e23 100644
--- a/devel/py-qt5-pyqt/distinfo
+++ b/devel/py-qt5-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666112445
-SHA256 (PyQt5-5.15.7.tar.gz) = 755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594
-SIZE (PyQt5-5.15.7.tar.gz) = 3238978
+TIMESTAMP = 1676964932
+SHA256 (PyQt5-5.15.9.tar.gz) = dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0
+SIZE (PyQt5-5.15.9.tar.gz) = 3241160
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 53575740541a..8d479d468f2a 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt5), QSci module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
 DESTDIRNAME=	INSTALL_ROOT
 
 USES=		python:3.8+ pyqt:5 gl qt:5
 USE_GL=		gl
 USE_PYQT=	pyqt5 sip:build qtbuilder
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui printsupport widgets buildtools:build qmake:build
 
 OPTIONS_DEFINE=		DEBUG
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 ALL_TARGET=	#empty
 
 post-extract:
 	${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml
 
 do-build:
 	(cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
 
 do-install:
 	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qsci.abi3.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-sip/Makefile b/devel/py-qt5-sip/Makefile
index 2bfd4d26baca..91b87debf4f3 100644
--- a/devel/py-qt5-sip/Makefile
+++ b/devel/py-qt5-sip/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	sip
 PORTVERSION=	${PYQT5SIP_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT5SIP}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
 DISTNAME=	${PYQT5SIP_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 WWW=		http://www.riverbankcomputing.co.uk/software/sip/
 
 LICENSE=		SIP GPLv2 GPLv3
 LICENSE_COMB=		multi
 LICENSE_GROUPS_SIP=	FSF GPL OSI
 LICENSE_NAME_SIP=	SIP License
 LICENSE_FILE_SIP=	${FILESDIR}/LICENSE
 LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		python:3.5+ pyqt:sip
 USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
 USE_PYQT=	#
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo
index 7074b4cdff93..ed3835164b0a 100644
--- a/devel/py-qt5-sip/distinfo
+++ b/devel/py-qt5-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666112484
-SHA256 (PyQt5_sip-12.11.0.tar.gz) = b4710fd85b57edef716cc55fae45bfd5bfac6fc7ba91036f1dcc3f331ca0eb39
-SIZE (PyQt5_sip-12.11.0.tar.gz) = 122792
+TIMESTAMP = 1676964955
+SHA256 (PyQt5_sip-12.11.1.tar.gz) = 97d3fbda0f61edb1be6529ec2d5c7202ae83aee4353e4b264a159f8c9ada4369
+SIZE (PyQt5_sip-12.11.1.tar.gz) = 122858
diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile
index 739456be4bc7..6746b1ff9e9f 100644
--- a/devel/py-qt5/Makefile
+++ b/devel/py-qt5/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	qt5
 PORTVERSION=	${PYQT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt 5 toolkit (meta port)
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 USES=		metaport python:3.8+ pyqt:5
 USE_PYTHON=	concurrent flavors py3kplist
 USE_PYQT=	pyqt5 chart networkauth
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
index 2da255266633..194453fb1be6 100644
--- a/devel/py-qt6-pyqt/distinfo
+++ b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665325767
-SHA256 (PyQt6-6.4.0.tar.gz) = 91392469be1f491905fa9e78fa4e4059a89ab616ddf2ecfd525bc1d65c26bb93
-SIZE (PyQt6-6.4.0.tar.gz) = 1024037
+TIMESTAMP = 1677650114
+SHA256 (PyQt6-6.4.2.tar.gz) = 740244f608fe15ee1d89695c43f31a14caeca41c4f02ac36c86dfba4a5d5813d
+SIZE (PyQt6-6.4.2.tar.gz) = 1025595
diff --git a/devel/py-qt6-qscintilla2/Makefile b/devel/py-qt6-qscintilla2/Makefile
index 31031ee62e81..1172798eb47b 100644
--- a/devel/py-qt6-qscintilla2/Makefile
+++ b/devel/py-qt6-qscintilla2/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt6-
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt6), QSci module
 WWW=		https://riverbankcomputing.com/software/pyqt \
 		https://www.riverbankcomputing.com/software/qscintilla
 
 LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt6/distinfo
 DESTDIRNAME=	INSTALL_ROOT
 
 USES=		python:3.5+ pyqt:6 gl qt:6
 USE_GL=		gl
 USE_PYQT=	pyqt6 sip:build qtbuilder
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		base
 
 OPTIONS_DEFINE=		DEBUG
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 ALL_TARGET=	#empty
 
 post-extract:
 	${CP} ${WRKSRC}/pyproject-qt6.toml ${WRKSRC}/pyproject.toml
 
 do-build:
 	(cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
 
 do-install:
 	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6/Qsci.abi3.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt6-sip/distinfo b/devel/py-qt6-sip/distinfo
index 1b3e1c15346b..4936d8b86510 100644
--- a/devel/py-qt6-sip/distinfo
+++ b/devel/py-qt6-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663421150
-SHA256 (PyQt6_sip-13.4.0.tar.gz) = 6d87a3ee5872d7511b76957d68a32109352caf3b7a42a01d9ee20032b350d979
-SIZE (PyQt6_sip-13.4.0.tar.gz) = 111209
+TIMESTAMP = 1676964963
+SHA256 (PyQt6_sip-13.4.1.tar.gz) = e00e287ea05bbc293fc6e2198301962af9b7b622bd2daf4288f925a88ae35dc9
+SIZE (PyQt6_sip-13.4.1.tar.gz) = 111256
diff --git a/devel/py-qt6/Makefile b/devel/py-qt6/Makefile
index b0f38212d51c..d766edefcaf7 100644
--- a/devel/py-qt6/Makefile
+++ b/devel/py-qt6/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	qt6
 PORTVERSION=	${PYQT_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt 6 toolkit (meta port)
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 USES=		metaport python:3.8+ pyqt:6
 USE_PYTHON=	concurrent flavors py3kplist
 USE_PYQT=	pyqt6 chart networkauth
 
 .include <bsd.port.mk>
diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo
index c225062de8c3..27e41db87d53 100644
--- a/devel/py-qtbuilder/distinfo
+++ b/devel/py-qtbuilder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666112516
-SHA256 (PyQt-builder-1.14.0.tar.gz) = 6755931c6d2f8940553e0334d10c933ce5cc18b64425e94fda1accf4ff774f59
-SIZE (PyQt-builder-1.14.0.tar.gz) = 3907829
+TIMESTAMP = 1676964997
+SHA256 (PyQt-builder-1.14.1.tar.gz) = 83bc3e300aff8b41405804b6a9c2913389ab59c48ad9f0cb8584a6ef73bca502
+SIZE (PyQt-builder-1.14.1.tar.gz) = 3907982
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 036a3dfe8d70..333bc0bf4c3e 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	qtconsole
 DISTVERSION=	5.4.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Qt-based console for Jupyter with support for rich media output
 WWW=		https://qtconsole.readthedocs.io/en/stable/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-client>=4.1:devel/py-jupyter-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-core>0:devel/py-jupyter-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=17.1:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=2.0.1:devel/py-QtPy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-qt>0:devel/py-pytest-qt@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.7+
 
 USE_PYQT=	sip pyqt5
 USE_PYTHON=	autoplist distutils pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index d5b417ee5033..36bcd9f205c5 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666118827
-SHA256 (sip-6.7.2.tar.gz) = 325016c787d0bff20999c420339ad816fbfd39a7c49b2c4dcda12b63c379dbda
-SIZE (sip-6.7.2.tar.gz) = 1157566
+TIMESTAMP = 1676965021
+SHA256 (sip-6.7.7.tar.gz) = dee9c06fa8ae6d441a401f922867fc6196edda274eebd9fbfec54f0769c2a9e2
+SIZE (sip-6.7.7.tar.gz) = 1161807
diff --git a/devel/py-sip4/Makefile b/devel/py-sip4/Makefile
index c443d66cbbf9..ad15d855c4b1 100644
--- a/devel/py-sip4/Makefile
+++ b/devel/py-sip4/Makefile
@@ -1,68 +1,69 @@
 PORTNAME=	sip4
 PORTVERSION=	${SIP4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.riverbankcomputing.com/static/Downloads/sip/${SIP4_VERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${SIP4_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
 WWW=		http://www.riverbankcomputing.co.uk/software/sip/
 
 USES=		python pyqt:sip
 USE_PYTHON=	concurrent py3kplist flavors
 USE_PYQT=	#
 
 CONFIGURE_ARGS=	-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
 		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
 		--sipdir ${PYQT_SIPDIR} \
 		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS DEBUG
 DEBUG_CONFIGURE_ON=	--debug
 
 # From upstreams site:
 # When building PyQt5 v5.11 or later you must configure SIP to create a
 # private copy of the sip module using a command line similar to the following:
 #  > python configure.py --sip-module PyQt5.sip --no-tools
 CONFIGURE_WRKSRC=	${WRKSRC}/default
 BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
 
 PYQT_SIPDIR=	${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
 
 do-configure:
 	# The default sip 'flavor'
 	${MKDIR} ${CONFIGURE_WRKSRC} &&  \
 		cd ${CONFIGURE_WRKSRC} && \
 		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
 		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${CONFIGURE_WRKSRC}/sipconfig.py
 	# The now needed version for 5.11 (which will be the default from 2019-03-16).
 	${MKDIR} ${WRKSRC}/sip_qt5 && \
 		cd ${WRKSRC}/sip_qt5 && \
 		${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools  && \
 		${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|'  ${WRKSRC}/sip_qt5/sipconfig.py
 
 post-build:
 	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
 		${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/sip
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/sip.so
 
 	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/PyQt5/sip.so
 
 .include <bsd.port.mk>
diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2-qt5/Makefile
index ecefa68f5235..94142df7116c 100644
--- a/devel/qscintilla2-qt5/Makefile
+++ b/devel/qscintilla2-qt5/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	qscintilla2-qt5
 PORTVERSION=	${QSCI2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 5 port of the Scintilla C++ editor class
 WWW=		http://www.riverbankcomputing.co.uk/software/qscintilla/
 
 USES=		compiler:c++11-lang gl qmake pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	#
 USE_QT=		buildtools:build core gui printsupport widgets
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=		${WRKSRC}/src
 CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
 		's|trans qsci|qsci|' qscintilla.pro
 .endif
 
 post-install:
 	cd ${WRKSRC} &&\
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\
 		${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR} &&\
 		${INSTALL_DATA} doc/html/* ${STAGEDIR}${DOCSDIR}/html &&\
 		${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla
 	cd ${WRKSRC}/example &&\
 		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\
 		${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\
 		${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images
 
 .include <bsd.port.mk>
diff --git a/devel/qscintilla2-qt6/Makefile b/devel/qscintilla2-qt6/Makefile
index 97dd7cb1b578..ba9c0011732e 100644
--- a/devel/qscintilla2-qt6/Makefile
+++ b/devel/qscintilla2-qt6/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	qscintilla2-qt6
 PORTVERSION=	${QSCI2_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 DISTNAME=	${QSCI2_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 6 port of the Scintilla C++ editor class
 WWW=		http://www.riverbankcomputing.co.uk/software/qscintilla/
 
 USES=		compiler:c++11-lang gl qmake pyqt:6 qt:6
 USE_GL=		gl
 USE_PYQT=	#
 USE_QT=		base
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=		${WRKSRC}/src
 CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
 INSTALL_WRKSRC=		${BUILD_WRKSRC}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
 		's|trans qsci|qsci|' qscintilla.pro
 .endif
 
 post-install:
 	cd ${WRKSRC} &&\
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\
 		${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR} &&\
 		${INSTALL_DATA} doc/html/* ${STAGEDIR}${DOCSDIR}/html &&\
 		${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla
 	cd ${WRKSRC}/example &&\
 		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\
 		${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\
 		${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images
 
 .include <bsd.port.mk>
diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index afd9b1601a80..413185ec9323 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 WWW=		https://www.spyder-ide.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.2.0:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.6.0:devel/py-cookiecutter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=20181111:textproc/py-diff-match-patch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.17.2:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0.7:devel/py-jellyfish@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>=17.0.0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6.0:textproc/py-numpydoc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1:devel/py-pylint-venv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-black>=1.2.0:textproc/py-python-lsp-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyls-spyder>=0.4.0:textproc/py-pyls-spyder@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qt5-webengine>0:www/py-qt5-webengine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lsp-server>0:textproc/py-python-lsp-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.26:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qtconsole>0:devel/py-qtconsole@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0.6.6:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.0:devel/py-spyder-kernels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR}
 
 USES=		desktop-file-utils python:3.7+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	pyqt5 sip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	spyder-ide
 
 NO_ARCH=	yes
 
 DOCSDIR=	${PYTHON_SITELIBDIR}/spyder
 
 post-extract: # remove bundled dependencies
 	@${RM} -r ${WRKSRC}/external-deps/*
 
 .include <bsd.port.mk>
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 09e6f551d1a8..25bf4ba3036a 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	tortoisehg
 DISTVERSION=	6.3.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.mercurial-scm.org/release/tortoisehg/targz/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 WWW=		https://tortoisehg.bitbucket.io/
 
 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=	qscintilla2 pyqt5
 USE_PYTHON=	autoplist distutils
 
 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 ${PORTNAME}-${DISTVERSION}/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/vitables/Makefile b/devel/vitables/Makefile
index 68bbc686fa8f..6b9ff90f0cd6 100644
--- a/devel/vitables/Makefile
+++ b/devel/vitables/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	vitables
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Viewer and editor of files in both PyTables format and HDF5 format
 WWW=		https://github.com/uvemas/ViTables
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=1.2.1:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=2.0:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=3.0:devel/py-tables@${PY_FLAVOR}
 
 USES=		dos2unix python pyqt:5
 USE_PYTHON=	distutils cython noflavors autoplist
 USE_PYQT=	pyqt5:run sip:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uvemas
 GH_PROJECT=	ViTables
 
 DOS2UNIX_FILES=	setup.py
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} "s|version=read('VERSION')|version='${DISTVERSION}'|" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/dns/knock/Makefile b/dns/knock/Makefile
index 1b2e35517319..36a2c13ef0cc 100644
--- a/dns/knock/Makefile
+++ b/dns/knock/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	knock
 DISTVERSION=	5.4.0
+PORTREVISION=	1
 CATEGORIES=	dns
 PKGNAMESUFFIX=	py
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool designed to enumerate subdomains on a target domain
 WWW=		https://github.com/guelfoweb/knock
 
 LICENSE=	GPLv2
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python pyqt:5 # pyqt:5 isn't used: https://github.com/guelfoweb/knock/issues/108
 USE_PYTHON=	distutils noflavors autoplist
 USE_PYQT=	pyqt5:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	guelfoweb
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/novelwriter/Makefile b/editors/novelwriter/Makefile
index 2760f723f1ab..cfa3fa5e2914 100644
--- a/editors/novelwriter/Makefile
+++ b/editors/novelwriter/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	novelwriter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	editors python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Text editor designed for writing novels
 WWW=		https://novelwriter.io/
 
 LICENSE=	GPLv3
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=3.0.0:textproc/py-enchant@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.7+ pyqt:5
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vkbo
 GH_PROJECT=	novelWriter
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/editors/retext/Makefile b/editors/retext/Makefile
index e5cf88241396..5e11f7852933 100644
--- a/editors/retext/Makefile
+++ b/editors/retext/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	retext
 DISTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Markdown editor
 WWW=		https://github.com/retext-project/retext
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-markdown-math>=0.6:textproc/py-python-markdown-math@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:6 python:3.9+
 USE_GITHUB=	yes
 GH_ACCOUNT=	retext-project
 USE_PYTHON=	autoplist distutils noflavors
 USE_PYQT=	pyqt6:run sip:run
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile
index 724854851971..bb556982c447 100644
--- a/emulators/fs-uae-launcher/Makefile
+++ b/emulators/fs-uae-launcher/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	fs-uae-launcher
 PORTVERSION=	3.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	https://fs-uae.net/stable/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI launcher for the FS-UAE Amiga emulator
 WWW=		http://fs-uae.net/launcher
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lhafile>0:archivers/py-python-lhafile@${PY_FLAVOR}
 
 USES=		gettext gmake gnome pathfix pyqt:5 python:3.4+
 
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	pyqt5 sip
 
 MAKE_ARGS+=	DESTDIR=${STAGEDIR} prefix=${PREFIX} PYTHON=${PYTHON_CMD}
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib=${PYTHON_SITELIBDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/games/anki/Makefile b/games/anki/Makefile
index 6371ea00100e..3815dedf7fb3 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -1,648 +1,648 @@
 PORTNAME=	anki
 DISTVERSION=	2.1.54
-PORTREVISION=	10
+PORTREVISION=	11
 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes
 CATEGORIES=	games education python
 MASTER_SITES=	LOCAL/kai/:yarncache \
 		LOCAL/kai/:npmcache
 DISTFILES=	anki-yarn-cache-${DISTVERSION}${EXTRACT_SUFX}:yarncache \
 		anki-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Flashcard trainer with spaced repetition
 WWW=		https://apps.ankiweb.net/
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	the bazel build framework supports only 64-bit systems.
 
 BUILD_DEPENDS=	bash:shells/bash \
 		bazel:devel/bazel \
 		npm:www/npm \
 		protoc:devel/protobuf \
 		rsync:net/rsync \
 		yarn:www/yarn \
 		${PYTHON_PKGNAMEPREFIX}mypy-protobuf>=1.21:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stringcase>0:devel/py-stringcase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fluent>0:devel/py-fluent@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 
 # NB: For x64 architectures there's also a Python package devel/py-orjson.
 # Chances are good that it'll be added to RUN_DEPENDS with the next release.
 #
 # Although the "orjson" package is required via the setup.py of Anki's Python
 # library it's (still) optional in the code.
 RUN_DEPENDS=	lame:audio/lame \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.17:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR}
 
 # USES=ssl is required for the compilation of the Rust code
 USES=		cargo desktop-file-utils go:modules,no_targets nodejs:build pyqt:5 \
 		python:3.9+ shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	ankitects
 # Translation files
 GH_TUPLE=	ankitects:anki-core-i18n:f3f9912:ftlrslib \
 		ankitects:anki-desktop-ftl:6e59ce7e:ftlextra
 # Bazel Skylib framework and sets of bazel rules
 GH_TUPLE+=	bazelbuild:bazel-skylib:e59b620:bzlskylib \
 		bazelbuild:rules_cc:40548a2:bzlrcc \
 		bazelbuild:rules_java:c13e3ea:bzlrjava \
 		bazelbuild:rules_nodejs:45e97fc:bzlrnodejs \
 		bazelbuild:rules_proto:f7a30f6:bzlrproto \
 		bazelbuild:rules_python:b842276:bzlrpython \
 		ankitects:rules_rust:adf2790:bzlrrust \
 		bazelbuild:rules_sass:d0cda22:bzlrsass
 # esbuild dependencies
 GH_TUPLE+=	evanw:esbuild:${_MY_ESBUILDVER}:esbuild \
 		golang:sys:aa78b53d3365:golang_sys
 
 USE_PYQT=	pyqt5 sip webengine
 
 SHEBANG_FILES=	qt/tools/runanki.system.in
 
 CARGO_CRATES=	adler-1.0.2 \
 		ahash-0.7.6 \
 		aho-corasick-0.7.18 \
 		ammonia-3.1.4 \
 		anyhow-1.0.56 \
 		arc-swap-1.5.0 \
 		arrayref-0.3.6 \
 		arrayvec-0.4.12 \
 		arrayvec-0.7.2 \
 		async-trait-0.1.52 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		base64-0.13.0 \
 		bitflags-1.3.2 \
 		blake3-1.3.1 \
 		block-buffer-0.10.2 \
 		bstr-0.2.17 \
 		bumpalo-3.9.1 \
 		byteorder-1.4.3 \
 		bytes-1.1.0 \
 		cast-0.2.7 \
 		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		clap-2.34.0 \
 		coarsetime-0.1.21 \
 		codespan-0.11.1 \
 		codespan-reporting-0.11.1 \
 		constant_time_eq-0.1.5 \
 		convert_case-0.4.0 \
 		core-foundation-0.9.3 \
 		core-foundation-sys-0.8.3 \
 		crc32fast-1.3.2 \
 		criterion-0.3.5 \
 		criterion-plot-0.4.4 \
 		crossbeam-channel-0.5.2 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.7 \
 		crossbeam-utils-0.8.7 \
 		crypto-common-0.1.3 \
 		cssparser-0.27.2 \
 		cssparser-macros-0.6.0 \
 		csv-1.1.6 \
 		csv-core-0.1.10 \
 		derive_more-0.99.17 \
 		digest-0.10.3 \
 		dirs-next-2.0.0 \
 		dirs-sys-next-0.1.2 \
 		dtoa-0.4.8 \
 		dtoa-short-0.3.3 \
 		dunce-1.0.2 \
 		either-1.6.1 \
 		encoding_rs-0.8.30 \
 		env_logger-0.9.0 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		fastrand-1.7.0 \
 		fixedbitset-0.4.1 \
 		flate2-1.0.22 \
 		fluent-0.16.0 \
 		fluent-bundle-0.15.2 \
 		fluent-langneg-0.13.0 \
 		fluent-syntax-0.11.0 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		form_urlencoded-1.0.1 \
 		futf-0.1.5 \
 		futures-0.3.21 \
 		futures-channel-0.3.21 \
 		futures-core-0.3.21 \
 		futures-executor-0.3.21 \
 		futures-io-0.3.21 \
 		futures-macro-0.3.21 \
 		futures-sink-0.3.21 \
 		futures-task-0.3.21 \
 		futures-util-0.3.21 \
 		fxhash-0.2.1 \
 		generic-array-0.14.5 \
 		getopts-0.2.21 \
 		getrandom-0.1.16 \
 		getrandom-0.2.5 \
 		h2-0.3.12 \
 		half-1.8.2 \
 		hashbrown-0.11.2 \
 		hashlink-0.7.0 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.4.3 \
 		html5ever-0.25.1 \
 		htmlescape-0.3.1 \
 		http-0.2.6 \
 		http-body-0.4.4 \
 		httparse-1.6.0 \
 		httpdate-1.0.2 \
 		humantime-2.1.0 \
 		hyper-0.14.17 \
 		hyper-rustls-0.22.1 \
 		hyper-tls-0.5.0 \
 		id_tree-1.8.0 \
 		idna-0.2.3 \
 		indexmap-1.8.0 \
 		indoc-0.3.6 \
 		indoc-impl-0.3.6 \
 		inflections-1.1.1 \
 		instant-0.1.12 \
 		intl-memoizer-0.5.1 \
 		intl_pluralrules-7.0.1 \
 		ipnet-2.4.0 \
 		itertools-0.10.3 \
 		itoa-0.4.8 \
 		itoa-1.0.1 \
 		jobserver-0.1.24 \
 		js-sys-0.3.56 \
 		kuchiki-0.8.1 \
 		lazy_static-1.4.0 \
 		libc-0.2.120 \
 		libsqlite3-sys-0.23.2 \
 		linkify-0.5.0 \
 		lock_api-0.4.6 \
 		log-0.4.14 \
 		mac-0.1.1 \
 		maplit-1.0.2 \
 		markup5ever-0.10.1 \
 		markup5ever_rcdom-0.1.0 \
 		matches-0.1.9 \
 		memchr-2.4.1 \
 		memoffset-0.6.5 \
 		mime-0.3.16 \
 		mime_guess-2.0.4 \
 		minimal-lexical-0.2.1 \
 		miniz_oxide-0.4.4 \
 		mio-0.8.1 \
 		miow-0.3.7 \
 		multimap-0.8.3 \
 		native-tls-0.2.8 \
 		new_debug_unreachable-1.0.4 \
 		nodrop-0.1.14 \
 		nom-7.1.1 \
 		ntapi-0.3.7 \
 		num-format-0.4.0 \
 		num-integer-0.1.44 \
 		num-traits-0.2.14 \
 		num_cpus-1.13.1 \
 		num_enum-0.5.7 \
 		num_enum_derive-0.5.7 \
 		num_threads-0.1.4 \
 		once_cell-1.10.0 \
 		oorandom-11.1.3 \
 		openssl-0.10.38 \
 		openssl-probe-0.1.5 \
 		openssl-sys-0.9.72 \
 		parking_lot-0.11.2 \
 		parking_lot-0.12.0 \
 		parking_lot_core-0.8.5 \
 		parking_lot_core-0.9.1 \
 		paste-0.1.18 \
 		paste-impl-0.1.18 \
 		percent-encoding-2.1.0 \
 		petgraph-0.6.0 \
 		phf-0.8.0 \
 		phf-0.10.1 \
 		phf_codegen-0.8.0 \
 		phf_generator-0.8.0 \
 		phf_generator-0.10.0 \
 		phf_macros-0.8.0 \
 		phf_macros-0.10.0 \
 		phf_shared-0.8.0 \
 		phf_shared-0.10.0 \
 		pin-project-1.0.10 \
 		pin-project-internal-1.0.10 \
 		pin-project-lite-0.2.8 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.24 \
 		plotters-0.3.1 \
 		plotters-backend-0.3.2 \
 		plotters-svg-0.3.1 \
 		ppv-lite86-0.2.16 \
 		precomputed-hash-0.1.1 \
 		proc-macro-crate-1.1.3 \
 		proc-macro-hack-0.5.19 \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-1.0.36 \
 		prost-0.9.0 \
 		prost-build-0.9.0 \
 		prost-derive-0.9.0 \
 		prost-types-0.9.0 \
 		pulldown-cmark-0.8.0 \
 		pyo3-0.15.1 \
 		pyo3-build-config-0.15.1 \
 		pyo3-macros-0.15.1 \
 		pyo3-macros-backend-0.15.1 \
 		quote-1.0.15 \
 		rand-0.7.3 \
 		rand-0.8.5 \
 		rand_chacha-0.2.2 \
 		rand_chacha-0.3.1 \
 		rand_core-0.5.1 \
 		rand_core-0.6.3 \
 		rand_hc-0.2.0 \
 		rand_pcg-0.2.1 \
 		rayon-1.5.1 \
 		rayon-core-1.9.1 \
 		redox_syscall-0.2.11 \
 		redox_users-0.4.0 \
 		regex-1.5.6 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.26 \
 		remove_dir_all-0.5.3 \
 		ring-0.16.20 \
 		rusqlite-0.26.3 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.4.0 \
 		rustls-0.19.1 \
 		rustls-native-certs-0.5.0 \
 		rustversion-1.0.6 \
 		ryu-1.0.9 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
 		scopeguard-1.1.0 \
 		sct-0.6.1 \
 		security-framework-2.6.1 \
 		security-framework-sys-2.6.1 \
 		selectors-0.22.0 \
 		self_cell-0.10.2 \
 		semver-1.0.6 \
 		serde-1.0.136 \
 		serde-aux-3.0.1 \
 		serde_cbor-0.11.2 \
 		serde_derive-1.0.136 \
 		serde_json-1.0.79 \
 		serde_repr-0.1.7 \
 		serde_tuple-0.5.0 \
 		serde_tuple_macros-0.5.0 \
 		serde_urlencoded-0.7.1 \
 		servo_arc-0.1.1 \
 		sha1-0.6.1 \
 		sha1_smol-1.0.0 \
 		signal-hook-registry-1.4.0 \
 		siphasher-0.3.10 \
 		slab-0.4.5 \
 		slog-2.7.0 \
 		slog-async-2.7.0 \
 		slog-envlogger-2.2.0 \
 		slog-scope-4.4.0 \
 		slog-stdlog-4.1.0 \
 		slog-term-2.9.0 \
 		smallvec-1.8.0 \
 		snowflake-1.3.0 \
 		socket2-0.4.4 \
 		spin-0.5.2 \
 		stable_deref_trait-1.2.0 \
 		string_cache-0.8.3 \
 		string_cache_codegen-0.5.1 \
 		strum-0.23.0 \
 		strum_macros-0.23.1 \
 		subtle-2.4.1 \
 		syn-1.0.88 \
 		take_mut-0.2.2 \
 		tempfile-3.3.0 \
 		tendril-0.4.2 \
 		term-0.7.0 \
 		termcolor-1.1.3 \
 		textwrap-0.11.0 \
 		thin-slice-0.1.1 \
 		thiserror-1.0.30 \
 		thiserror-impl-1.0.30 \
 		thread_local-1.1.4 \
 		time-0.1.44 \
 		time-0.3.7 \
 		time-macros-0.2.3 \
 		tinystr-0.3.4 \
 		tinytemplate-1.2.1 \
 		tinyvec-1.5.1 \
 		tinyvec_macros-0.1.0 \
 		tokio-1.17.0 \
 		tokio-macros-1.7.0 \
 		tokio-native-tls-0.3.0 \
 		tokio-rustls-0.22.0 \
 		tokio-socks-0.5.1 \
 		tokio-util-0.6.9 \
 		toml-0.5.8 \
 		tower-service-0.3.1 \
 		tracing-0.1.32 \
 		tracing-core-0.1.23 \
 		try-lock-0.2.3 \
 		type-map-0.4.0 \
 		typenum-1.15.0 \
 		unic-char-property-0.9.0 \
 		unic-char-range-0.9.0 \
 		unic-common-0.9.0 \
 		unic-langid-0.9.0 \
 		unic-langid-impl-0.9.0 \
 		unic-langid-macros-0.9.0 \
 		unic-langid-macros-impl-0.9.0 \
 		unic-ucd-category-0.9.0 \
 		unic-ucd-version-0.9.0 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.7 \
 		unicode-normalization-0.1.19 \
 		unicode-segmentation-1.9.0 \
 		unicode-width-0.1.9 \
 		unicode-xid-0.2.2 \
 		unindent-0.1.8 \
 		untrusted-0.7.1 \
 		url-2.2.2 \
 		utf-8-0.7.6 \
 		utf8-decode-1.0.1 \
 		utime-0.3.1 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		walkdir-2.3.2 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.79 \
 		wasm-bindgen-backend-0.2.79 \
 		wasm-bindgen-futures-0.4.29 \
 		wasm-bindgen-macro-0.2.79 \
 		wasm-bindgen-macro-support-0.2.79 \
 		wasm-bindgen-shared-0.2.79 \
 		web-sys-0.3.56 \
 		webpki-0.21.4 \
 		webpki-roots-0.21.1 \
 		which-4.2.4 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.32.0 \
 		windows_aarch64_msvc-0.32.0 \
 		windows_i686_gnu-0.32.0 \
 		windows_i686_msvc-0.32.0 \
 		windows_x86_64_gnu-0.32.0 \
 		windows_x86_64_msvc-0.32.0 \
 		winreg-0.7.0 \
 		xml5ever-0.16.2 \
 		zip-0.5.13 \
 		zstd-0.10.0+zstd.1.5.2 \
 		zstd-safe-4.1.4+zstd.1.5.2 \
 		zstd-sys-1.6.3+zstd.1.5.2 \
 		reqwest@git+https://github.com/ankitects/reqwest.git?rev=7591444614de02b658ddab125efba7b2bb4e2335\#7591444614de02b658ddab125efba7b2bb4e2335 \
 		hyper-timeout@git+https://github.com/ankitects/hyper-timeout.git?rev=0cb6f7d14c62819e37cd221736f8b0555e823712\#0cb6f7d14c62819e37cd221736f8b0555e823712 \
 		csv,csv-core@git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90\#1c9d3aab6f79a7d815c69f925a46a4590c115f90 \
 		linkcheck@git+https://github.com/ankitects/linkcheck.git?rev=2f20798ce521cc594d510d4e417e76d5eac04d4b\#2f20798ce521cc594d510d4e417e76d5eac04d4b \
 		tokio-io-timeout@git+https://github.com/ankitects/tokio-io-timeout.git?rev=1ee0892217e9a76bba4bb369ec5fab8854935a3c\#1ee0892217e9a76bba4bb369ec5fab8854935a3c \
 		pct-str@git+https://github.com/timothee-haudebourg/pct-str.git?rev=4adccd8d4a222ab2672350a102f06ae832a0572d\#4adccd8d4a222ab2672350a102f06ae832a0572d
 
 CARGO_CARGOTOML=	${WRKSRC}/pylib/rsbridge/Cargo.toml
 
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
 
 # BAZEL=1 is required otherwise ${WRKSRC}/rslib/build/main.rs produces a dummy
 # buildinfo.txt that doesn't contain the actual build hash.
 CARGO_ENV=	BAZEL=1 \
 		BUILDINFO=${_MY_LOCALREPO}/rust_output/buildinfo.txt \
 		PYO3_PYTHON=${PYTHON_CMD} \
 		PROTO_TOP=${WRKSRC}/proto/.top_level \
 		PROTOC=${LOCALBASE}/bin/protoc \
 		BACKEND_PROTO=${WRKSRC}/rslib/backend.proto \
 		RSLIB_FTL_ROOT=${WRKSRC_ftlrslib}/l10n.toml \
 		EXTRA_FTL_ROOT=${WRKSRC_ftlextra}/l10n.toml
 
 GO_TARGET=	./cmd/esbuild:esbuild
 
 OPTIONS_DEFAULT=	MPV
 OPTIONS_GROUP=		PLAYER
 OPTIONS_GROUP_PLAYER=	MPLAYER MPV
 OPTIONS_SUB=		yes
 
 MPV_DESC=	mpv media player support
 
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 
 # Should contain the most recent commit that reflects ${DISTVERSION} and must
 # be exactly 8 digits otherwise the check for newer versions won't work as
 # expected.
 _MY_BUILDHASH=	b6a7760c
 # Required version of esbuild that is pre-built.  This is because the JS
 # counterpart of esbuild, which is used by the NodeJS ruleset for Bazel, has a
 # fixed version check for the binary version.
 _MY_ESBUILDVER=	v0.14.11
 # Path of the local bazel repositories
 _MY_LOCALREPO=	${WRKSRC}/local_repos
 # Path of caches that are used by www/npm and www/yarn
 _MY_NPMCACHE=	${WRKDIR}/.npm
 _MY_YARNCACHE=	${WRKDIR}/.yarn
 
 post-extract:
 	# Create a configuration file for bazel
 	@${ECHO_CMD} "startup --batch" > ${WRKSRC}/user.bazelrc
 	# Create local repositories which are used by bazel
 	@${MKDIR} ${_MY_LOCALREPO} \
 		${_MY_LOCALREPO}/local_esbuild/bin \
 		${_MY_LOCALREPO}/local_node/node/bin \
 		${_MY_LOCALREPO}/local_node/node/lib \
 		${_MY_LOCALREPO}/local_node/yarn/bin \
 		${_MY_LOCALREPO}/protoc_bin_freebsd/bin \
 		${_MY_LOCALREPO}/rust_output/librsbridge \
 		${_MY_LOCALREPO}/rust_output/strings_json
 	# Create empty WORKSPACE files in the top directory of each local
 	# repository
 	@${TOUCH} ${_MY_LOCALREPO}/local_esbuild/WORKSPACE \
 		${_MY_LOCALREPO}/local_node/WORKSPACE \
 		${_MY_LOCALREPO}/protoc_bin_freebsd/WORKSPACE
 	# Copy the bazel rules for NodeJS to the custom local repository
 	# as they need some patching
 	@${CP} -r ${WRKSRC_bzlrnodejs} ${_MY_LOCALREPO}/rules_nodejs
 	# Link the remaining bazel rules into the custom local repository as
 	# they don't need to be patched
 .for _dir in bzlskylib bzlrcc bzlrjava bzlrproto bzlrpython bzlrrust bzlrsass
 	@${RLN} ${WRKSRC_${_dir}} ${_MY_LOCALREPO}/${_dir:S/bzlr/rules_/}
 .endfor
 	# Prepare the Go environment for esbuild
 	@${MKDIR} ${WRKSRC_esbuild}/vendor/golang.org/x
 	@${RLN} ${WRKSRC_golang_sys} ${WRKSRC_esbuild}/vendor/golang.org/x/sys
 	# Copy custom BUILD.bazel files to the local repositories
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-local_esbuild \
 		${_MY_LOCALREPO}/local_esbuild/BUILD.bazel
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-local_node \
 		${_MY_LOCALREPO}/local_node/BUILD.bazel
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-protoc_bin_freebsd \
 		${_MY_LOCALREPO}/protoc_bin_freebsd/BUILD.bazel
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-rust_output-librsbridge \
 		${_MY_LOCALREPO}/rust_output/librsbridge/BUILD.bazel
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-rust_output-strings_json \
 		${_MY_LOCALREPO}/rust_output/strings_json/BUILD.bazel
 	# Move some files out of the way as they will be replaced by custom copies.
 	@${MV} ${WRKSRC}/repos.bzl ${WRKSRC}/repos.bzl.dist
 	@${MV} ${WRKSRC}/pylib/rsbridge/BUILD.bazel ${WRKSRC}/pylib/rsbridge/BUILD.bazel.dist
 	@${MV} ${WRKSRC}/rslib/i18n/BUILD.bazel ${WRKSRC}/rslib/i18n/BUILD.bazel.dist
 	# Copy the replacement files
 	@${CP} ${FILESDIR}/bazel/repos.bzl ${WRKSRC}/
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-pylib-rsbridge \
 		${WRKSRC}/pylib/rsbridge/BUILD.bazel
 	@${CP} ${FILESDIR}/bazel/BUILD.bazel-rslib-i18n \
 		${WRKSRC}/rslib/i18n/BUILD.bazel
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${_MY_LOCALREPO}/rules_nodejs/internal/node/node_patches.js
 	@${REINPLACE_CMD} -e 's|\@PREFIX\@|${PREFIX}|' \
 		${WRKSRC}/qt/tools/runanki.system.in
 	@${REINPLACE_CMD} -e 's|%%_MY_BUILDHASH%%|${_MY_BUILDHASH}|' \
 		${WRKSRC}/tools/status.sh
 	@${REINPLACE_CMD} -e 's|%%_MY_LOCALREPO%%|${_MY_LOCALREPO}|g' \
 		${WRKSRC}/proto/protobuf.bzl \
 		${WRKSRC}/repos.bzl \
 		${_MY_LOCALREPO}/rules_nodejs/toolchains/esbuild/esbuild_repositories.bzl
 	@${REINPLACE_CMD} -e 's|%%_MY_YARNCACHE%%|${_MY_YARNCACHE}|' \
 		${_MY_LOCALREPO}/rules_nodejs/internal/npm_install/npm_install.bzl
 
 pre-configure:
 	# Link the binaries of Node, Protobuf and Yarn into the local bazel
 	# repositories to provide them during build.
 	${LN} -s ${LOCALBASE}/bin/node ${_MY_LOCALREPO}/local_node/node/bin/node
 	${LN} -s ${LOCALBASE}/lib/node_modules ${_MY_LOCALREPO}/local_node/node/lib/node_modules
 	${LN} -s ${LOCALBASE}/bin/yarn.js ${_MY_LOCALREPO}/local_node/yarn/bin/yarn.js
 	${LN} -s ${LOCALBASE}/bin/protoc ${_MY_LOCALREPO}/protoc_bin_freebsd/bin/protoc
 
 # Overview of the build process
 #
 # Steps 1 and 2 are built separately from the bazel build process.
 #
 # 1. rslib (Rust library, implictly built by step 2)
 #    `-> produces ${_MY_LOCALREPO}/rust_output/strings_json/strings.json
 # 2. pylib/rsbridge (Rust/Python bridge)
 #    `-> produces ${_MY_LOCALREPO}/rust_output/librsbridge/librsbridge.so
 # 3. The remaining components (Python, Qt5 and JS) are built by bazel
 pre-build:
 	${ECHO_MSG} "===> Building vendored esbuild binary with Go"
 	(cd ${WRKSRC_esbuild} ; \
 	for t in ${GO_TARGET}; do \
 		out=$$(${BASENAME} $$(${ECHO_CMD} $${t} | \
 			${SED} -Ee 's/^[^:]*:([^:]+).*$$/\1/' -e 's/^\.$$/esbuild/')); \
 		pkg=$$(${ECHO_CMD} $${t} | \
 			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^esbuild$$/./'); \
 		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
 			-o ${GO_WRKDIR_BIN}/$${out} \
 			$${pkg}; \
 	done)
 	${CP} ${GO_WRKDIR_BIN}/esbuild ${_MY_LOCALREPO}/local_esbuild/bin/
 	${ECHO_MSG} "===> Building library with Rust"
 	# Generate buildinfo.txt which is used via BUILDINFO in ${CARGO_ENV} during
 	# compilation.
 	${ECHO_CMD} -e "STABLE_VERSION ${DISTVERSION}\nSTABLE_BUILDHASH ${_MY_BUILDHASH}" >> ${_MY_LOCALREPO}/rust_output/buildinfo.txt
 	${CARGO_CARGO_RUN} build \
 		--manifest-path ${CARGO_CARGOTOML} \
 		--verbose \
 		${CARGO_BUILD_ARGS}
 	# These files are required for the remaining build process via bazel so copy
 	# them the local repository.
 	${CP} `${FIND} ${CARGO_TARGET_DIR} -name "librsbridge.so"` ${_MY_LOCALREPO}/rust_output/librsbridge/
 	${CP} `${FIND} ${CARGO_TARGET_DIR} -name "strings.json"` ${_MY_LOCALREPO}/rust_output/strings_json/
 
 do-build:
 	# Limit bazel jobs to 1 due random build failures while compiling TS files
 	# via "tsc".
 	cd ${WRKSRC} && \
 		bazel --output_user_root="${WRKDIR}/.bazel" build \
 			--action_env=npm_config_cache="${_MY_NPMCACHE}" \
 			--action_env=npm_config_offline="true" \
 			--action_env=PYO3_PYTHON="${PYTHON_CMD}" \
 			--action_env=PYTHON_SITE_PACKAGES="${PYTHON_SITELIBDIR}" \
 			--action_env=PYTHON_SYS_EXECUTABLE="${PYTHON_CMD}" \
 			--color=no \
 			--compilation_mode opt \
 			--config opt \
 			--jobs=1 \
 			--subcommands \
 	                --show_progress_rate_limit=-1 \
 			wheels
 
 post-build:
 	${MKDIR} ${WRKSRC}/bazel-dist
 	${TAR} -xf `${FIND} ${WRKDIR}/.bazel -name "wheels.tar"` -C ${WRKSRC}/bazel-dist
 	cd ${WRKSRC}/bazel-dist && \
 		${UNZIP_NATIVE_CMD} anki-${DISTVERSION}-*.whl && \
 		${UNZIP_NATIVE_CMD} aqt-${DISTVERSION}-*.whl
 	# Compile Anki's Python libary (pylib) and Qt5 library (aqt) to prepare
 	# them for installation
 	${PYTHON_CMD} -m compileall ${WRKSRC}/bazel-dist/anki
 	${PYTHON_CMD} -O -m compileall ${WRKSRC}/bazel-dist/anki
 	${PYTHON_CMD} -m compileall ${WRKSRC}/bazel-dist/aqt
 	${PYTHON_CMD} -O -m compileall ${WRKSRC}/bazel-dist/aqt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/anki \
 			${STAGEDIR}${DATADIR}/aqt \
 			${STAGEDIR}${PREFIX}/share/pixmaps \
 			${STAGEDIR}${PREFIX}/share/applications
 	cd ${WRKSRC}/bazel-dist/ \
 		&& ${COPYTREE_SHARE} anki ${STAGEDIR}${DATADIR} "! -name .gitignore" \
 		&& ${COPYTREE_SHARE} aqt ${STAGEDIR}${DATADIR} "! -name .gitignore"
 	cd ${WRKSRC}/qt/bundle/lin \
 		&& ${INSTALL_DATA} anki.xpm anki.png ${STAGEDIR}${PREFIX}/share/pixmaps \
 		&& ${INSTALL_DATA} anki.desktop ${STAGEDIR}${PREFIX}/share/applications \
 		&& ${INSTALL_MAN} anki.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	cd ${WRKSRC}/qt/tools \
 		&& ${INSTALL_SCRIPT} runanki.system.in ${STAGEDIR}${PREFIX}/bin/anki
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/anki/_backend/rsbridge.so
 
 # Helper target to make the generation of the npm cache easier (only required for esbuild-npm)
 make-npm-cache: patch
 	@cd ${WRKDIR} && ${RM} -r ${_MY_NPMCACHE}
 	@cd ${WRKSRC_bzlrnodejs}/toolchains/esbuild/ \
 		&& ${SETENV} HOME=${WRKDIR} ${LOCALBASE}/bin/npm install --no-optional --ignore-scripts
 	@cd ${_MY_NPMCACHE} \
 		&& ${RM} -r _locks anonymous-cli-metrics.json
 	@cd ${WRKDIR} \
 		&& ${TAR} -czf ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} .npm \
 		&& ${ECHO_CMD} "Please upload the file ${WRKDIR}/${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}"
 
 # Helper target to make the generation of the yarn cache easier
 make-yarn-cache: patch
 	@${RM} -r ${_MY_YARNCACHE}
 	@cd ${WRKSRC}/ts \
 		&& ${LOCALBASE}/bin/yarn --cache-folder ${_MY_YARNCACHE} install
 	@cd ${WRKSRC_bzlrnodejs}/packages/labs/grpc_web/ \
 		&& ${LOCALBASE}/bin/yarn --cache-folder ${_MY_YARNCACHE} install
 	@cd ${WRKSRC_bzlrsass}/sass \
 		&& ${LOCALBASE}/bin/yarn --cache-folder ${_MY_YARNCACHE} install
 	@cd ${WRKDIR} \
 		&& ${TAR} -czf ${PORTNAME}-yarn-cache-${DISTVERSION}${EXTRACT_SUFX} .yarn \
 		&& ${ECHO_CMD} "Please upload the file ${WRKDIR}/${PORTNAME}-yarn-cache-${DISTVERSION}${EXTRACT_SUFX}"
 
 .include <bsd.port.mk>
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 41f87516e71a..affebd398f46 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	mnemosyne
 PORTVERSION=	2.10.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games education python
 MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Mnemosyne-${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Flash-card tool which optimises your learning process
 WWW=		https://www.mnemosyne-proj.org/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}argon2-cffi>0:security/py-argon2-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cheroot>=5.0:www/py-cheroot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}googletrans>=3.0:textproc/py-googletrans@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gTTS>=0:audio/py-gtts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR}
 
 USES=		pyqt:6 python shebangfix
 USE_PYQT=	pyqt6:run sip:run webengine:run
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	mnemosyne/pyqt_ui/mnemosyne
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|icons|pixmaps|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
index 10b0fdbfddf2..f2d01fadd63f 100644
--- a/graphics/py-python-poppler-qt5/Makefile
+++ b/graphics/py-python-poppler-qt5/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	python-poppler-qt5
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.75.0
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Python bindings for the Poppler-Qt PDF rendering library
 WWW=		https://pypi.org/project/python-poppler-qt5/
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	qmake-qt5:devel/qt5-qmake
 LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
 USES=		compiler:c++11-lang gl pkgconfig pyqt:5 python:3.7-3.9 qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	frescobaldi
 USE_GL=		gl
 USE_PYQT=	pyqt5 sip:build
 USE_PYTHON=	flavors
 USE_QT=		core gui xml
 
 PLIST_SUB=	_PY_SONAME=${_PY_SONAME}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 _PY_SONAME=	.cpython-${PYTHON_SUFFIX}m
 .else
 _PY_SONAME=	${PYTHON_EXT_SUFFIX}
 .endif
 
 do-build:
 	(cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
 
 do-install:
 	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 
 post-install:
 	${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so
 
 .include <bsd.port.post.mk>
diff --git a/graphics/py-qpageview/Makefile b/graphics/py-qpageview/Makefile
index e60d2ca01566..e997006b4d7a 100644
--- a/graphics/py-qpageview/Makefile
+++ b/graphics/py-qpageview/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	qpageview
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Page-based viewer widget for Qt5/PyQt5
 WWW=		https://qpageview.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.6+ qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	frescobaldi
 USE_PYQT=	pyqt5
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CUPS
 
 CUPS_DESC=	Use print/py-pycups for printing
 
 CUPS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/graphics/py-visvis/Makefile b/graphics/py-visvis/Makefile
index dbc462b16671..fa45391ee278 100644
--- a/graphics/py-visvis/Makefile
+++ b/graphics/py-visvis/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	visvis
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Object oriented approach to visualization of 1D to 4D data
 WWW=		https://github.com/almarklein/visvis
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR}
 
 USES=		gl python:3.7+ pyqt:5 pytest shebangfix
 USE_GL=		gl
 USE_PYQT=	pyqt5
 USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 
 SHEBANG_FILES=	examples/*.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 881badaef6ad..00eec768dc6d 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,181 +1,182 @@
 PORTNAME=	qgis
 DISTVERSION=	3.22.15
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		liblazperf.so:archivers/lazperf \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \
 		-DWITH_INTERNAL_MDAL:BOOL=false \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \
 		WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index d79b842b6334..fd422847a7b2 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,180 +1,181 @@
 PORTNAME=	qgis
 DISTVERSION=	3.28.3
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdal_base.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.8+ qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg uitools:build \
 		webengine webkit widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_3D WITH_ASTYLE WITH_BINDINGS \
 		WITH_COPC WITH_CUSTOM_WIDGETS WITH_EPT  WITH_INTERNAL_LAZPERF \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		GRASS SERVER
 OPTIONS_DEFAULT=	GRASS SERVER
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_SUB=		yes
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass7:databases/grass7
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS7
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 # QGIS requires flex >= 2.5.6, see
 # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex
 .endif
 
 post-patch:
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile
index 483601c4a585..bf838995dc50 100644
--- a/graphics/qtqr/Makefile
+++ b/graphics/qtqr/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	qtqr
 DISTVERSION=	2.0.bzr39
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics python
 MASTER_SITES=	LOCAL/ehaupt
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	qr-tools-${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GUI that makes it easy to create and decode QR codes
 WWW=		https://launchpad.net/qr-tools
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:5 python:3.6+ shebangfix
 USE_PYQT=	pyqt5:run
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	qtqr.py
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qtqr.py ${STAGEDIR}${PREFIX}/bin/qtqr
 	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtqr.png
 	${INSTALL_DATA} ${WRKSRC}/qtqr.desktop ${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt5/translations
 	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${PREFIX}/share/qt5/translations
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile
index 0c5940d8d3be..e21ac686d477 100644
--- a/graphics/rapid-photo-downloader/Makefile
+++ b/graphics/rapid-photo-downloader/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	rapid-photo-downloader
 DISTVERSION=	0.9.26
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Import photos and videos efficiently and reliably
 WWW=		https://www.damonlynch.net/rapid/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2 \
 		libgudev-1.0.so:devel/libgudev
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colour>0:graphics/py-colour@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>2.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}easygui>=0:x11-toolkits/py-easygui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gphoto2>=1.4.0:graphics/py-gphoto2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymediainfo>=1.0:multimedia/py-pymediainfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rawkit>0:graphics/py-rawkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>0:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		exiftool:graphics/p5-Image-ExifTool
 
 USES=		desktop-file-utils gettext pyqt:5 python:3.6+ qt:5
 USE_PYTHON=	autoplist distutils noflavors
 USE_QT=		imageformats:run
 USE_PYQT=	pyqt5 sip
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		COLOUR PROGRESS
 OPTIONS_DEFAULT=	COLOUR PROGRESS
 
 COLOUR_DESC=	generates coloured program output
 PROGRESS_DESC=	shows a progress bar on the command line
 
 COLOUR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR}
 PROGRESS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyprind>=1.4.0:misc/py-pyprind@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 5ab3abfd08b7..53806495dfce 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	asymptote
 PORTVERSION=	2.81
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 PATCH_SITES=	https://github.com/vectorgraphics/asymptote/commit/
 PATCHFILES+=	fa28442195bd99b9bac87e3ff752953ac57ee172.patch:-p1 # backport fix for https://github.com/vectorgraphics/asymptote/issues/328
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Powerful script-based vector graphics language
 WWW=		https://asymptote.sourceforge.io/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
 ONLY_FOR_ARCHS=	amd64 i386
 BROKEN_FreeBSD_12_i386=	./base/plain_filldraw.asy: 21.5: runtime: gmake[2]: *** [Makefile:42: makepen.pdf] Floating point exception (core dumped)
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libsigsegv.so:devel/libsigsegv
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \
 		${PY_PILLOW}
 
 USES=		compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \
 		pyqt:5 shebangfix tar:tgz tex
 SHEBANG_FILES=	GUI/*.py
 USE_GL=		gl glu glut
 USE_GNOME=	librsvg2:run
 USE_PERL5=	build
 USE_TEX=	dvipsk formats
 USE_PYQT=	pyqt5:run
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-lsp # disable the module with Boost-related errors
 
 MAKE_ENV=	ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR}
 MAKE_JOBS_UNSAFE=	yes # see https://github.com/vectorgraphics/asymptote/issues/331
 
 ALL_TARGET=	asy asy-keywords.el
 INSTALL_TARGET=	install-asy
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFAULT=	FFTW GSL MANPAGES READLINE
 OPTIONS_DEFINE=		BDWGC DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE
 
 BDWGC_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 BDWGC_DESC=		Enable Boehm-Demers-Weiser garbage collector
 BDWGC_CONFIGURE_ENABLE=	gc=${LOCALBASE}
 
 DOCS_ALL_TARGET=	html
 DOCS_BUILD_DEPENDS=	texi2dvi:print/texinfo
 DOCS_CONFIGURE_WITH=	docdir=${DOCSDIR}
 DOCS_INSTALL_TARGET=	install-html
 
 FFTW_CONFIGURE_ENABLE=	fftw
 FFTW_DESC=	Use FFTW to compute the Discrete Fourier Transform
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 GSL_CONFIGURE_ENABLE=	gsl
 GSL_DESC=	Enable GNU Scientific library
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 MANPAGES_ALL_TARGET=	man
 MANPAGES_BUILD_DEPENDS=	texi2dvi:print/texinfo
 MANPAGES_INFO=	asy-faq
 
 OFFSCREEN_CONFIGURE_ENABLE=	offscreen
 OFFSCREEN_DESC=	Enable offscreen rendering using OSMesa library
 OFFSCREEN_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 
 READLINE_CONFIGURE_ENABLE=	readline
 READLINE_USES=	readline
 
 TEST_TARGET=	test
 TEST_WRKSRC=	${WRKSRC}/tests
 
 PORTEXAMPLES=	*
 
 post-patch:
 	@${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,makeinfo,${LOCALBASE}/bin/makeinfo,' \
 		${WRKSRC}/doc/png/Makefile.in
 
 # Fix the python interpreter in the generated file share/asymptote/GUI/xasyVersion.py:
 	@${REINPLACE_CMD} 's,/usr/bin/env python3,${PYTHON_CMD},' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy
 
 .include <bsd.port.mk>
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index b54b20a61dfa..0878255f474d 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	convertall
 PORTVERSION=	0.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/doug-101/ConvertAll/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Another unit converter
 WWW=		https://convertall.bellz.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		pyqt:5 python:3.5+ shebangfix
 USE_PYQT=	pyqt5 sip
 
 SHEBANG_FILES=	source/convertall.py
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ConvertAll
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_OFF=	-s
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index d52f06481aa1..31d895e1768a 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	rpcalc
 PORTVERSION=	0.8.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Simple RPN calculator
 WWW=		https://rpcalc.bellz.org/index.html
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		pyqt:5 python:3.4+ shebangfix
 USE_PYQT=	pyqt5 sip
 
 SHEBANG_FILES=	source/rpcalc.py
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rpCalc
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile
index bcf432b6e8ee..6c1c19c13df2 100644
--- a/misc/orange3/Makefile
+++ b/misc/orange3/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	orange3
 DISTVERSION=	3.29.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component-based data mining software
 WWW=		https://orange.biolab.si/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}AnyQt>=0.0.11:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}baycomp>=1.0.2:math/py-baycomp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.0:math/py-bottleneck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.14.0:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openTSNE>=0.6.0:math/py-openTSNE@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-canvas-core>=0.1.19:devel/py-orange-canvas-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-widget-base>=4.13.0:devel/py-orange-widget-base@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-louvain>=0.13:math/py-python-louvain@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.11.1:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.2:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.7+ pyqt:5
 USE_PYTHON=	distutils cython autoplist noflavors
 USE_PYQT=	pyqt5:run webengine:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 CFLAGS+=	-DQSORT_R_STYLE_BSD=yes
 LDFLAGS+=	-Xlinker -strip-all # strip, stage-qa doesn't catch that it isn't stripped
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_PYQT+=	webengine:run
 .else
 USE_PYQT+=	webkit:run
 .endif
 
 xpost-install:
 	@${REINPLACE_CMD} -e 's|^"${PREFIX}/|| ; s|"$$||' ${_PYTHONPKGLIST} # https://github.com/biolab/orange3/issues/3060
 	@${REINPLACE_CMD} -e 's|import sys|& ; from OpenGL import GL|' ${STAGEDIR}${PREFIX}/bin/orange-canvas # https://github.com/biolab/orange3/issues/3062
 
 .include <bsd.port.mk>
diff --git a/misc/py-QSpectrumAnalyzer/Makefile b/misc/py-QSpectrumAnalyzer/Makefile
index f10d8cc2949d..d89830a1a2a3 100644
--- a/misc/py-QSpectrumAnalyzer/Makefile
+++ b/misc/py-QSpectrumAnalyzer/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	QSpectrumAnalyzer
 DISTVERSION=	2.1.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spectrum analyzer for multiple SDR platforms
 WWW=		https://github.com/xmikos/qspectrumanalyzer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.10.0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}soapy_power>=1.5.0:misc/py-soapy_power@${PY_FLAVOR}
 
 USES=		fortran python:3.8+ pyqt:5
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils concurrent autoplist
 
 PLIST_FILES=	bin/${PORTNAME:tl}.shadow
 
 post-patch: # change from Qt.py that doesn't work to PyQt5
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|from Qt import |from PyQt5 import | ; \
 		s|, __binding__|| ; \
 		s|QtCore.Signal|QtCore.pyqtSignal| ; \
 		s|QtCore.Slot|QtCore.pyqtSlot|'
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc9/libgcc_s.so ${PREFIX}/bin/${PORTNAME:tl}.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 
 .include <bsd.port.mk>
diff --git a/misc/urh/Makefile b/misc/urh/Makefile
index d2e5441c74a6..f48b104124b2 100644
--- a/misc/urh/Makefile
+++ b/misc/urh/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	urh
 DISTVERSION=	2.9.4
+PORTREVISION=	1
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal Radio Hacker: investigate wireless protocols like a boss
 WWW=		https://github.com/jopohl/urh
 
 LICENSE=	GPLv3
 
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang fortran python:3.4+ localbase pyqt:5
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils cython noflavors autoplist
 
 PLIST_FILES=	bin/urh.shadow
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/urh ${STAGEDIR}${PREFIX}/bin/urh.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/bin/urh.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/urh
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/urh
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/urh/cythonext/*.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index ef57f4f453ae..946ea7a63d5e 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	OpenShot Video Editor
 WWW=		https://www.openshot.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libopenshot>=0.3.0:multimedia/libopenshot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>=0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:5 python shared-mime-info shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot
 GH_PROJECT=	${PORTNAME}-qt
 USE_PYQT=	pyqt5
 USE_PYTHON=	distutils optsuffix
 SHEBANG_FILES=	src/language/generate_translations.py\
 		src/language/show_translations.py\
 		src/language/test_translations.py
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 DOCS_PORTDOCS=	*
 
 do-build-DOCS-on:
 	@(cd ${BUILD_WRKSRC}/doc; if ! ${DO_MAKE_BUILD} html; then \
 		(${ECHO_CMD} "===> ${.TARGET} failed unexpectedly.") | ${FMT_80} ; \
 		${FALSE}; \
 		fi)
 
 do-install-DOCS-on:
 	@(cd ${INSTALL_WRKSRC}/doc/_build &&\
 		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/net-im/scudcloud/Makefile b/net-im/scudcloud/Makefile
index 37c0200249ec..69657f5e1a5a 100644
--- a/net-im/scudcloud/Makefile
+++ b/net-im/scudcloud/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	scudcloud
 PORTVERSION=	1.65
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Desktop client app for Slack
 WWW=		https://github.com/raelgc/scudcloud
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsmin>0:devel/py-jsmin@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 
 GH_ACCOUNT=	raelgc
 
 HUNSPELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR} \
 			falkon:www/falkon
 
 OPTIONS_DEFINE=	HUNSPELL
 
 USES=		gnome python:3.5+ pyqt:5
 USE_PYQT=	sip:run pyqt5:run
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils optsuffix
 NO_ARCH=	yes
 
 post-patch:
 		@${REINPLACE_CMD} -i.bak -e 's,%%LOCALBASE%%,${LOCALBASE},1' \
 			${WRKSRC}/share/${PORTNAME}.desktop \
 			${WRKSRC}/${PORTNAME}/resources.py
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index c740b2cf2680..6c0cebe06a00 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	nagstamon
 PORTVERSION=	3.10.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Nagios status monitor for your desktop
 WWW=		https://nagstamon.ifw-dresden.de/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-gssapi>0:www/py-requests-gssapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-kerberos>0:security/py-requests-kerberos@${PY_FLAVOR}
 
 USES=		cpe pyqt:5 python:3.6+
 CPE_VENDOR=	henri_wahl
 USE_GITHUB=	yes
 GH_ACCOUNT=	HenriWahl
 GH_PROJECT=	Nagstamon
 USE_PYQT=	pyqt5:run sip:run
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile
index ed08e7532557..a724ae170381 100644
--- a/net/libarcus/Makefile
+++ b/net/libarcus/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	libArcus
 PORTVERSION=	4.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Communication library between internal components for Ultimaker
 WWW=		https://github.com/Ultimaker/libArcus
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	sip:devel/py-sip4
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++11-lang python:3.5+ pyqt:5
 USE_PYQT=	pysip
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 USE_LDCONFIG=	yes
 #GH_TAGNAME=	3afb644
 
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \
 				-DPYTHON_INCLUDEDIR:STRING=${PYTHON_INCLUDEDIR}
 .include <bsd.port.mk>
diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
index 3689b2c8aa8d..c0d973abdae8 100644
--- a/net/py-qt5-networkauth/Makefile
+++ b/net/py-qt5-networkauth/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	networkauth
 PORTVERSION=	${PYQTNETWORKAUTH_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQTNETWORKAUTH}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTNETWORKAUTH_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtNetworkAuth module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 BUILD_DEPENDS=	qmake-qt5:devel/qt5-qmake
 LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 USES=		gl pyqt:5 python:3.8+ qt:5
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt5
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui network networkauth
 
 .include <bsd.port.mk>
diff --git a/net/py-qt6-networkauth/Makefile b/net/py-qt6-networkauth/Makefile
index ebabb1d8d591..dbb1fdcb247d 100644
--- a/net/py-qt6-networkauth/Makefile
+++ b/net/py-qt6-networkauth/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	networkauth
 PORTVERSION=	${PYQTNETWORKAUTH_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQTNETWORKAUTH}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTNETWORKAUTH_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtNetworkAuth module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
 
 USES=		gl pyqt:6 python:3.8+ qt:6
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt6 qtbuilder
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		base networkauth
 
 .include <bsd.port.mk>
diff --git a/print/py-frescobaldi/Makefile b/print/py-frescobaldi/Makefile
index 5d25710026e9..6d02f37e1a70 100644
--- a/print/py-frescobaldi/Makefile
+++ b/print/py-frescobaldi/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	frescobaldi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	print kde python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Music score editor for lilypond
 WWW=		https://www.frescobaldi.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qpageview>=0:graphics/py-qpageview@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gmake pyqt:5 python:3.5+ qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	frescobaldi
 USE_PYQT=	pyqt5 sip webengine
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	LILYPOND
 
 LILYPOND_DESC=	Use unstable LilyPond (lilypond-devel)
 
 LILYPOND_RUN_DEPENDS=		lilypond:print/lilypond-devel
 LILYPOND_RUN_DEPENDS_OFF=	lilypond:print/lilypond
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \
 		${WRKSRC}/setup.py
 post-build:
 	(cd ${WRKSRC} && ${GMAKE} -C linux)
 
 .include <bsd.port.mk>
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index cb86252933d8..4b18a403f0b6 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	code_saturne
 PORTVERSION=	7.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	EDF's general purpose Computational Fluid Dynamics (CFD) software
 WWW=		https://www.code-saturne.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libcgns.so:science/cgnslib	\
 		libhdf5.so:science/hdf5		\
 		libmedC.so:french/med
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}	\
 		xmgrace:math/grace	\
 		bash:shells/bash	\
 		xterm:x11/xterm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	code-saturne
 
 USES=		autoreconf bison compiler:c11 fortran gettext gnome gmake \
 		iconv localbase libtool pyqt:5 python:3.7+ shebangfix xorg
 USE_GNOME=	libxml2
 USE_PYQT=	pyqt5 sip
 USE_XORG=	x11
 SHEBANG_FILES=	install_saturne.py tests/unittests.py bin/*.py build-aux/*.py
 CFLAGS+=	-D__XSI_VISIBLE
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
 		--without-salome-gui --enable-python
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
 		pyuic5=pyuic5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS HYPRE MPICH MUMPS PETSC SCOTCH
 OPTIONS_DEFAULT=	BATCH BLAS HYPRE METIS MPICH MUMPS PETSC SCOTCH
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
 OPTIONS_SUB=		yes
 BLAS_DESC=		Support of BLAS
 BLAS_USES=		blaslapack
 BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-type=BLAS	\
 			--with-blas-include=${LOCALBASE}/include/cblas	\
 			--with-blas-lib=${LOCALBASE}/lib
 BLAS_LIB_DEPENDS=	libcblas.so:math/cblas
 BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 HYPRE_DESC=		Support of HYPRE
 HYPRE_BUILD_DEPENDS=	hypre>0:science/hypre
 HYPRE_RUN_DEPENDS=	hypre>0:science/hypre
 HYPRE_CONFIGURE_ON=	--with-hypre="${LOCALBASE}"
 MPICH_USES=		mpi
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_CONFIGURE_WITH=	mpi
 METIS_DESC=		Support of METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 METIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include"
 MUMPS_DESC=		Support of MUMPS
 MUMPS_LIB_DEPENDS=	libsmumps.so:math/mumps
 MUMPS_CONFIGURE_ON=	--with-mumps="${LOCALBASE}"
 MUMPS_CONFIGURE_ENV=	MUMPS_LIBS="-lmpiseq -llapack"
 PARMETIS_DESC=		Support of ParMETIS
 PARMETIS_LIB_DEPENDS=	libparmetis.so:math/parmetis
 PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
 PARMETIS_CONFIGURE_ENV=	LIBS=-lexecinfo
 PETSC_DESC=		Support of PETSc
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
 PETSC_CONFIGURE_ON=	--with-petsc="${LOCALBASE}"
 SCOTCH_DESC=		Support of Scotch
 SCOTCH_LIB_DEPENDS=	libscotch.so:cad/scotch
 SCOTCH_CONFIGURE_ON=	--with-scotch-include="${LOCALBASE}/include"
 
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 TERM=		vt100	# Force for pointyhat to override su
 .else
 TERM?=		vt100	# Default value needed for tput in jail or tinderbox
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs
 # /libsaturne.so:
 # undefined reference to `__atomic_compare_exchange'
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 USES+=		tex
 USE_TEX=	tex:build
 BUILD_DEPENDS+=	fig2dev:print/fig2dev		\
 		doxygen:devel/doxygen		\
 		dot:graphics/graphviz		\
 		dvips:print/tex-dvipsk		\
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 BINARY_ALIAS+=	sphinx-build=sphinx-build-${PYTHON_VER}
 ALL_TARGET=	all pdf
 DOCS=		AUTHORS ChangeLog README
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile.am
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/code_saturne/cs_solver
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/science/py-boututils/Makefile b/science/py-boututils/Makefile
index 15e93c8197ad..211449c1ba1c 100644
--- a/science/py-boututils/Makefile
+++ b/science/py-boututils/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	boututils
 DISTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	science education
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package containing BOUT++ utils
 WWW=		https://github.com/boutproject/boututils
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.2.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mayavi>0:graphics/py-mayavi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.5.3:science/py-netCDF4@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.4.1:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.6+ pyqt:5
 USE_PYTHON=	distutils autoplist pytest
 USE_PYQT=	pyqt5
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
index 2ba8619969dd..0652ee3e2905 100644
--- a/science/py-veusz/Makefile
+++ b/science/py-veusz/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	veusz
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.6.2
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific plotting package
 WWW=		https://veusz.github.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang python:3.5+ pyqt:5 qt:5 shebangfix
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5 sip
 USE_PYTHON=	distutils concurrent autoplist pytest
 USE_QT=		core gui xml widgets qmake:build
 
 SHEBANG_FILES=	tests/runselftest.py examples/embedexample.py
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 post-install:
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/veusz/helpers/*.so
 
 do-test:
 	@cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ./runselftest.py
 
 .include <bsd.port.mk>
diff --git a/sysutils/angrysearch/Makefile b/sysutils/angrysearch/Makefile
index 0982317ab624..5ba767afb59c 100644
--- a/sysutils/angrysearch/Makefile
+++ b/sysutils/angrysearch/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils python
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quick search GUI tool for Unix-like systems
 WWW=		https://github.com/DoTheEvo/ANGRYsearch
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DoTheEvo
 GH_PROJECT=	ANGRYsearch
 
 USES=		python pyqt:5
 USE_PYTHON=	autoplist distutils noflavors
 USE_PYQT=	pyqt5:run
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,Linux,${OPSYS}, ; s,linux,${OPSYS:tl}, \
 		; s,/usr/share,${PREFIX}/share,' ${WRKSRC}/setup.py \
 		${WRKSRC}/angrysearch.desktop
 
 .include <bsd.port.mk>
 
 PATCH_ARGS+=	-l
diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile
index 8d3c74a60d05..c42974a79d9e 100644
--- a/www/onionshare/Makefile
+++ b/www/onionshare/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	onionshare
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	www security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Secure and anonymous file sharing via Tor
 WWW=		https://onionshare.org
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	meek-client:security/meek \
 		obfs4proxy:security/obfs4proxy-tor \
 		snowflake-client:security/snowflake-tor \
 		tor:security/tor \
 		${PYTHON_PKGNAMEPREFIX}Flask-HTTPAuth>=0:security/py-flask-httpauth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}atomicwrites>=0:devel/py-atomicwrites@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cepa>=0:net/py-cepa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask-socketio>=0:www/py-flask-socketio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}onionshare-cli>=0:www/onionshare-cli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shiboken2>=0:devel/shiboken2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-qt>=0:devel/py-pytest-qt@${PY_FLAVOR}
 
 USES=		cpe python:3.6+ pyqt:5 qt:5 shebangfix xorg
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5 sip
 USE_PYTHON=	distutils autoplist
 USE_XORG=	x11 xcb
 
 PYSETUP=	${WRKSRC}/desktop/setup.py
 SHEBANG_FILES=	${WRKSRC}/cli/*.py \
 		${WRKSRC}/cli/onionshare_cli/*.py \
 		${WRKSRC}/cli/tests/*.py \
 		${WRKSRC}/desktop/*.py \
 		${WRKSRC}/desktop/scripts/*.py \
 		${WRKSRC}/desktop/tests/*.py
 
 post-patch:
 	${RLN} ${WRKSRC}/cli/onionshare_cli ${WRKSRC}/onionshare-cli
 	${RLN} ${WRKSRC}/desktop/onionshare ${WRKSRC}/onionshare
 	${REINPLACE_CMD} 's|"onionshare-cli = onionshare_cli:main",||' ${PYSETUP}
 	${RM} ${WRKSRC}/desktop/package/onionshare-cli.py
 
 # https://github.com/onionshare/onionshare/blob/main/desktop/tests/run.sh
 do-test:
 	cd ${WRKSRC}/desktop \
 	&& ${PYTHON_CMD} -m pytest -v tests/test_gui_tabs.py \
 	&& ${PYTHON_CMD} -m pytest -v tests/test_gui_share.py \
 	&& ${PYTHON_CMD} -m pytest -v tests/test_gui_receive.py \
 	&& ${PYTHON_CMD} -m pytest -v tests/test_gui_website.py \
 	&& ${PYTHON_CMD} -m pytest -v tests/test_gui_chat.py
 
 .include <bsd.port.mk>
diff --git a/www/persepolis/Makefile b/www/persepolis/Makefile
index 45edd642fc4e..c9557ec1def6 100644
--- a/www/persepolis/Makefile
+++ b/www/persepolis/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	persepolis
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	www net ftp python
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Graphical download manager (GUI for Aria2)
 WWW=		https://persepolisdm.github.io/
 
 LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	aria2c:www/aria2 ffmpeg:multimedia/ffmpeg \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
 		${LOCALBASE}/share/sounds/freedesktop/stereo/complete.oga:audio/freedesktop-sound-theme
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		xdg-mime:devel/xdg-utils yt-dlp:www/yt-dlp \
 		${PYTHON_PKGNAMEPREFIX}PyOgg>0:audio/py-pyogg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		pyqt:5 python
 USE_PYTHON=	autoplist distutils noflavors
 USE_PYQT=	pyqt5
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}dm
 
 # Preserve remote (as on server) modification time of downloaded files
 post-patch:
 	@${REINPLACE_CMD} -e "/aria2c/s/--no-conf/&', '-R/" \
 		${WRKSRC}/persepolis/scripts/download.py
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 6de91578d8ca..614bdb99c855 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	webengine
 DISTVERSION=	${PYQTWEBENGINE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITES_PYQTWEBENGINE}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTWEBENGINE_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebEngine module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 LICENSE=	GPLv3
 
 USES=		gl python:3.8+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt5
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui location network printsupport webchannel \
 		webengine widgets qmake:build
 
 PLIST_SUB=		PYQT_WEBENGINE_VERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/www/py-qt6-webengine/Makefile b/www/py-qt6-webengine/Makefile
index e7b662ad9552..fac131af9dfc 100644
--- a/www/py-qt6-webengine/Makefile
+++ b/www/py-qt6-webengine/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	webengine
 DISTVERSION=	${PYQTWEBENGINE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITES_PYQTWEBENGINE}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTWEBENGINE_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtWebEngine module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 LICENSE=	GPLv3
 
 USES=		gl python:3.8+ pyqt:6 qt:6
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt6
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		base declarative positioning webchannel webengine
 
 PLIST_SUB=		PYQT_WEBENGINE_VERSION=${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/www/py-woob-qt/Makefile b/www/py-woob-qt/Makefile
index c15f099389e9..9dee9d69d5e6 100644
--- a/www/py-woob-qt/Makefile
+++ b/www/py-woob-qt/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	woob-qt
 DISTVERSION=	2.0-27
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g958a79c2
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Web Outside of Browsers
 WWW=		https://woob.tech/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
 
 USES=		gmake pyqt:5 python:3.7+
 USE_PYQT=	pyqt5 sip
 USE_PYTHON=	autoplist distutils
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	woob
 GL_COMMIT=	958a79c2e5de4698afe34f960fc1698cf2de8ca5
 
 BINARY_ALIAS=	pyuic5=pyuic5-${PYTHON_VER}
 
 NO_ARCH=	yes
 
 # woob-qt attempts to install __init__.py and the generated bytecode into
 # these directories which conflicts with those installed by woob. We need to
 # delete these files and their entries in the generated plist post-install.
 COMMON_DIRS=	woob \
 		woob/applications \
 		woob/tools \
 		woob/tools/application
 
 post-install:
 .for dir in ${COMMON_DIRS:S|/|\/|g}
 	@${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \
 		-e '/.*\/${dir}\/__pycache__.*/d' \
 		${WRKDIR}/.PLIST.pymodtmp
 .endfor
 .for dir in ${COMMON_DIRS}
 	@(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index 2f055dc1d8f2..6eb4057ea46b 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	qutebrowser
 DISTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	PYPI
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Keyboard-focused browser with a minimal GUI
 WWW=		https://www.qutebrowser.org/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR}
 
 USES=		cpe desktop-file-utils python:3.6+ pyqt:5 qt:5
 USE_PYQT=	pyqt5 webengine
 USE_PYTHON=	distutils autoplist noflavors
 USE_QT=		sql-sqlite3
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 PLIST_FILES=	share/applications/${PORTNAME}-${PYTHON_VER}.desktop
 
 OPTIONS_DEFINE_amd64=	ADBLOCK
 OPTIONS_DEFAULT_amd64=	ADBLOCK
 
 ADBLOCK_DESC=		Enable the newer adblocking support
 
 ADBLOCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
index a4a1415317db..12c62232dd4d 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-chart/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	chart
 PORTVERSION=	${PYQTCHART_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTCHART_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtChart module
 WWW=		https://riverbankcomputing.com/software/pyqtchart
 
 LICENSE=	${PYQT5_LICENSE}
 
 LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 USES=		gl python:3.8+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt5
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		charts core declarative gui qmake:build widgets
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt6-chart/Makefile b/x11-toolkits/py-qt6-chart/Makefile
index 88fb4953d010..59c448503a5f 100644
--- a/x11-toolkits/py-qt6-chart/Makefile
+++ b/x11-toolkits/py-qt6-chart/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	chart
 PORTVERSION=	${PYQTCHART_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTCHART_DISTNAME}
 
 PYQT_DIST=	yes
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtChart module
 WWW=		https://riverbankcomputing.com/software/pyqtchart
 
 LICENSE=	${PYQT6_LICENSE}
 
 LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
 
 USES=		gl pyqt:6 python:3.8+ qt:6
 USE_GL=		gl
 USE_PYQT=	sip:build pyqt6 qtbuilder
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		base charts declarative
 
 .include <bsd.port.mk>
diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile
index 19db82204080..04a5cc94a923 100644
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	nscde
 DISTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/NsCDE/NsCDE/releases/download/${DISTVERSION}/
 
 MAINTAINER=	freebsd@ny-central.org
 COMMENT=	Modern CDE clone based on fvwm
 WWW=		https://github.com/NsCDE/NsCDE
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		ksh93:shells/ksh93 \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 
 USES=		desktop-file-utils gettext magick pkgconfig:build pyqt:5 \
 		python:3.7+ shebangfix xorg
 USE_PYQT=	pyqt5
 USE_XORG=	x11 xext xpm
 
 SHEBANG_FILES=	doc/examples/fvwm3-per-monitor/nitrowrapper
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python-shebang="${PYTHON_CMD}"
 
 DOCSDIR=	${PREFIX}/share/doc/nscde
 SUB_FILES=	pkg-message
 SUB_LIST=	EXAMPLESDIR=${EXAMPLESDIR} \
 		PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/NsCDE-${DISTVERSION}
 
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		DOCS EXAMPLES KSH2020 SUDO
 OPTIONS_SINGLE=			IMGMAG KSHOPT ROOTAUTH
 OPTIONS_SINGLE_KSHOPT=		ASTKSH KSH2020
 OPTIONS_SINGLE_ROOTAUTH=	DOAS SUDO
 ASTKSH_DESC=			AT&T KSH93
 DOAS_DESC=			Use doas to elevate privileges
 KSH2020_DESC=			Updated AT&T KSH93 (arm64 compatible)
 KSHOPT_DESC=			KSH version
 ROOTAUTH_DESC=			Root authorization
 SUDO_DESC=			Use sudo to elevate privileges
 
 ASTKSH_RUN_DEPENDS=	ksh93:shells/ast-ksh93
 DOAS_RUN_DEPENDS=	doas:security/doas
 KSH2020_RUN_DEPENDS=	ksh93:shells/ksh93
 SUDO_RUN_DEPENDS=	sudo:security/sudo
 
 _SUDOFILES=	data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog
 
 .include <bsd.port.pre.mk>
 
 UNAME_M_CMD=	${UNAME} -m
 PLIST_SUB+=	ARCH="$$(${UNAME_M_CMD})"
 
 post-patch-DOAS-on:
 	( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done )
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}
 	${MV} ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/* ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}/
 
 post-install-EXAMPLES-off:
 	${RM} -fr ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/*
 
 .include <bsd.port.post.mk>
diff --git a/x11/dsbxinput/Makefile b/x11/dsbxinput/Makefile
index 5a3267b5a436..bea6033f501f 100644
--- a/x11/dsbxinput/Makefile
+++ b/x11/dsbxinput/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	dsbxinput
 DISTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	mk@nic-nac-project.org
 COMMENT=	Graphical tool for configuring pointing devices
 WWW=		https://github.com/mrclksr/DSBXinput
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xinput:x11/xinput
 
 USES=		pyqt:5 python:3.8+ qt:5
 USE_QT=		linguisttools:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	mrclksr
 GH_PROJECT=	DSBXinput
 USE_PYQT=	pyqt5
 
 BINARY_ALIAS=	lrelease=${LRELEASE}
 .include <bsd.port.mk>