diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 3066745085f9..42d37d71d9aa 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -1,291 +1,291 @@
 # Handle PyQt related ports
 #
 # Feature:	pyqt
 # Usage:	USES=pyqt:ARGS
 # Valid ARGS:	5
 #
 # MAINTAINER:	kde@FreeBSD.org
 #
 # Internal Port variables for PyQt ports:
 # PYQT_DIST	- This port is part of PyQt5 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          both (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, sip
 # option is for internal use by the py-sip ports.
 _PYQT_SUPPORTED=        5 sip
 
 .  if empty(pyqt_ARGS)
 IGNORE=	pyqt needs a qt-version (${_PYQT_SUPPORTED})
 .  endif
 
 # At the moment we support PyQt bindings versions 5
 .  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_PYQTSIP=	https://pypi.python.org/packages/source/P/PyQt5-sip/
 MASTER_SITES_PYQTCHART=	https://pypi.python.org/packages/source/P/PyQtChart/
 MASTER_SITES_PYQTNETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
 MASTER_SITES_PYQTBUILDER=	https://pypi.io/packages/source/P/PyQt-builder/
 #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
 
 SIP_VERSION=		5.5.0
-QSCI2_VERSION=		2.12.1
+QSCI2_VERSION=		2.13.0
 PYQT5_VERSION=		5.15.4
-PYQTSIP_VERSION=	12.8.1
+PYQTSIP_VERSION=	12.9.0
 PYQTBUILDER_VERSION=	1.9.1
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
 PYQT5_DISTNAME=		PyQt5-${PYQT5_VERSION}
 PYQTSIP_DISTNAME=	PyQt5_sip-${PYQTSIP_VERSION}
 PYQTCHART_DISTNAME=	PyQtChart-${PYQT_VERSION}
 PYQTNETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQT_VERSION}
 PYQTBUILDER_DISTNAME=	PyQt-builder-${PYQTBUILDER_VERSION}
 PYQT5_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 QSCI2_DISTNAME=		QScintilla_src-${QSCI2_VERSION}
 PYQT5_LICENSE=		GPLv3
 
 _USE_PYQT_COMMS=	sensors serialport
 _USE_PYQT_DATABASES=	sql
 _USE_PYQT_DEVEL=	core dbus dbussupport help location \
 			designer designerplugin remoteobjects test 
 _USE_PYQT_GRAPHICS=	svg
 _USE_PYQT_LANG=		qml
 _USE_PYQT_LOCATION=	location
 _USE_PYQT_MISC=		demo
 _USE_PYQT_MULTIMEDIA=	multimedia multimediawidgets
 _USE_PYQT_NET=		network networkauth
 _USE_PYQT_POSITIONING=	positioning
 _USE_PYQT_PRINT=	printsupport
 _USE_PYQT_TEXTPROC=	xml xmlpatterns
 _USE_PYQT_WWW=		webchannel webengine webkit webkitwidgets websockets
 _USE_PYQT_X11=		opengl
 _USE_PYQT_X11-TOOLKITS=	chart gui widgets quick quick3d quickwidgets
 
 # Keep these synchronized with OPTIONS_DEFINE in devel/py-qt5
 # PyQt components split up into pyqt5/...
 _USE_PYQT_ALL=		${_USE_PYQT_COMMS} \
 			${_USE_PYQT_DATABASES} \
 			${_USE_PYQT_DEVEL} \
 			${_USE_PYQT_GRAPHICS} \
 			${_USE_PYQT_LANG} \
 			${_USE_PYQT_LOCATION} \
 			${_USE_PYQT_MISC} \
 			${_USE_PYQT_MULTIMEDIA} \
 			${_USE_PYQT_NET} \
 			${_USE_PYQT_POSITIONING} \
 			${_USE_PYQT_PRINT} \
 			${_USE_PYQT_TEXTPROC} \
 			${_USE_PYQT_WWW} \
 			${_USE_PYQT_X11} \
 			${_USE_PYQT_X11-TOOLKITS}
 _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}
 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}
 PYQT_DISTINFO_FILE=	${PYQT${_PYQT_VERSION}_DISTINFO_FILE}
 PYQT_LICENSE=		${PYQT${_PYQT_VERSION}_LICENSE}
 
 # PATH
 py-sip_PATH=			${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}
 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}
 
 .  for _component in ${_USE_PYQT_ALL}
 py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}
 .  endfor
 
 # 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
 
 .  for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits
 _PYQT_CATEGORIE=	_USE_PYQT_${_categorie:tu}
 .    for _component in ${${_PYQT_CATEGORIE}}
 py-${_component}_PORT?=${_categorie}/${PYQT_RELNAME}-${_component}
 .    endfor
 .  endfor
 
 py-core_DESC=			Python bindings for QtCore module
 py-chart_DESC=			Python bindings for QtChart module
 py-dbus_DESC=			Python bindings for QtDBus module
 py-dbussupport_DESC=		Qt event loop support for dbus-python
 py-demo_DESC=			PyQt demo and examples
 py-designer_DESC=		Python bindings for QtDesigner module
 py-designerplugin_DESC=		Python bindings for QtDesigner plugin
 py-gui_DESC=			Python bindings for QtGui module
 py-help_DESC=			Python bindings for QtHelp module
 py-location_DESC=		Python bindings for Location module
 py-multimedia_DESC=		Python bindings for Multimedia module
 py-multimediawidgets_DESC=	Python bindings for QtMultimediaWidgets module
 py-network_DESC=		Python bindings for QtNetwork module
 py-networkauth_DESC=		Python bindings for QtNetworkAuth module
 py-opengl_DESC=			Python bindings for QtOpenGL module
 py-positioning_DESC=		Python bindings for QtPositioning module
 py-printsupport_DESC=		Python bindings for Printsupport module
 py-qml_DESC=			Python bindings for Qml module
 py-qscintilla2_DESC=		Python bindings for QScintilla2
 py-quick_DESC=			Python bindings for QtQuick module
 py-quick3d_DESC=		Python bindings for QtQuick3D module
 py-quickwidgets_DESC=		Python bindings for QtQuickWidgets module
 py-remoteobjects_DESC=		Python bindings for QtRemoteObjects module
 py-sip_DESC=			Python bindings generator for C and C++ libraries
 py-sensors_DESC=		Python bindings for QtSensors
 py-serialport_DESC=		Python bindings for QtSerialPort
 py-sql_DESC=			Python bindings for QtSql module
 py-svg_DESC=			Python bindings for QtSvg module
 py-test_DESC=			Python bindings for QtTest module
 py-webchannel_DESC=		Python bindings for QtWebChannel module
 py-webengine_DESC=		Python bindings for QtWebEngine module
 py-webkit_DESC=			Python bindings for QtWebKit module
 py-webkitwidgets_DESC=		Python bindings for QtWebKitWidgets module
 py-widgets_DESC=		Python bindings for QTWidgets module
 py-xml_DESC=			Python bindings for QtXml module
 py-xmlpatterns_DESC=		Python bindings for QtXmlPatterns module
 
 # The versionned executable of sip
 SIP=		${LOCALBASE}/bin/sip5-${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)
 PORTVERSION=	${PYQT_VERSION}
 MASTER_SITES=	${PYQT_MASTERSITES}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT_DISTNAME}
 DISTINFO_FILE=	${PYQT_DISTINFO_FILE}
 LICENSE?=	${PYQT_LICENSE}
 HAS_CONFIGURE=	yes
 
 .    if ${_PYQT_VERSION} > 4
 # PyQt5's configure.py generates .pro files and calls qmake to generate the
 # Makefiles. qmake's Makefiles use INSTALL_ROOT instead of DESTDIR.
 DESTDIRNAME=	INSTALL_ROOT
 # Limit PyQt5's version to the Qt5 version in ports
 PORTSCOUT?=	limit:^${_QT_VERSION:R}
 .    endif
 
 PATCHDIR=	${.CURDIR}/../../devel/${PYQT_RELNAME}-core/files
 CONFIGURE_ARGS+=-b ${PREFIX}/bin \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-q ${QMAKE} \
 		--confirm-license \
 		--sip ${SIP} \
 		--sipdir ${PYQT_SIPDIR}
 .    if ${_PYQT_VERSION:M5}
 # Move the designer plugin and qml libraries to versioned folders.
 CONFIGURE_ARGS+=--qml-plugindir ${PYQT_QMLDIR} \
 		--designer-plugindir ${PYQT_DESIGNERDIR}
 # Further do not gernate the dinstinfo files.
 CONFIGURE_ARGS+=--no-dist-info
 .    endif
 # One of the things PyQt looks for to determine whether to build the Qt DBus
 # main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is
 # present. Only extract it for that port then.
 .    if ${PORTNAME} != "dbussupport"
 EXTRACT_AFTER_ARGS+=	--exclude "${DISTNAME}/dbus"
 .    endif  # ${PORTNAME} != "dbussupport"
 
 .    if !target(do-configure)
 do-configure:
 	${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 .    endif  # !target(do-configure)
 .  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}_BUILD_DEPENDS}
 RUN_DEPENDS+=		${py-${comp}_RUN_DEPENDS}
 TEST_DEPENDS+=		${py-${comp}_TEST_DEPENDS}
 .    else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
 .    endif
 .  endfor
 
 .endif # defined(_INCLUDE_USES_PYQT_MK)
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 0ef0fffcfb73..5ba3da017afc 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,50 +1,50 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 
 PORTNAME=	openscad
 PORTVERSION=	2021.02.09
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	b6c170cc5dd1.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=  cgal>0:math/cgal
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 CONFLICTS=	openscad
 
 USES=		bison compiler:c++14-lang desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_TAGNAME=	63a7c77740030c63d646eb0684ba6947eecb0db7
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index c5887e9ef166..823c1c3b7f52 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,52 +1,52 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 
 PORTNAME=	openscad
 PORTVERSION=	2021.01.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 #PATCHFILES+=	b6c170cc5dd1.patch:-p1 \
 #		15acf6700674.patch:-p1 \
 #		9c4d5ae7ab05.patch:-p1 \
 #		07a56df933a3.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=  cgal>0:math/cgal
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libhidapi.so:comms/hidapi \
 		libboost_regex.so:devel/boost-libs \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libopencsg.so:graphics/opencsg \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
 #CONFLICTS=	openscad-devel
 
 USES=		bison compiler:c++14-lang desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
 GH_TAGNAME=	41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
 
 post-patch:
 	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
 	@${REINPLACE_CMD} -e 's,share/man,man,' \
 		${WRKSRC}/openscad.pro
 
 .include <bsd.port.mk>
diff --git a/comms/py-qt5-sensors/Makefile b/comms/py-qt5-sensors/Makefile
index 15a5f9dc0e40..9d5ec277b65e 100644
--- a/comms/py-qt5-sensors/Makefile
+++ b/comms/py-qt5-sensors/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sensors
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtSensors module
 
 CONFIGURE_ARGS=	--enable QtSensors
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui sensors qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtSensors API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSensors.so
 
 .include <bsd.port.mk>
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index 36ba4fc327b5..99a67a6a8487 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	serialport
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtSerialPort module
 
 CONFIGURE_ARGS=	--enable QtSerialPort
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui serialport qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtSerialPort API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSerialPort.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 1217cb05a495..49e84b325471 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sql
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtSql module
 
 CONFIGURE_ARGS=	--enable QtSql
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui sql widgets buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtSql API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSql.so
 
 .include <bsd.port.mk>
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index ffade65d4966..e0b0f1b7c336 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -1,35 +1,35 @@
 # Created by: loïc bartoletti <lbartoletti@FreeBSD.org>
 
 PORTNAME=	sqlitebrowser
 PORTVERSION=	3.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Visual tool to manage SQLite databases
 
 LICENSE=	MPL20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:devel/antlr
 LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 USES=		compiler:c++11-lang cmake desktop-file-utils gnome qt:5 sqlite
 CMAKE_ARGS+=	-DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
 USE_QT=		core concurrent gui network printsupport testlib widgets \
 		buildtools_build linguisttools_build qmake_build xml
 USE_GITHUB=	yes
 
 INSTALLS_ICONS=	yes
 
 PORTSCOUT=	ignore:1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
 		${WRKSRC}/src/PreferencesDialog.cpp ${WRKSRC}/src/Application.cpp
 	@${REINPLACE_CMD} -e 's|metainfo|appdata|' \
 		${WRKSRC}/src/src.pro ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 862f15e12e78..977046590352 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,120 +1,121 @@
 # Created by: stas
 
 PORTNAME=	calibre
 PORTVERSION=	5.23.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
 LICENSE=	GPLv3
 
 DEPRECATED=	Uses EOL Python 2.7 via www/py-qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		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
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${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} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
 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}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cchardet>=0:textproc/py-cchardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		pdftohtml:graphics/poppler-utils \
 		${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
 
 USES=		desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
 		pkgconfig pyqt:5 python:3.8+ qt:5 shared-mime-info shebangfix \
 		ssl tar:xz xorg
 USE_RC_SUBR=	calibre
 SUB_LIST+=	PYTHON_VERSION=${PYTHON_VERSION}
 USE_PYQT=	core gui network pysip qtbuilder sip svg webengine widgets xmlpatterns
 USE_QT=		buildtools_build core dbus gui qmake_build widgets
 USE_GL=		egl gl
 USE_GNOME=	glib20
 USE_XORG=	xrender xext x11
 
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
 SHEBANG_GLOB=	*.sh *.py *.recipe
 python_OLD_CMD=	"/usr/bin/env python2" "/usr/bin/env  python2" "/usr/bin/env  python" /bin/python2 \
 		/usr/bin/python2 ${LOCALBASE}/bin/python3
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 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} \
 		CALIBRE_PY3_PORT=1
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python2|#!${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-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} build)
 
 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/*
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-autokey/Makefile b/deskutils/py-autokey/Makefile
index 7828de444795..51832a7d7c07 100644
--- a/deskutils/py-autokey/Makefile
+++ b/deskutils/py-autokey/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	autokey
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.95.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	daniel@shafer.cc
 COMMENT=	Desktop automation utility for FreeBSD and X11
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils concurrent
 USE_GITHUB=	yes
 
 INSTALLS_ICONS=	yes
 
 NO_ARCH=	yes
 
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	GTK3 QT5
 OPTIONS_DEFAULT=	GTK3
 OPTIONS_SUB=	yes
 
 GTK3_RUN_DEPENDS=	libappindicator>0:devel/libappindicator
 GTK3_USES=	gnome
 GTK3_USE=	GNOME=gtk30,gtksourceview3,pygobject3
 
 QT5_USES=	pyqt:5
 QT5_USE=	PYQT=dbus,qscintilla2,sip,svg,xml
 
 post-patch:
 	@${REINPLACE_CMD} 's|share/man|man|g' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} "/install_requires=/s|'dbus-python', ||g" ${WRKSRC}/setup.py
 
 # setup.py installs both gtk and qt files no matter what, need to clean that up.
 post-install-GTK3-off:
 	@${RM} ${STAGEDIR}${PREFIX}/share/applications/autokey-gtk.desktop
 	@${RM} ${STAGEDIR}${PREFIX}/bin/autokey-gtk
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/autokey-gtk.1
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}${PORTNAME}/gtkui
 
 post-install-QT5-off:
 	@${RM} ${STAGEDIR}${PREFIX}/share/applications/autokey-qt.desktop
 	@${RM} ${STAGEDIR}${PREFIX}/bin/autokey-qt
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/autokey-qt.1
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}${PORTNAME}/gtkui
 
 .include <bsd.port.mk>
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index d1ca7fd015ff..213d74a6a3d2 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -1,67 +1,67 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 
 .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
 
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 DEPRECATED=	Uses EOL Python 2.7 via www/py-qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 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}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}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/}
 
 USES+=		desktop-file-utils python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	flavors
 USE_PYQT=	chart core gui qscintilla2 webengine \
 		help_run network_run svg_run sql_run
 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/libsavitar/Makefile b/devel/libsavitar/Makefile
index 885b7eece9f3..5143d7f473fc 100644
--- a/devel/libsavitar/Makefile
+++ b/devel/libsavitar/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	libSavitar
 DISTVERSION=	4.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel cad
 DIST_SUBDIR=	Ultimaker
 
 PATCH_SITES=   https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=    195633cf0c5f.patch:-p1
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	C++ implementation of 3mf loading/python bindings
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpugixml.so:textproc/pugixml
 
 USES=		cmake compiler:c++11-lang python:3.5+ pyqt:5
 USE_PYQT=	sip pysip
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_TAGNAME=	96eba0e
 USE_LDCONFIG=	yes
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/py-pynest2d/Makefile b/devel/py-pynest2d/Makefile
index 5cf2bb040177..b41138701b93 100644
--- a/devel/py-pynest2d/Makefile
+++ b/devel/py-pynest2d/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	pynest2d
 DISTVERSION=	4.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	y@trombik.org
 COMMENT=	CPython bindings for libnest2d by Ultimaker
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker
 BUILD_DEPENDS=	${LOCALBASE}/include/libnest2d/libnest2d.hpp:devel/libnest2d-ultimaker
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libboost_system.so:devel/boost-libs \
 		libnlopt.so:math/nlopt
 
 USES=		python:3.6+ cmake compiler:c++11-lang pyqt:5 pkgconfig
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_TUPLE=	Ultimaker:pynest2d:d31a381
 USE_PYQT=	sip pysip
 CMAKE_ARGS=	-DSIP_EXECUTABLE=${SIP} \
 			-DLIBNEST2D_INCLUDE_DIRS=${PREFIX}/include/libnest2d
 
 CONFIGURE_ENV=	CLIPPER_PATH=${LOCALBASE} VERBOSE=y
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 245528529f33..7c60fb60fa58 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	core
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtCore module
 
 PYQT_MODULE=	QtCore
 CONFIGURE_ARGS=	${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \
 		--enable=${PYQT_MODULE}
 
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYTHON=	concurrent flavors py3kplist
 USE_PYQT=	sip pysip
 USE_QT=		core buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtCore API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
 post-patch:
 	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	# This Qt.so masks the Qt.py which is supposed to import
 	# all of the Qt submodules.
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qt.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtCore.so
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 3a99f97a177d..57c635578d58 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	dbus
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtDBus module
 
 CONFIGURE_ARGS=	--enable QtDBus
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core dbus qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtDBus API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtDBus.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index 9fcbf2cd9b93..ee5b6b38cffb 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	designer
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtDesigner module
 
 CONFIGURE_ARGS=	--enable QtDesigner --no-designer-plugin
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui designer widgets xml \
 		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtDesigner API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtDesigner.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile
index 1df5e269d3f8..7ae4d9791723 100644
--- a/devel/py-qt5-help/Makefile
+++ b/devel/py-qt5-help/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	help
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtHelp module
 
 CONFIGURE_ARGS=	--enable QtHelp
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui widgets help network sql buildtools_build qmake_build xml
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtHelp API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtHelp.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-location/Makefile b/devel/py-qt5-location/Makefile
index 11242be8f608..d9374bf89b0e 100644
--- a/devel/py-qt5-location/Makefile
+++ b/devel/py-qt5-location/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	location
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtLocation module
 
 CONFIGURE_ARGS=	--enable QtLocation
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui location network buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtLocation API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtLocation.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-positioning/Makefile b/devel/py-qt5-positioning/Makefile
index da5726a7a2b3..2adc64d040cb 100644
--- a/devel/py-qt5-positioning/Makefile
+++ b/devel/py-qt5-positioning/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	positioning
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtPositioning module
 
 CONFIGURE_ARGS=	--enable QtPositioning
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui location qmake_build widgets
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtPositioning API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtPositioning.so
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-remoteobjects/Makefile b/devel/py-qt5-remoteobjects/Makefile
index 136639723641..af56a501cf77 100644
--- a/devel/py-qt5-remoteobjects/Makefile
+++ b/devel/py-qt5-remoteobjects/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	remoteobjects
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtRemoteObjects module
 
 CONFIGURE_ARGS=	--enable QtRemoteObjects
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui remoteobjects network buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtRemoteObjects API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtRemoteObjects.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo
index bdcda3da5a8b..99d09e429df5 100644
--- a/devel/py-qt5-sip/distinfo
+++ b/devel/py-qt5-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607712818
-SHA256 (PyQt5_sip-12.8.1.tar.gz) = 30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd
-SIZE (PyQt5_sip-12.8.1.tar.gz) = 102324
+TIMESTAMP = 1626762347
+SHA256 (PyQt5_sip-12.9.0.tar.gz) = d3e4489d7c2b0ece9d203ae66e573939f7f60d4d29e089c9f11daa17cfeaae32
+SIZE (PyQt5_sip-12.9.0.tar.gz) = 103007
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index 55c84e127eec..abc94ff2c92c 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	test
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtTest module
 
 CONFIGURE_ARGS=	--enable QtTest
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui testlib widgets \
 		buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtTest API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtTest.so
 
 .include <bsd.port.mk>
diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2-qt5/distinfo
index 9b62cb6bcaee..a8292180f56b 100644
--- a/devel/qscintilla2-qt5/distinfo
+++ b/devel/qscintilla2-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625506502
-SHA256 (QScintilla_src-2.12.1.tar.gz) = a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
-SIZE (QScintilla_src-2.12.1.tar.gz) = 3059045
+TIMESTAMP = 1626762174
+SHA256 (QScintilla_src-2.13.0.tar.gz) = 05116938bedfceb2953d3c24f862e1ab4d68ba7845f135d1d7aa1086595449b2
+SIZE (QScintilla_src-2.13.0.tar.gz) = 3059601
diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist
index 3099ae748740..dc381bc0dede 100644
--- a/devel/qscintilla2-qt5/pkg-plist
+++ b/devel/qscintilla2-qt5/pkg-plist
@@ -1,76 +1,76 @@
 %%QT_INCDIR%%/Qsci/qsciabstractapis.h
 %%QT_INCDIR%%/Qsci/qsciapis.h
 %%QT_INCDIR%%/Qsci/qscicommand.h
 %%QT_INCDIR%%/Qsci/qscicommandset.h
 %%QT_INCDIR%%/Qsci/qscidocument.h
 %%QT_INCDIR%%/Qsci/qsciglobal.h
 %%QT_INCDIR%%/Qsci/qscilexer.h
 %%QT_INCDIR%%/Qsci/qscilexeravs.h
 %%QT_INCDIR%%/Qsci/qscilexerbash.h
 %%QT_INCDIR%%/Qsci/qscilexerbatch.h
 %%QT_INCDIR%%/Qsci/qscilexercmake.h
 %%QT_INCDIR%%/Qsci/qscilexercoffeescript.h
 %%QT_INCDIR%%/Qsci/qscilexercpp.h
 %%QT_INCDIR%%/Qsci/qscilexercsharp.h
 %%QT_INCDIR%%/Qsci/qscilexercss.h
 %%QT_INCDIR%%/Qsci/qscilexercustom.h
 %%QT_INCDIR%%/Qsci/qscilexerd.h
 %%QT_INCDIR%%/Qsci/qscilexerdiff.h
 %%QT_INCDIR%%/Qsci/qscilexeredifact.h
 %%QT_INCDIR%%/Qsci/qscilexerfortran.h
 %%QT_INCDIR%%/Qsci/qscilexerfortran77.h
 %%QT_INCDIR%%/Qsci/qscilexerhtml.h
 %%QT_INCDIR%%/Qsci/qscilexeridl.h
 %%QT_INCDIR%%/Qsci/qscilexerjava.h
 %%QT_INCDIR%%/Qsci/qscilexerjavascript.h
 %%QT_INCDIR%%/Qsci/qscilexerjson.h
 %%QT_INCDIR%%/Qsci/qscilexerlua.h
 %%QT_INCDIR%%/Qsci/qscilexermakefile.h
 %%QT_INCDIR%%/Qsci/qscilexermarkdown.h
 %%QT_INCDIR%%/Qsci/qscilexermatlab.h
 %%QT_INCDIR%%/Qsci/qscilexeroctave.h
 %%QT_INCDIR%%/Qsci/qscilexerpascal.h
 %%QT_INCDIR%%/Qsci/qscilexerperl.h
 %%QT_INCDIR%%/Qsci/qscilexerpo.h
 %%QT_INCDIR%%/Qsci/qscilexerpostscript.h
 %%QT_INCDIR%%/Qsci/qscilexerpov.h
 %%QT_INCDIR%%/Qsci/qscilexerproperties.h
 %%QT_INCDIR%%/Qsci/qscilexerpython.h
 %%QT_INCDIR%%/Qsci/qscilexerruby.h
 %%QT_INCDIR%%/Qsci/qscilexerspice.h
 %%QT_INCDIR%%/Qsci/qscilexersql.h
 %%QT_INCDIR%%/Qsci/qscilexertcl.h
 %%QT_INCDIR%%/Qsci/qscilexertex.h
 %%QT_INCDIR%%/Qsci/qscilexerverilog.h
 %%QT_INCDIR%%/Qsci/qscilexervhdl.h
 %%QT_INCDIR%%/Qsci/qscilexerxml.h
 %%QT_INCDIR%%/Qsci/qscilexeryaml.h
 %%QT_INCDIR%%/Qsci/qscimacro.h
 %%QT_INCDIR%%/Qsci/qsciprinter.h
 %%QT_INCDIR%%/Qsci/qsciscintilla.h
 %%QT_INCDIR%%/Qsci/qsciscintillabase.h
 %%QT_INCDIR%%/Qsci/qscistyle.h
 %%QT_INCDIR%%/Qsci/qscistyledtext.h
 %%QT_LIBDIR%%/libqscintilla2_qt5.so
 %%QT_LIBDIR%%/libqscintilla2_qt5.so.15
-%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0
-%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0.1
+%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.1
+%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.1.0
 %%QT_MKSPECDIR%%/features/qscintilla2.prf
 %%QT_DATADIR%%/qsci/api/python/Python-2.4.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.5.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.6.api
 %%QT_DATADIR%%/qsci/api/python/Python-2.7.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.1.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.2.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.3.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.4.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.5.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.6.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.7.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.8.api
 %%QT_DATADIR%%/qsci/api/python/Python-3.9.api
 %%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm
 %%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm
 %%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm
 %%NLS%%%%QT_L10NDIR%%/qscintilla_fr.qm
 %%NLS%%%%QT_L10NDIR%%/qscintilla_pt_br.qm
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index fc9e0026ec0f..a5ba5eac7dbb 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	tortoisehg
 DISTVERSION=	5.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PY_MERCURIAL}
 RUN_DEPENDS=	${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.5+
 USE_PYQT=	core gui network qscintilla2 xml
 USE_PYTHON=	distutils autoplist
 
 USE_GITLAB=	yes
 GL_SITE=	https://foss.heptapod.net
 GL_ACCOUNT=	mercurial/tortoisehg
 GL_PROJECT=	thg
 GL_COMMIT=	9f108b8c92463866721dedda1f3f872e0e2b4344
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude thg-${GL_COMMIT}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-on:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-off:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tortoisehg
 	${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
 
 .include <bsd.port.post.mk>
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 9e21401f08dd..55accfc38cdc 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	svg
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtSvg module
 
 CONFIGURE_ARGS=	--enable QtSvg
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui svg widgets qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtSvg API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSvg.so
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 506ec66f3c3d..47060b0532f1 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,180 +1,180 @@
 # Created by: Laurent Courty
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_16_8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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 \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/szip \
 		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>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tu}
 USE_GL=		gl
 USE_GNOME=	libxml2
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_PYQT=	core gui location network qml quick quickwidgets qscintilla2 \
 		pysip sip sql svg webkit_run webkitwidgets_run xml
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer doc gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools \
 		webengine widgets webkit 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 \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_INTERNAL_MDAL \
 		WITH_POSTGRESQL
 CMAKE_OFF=	WITH_GLOBE WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis
 
 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>
 
 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 d8b84e90d6bd..d1810f4017f0 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,180 +1,180 @@
 # Created by: Laurent Courty
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_20_0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 BUILD_DEPENDS=	gpsbabel>=1.5.4:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.20.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.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 \
 		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 \
 		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/szip \
 		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>=19.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features cpe desktop-file-utils \
 		fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \
 		shebangfix sqlite:3
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME:tu}
 USE_GL=		gl
 USE_GNOME=	libxml2
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_PYQT=	core gui location network qml quick quickwidgets qscintilla2 \
 		pysip sip sql svg webkit_run webkitwidgets_run xml
 USE_QT=		3d buildtools_build core concurrent dbus declarative \
 		designer doc gamepad gui linguist_build location \
 		network printsupport qmake_build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools \
 		webengine widgets webkit 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 \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 CMAKE_ON=	BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \
 		WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_INTERNAL_MDAL \
 		WITH_POSTGRESQL WITH_PDAL
 CMAKE_OFF=	WITH_GLOBE 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>
 
 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/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index 88912d46a7c8..71dc9375b977 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	qml
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QML module
 
 CONFIGURE_ARGS=	--enable QtQml
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run network_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui network buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtQml API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQml.so
 
 .include <bsd.port.mk>
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 72e343c7c677..e0682d9507a4 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,137 +1,138 @@
 # Created by: chuckr@FreeBSD.org
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gnuplot:math/gnuplot \
 		${LOCALBASE}/bin/gperf:devel/gperf \
 		gsed:textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:print/texinfo
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		gsed:textproc/gsed \
 		${LOCALBASE}/bin/makeinfo:print/texinfo
 LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 		libarpack.so:math/arpack-ng \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libftgl.so:graphics/ftgl \
 		libhdf5.so:science/hdf5 \
 		libpcre.so:devel/pcre \
 		libqhull.so.7:math/qhull \
 		libqrupdate.so:math/qrupdate \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libklu.so:math/suitesparse-klu \
 		libumfpack.so:math/suitesparse-umfpack \
 		libglpk.so:math/glpk \
 		libgl2ps.so:print/gl2ps \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libdrm.so:graphics/libdrm \
 		libOSMesa.so:graphics/libosmesa \
 		libsundials_arkode.so:math/sundials \
 		libportaudio.so:audio/portaudio
 #		libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities.
 
 USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
 		tar:xz compiler:c++14-lang \
 		desktop-file-utils gl iconv ncurses xorg
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_QT=		core gui help network opengl \
 		qmake_build buildtools_build linguist_build \
 		printsupport sql widgets \
 		xml
 USE_XORG=	x11 xext xfixes xft \
 		xcursor xinerama xrender
 USE_GL=		gl glu
 
 OCTAVE_VERSION=	${PORTVERSION}
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt5
 CONFIGURE_ENV=	GPERF="${LOCALBASE}/bin/gperf" \
 		JAVA_HOME=${JAVA_HOME} \
 		MAKEINFO=${LOCALBASE}/bin/makeinfo \
 		MKINFO=${LOCALBASE}/bin/makeinfo \
 		MOC_QTVER=${MOC} \
 		UIC_QTVER=${UIC} \
 		RCC_QTVER=${RCC} \
 		LRELEASE_QTVER=${LRELEASE} \
 		QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
 		QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
 		ac_cv_type_max_align_t=yes \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 
 CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		--with-lapack="${LAPACKLIB}" \
 		--enable-shared \
 		--disable-jit \
 		--disable-openmp \
 		--with-osmesa
 
 INFO=		octave liboctave
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS JAVA QT5
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
 OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
 QT5_CONFIGURE_WITH=	qt=5 qscintilla
 
 QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 
 DOCS_USE=	TEX=dvipsk:build,formats:build
 JAVA_USE=	JAVA=yes
 QT5_USES=	qt:5
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=		blaslapack:atlas
 
 post-patch:
 	${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
 	${REINPLACE_CMD} 's/"-qt=$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
 
 post-install:
 	(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib  .)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in liboctave/liboctave.ps \
 	refcard/refcard-a4.ps refcard/refcard-legal.ps \
 	refcard/refcard-letter.ps interpreter/octave.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .for file in interpreter/octave.info liboctave/liboctave.info
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endfor
 
 check regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 .include "Makefile.version"
 .include <bsd.port.mk>
diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile
index 3796e007dd7a..cba0628709f0 100644
--- a/misc/py-qt5-demo/Makefile
+++ b/misc/py-qt5-demo/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	demo
 PORTVERSION=	${PYQT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT5}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
 DISTNAME=	${PYQT_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, Qt demo and examples
 
 DISTINFO_FILE=	${PYQT_DISTINFO_FILE}
 NO_BUILD=	yes
 
 PORTSCOUT=	limit:^${PYQT5_VERSION}
 
 USES=		python:3.5+ pyqt:5
 USE_PYQT=	core_run dbus_run designer_run \
 		designerplugin_run gui_run multimedia_run \
 		multimediawidgets_run network_run opengl_run \
 		printsupport_run qscintilla2_run serialport_run sql_run \
 		sip_run svg_run test_run webkit_run webkitwidgets_run \
 		widgets_run xml_run xmlpatterns_run
 		
 USE_PYTHON=	concurrent flavors py3kplist
 NO_ARCH=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYQT_EXAMPLEDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYQT_EXAMPLEDIR}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYQT_EXAMPLEDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYQT_EXAMPLEDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 10d441014446..3359473832bf 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	multimedia
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtMultimedia module
 
 CONFIGURE_ARGS=	--enable QtMultimedia
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run network_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui multimedia network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtMultimedia API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimedia.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index 33cf7342c523..0e6c10c80d2d 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	multimediawidgets
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtMultimediaWidgets module
 
 CONFIGURE_ARGS=	--enable QtMultimediaWidgets
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run multimedia_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui multimedia network widgets qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtMultimedia API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimediaWidgets.so
 
 .include <bsd.port.mk>
diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile
index a5c008e64842..725cff2bf20b 100644
--- a/net/libarcus/Makefile
+++ b/net/libarcus/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	libArcus
 PORTVERSION=	4.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	net cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Communication library between internal components for Ultimaker
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++11-lang python:3.5+ pyqt:5
 USE_PYQT=	sip 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-network/Makefile b/net/py-qt5-network/Makefile
index b6f439377fab..1a7130760e07 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	network
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtNetwork module
 
 CONFIGURE_ARGS=	--enable QtNetwork
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core network qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtNetwork API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtNetwork.so
 
 .include <bsd.port.mk>
diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
index 03e9f8b83630..a8c58b980eba 100644
--- a/net/py-qt5-networkauth/Makefile
+++ b/net/py-qt5-networkauth/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	networkauth
 PORTVERSION=	${PYQT5_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQTNETWORKAUTH}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTNETWORKAUTH_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtNetworkAuth module
 
 USES=		gl pyqt:5 python:3.5+ qt:5
 USE_PYQT=	sip_build core gui network widgets
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui network networkauth qmake_build
 USE_GL+=	gl
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+= --verbose --no-dist-info \
 		-d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-q ${QMAKE} \
 		--sip ${SIP} \
 		--pyqt-sipdir=${PYQT_SIPDIR}
 DESTDIRNAME=	INSTALL_ROOT
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtNetworkAuth API for QScintilla2
 API_CONFIGURE_ON=	--apidir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-patch:
 	${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py;
 	${REINPLACE_CMD} -e "s/-gui/gui/" ${WRKSRC}/configure.py ${WRKSRC}/pyproject.toml
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtNetworkAuth.so
 
 .include <bsd.port.mk>
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index ffc4020aca34..ca04d514407a 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	printsupport
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtPrintSupport module
 
 CONFIGURE_ARGS=	--enable QtPrintSupport
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui printsupport widgets qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtPrintsupport API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtPrintSupport.so
 .include <bsd.port.mk>
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index c4f728764d90..a6b73ba7be8d 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	xml
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtXml module
 
 CONFIGURE_ARGS=	--enable QtXml
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core xml buildtools_build qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtXml API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtXml.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/pyrcc.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/pylupdate.so
 
 .include <bsd.port.mk>
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 85a0ef385009..6604c81c9f4a 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	xmlpatterns
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtXmlPatterns module
 
 CONFIGURE_ARGS=	--enable QtXmlPatterns
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run network_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core network xmlpatterns qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtXmlPatterns API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtXmlPatterns.so
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile
index 18408497d117..6571c40d2cd4 100644
--- a/www/py-qt5-webchannel/Makefile
+++ b/www/py-qt5-webchannel/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	webchannel
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebChannel module
 
 # LICENSE set in Mk/Uses/pyqt.mk
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run gui_run qml_run network_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative qmake_build gui network webchannel widgets
 
 CONFIGURE_ARGS=	--enable QtWebChannel \
 		--no-stubs
 PYQT_DIST=	yes
 
 OPTIONS_DEFINE=		API DEBUG
 OPTIONS_DEFAULT=	API
 OPTIONS_SUB=		yes
 
 API_DESC=		Install QtWebChannel API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebChannel.so
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 014bc011026f..acd19b0cdf85 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	webengine
 DISTVERSION=	${PYQT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	PyQtWebEngine-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebEngine module
 
 LICENSE=	GPLv3
 
 DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core gui network printsupport webchannel
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui location network printsupport webchannel \
 		webengine widgets qmake_build
 
 CONFIGURE_ARGS=	-d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-q ${QMAKE} \
 		--sip ${SIP} \
 		--pyqt-sipdir ${PYQT_SIPDIR} \
 		--verbose
 DESTDIRNAME=	INSTALL_ROOT
 
 OPTIONS_DEFINE=		API DEBUG
 OPTIONS_DEFAULT=	API
 OPTIONS_SUB=		yes
 
 API_DESC=		Install QtWebEngine API for QScintilla2
 API_CONFIGURE_ON=	--apidir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 PLIST_SUB=		PYQT_WEBENGINE_VERSION=${DISTVERSION}
 
 post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/PyQt5/QtWebEngine*.so
 
 post-patch:
 	${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index f7ab3c4bcacd..8d987e4d9665 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	webkit
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebKit module
 
 CONFIGURE_ARGS=	--enable QtWebKit
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run network_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui network webkit qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtWebKit API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebKit.so
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index 7d8499a9f511..956cefa6e3d2 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	webkitwidgets
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebKitWidgets module
 
 CONFIGURE_ARGS=	--enable QtWebKitWidgets
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run printsupport_run webkit_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui network printsupport webkit widgets \
 		qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtWebKitWidgets API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebKitWidgets.so
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-websockets/Makefile b/www/py-qt5-websockets/Makefile
index 03dad4b4b8f3..3a2d25864830 100644
--- a/www/py-qt5-websockets/Makefile
+++ b/www/py-qt5-websockets/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	websockets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www net devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebSockets module
 
 CONFIGURE_ARGS=	--enable QtWebSockets
 PYQT_DIST=	yes
 
 USES=		python:3.5+ pyqt:5 qt:5
 USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core qmake_build network websockets
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtNetwork API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebSockets.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
index 956d05199d2e..cb858ce3b126 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-chart/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	chart
 PORTVERSION=	${PYQT5_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTCHART_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtChart module
 
 LICENSE=	${PYQT5_LICENSE}
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core gui widgets
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		charts core declarative gui qmake_build widgets
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+= --verbose --no-dist-info \
 		-d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-q ${QMAKE} \
 		--sip ${SIP} \
 		--pyqt-sipdir=${PYQT_SIPDIR} \
 		--qtchart-sipdir=${PYQT_SIPDIR}
 DESTDIRNAME=	INSTALL_ROOT
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtCharts API for QScintilla2
 API_CONFIGURE_ON=	--apidir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-patch:
 	${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtChart.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index be455d3b69de..366c062387e6 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	quick
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtQuick module
 
 CONFIGURE_ARGS=	--enable QtQuick
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui qmake_build network
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtQuick API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuick.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quick3d/Makefile b/x11-toolkits/py-qt5-quick3d/Makefile
index 3f93957d77de..8130102831c3 100644
--- a/x11-toolkits/py-qt5-quick3d/Makefile
+++ b/x11-toolkits/py-qt5-quick3d/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	quick3d
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtQuick3D module
 
 CONFIGURE_ARGS=	--enable QtQuick3D
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui qmake_build network quick3d
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtQuick API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuick3D.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quickwidgets/Makefile b/x11-toolkits/py-qt5-quickwidgets/Makefile
index 64d3f435e8b9..845f89733489 100644
--- a/x11-toolkits/py-qt5-quickwidgets/Makefile
+++ b/x11-toolkits/py-qt5-quickwidgets/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	quickwidgets
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtQuickWidgets module
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	core_run gui_run sip_build 
 PYQT_DIST=	yes
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui network widgets \
 		qmake_build
 
 CONFIGURE_ARGS=	--enable QtQuickWidgets
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=	API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtQuick API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuickWidgets.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index 6278ec151892..497c63f8d364 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	widgets
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWidgets module
 
 CONFIGURE_ARGS=	--enable QtWidgets
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui widgets qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtGui API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWidgets.so
 
 .include <bsd.port.mk>
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index 86278cc51819..3b1f6c8411a2 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	opengl
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 devel python
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtOpenGL module
 
 CONFIGURE_ARGS=	--enable QtOpenGL
 PYQT_DIST=	yes
 
 USES=		gl python:3.5+ pyqt:5 qt:5
 USE_GL=		gl
 USE_PYQT=	sip_build core_run gui_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui opengl widgets qmake_build
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
 OPTIONS_SUB=	yes
 
 API_DESC=		Install QtOpenGL API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>