Index: head/Mk/Uses/pyqt.mk
===================================================================
--- head/Mk/Uses/pyqt.mk	(revision 568546)
+++ head/Mk/Uses/pyqt.mk	(revision 568547)
@@ -1,287 +1,287 @@
 # $FreeBSD$
 #
 # 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.0
-PYQT5_VERSION=		5.15.3
+PYQT5_VERSION=		5.15.4
 PYQTSIP_VERSION=	12.8.1
-PYQTBUILDER_VERSION=	1.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_MISC=		demo
 _USE_PYQT_MULTIMEDIA=	multimedia multimediawidgets
 _USE_PYQT_NET=		network networkauth
 _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_MISC} \
 			${_USE_PYQT_MULTIMEDIA} \
 			${_USE_PYQT_NET} \
 			${_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
 
 .  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-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)
Index: head/audio/cadence/Makefile
===================================================================
--- head/audio/cadence/Makefile	(revision 568546)
+++ head/audio/cadence/Makefile	(revision 568547)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	cadence
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of tools useful for audio production
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	jackit>0:audio/jack
 
 USES=		compiler:c++11-lang gmake localbase pkgconfig \
 		python:3.4+ pyqt:5 qt:5 shebangfix tar:bz2
 SHEBANG_FILES=	src/*.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 GH_PROJECT=	Cadence
 USE_QT=		core gui widgets buildtools_build
 USE_PYQT=	core_run gui_run network_run widgets_run sip xml dbussupport
 
 CXXFLAGS+=	-DJACKBRIDGE_PROPER_CPP11_SUPPORT=yes
 # Give the Makefile the proper versioned binaries of PyQt
 BINARY_ALIAS=	pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@cd ${WRKSRC}/data && ${REINPLACE_CMD} ' \
 		s|#!/bin/bash|#!/bin/sh| ; \
 		s|exec $$PYTHON |exec ${PYTHON_CMD} | ; \
 		s|ps -f -u |ps -U |' \
 		cadence cadence-aloop-daemon cadence-jacksettings cadence-logs \
 		cadence-pulse2jack cadence-pulse2loopback cadence-render \
 		cadence-session-start catarina catia claudia claudia-launcher
 	${REINPLACE_CMD} -e 's|-mtune=generic||' ${WRKSRC}/c++/Makefile.mk
 .if ! ${ARCH} == amd64 && ! ${ARCH} == i386
 	${REINPLACE_CMD} -e 's|-msse -mfpmath=sse||' ${WRKSRC}/c++/Makefile.mk
 .endif
 
 .include <bsd.port.post.mk>
Index: head/audio/carla/Makefile
===================================================================
--- head/audio/carla/Makefile	(revision 568546)
+++ head/audio/carla/Makefile	(revision 568547)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Audio LV2 plugin host for Jack and PulseAudio
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 LIB_DEPENDS=	liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 
 CONFLICTS_BUILD=	rtaudio-* rtmidi-*
 
 USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
 		pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix \
 		tar:bz2 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 USE_PYQT=	core_run gui_run sip svg_run widgets_run xml_build  # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
 USE_GNOME=	gtk20 gtk30
 USE_QT=		core gui widgets buildtools_build
 USE_GL=		gl
 USE_XORG=	x11
 USE_LDCONFIG=	${PREFIX}/lib/carla
 SHEBANG_FILES=	data/carla-single data/carla-bridge-lv2-modgui source/native-plugins/resources/* source/frontend/*
 
 MAKE_ARGS=	HAVE_QT4=false \
 		EXTERNAL_PLUGINS=false \
 # Give the Makefile the proper versioned binaries of PyQt
 BINARY_ALIAS=	pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
 
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		FFMPEG FLUIDSYNTH LINUXSAMPLER
 OPTIONS_DEFAULT=	FFMPEG FLUIDSYNTH JACK LINUXSAMPLER
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	JACK PULSEAUDIO
 BACKEND_DESC=		Audio backend
 LINUXSAMPLER_DESC=	Use LinuxSampler: a software audio sampler
 
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg
 FFMPEG_MAKE_ARGS_OFF=		HAVE_FFMPEG=false
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_MAKE_ARGS_OFF=	HAVE_FLUIDSYNTH=false
 LINUXSAMPLER_LIB_DEPENDS=	liblinuxsampler.so:audio/linuxsampler
 LINUXSAMPLER_MAKE_ARGS_OFF=	HAVE_LINUXSAMPLER=false
 JACK_RUN_DEPENDS=		${LOCALBASE}/lib/libjack.so:audio/jack
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_MAKE_ARGS_OFF=	HAVE_PULSEAUDIO=false
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e ' \
 		s|^PYTHON=.*|PYTHON=${PYTHON_CMD}|; \
 		s|#!/bin/bash|#!/bin/sh|' \
 		${STAGEDIR}${PREFIX}/bin/carla*
 
 devel-features: patch
 	@${ECHO} "Developer command: show build features"
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} features
 
 .include <bsd.port.mk>
Index: head/audio/picard/Makefile
===================================================================
--- head/audio/picard/Makefile	(revision 568546)
+++ head/audio/picard/Makefile	(revision 568547)
@@ -1,43 +1,43 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	picard
 PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		http://ftp.osuosl.org/pub/musicbrainz/picard/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Next generation MusicBrainz Tagger
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=0.5.2:audio/py-discid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.37:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR}
 
 USES=		gettext pyqt:5 python:3.5+ desktop-file-utils
 USE_LOCALE=	en_US.UTF-8
 USE_PYQT=	core_run dbus_run gui_run network_run widgets_run sip
 USE_PYTHON=	autoplist distutils noflavors
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
 
 OPTIONS_DEFINE=		ACOUSTID PLAYER PLUGINS
 OPTIONS_DEFAULT=	PLAYER PLUGINS
 
 ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
 PLAYER_DESC=		Built-in audio player
 PLAYER_USE=		PYQT=multimedia_run
 
 PLUGINS_DESC=		Install various plugins to extend functionality
 PLUGINS_RUN_DEPENDS=	picard-plugins>=2.0:audio/picard-plugins
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/picard/util/_astrcmp*.so
 
 .include <bsd.port.mk>
Index: head/biology/py-ete3/Makefile
===================================================================
--- head/biology/py-ete3/Makefile	(revision 568546)
+++ head/biology/py-ete3/Makefile	(revision 568547)
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	ete3
 DISTVERSION=	3.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for the analysis and visualization of trees
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.5+ pyqt:5 shebangfix
 SHEBANG_GLOB=	*.py
 USE_PYTHON=	distutils concurrent autoplist
 USE_PYQT=	core gui opengl printsupport svg widgets
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/cad/cura/Makefile
===================================================================
--- head/cad/cura/Makefile	(revision 568546)
+++ head/cad/cura/Makefile	(revision 568547)
@@ -1,54 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	Cura
 DISTVERSION=	4.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Slicing application for 3D printers
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	Uranium>0,1:cad/uranium
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
 		qt5-graphicaleffects>0:graphics/qt5-graphicaleffects \
 		qt5-quickcontrols>0:x11-toolkits/qt5-quickcontrols \
 		qt5-quickcontrols2>0:x11-toolkits/qt5-quickcontrols2 \
 		${PYTHON_PKGNAMEPREFIX}qt5-svg>0:graphics/py-qt5-svg \
 		Uranium>=${DISTVERSION}:cad/uranium \
 		libCharon>=${DISTVERSION}:net/libcharon \
 		CuraEngine>=${DISTVERSION}:cad/cura-engine \
 		fdm_materials>=${DISTVERSION}:cad/fdm_materials \
 		${PYTHON_PKGNAMEPREFIX}trimesh>0:devel/py-trimesh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynest2d>=${DISTVERSION}:devel/py-pynest2d@${PY_FLAVOR}
 
 LIB_DEPENDS=	libArcus.so:net/libarcus \
 		libSavitar.so:devel/libsavitar
 
 USES=		cmake gettext shebangfix python:3.5+ pyqt:5 \
 		desktop-file-utils shared-mime-info
 USE_PYQT=	gui widgets qml
 CMAKE_ARGS+=	-DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts" \
 	-DCURA_VERSION=${DISTVERSION}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_TAGNAME=	58bae31
 NO_ARCH=	yes
 SHEBANG_FILES=	cura_app.py
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' \
 		${WRKSRC}/CMakeLists.txt
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKSRC}/cura_app.py
 
 .include <bsd.port.mk>
Index: head/cad/openscad/Makefile
===================================================================
--- head/cad/openscad/Makefile	(revision 568546)
+++ head/cad/openscad/Makefile	(revision 568547)
@@ -1,54 +1,54 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2021.01.01
-PORTREVISION=	1
+PORTREVISION=	2
 #PORTREVISION=	1
 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>
Index: head/cad/openscad-devel/Makefile
===================================================================
--- head/cad/openscad-devel/Makefile	(revision 568546)
+++ head/cad/openscad-devel/Makefile	(revision 568547)
@@ -1,52 +1,52 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openscad
 PORTVERSION=	2021.02.09
-PORTREVISION=	1
+PORTREVISION=	2
 #PORTREVISION=	1
 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>
Index: head/cad/py-cq-editor/Makefile
===================================================================
--- head/cad/py-cq-editor/Makefile	(revision 568546)
+++ head/cad/py-cq-editor/Makefile	(revision 568547)
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	cq-editor
 DISTVERSION=	0.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	CadQuery GUI editor based on PyQT
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cadquery>=0:cad/py-cadquery@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/spyder/__init__.py:devel/py-spyder
 
 USES=		pyqt:5 python:3.6+
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	core gui widgets
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
 GH_PROJECT=	CQ-editor
 
 .include <bsd.port.mk>
Index: head/cad/py-pyfda/Makefile
===================================================================
--- head/cad/py-pyfda/Makefile	(revision 568546)
+++ head/cad/py-pyfda/Makefile	(revision 568547)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	pyfda
 PORTVERSION=	0.1
-PORTREVISION=	8
+PORTREVISION=	9
 DISTVERSIONSUFFIX=	rc6
 CATEGORIES=	cad python devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GUI tool for designing and analysing discrete time filters
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
 USES=		python:3.4+ pyqt:5
 USE_PYTHON=	distutils autoplist
 USE_PYQT=	core_run gui_run widgets_run
 NO_ARCH=	yes
 
 post-extract:
 	@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
 	@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e " \
 		s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
 		s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e " \
 		s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
 		${WRKSRC}/pyfda/pyfdax.py
 	@${REINPLACE_CMD} -e " \
 		s|'pyfda.log'|'/tmp/pyfda.log'|" \
 		${WRKSRC}/pyfda/*.conf.sample
 
 post-stage:
 	@${REINPLACE_CMD} -E " \
 		s|(.*\.sample)$$|@sample \1|" \
 		${WRKDIR}/.PLIST.pymodtmp
 
 .include <bsd.port.mk>
Index: head/cad/uranium/Makefile
===================================================================
--- head/cad/uranium/Makefile	(revision 568546)
+++ head/cad/uranium/Makefile	(revision 568547)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	Uranium
 DISTVERSION=	4.8
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	cad
 DIST_SUBDIR=	Ultimaker
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Python framework for 3D printing applications
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
 
 USES=		cmake gettext python:3.5+ pyqt:5
 USE_PYQT=	quick
 USE_GITHUB=	yes
 GH_ACCOUNT=	Ultimaker
 GH_TAGNAME=	3ed9c4de
 STRIP=
 NO_ARCH=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/uranium/scripts
 	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/uranium/scripts
 
 .include <bsd.port.mk>
Index: head/comms/gnuradio/Makefile
===================================================================
--- head/comms/gnuradio/Makefile	(revision 568546)
+++ head/comms/gnuradio/Makefile	(revision 568547)
@@ -1,124 +1,124 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	volk>0:devel/volk \
 		doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info \
 		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnuradio
 GH_PROJECT=	gnuradio
 
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 # Unfortunately building docs on i386 fails
 ##OPTIONS_EXCLUDE_${i386}=	DOXYGEN
 # Yay. building docs is broken on 10 and HEAD too so turn them all off
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 INSTALLS_ICONS=		yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
Index: head/comms/nanovna-saver/Makefile
===================================================================
--- head/comms/nanovna-saver/Makefile	(revision 568546)
+++ head/comms/nanovna-saver/Makefile	(revision 568547)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	nanovna-saver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Multiplatform tool to save Touchstone files from the NanoVNA
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python:3.3+ pyqt:5
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	core_run gui_run widgets_run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mihtjel
 
 NO_ARCH=	yes
 
 post-extract:
 	${CP} ${FILESDIR}/Sysctl.py ${WRKSRC}/NanoVNASaver/Hardware/
 
 .include <bsd.port.mk>
Index: head/databases/sqlitebrowser/Makefile
===================================================================
--- head/databases/sqlitebrowser/Makefile	(revision 568546)
+++ head/databases/sqlitebrowser/Makefile	(revision 568547)
@@ -1,36 +1,36 @@
 # Created by: loïc bartoletti <lbartoletti@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sqlitebrowser
 PORTVERSION=	3.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 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:continuous
 
 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>
Index: head/deskutils/calibre/Makefile
===================================================================
--- head/deskutils/calibre/Makefile	(revision 568546)
+++ head/deskutils/calibre/Makefile	(revision 568547)
@@ -1,116 +1,117 @@
 # Created by: stas
 # $FreeBSD$
 
 PORTNAME=	calibre
 PORTVERSION=	5.13.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
 LICENSE=	GPLv3
 
 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
 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}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.5+ 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>
Index: head/deskutils/py-autokey/Makefile
===================================================================
--- head/deskutils/py-autokey/Makefile	(revision 568546)
+++ head/deskutils/py-autokey/Makefile	(revision 568547)
@@ -1,61 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	autokey
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.95.9
-PORTREVISION=	3
+PORTREVISION=	4
 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>
Index: head/deskutils/treeline/Makefile
===================================================================
--- head/deskutils/treeline/Makefile	(revision 568546)
+++ head/deskutils/treeline/Makefile	(revision 568547)
@@ -1,61 +1,61 @@
 # Created by: Tobias Roth <ports@fsck.ch>
 # $FreeBSD$
 
 PORTNAME=	treeline
 PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Structured information storage program
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		python:3.5+ pyqt:5 shebangfix
 USE_PYQT=	core gui network printsupport widgets sip
 
 SHEBANG_FILES=	source/treeline.py
 
 CONFIGURE_ARGS=	-b ${STAGEDIR} -p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/TreeLine
 
 OPTIONS_DEFINE=		DOCS NLS
 SPELL_DESC=		Spell check support
 OPTIONS_SINGLE=		SPELL
 OPTIONS_SINGLE_SPELL=	ASPELL HUNSPELL ISPELL
 OPTIONS_DEFAULT=	ASPELL
 OPTIONS_SUB=		yes
 
 ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 ASPELL_VARS=		SPELL_ENGINE=aspell
 
 HUNSPELL_BUILD_DEPENDS=	hunspell:textproc/hunspell
 HUNSPELL_RUN_DEPENDS=	hunspell:textproc/hunspell
 HUNSPELL_VARS=		SPELL_ENGINE=hunspell
 
 ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_VARS=		SPELL_ENGINE=ispell
 
 NLS_CONFIGURE_OFF=	-s
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%SPELL_ENGINE%%|${SPELL_ENGINE}|' \
 		${WRKSRC}/install.py \
 		${WRKSRC}/source/spellcheck.py
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DATADIR} && ${RM} *.bak *.orig *.pro *.spec)
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
Index: head/devel/eric6/Makefile
===================================================================
--- head/devel/eric6/Makefile	(revision 568546)
+++ head/devel/eric6/Makefile	(revision 568547)
@@ -1,55 +1,55 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 # $FreeBSD$
 
 .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
 
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${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
 
 .include <bsd.port.mk>
Index: head/devel/git-cola/Makefile
===================================================================
--- head/devel/git-cola/Makefile	(revision 568546)
+++ head/devel/git-cola/Makefile	(revision 568547)
@@ -1,40 +1,40 @@
 # Created by: Jonathan Anderson <jonathan@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		git-cola
 DISTVERSIONPREFIX=	v
 DISTVERSION=		3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=		devel
 
 MAINTAINER=		dch@FreeBSD.org
 COMMENT=		Sleek and powerful Git GUI
 
 LICENSE=		GPLv2+
 LICENSE_FILE=		${WRKSRC}/COPYING
 
 BUILD_DEPENDS=		git>=0:devel/git
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}QtPy>=1.7.1:devel/py-QtPy@${PY_FLAVOR}
 
 USES=			desktop-file-utils gmake gnome python pyqt:5 qt:5 shebangfix
 USE_GITHUB=		yes
 USE_PYQT=		core gui network widgets
 
 INSTALLS_ICONS=		yes
 NO_ARCH=		yes
 
 # NO_VENDOR_LIBS ensures we use ports QtPy not embedded version
 MAKE_ARGS=		prefix=${PREFIX} PYTHON=${PYTHON_CMD} NO_VENDOR_LIBS=1
 
 OPTIONS_DEFINE=		DOCS NLS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|LN_S = $$(LN) -s -f|LN_S = ${RLN}|;\
 	s|$$(LN_S) "$$(datadir)/icons/git-cola.svg"|$$(LN_S) \
 	"$$(DESTDIR)$$(datadir)/icons/git-cola.svg"|' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/devel/libsavitar/Makefile
===================================================================
--- head/devel/libsavitar/Makefile	(revision 568546)
+++ head/devel/libsavitar/Makefile	(revision 568547)
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	libSavitar
 DISTVERSION=	4.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 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>
Index: head/devel/py-pynest2d/Makefile
===================================================================
--- head/devel/py-pynest2d/Makefile	(revision 568546)
+++ head/devel/py-pynest2d/Makefile	(revision 568547)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	pynest2d
 DISTVERSION=	4.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 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>
Index: head/devel/py-qt5/distinfo
===================================================================
--- head/devel/py-qt5/distinfo	(revision 568546)
+++ head/devel/py-qt5/distinfo	(revision 568547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614187937
-SHA256 (PyQt5-5.15.3.tar.gz) = 965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838
-SIZE (PyQt5-5.15.3.tar.gz) = 3263087
+TIMESTAMP = 1615474730
+SHA256 (PyQt5-5.15.4.tar.gz) = 2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be
+SIZE (PyQt5-5.15.4.tar.gz) = 3258085
Index: head/devel/py-qtbuilder/distinfo
===================================================================
--- head/devel/py-qtbuilder/distinfo	(revision 568546)
+++ head/devel/py-qtbuilder/distinfo	(revision 568547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614230561
-SHA256 (PyQt-builder-1.9.0.tar.gz) = 54520b4d40d6e6d1307f9cebab4730ae78e01873c88866aa1e5192c24801005a
-SIZE (PyQt-builder-1.9.0.tar.gz) = 5703103
+TIMESTAMP = 1615477423
+SHA256 (PyQt-builder-1.9.1.tar.gz) = 8d669fe8fa434a3e47abde3b40d924d91932e8e19d88b20c778a3e1c77621ebc
+SIZE (PyQt-builder-1.9.1.tar.gz) = 5703222
Index: head/devel/py-spyder/Makefile
===================================================================
--- head/devel/py-spyder/Makefile	(revision 568546)
+++ head/devel/py-spyder/Makefile	(revision 568547)
@@ -1,75 +1,75 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 # $FreeBSD$
 
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=1.3.1:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.3.1:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.9.0:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qtconsole>=4.3.0:devel/py-qtconsole@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>0:textproc/py-numpydoc@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parso>=0.1.1:textproc/py-parso@${PY_FLAVOR}
 
 USES=		desktop-file-utils python:3.7+ pyqt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	spyder-ide
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	core_run gui_run network_run sip_run svg_run webkit_run webkitwidgets_run
 NO_ARCH=	yes
 
 DOCSDIR=	${PYTHON_SITELIBDIR}/spyder
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_GROUP=	RECOMMENDED OPTIONAL
 OPTIONS_GROUP_RECOMMENDED=	IPYTHON MATPLOT NUMPY PSUTIL PYFLAKES ROPE SCIPY SPHINX
 OPTIONS_GROUP_OPTIONAL=	PANDAS PYGMENTS SYMPY
 OPTIONS_DEFAULT=	IPYTHON MATPLOT NUMPY PSUTIL PYFLAKES ROPE SCIPY SPHINX
 
 IPYTHON_DESC=	IPython Console integration
 MATPLOT_DESC=	Interactive data plotting in the consoles
 NUMPY_DESC=	N-dimensional arrays
 PANDAS_DESC=	View and edit DataFrames and Series in the Variable Explorer
 PSUTIL_DESC=	CPU and memory usage info in the status bar
 PYFLAKES_DESC=	Real-time code analysis on the Editor
 PYGMENTS_DESC=	Syntax highlighting for Matlab, Julia and other file types
 ROPE_DESC=	Editor's code completion, go-to-definition and help
 SCIPY_DESC=	Signal/image processing
 SPHINX_DESC=	Rich text help on the Object Inspector
 SYMPY_DESC=	Symbolic mathematics in the IPython Console
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=6.0:devel/ipython@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${PY_FLAVOR}
 MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR}
 NUMPY_RUN_DEPENDS=	${PYNUMPY}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${PY_FLAVOR}
 PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${PY_FLAVOR}
 PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${PY_FLAVOR}
 PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
 ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${PY_FLAVOR}
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 SPHINX_RUN_DEPENDS=	${DOCS_BUILD_DEPENDS}
 SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|g" \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "s|cmdclass=CMDCLASS||g" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/devel/tortoisehg/Makefile
===================================================================
--- head/devel/tortoisehg/Makefile	(revision 568546)
+++ head/devel/tortoisehg/Makefile	(revision 568547)
@@ -1,73 +1,73 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
 DISTVERSION=	5.7.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} \
 		${PY_PYGMENTS}
 
 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=	1be900fc8505ed5a93c900d19d1d8700a1b22aee
 GL_HEPTAPOD_COMMIT=	69fd57f838ac26b5fa1b94560f388a783236c6d4
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude ${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop
 
 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/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
 	${INSTALL_DATA} ${WRKSRC}/contrib/tortoisehg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	# workaround bug in python autoplist
 	@${REINPLACE_CMD} -e '/16x16$$/d' -e '/22x22$$/d' -e '/24x24$$/d' -e '/32x32$$/d' -e '/scalable$$/d' \
 		${_PYTHONPKGLIST}
 
 .include <bsd.port.post.mk>
Index: head/devel/vitables/Makefile
===================================================================
--- head/devel/vitables/Makefile	(revision 568546)
+++ head/devel/vitables/Makefile	(revision 568547)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	vitables
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Viewer and editor of files in both PyTables format and HDF5 format
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}QtPy>=1.2.1:devel/py-QtPy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numexpr>=2.0:math/py-numexpr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>=3.0:devel/py-tables@${PY_FLAVOR}
 
 USES=		dos2unix python pyqt:5
 USE_PYTHON=	distutils cython noflavors autoplist
 USE_PYQT=	core_run gui_run sip_run widgets_run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uvemas
 GH_PROJECT=	ViTables
 
 DOS2UNIX_FILES=	setup.py
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} "s|version=read('VERSION')|version='${DISTVERSION}'|" ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/emulators/fs-uae-launcher/Makefile
===================================================================
--- head/emulators/fs-uae-launcher/Makefile	(revision 568546)
+++ head/emulators/fs-uae-launcher/Makefile	(revision 568547)
@@ -1,32 +1,32 @@
 # Created by: Uffe Jakobsen <uffe@uffe.org>
 # $FreeBSD$
 
 PORTNAME=	fs-uae-launcher
 PORTVERSION=	3.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	https://fs-uae.net/stable/${PORTVERSION}/
 
 MAINTAINER=	ndowens@yahoo.com
 COMMENT=	GUI launcher for the FS-UAE Amiga emulator
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-lhafile>0:archivers/py-python-lhafile@${PY_FLAVOR}
 
 USES=		gettext gmake gnome pathfix pyqt:5 python:3.4+
 
 USE_PYTHON=	distutils autoplist noflavors
 USE_PYQT=	core sip gui widgets opengl
 
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	DESTDIR=${STAGEDIR} prefix=${PREFIX} PYTHON=${PYTHON_CMD}
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib=${PYTHON_SITELIBDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
Index: head/games/anki/Makefile
===================================================================
--- head/games/anki/Makefile	(revision 568546)
+++ head/games/anki/Makefile	(revision 568547)
@@ -1,437 +1,437 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	anki
 DISTVERSION=	2.1.35
-PORTREVISION=	6
+PORTREVISION=	7
 # Don't forget to update ${_MY_BUILDHASH}
 CATEGORIES=	games education python
 MASTER_SITES=	LOCAL/kai/:npmcache
 DISTFILES=	anki-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache
 DIST_SUBDIR=	python
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Flashcard trainer with spaced repetition
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		maturin:devel/py-maturin@${PY_FLAVOR} \
 		protoc:devel/protobuf \
 		npm:www/npm \
 		rsync:net/rsync \
 		${PYTHON_PKGNAMEPREFIX}mypy-protobuf>=1.21:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stringcase==1.2.0:devel/py-stringcase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 
 # For x64 architectures there's also a Python package "orjson" that still needs
 # to be ported once the required features (= "untagged unions",
 # "specialication" and "const_generics") of the "smallvec" crate are available
 # in the Rust release channel.
 #
 # Although the "orjson" package is required via the setup.py of Anki's Python
 # library it's (still) optional in the code.
 RUN_DEPENDS=	lame:audio/lame \
 		${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR}
 
 # USES=ssl is required for the compilation of the Rust code
 USES=		cargo desktop-file-utils gmake perl5 pyqt:5 python:3.7+ shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	ankitects
 GH_TUPLE=	ankitects:anki-core-i18n:fbda2ed:i18ncore \
 		ankitects:anki-desktop-ftl:f56e959:i18nfluent \
 		ankitects:anki-desktop-i18n:a93ccef:i18ndesktop \
 		ankitects:rust-coarsetime:f9e2c86216f0f4803bc75404828318fc206dab29:coarsetime \
 		ankitects:fluent-rs:f61c5e10a53161ef5261f3c87b62047f12e4aa74:fluent \
 		ankitects:hyper-timeout:664b6f9c387f6a7d75d1609a65c02554e8c55bc7:hypertimeout \
 		ankitects:reqwest:57665e2c2a39db85723ba860f1b570a608bb73f9:reqwest \
 		ankitects:tokio-io-timeout:96e1358555c49905de89170f2b1102a7d8b6c4c2:tokioiotimeout
 USE_PERL5=	build
 USE_PYQT=	core gui network printsupport sip svg webchannel webengine widgets xml_build
 
 SHEBANG_FILES=	qt/po/scripts/build-mo-files \
 		qt/po/scripts/copy-qt-files \
 		qt/runanki \
 		qt/tools/build_ui.sh \
 		scripts/rename
 
 CARGO_CRATES=	addr2line-0.13.0 \
 		adler-0.2.3 \
 		aho-corasick-0.7.14 \
 		anyhow-1.0.33 \
 		arc-swap-0.4.7 \
 		arrayref-0.3.6 \
 		arrayvec-0.4.12 \
 		arrayvec-0.5.1 \
 		askama-0.10.3 \
 		askama_derive-0.10.3 \
 		askama_escape-0.10.1 \
 		askama_shared-0.10.4 \
 		async-compression-0.3.5 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
 		backtrace-0.3.53 \
 		base64-0.12.3 \
 		bitflags-1.2.1 \
 		blake2b_simd-0.5.10 \
 		blake3-0.3.7 \
 		bumpalo-3.4.0 \
 		byteorder-1.3.4 \
 		bytes-0.4.12 \
 		bytes-0.5.6 \
 		cc-1.0.61 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
 		cloudabi-0.1.0 \
 		constant_time_eq-0.1.5 \
 		core-foundation-0.7.0 \
 		core-foundation-sys-0.7.0 \
 		crc32fast-1.2.1 \
 		crossbeam-channel-0.4.4 \
 		crossbeam-utils-0.7.2 \
 		crypto-mac-0.8.0 \
 		ctor-0.1.16 \
 		derivative-2.1.1 \
 		digest-0.9.0 \
 		dirs-2.0.2 \
 		dirs-sys-0.3.5 \
 		dtoa-0.4.6 \
 		either-1.6.1 \
 		encoding_rs-0.8.24 \
 		failure-0.1.8 \
 		failure_derive-0.1.8 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		fixedbitset-0.2.0 \
 		flate2-1.0.18 \
 		fluent-langneg-0.12.1 \
 		fluent-syntax-0.9.3 \
 		fnv-1.0.7 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.3.6 \
 		futures-channel-0.3.6 \
 		futures-core-0.3.6 \
 		futures-executor-0.3.6 \
 		futures-io-0.3.6 \
 		futures-macro-0.3.6 \
 		futures-sink-0.3.6 \
 		futures-task-0.3.6 \
 		futures-util-0.3.6 \
 		fxhash-0.2.1 \
 		generic-array-0.14.4 \
 		getrandom-0.1.15 \
 		ghost-0.1.2 \
 		gimli-0.22.0 \
 		h2-0.2.6 \
 		hashbrown-0.9.1 \
 		heck-0.3.1 \
 		hermit-abi-0.1.17 \
 		hex-0.4.2 \
 		htmlescape-0.3.1 \
 		http-0.2.1 \
 		http-body-0.3.1 \
 		httparse-1.3.4 \
 		httpdate-0.3.2 \
 		humansize-1.1.0 \
 		hyper-0.13.8 \
 		hyper-tls-0.4.3 \
 		idna-0.2.0 \
 		indexmap-1.6.0 \
 		indoc-0.3.6 \
 		indoc-impl-0.3.6 \
 		instant-0.1.7 \
 		intl_pluralrules-6.0.0 \
 		inventory-0.1.9 \
 		inventory-impl-0.1.9 \
 		iovec-0.1.4 \
 		itertools-0.8.2 \
 		itertools-0.9.0 \
 		itoa-0.4.6 \
 		js-sys-0.3.45 \
 		kernel32-sys-0.2.2 \
 		lazy_static-1.4.0 \
 		lexical-core-0.7.4 \
 		libc-0.2.79 \
 		libsqlite3-sys-0.18.0 \
 		linked-hash-map-0.5.3 \
 		lock_api-0.4.1 \
 		log-0.4.11 \
 		lru-cache-0.1.2 \
 		matches-0.1.8 \
 		maybe-uninit-2.0.0 \
 		memchr-2.3.3 \
 		mime-0.3.16 \
 		mime_guess-2.0.3 \
 		miniz_oxide-0.4.3 \
 		mio-0.6.22 \
 		miow-0.2.1 \
 		multimap-0.8.2 \
 		native-tls-0.2.4 \
 		net2-0.2.35 \
 		nodrop-0.1.14 \
 		nom-5.1.2 \
 		num-format-0.4.0 \
 		num-integer-0.1.43 \
 		num-traits-0.2.12 \
 		num_cpus-1.13.0 \
 		num_enum-0.5.1 \
 		num_enum_derive-0.5.1 \
 		object-0.21.1 \
 		once_cell-1.4.1 \
 		openssl-0.10.30 \
 		openssl-probe-0.1.2 \
 		openssl-sys-0.9.58 \
 		parking_lot-0.11.0 \
 		parking_lot_core-0.8.0 \
 		paste-0.1.18 \
 		paste-impl-0.1.18 \
 		percent-encoding-2.1.0 \
 		petgraph-0.5.1 \
 		pin-project-0.4.27 \
 		pin-project-internal-0.4.27 \
 		pin-project-lite-0.1.11 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.19 \
 		podio-0.1.7 \
 		ppv-lite86-0.2.9 \
 		proc-macro-crate-0.1.5 \
 		proc-macro-hack-0.5.18 \
 		proc-macro-nested-0.1.6 \
 		proc-macro2-1.0.24 \
 		prost-0.6.1 \
 		prost-build-0.6.1 \
 		prost-derive-0.6.1 \
 		prost-types-0.6.1 \
 		pyo3-0.11.1 \
 		pyo3-derive-backend-0.11.1 \
 		pyo3cls-0.11.1 \
 		quote-1.0.7 \
 		rand-0.7.3 \
 		rand_chacha-0.2.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.2.0 \
 		redox_syscall-0.1.57 \
 		redox_users-0.3.5 \
 		regex-1.4.1 \
 		regex-syntax-0.6.20 \
 		remove_dir_all-0.5.3 \
 		rental-0.5.5 \
 		rental-impl-0.5.5 \
 		rusqlite-0.23.1 \
 		rust-argon2-0.8.2 \
 		rustc-demangle-0.1.18 \
 		ryu-1.0.5 \
 		schannel-0.1.19 \
 		scopeguard-1.1.0 \
 		security-framework-0.4.4 \
 		security-framework-sys-0.4.3 \
 		serde-1.0.117 \
 		serde-aux-0.6.1 \
 		serde_derive-1.0.117 \
 		serde_json-1.0.59 \
 		serde_repr-0.1.6 \
 		serde_tuple-0.5.0 \
 		serde_tuple_macros-0.5.0 \
 		serde_urlencoded-0.6.1 \
 		sha1-0.6.0 \
 		slab-0.4.2 \
 		slog-2.5.2 \
 		slog-async-2.5.0 \
 		slog-envlogger-2.2.0 \
 		slog-scope-4.3.0 \
 		slog-stdlog-4.1.0 \
 		slog-term-2.6.0 \
 		smallvec-1.4.2 \
 		socket2-0.3.15 \
 		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		subtle-2.3.0 \
 		syn-1.0.46 \
 		synstructure-0.12.4 \
 		take_mut-0.2.2 \
 		tempfile-3.1.0 \
 		term-0.6.1 \
 		thiserror-1.0.21 \
 		thiserror-impl-1.0.21 \
 		thread_local-1.0.1 \
 		time-0.1.44 \
 		tinystr-0.3.4 \
 		tinyvec-0.3.4 \
 		tokio-0.2.22 \
 		tokio-socks-0.2.2 \
 		tokio-tls-0.3.1 \
 		tokio-util-0.3.1 \
 		toml-0.5.7 \
 		tower-service-0.3.0 \
 		tracing-0.1.21 \
 		tracing-core-0.1.17 \
 		try-lock-0.2.3 \
 		type-map-0.3.0 \
 		typenum-1.12.0 \
 		unic-langid-0.8.0 \
 		unic-langid-impl-0.8.0 \
 		unic-langid-macros-0.8.0 \
 		unic-langid-macros-impl-0.8.0 \
 		unicase-2.6.0 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.13 \
 		unicode-segmentation-1.6.0 \
 		unicode-xid-0.2.1 \
 		unindent-0.1.7 \
 		url-2.1.1 \
 		utime-0.3.1 \
 		vcpkg-0.2.10 \
 		version_check-0.9.2 \
 		want-0.3.0 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.68 \
 		wasm-bindgen-backend-0.2.68 \
 		wasm-bindgen-futures-0.4.18 \
 		wasm-bindgen-macro-0.2.68 \
 		wasm-bindgen-macro-support-0.2.68 \
 		wasm-bindgen-shared-0.2.68 \
 		web-sys-0.3.45 \
 		which-3.1.1 \
 		winapi-0.2.8 \
 		winapi-0.3.9 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		winreg-0.6.2 \
 		ws2_32-sys-0.2.1 \
 		zip-0.5.6
 CARGO_USE_GITHUB=	yes
 
 CARGO_CARGOLOCK=	${WRKSRC}/rspy/Cargo.lock
 CARGO_CARGOTOML=	${WRKSRC}/rspy/Cargo.toml
 
 CARGO_BUILD=	no
 
 MAKE_ARGS=	DEVEL="rspy pylib ts qt" PYTHON_FILE="${PYTHON_CMD}" SHELL="${LOCALBASE}/bin/bash"
 # devel/py-maturin  acts as a wrapper for "cargo" and "rustc".  Ensure that it
 # uses the arguments/flags for Rust of the Ports framework.
 MAKE_ARGS+=	BUILDFLAGS="--cargo-extra-args='${CARGO_BUILD_ARGS} --verbose'"
 MAKE_ENV=	${CARGO_ENV} npm_config_offline=true
 
 ALL_TARGET=		build
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_DEFAULT=	MPV
 OPTIONS_GROUP=		PLAYER
 OPTIONS_GROUP_PLAYER=	MPLAYER MPV
 OPTIONS_SUB=		yes
 
 MPV_DESC=	mpv media player support
 
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 
 NLS_USES=	gettext
 
 # Should contain the most recent commit that reflects ${DISTVERSION} and must
 # be exactly 8 digits otherwise the check for newer versions won't work as
 # expected.
 _MY_BUILDHASH=	84dcaa86
 
 # Place the translation files to the appropriate directories
 post-extract:
 	@${RLN} ${WRKSRC_i18ncore} ${WRKSRC}/rslib/ftl/repo
 	@${RLN} ${WRKSRC_i18nfluent} ${WRKSRC}/qt/ftl/repo
 	@${RLN} ${WRKSRC_i18ndesktop} ${WRKSRC}/qt/po/repo
 
 post-patch:
 	# Add trailing directory names to cargo repositories
 	@${REINPLACE_CMD} -Ee '/^fluent =/ s|(${WRKSRC_fluent})|\1/fluent|; \
 		/^intl-memoizer =/ s|(${WRKSRC_fluent})|\1/intl-memoizer|' ${WRKSRC}/rslib/Cargo.toml
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/qt/runanki
 	@${REINPLACE_CMD} -e 's|%%MAKE_CMD%%|${MAKE_CMD}|' ${WRKSRC}/qt/Makefile
 	@${REINPLACE_CMD} -e 's|%%UNZIP_NATIVE_CMD%%|${UNZIP_NATIVE_CMD}|' ${WRKSRC}/rspy/Makefile
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's|### NLS ###||' ${WRKSRC}/qt/Makefile
 
 # Although PYTHON_FILE is set to ${PYTHON_CMD} via MAKE_ARGS to make the
 # compilation of the pyo3 crate possible there are also hardcoded "python"
 # occurences in too many places.
 pre-configure:
 	${MKDIR} ${WRKDIR}/.bin && ${LN} -s ${PYTHON_CMD} ${WRKDIR}/.bin/python
 
 # Overview of the build process
 #
 # 1. rslib (Rust library, implictly built by step 2)
 #    `-> produces ${WRKSRC}/proto/fluent.proto
 # 2. rspy (Rust/Python bridge) which is built by devel/py-maturin
 #    `-> produces ${WRKSRC}/pylib/ankirspy.cpython-${PYTHON_SUFFIX}m.so
 # 3. pylib (Python-only library)
 # 4. ts (builds ${WRKSRC}/ts/node_modules/.bin/{tsc,sass})
 # 5. qt (Python library with Qt5 bindings)
 pre-build:
 	# Set the buildhash that is used at various places during build.
 	${ECHO_CMD} ${_MY_BUILDHASH} > ${WRKSRC}/meta/buildhash
 
 post-build:
 	# Compile Anki's Python libary (pylib) and Qt5 library (aqt) to prepare
 	# them for installation
 	${PYTHON_CMD} -m compileall ${WRKSRC}/pylib/anki
 	${PYTHON_CMD} -O -m compileall ${WRKSRC}/pylib/anki
 	${PYTHON_CMD} -m compileall ${WRKSRC}/qt/aqt
 	${PYTHON_CMD} -O -m compileall ${WRKSRC}/qt/aqt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/anki \
 			${STAGEDIR}${DATADIR}/aqt \
 			${STAGEDIR}${DATADIR}/aqt_data \
 			${STAGEDIR}${PREFIX}/share/pixmaps \
 			${STAGEDIR}${PREFIX}/share/applications
 	cd ${WRKSRC}/pylib \
 		&& ${COPYTREE_SHARE} anki ${STAGEDIR}${DATADIR} "! -name .gitignore" \
 		&& ${INSTALL_LIB} *.so ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/qt \
 		&& ${COPYTREE_SHARE} aqt ${STAGEDIR}${DATADIR} "! -name .gitignore" \
 		&& ${COPYTREE_SHARE} aqt_data ${STAGEDIR}${DATADIR} "! -name .gitignore" \
 		&& ${INSTALL_DATA} anki.xpm anki.png ${STAGEDIR}${PREFIX}/share/pixmaps \
 		&& ${INSTALL_DATA} anki.desktop ${STAGEDIR}${PREFIX}/share/applications \
 		&& ${INSTALL_MAN} anki.1 ${STAGEDIR}${MANPREFIX}/man/man1 \
 		&& ${INSTALL_SCRIPT} runanki ${STAGEDIR}${PREFIX}/bin/anki
 
 # Helper target to make the generation of the npm cache easier
 #
 # The command "npx pbjs" tries to install additional dependencies for the CLI
 # component of the "protobufjs" package and will fail during build because the
 # environment variable "npm_config_offline" is set to "true" via ${MAKE_ENV}.
 #
 # Thus "npx pbjs" is issued after "npm install" to get the remaining
 # dependencies to populate the cache with them.
 make-npm-cache:
 	# Run "make extract" before executing this target
 	@cd ${WRKDIR} && ${RM} -r .npm
 	@cd ${WRKSRC}/ts \
 		&& ${SETENV} HOME=${WRKDIR} npm install \
 		&& ${TOUCH} in.proto \
 		&& ${SETENV} HOME=${WRKDIR} npx --cache ${WRKDIR}/.npm pbjs -q -t static-module in.proto -o out.proto
 	@cd ${WRKDIR}/.npm \
 		&& ${RM} -r _locks anonymous-cli-metrics.json
 	@cd ${WRKDIR} \
 		&& ${TAR} -czf ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} .npm \
 		&& ${ECHO} "Please upload the file ${WRKDIR}/${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}"
 
 .include <bsd.port.mk>
Index: head/games/py-mnemosyne/Makefile
===================================================================
--- head/games/py-mnemosyne/Makefile	(revision 568546)
+++ head/games/py-mnemosyne/Makefile	(revision 568547)
@@ -1,41 +1,41 @@
 # Created by: Beech Rintoul <beech@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mnemosyne
 PORTVERSION=		2.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games education python
 MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Mnemosyne-${DISTVERSION}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Flash-card tool which optimises your learning process
 
 LICENSE=	LGPL3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}googletrans>=0:textproc/py-googletrans@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gtts>=0:audio/py-gtts@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.7+ shebangfix dos2unix #due textproc/py-googletrans
 USE_PYQT=	gui_run network_run printsupport_run sip_run sql_run webengine_run
 USE_PYTHON=	autoplist concurrent distutils
 
 DOS2UNIX_GLOB=	*.py
 DOS2UNIX_FILES=	mnemosyne/pyqt_ui/mnemosyne
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	mnemosyne/pyqt_ui/mnemosyne
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|icons|pixmaps|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/graphics/py-python-poppler-qt5/Makefile
===================================================================
--- head/graphics/py-python-poppler-qt5/Makefile	(revision 568546)
+++ head/graphics/py-python-poppler-qt5/Makefile	(revision 568547)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	python-poppler-qt5
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.75.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Python bindings for the Poppler-Qt PDF rendering library
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	qmake:devel/qt5-qmake
 LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
 USES=		compiler:c++11-lang pkgconfig pyqt:5 python:3.5+ qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	frescobaldi
 USE_PYQT=	gui xml sip_build qtbuilder
 
 do-build:
 	(cd ${WRKSRC} ; sip-build  --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
 
 do-install:
 	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 
 post-install:
 	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so
 
 .include <bsd.port.mk>
Index: head/graphics/py-visvis/Makefile
===================================================================
--- head/graphics/py-visvis/Makefile	(revision 568546)
+++ head/graphics/py-visvis/Makefile	(revision 568547)
@@ -1,31 +1,31 @@
 # Created by: Rainer Hurling <rhurlin@gwdg.de>
 # $FreeBSD$
 
 PORTNAME=	visvis
 PORTVERSION=	1.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Object oriented approach to visualization of 1D to 4D data
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
 
 USES=		gl python:3.5+ pyqt:5
 USE_GL=		gl
 USE_PYQT=	core gui
 USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/graphics/qgis/Makefile
===================================================================
--- head/graphics/qgis/Makefile	(revision 568546)
+++ head/graphics/qgis/Makefile	(revision 568547)
@@ -1,175 +1,175 @@
 # Created by: Laurent Courty
 # $FreeBSD$
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_18_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
 
 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 \
 		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}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 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-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>
Index: head/graphics/qgis-ltr/Makefile
===================================================================
--- head/graphics/qgis-ltr/Makefile	(revision 568546)
+++ head/graphics/qgis-ltr/Makefile	(revision 568547)
@@ -1,180 +1,180 @@
 # Created by: Laurent Courty
 # $FreeBSD$
 
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_10_14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	33192f38bc7d.patch:-p1 \
 		12203f0ce527.patch:-p1 \
 		6e9d42d70099.patch:-p1
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 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 \
 		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}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}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${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 network qml quick quickwidgets qscintilla2 \
 		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
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 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
 	@${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \
 		${WRKSRC}/cmake/FindPyQt5.py \
 		${WRKSRC}/cmake/FindSIP.py
 
 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>
Index: head/graphics/qtqr/Makefile
===================================================================
--- head/graphics/qtqr/Makefile	(revision 568546)
+++ head/graphics/qtqr/Makefile	(revision 568547)
@@ -1,43 +1,43 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qtqr
 DISTVERSION=	2.0.bzr39
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics python
 MASTER_SITES=	LOCAL/ehaupt
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	qr-tools-${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GUI that makes it easy to create and decode QR codes
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zbar-py>=1.0.4:graphics/py-zbar-py@${PY_FLAVOR}
 
 USES=		desktop-file-utils pyqt:5 python:3.6+ shebangfix
 USE_PYQT=	core_run gui_run network_run widgets_run
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	qtqr.py
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qtqr.py ${STAGEDIR}${PREFIX}/bin/qtqr
 	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtqr.png
 	${INSTALL_DATA} ${WRKSRC}/qtqr.desktop ${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt5/translations
 	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${PREFIX}/share/qt5/translations
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/rapid-photo-downloader/Makefile
===================================================================
--- head/graphics/rapid-photo-downloader/Makefile	(revision 568546)
+++ head/graphics/rapid-photo-downloader/Makefile	(revision 568547)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	rapid-photo-downloader
 DISTVERSION=	0.9.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Import photos and videos efficiently and reliably
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2 \
 		libgudev-1.0.so:devel/libgudev
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colour>0:graphics/py-colour@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>2.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}easygui>=0:x11-toolkits/py-easygui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gphoto2>=1.4.0:graphics/py-gphoto2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymediainfo>=1.0:multimedia/py-pymediainfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rawkit>0:graphics/py-rawkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>0:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		exiftool:graphics/p5-Image-ExifTool
 
 USES=		desktop-file-utils gettext pyqt:5 python:3.6+ qt:5
 USE_PYTHON=	autoplist distutils noflavors
 USE_QT=		imageformats_run
 USE_PYQT=	core gui network sip widgets
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		COLOUR PROGRESS
 OPTIONS_DEFAULT=	COLOUR PROGRESS
 
 COLOUR_DESC=	generates coloured program output
 PROGRESS_DESC=	shows a progress bar on the command line
 
 COLOUR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR}
 PROGRESS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyprind>=1.4.0:misc/py-pyprind@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/math/asymptote/Makefile
===================================================================
--- head/math/asymptote/Makefile	(revision 568546)
+++ head/math/asymptote/Makefile	(revision 568547)
@@ -1,90 +1,90 @@
 # Created by: Nicola Vitale <nivit@email.it>
 # $FreeBSD$
 
 PORTNAME=	asymptote
 PORTVERSION=	2.67
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Powerful script-based vector graphics language
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libsigsegv.so:devel/libsigsegv
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \
 		${PY_PILLOW}
 
 USES=		compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \
 		pyqt:5 shebangfix tar:tgz
 SHEBANG_FILES=	GUI/*.py
 USE_GL=		gl glu glut
 USE_GNOME=	librsvg2:run
 USE_PERL5=	build
 USE_TEX=	dvipsk formats
 USE_PYQT=	svg_run widgets_run
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR}
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	asy asy-keywords.el
 INSTALL_TARGET=	install-asy
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFAULT=	FFTW GSL MANPAGES READLINE
 OPTIONS_DEFINE=		BDWGC DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE
 
 BDWGC_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 BDWGC_DESC=		Enable Boehm-Demers-Weiser garbage collector
 BDWGC_CONFIGURE_ENABLE=	gc=${LOCALBASE}
 
 DOCS_ALL_TARGET=	html
 DOCS_BUILD_DEPENDS=	texi2dvi:print/texinfo
 DOCS_CONFIGURE_WITH=	docdir=${DOCSDIR}
 DOCS_INSTALL_TARGET=	install-html
 
 FFTW_CONFIGURE_ENABLE=	fftw
 FFTW_DESC=	Use FFTW to compute the Discrete Fourier Transform
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 GSL_CONFIGURE_ENABLE=	gsl
 GSL_DESC=	Enable GNU Scientific library
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 MANPAGES_ALL_TARGET=	man
 MANPAGES_BUILD_DEPENDS=	texi2dvi:print/texinfo
 MANPAGES_INFO=	asy-faq
 
 OFFSCREEN_CONFIGURE_ENABLE=	offscreen
 OFFSCREEN_DESC=	Enable offscreen rendering using OSMesa library
 OFFSCREEN_LIB_DEPENDS=	libOSMesa.so:graphics/libosmesa
 
 READLINE_CONFIGURE_ENABLE=	readline
 READLINE_USES=	readline:port
 
 TEST_TARGET=	test
 TEST_WRKSRC=	${WRKSRC}/tests
 
 post-patch:
 	@${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,makeinfo,${LOCALBASE}/bin/makeinfo,' \
 		${WRKSRC}/doc/png/Makefile.in
 
 # Fix the python interpreter in the generated file share/asymptote/GUI/xasyVersion.py:
 	@${REINPLACE_CMD} 's,/usr/bin/env python3,${PYTHON_CMD},' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy
 
 .include <bsd.port.mk>
Index: head/math/convertall/Makefile
===================================================================
--- head/math/convertall/Makefile	(revision 568546)
+++ head/math/convertall/Makefile	(revision 568547)
@@ -1,38 +1,38 @@
 # Created by: Michael Johnson <ahze@ahze.net>
 # $FreeBSD$
 
 PORTNAME=	convertall
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/doug-101/ConvertAll/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Another unit converter
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		pyqt:5 python:3.5+ shebangfix
 USE_PYQT=	core gui widgets sip
 
 SHEBANG_FILES=	source/convertall.py
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ConvertAll
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_OFF=	-s
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
Index: head/math/octave/Makefile
===================================================================
--- head/math/octave/Makefile	(revision 568546)
+++ head/math/octave/Makefile	(revision 568547)
@@ -1,128 +1,128 @@
 # Created by: chuckr@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 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 \
 		libumfpack.so:math/suitesparse \
 		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 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=${LOCALBASE}/bin/moc \
 		UIC_QTVER=${LOCALBASE}/bin/uic \
 		RCC_QTVER=${LOCALBASE}/bin/rcc \
 		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>
Index: head/math/rpcalc/Makefile
===================================================================
--- head/math/rpcalc/Makefile	(revision 568546)
+++ head/math/rpcalc/Makefile	(revision 568547)
@@ -1,33 +1,33 @@
 # Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
 
 PORTNAME=	rpcalc
 PORTVERSION=	0.8.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Simple RPN calculator
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 USES=		pyqt:5 python:3.4+ shebangfix
 USE_PYQT=	core gui widgets sip
 
 SHEBANG_FILES=	source/rpcalc.py
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rpCalc
 
 do-install:
 	(cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CONFIGURE_ARGS})
 	(cd ${STAGEDIR}${PREFIX} && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${DATADIR} -f ${DATADIR_REL})
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
 
 .include <bsd.port.mk>
Index: head/misc/orange3/Makefile
===================================================================
--- head/misc/orange3/Makefile	(revision 568546)
+++ head/misc/orange3/Makefile	(revision 568547)
@@ -1,55 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	orange3
 DISTVERSION=	3.28.0
+PORTREVISION=	1
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component-based data mining software
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}AnyQt>=0.0.8:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}baycomp>=1.0.2:math/py-baycomp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.0:math/py-bottleneck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.14.0:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openTSNE>=0.4.3:math/py-openTSNE@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-canvas-core>=0.1.19:devel/py-orange-canvas-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-widget-base>=4.12.0:devel/py-orange-widget-base@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-louvain>=0.13:math/py-python-louvain@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.11.0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.2:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.4+ pyqt:5
 USE_PYTHON=	distutils cython autoplist noflavors
 USE_PYQT=	core_run gui_run printsupport_run widgets_run webengine_run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 CFLAGS+=	-DQSORT_R_STYLE_BSD=yes
 LDFLAGS+=	-Xlinker -strip-all # strip, stage-qa doesn't catch that it isn't stripped
 
 xpost-install:
 	@${REINPLACE_CMD} -e 's|^"${PREFIX}/|| ; s|"$$||' ${_PYTHONPKGLIST} # https://github.com/biolab/orange3/issues/3060
 	@${REINPLACE_CMD} -e 's|import sys|& ; from OpenGL import GL|' ${STAGEDIR}${PREFIX}/bin/orange-canvas # https://github.com/biolab/orange3/issues/3062
 
 .include <bsd.port.mk>
Index: head/misc/py-QSpectrumAnalyzer/Makefile
===================================================================
--- head/misc/py-QSpectrumAnalyzer/Makefile	(revision 568546)
+++ head/misc/py-QSpectrumAnalyzer/Makefile	(revision 568547)
@@ -1,41 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	QSpectrumAnalyzer
 DISTVERSION=	2.1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Spectrum analyzer for multiple SDR platforms
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.10.0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}soapy_power>=1.5.0:misc/py-soapy_power@${PY_FLAVOR}
 
 USES=		fortran python:3.4+ pyqt:5
 USE_PYQT=	core gui widgets
 USE_PYTHON=	distutils concurrent autoplist
 
 PLIST_FILES=	bin/${PORTNAME:tl}.shadow
 
 post-patch: # change from Qt.py that doesn't work to PyQt5
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -i '' -e ' \
 		s|from Qt import |from PyQt5 import | ; \
 		s|, __binding__|| ; \
 		s|QtCore.Signal|QtCore.pyqtSignal| ; \
 		s|QtCore.Slot|QtCore.pyqtSlot|'
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc9/libgcc_s.so ${PREFIX}/bin/${PORTNAME:tl}.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 
 .include <bsd.port.mk>
Index: head/misc/urh/Makefile
===================================================================
--- head/misc/urh/Makefile	(revision 568546)
+++ head/misc/urh/Makefile	(revision 568547)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	urh
 DISTVERSION=	2.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal Radio Hacker: investigate wireless protocols like a boss
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang fortran python:3.4+ localbase pyqt:5
 USE_PYQT=	core gui test widgets
 USE_PYTHON=	distutils cython noflavors autoplist
 
 PLIST_FILES=	bin/urh.shadow
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/urh ${STAGEDIR}${PREFIX}/bin/urh.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/bin/urh.shadow \"$$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/urh
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/urh
 
 .include <bsd.port.mk>
Index: head/multimedia/openshot/Makefile
===================================================================
--- head/multimedia/openshot/Makefile	(revision 568546)
+++ head/multimedia/openshot/Makefile	(revision 568547)
@@ -1,33 +1,33 @@
 # Created by: Charlie Kester <corky1951@comcast.net>
 # $FreeBSD$
 
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1-732
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g14ecc519
 CATEGORIES=	multimedia
 
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	OpenShot Video Editor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libopenshot>=0.2.4:multimedia/libopenshot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		desktop-file-utils pyqt:5 python:3.5+ shared-mime-info shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenShot
 GH_PROJECT=	${PORTNAME}-qt
 USE_PYQT=	core gui svg webkitwidgets widgets
 USE_PYTHON=	distutils optsuffix
 
 SHEBANG_FILES=	src/language/generate_translations.py\
 		src/language/show_translations.py\
 		src/language/test_translations.py
 
 .include <bsd.port.mk>
Index: head/net/libarcus/Makefile
===================================================================
--- head/net/libarcus/Makefile	(revision 568546)
+++ head/net/libarcus/Makefile	(revision 568547)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	libArcus
 PORTVERSION=	4.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 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>
Index: head/net/py-qt5-networkauth/distinfo
===================================================================
--- head/net/py-qt5-networkauth/distinfo	(revision 568546)
+++ head/net/py-qt5-networkauth/distinfo	(revision 568547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614867526
-SHA256 (PyQtNetworkAuth-5.15.3.tar.gz) = 2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
-SIZE (PyQtNetworkAuth-5.15.3.tar.gz) = 35833
+TIMESTAMP = 1615473416
+SHA256 (PyQtNetworkAuth-5.15.4.tar.gz) = 893b9f8afb26a64757e9fa3436261b8bfcb4e696efc2a364a9dc8ac44db67fa7
+SIZE (PyQtNetworkAuth-5.15.4.tar.gz) = 36006
Index: head/net-im/scudcloud/Makefile
===================================================================
--- head/net-im/scudcloud/Makefile	(revision 568546)
+++ head/net-im/scudcloud/Makefile	(revision 568547)
@@ -1,39 +1,39 @@
 # Created by: Nicola Stanislao Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scudcloud
 PORTVERSION=	1.65
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Desktop client app for Slack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsmin>0:devel/py-jsmin@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
 
 GH_ACCOUNT=	raelgc
 
 HUNSPELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR} \
 			falkon:www/falkon
 
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	HUNSPELL
 
 USES=		gnome python:3.5+ pyqt:5
 USE_PYQT=	sip_run webkit_run webkitwidgets_run
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils optsuffix
 NO_ARCH=	yes
 
 post-patch:
 		@${REINPLACE_CMD} -i.bak -e 's,%%LOCALBASE%%,${LOCALBASE},1' \
 			${WRKSRC}/share/${PORTNAME}.desktop \
 			${WRKSRC}/${PORTNAME}/resources.py
 
 .include <bsd.port.mk>
Index: head/net-mgmt/nagstamon/Makefile
===================================================================
--- head/net-mgmt/nagstamon/Makefile	(revision 568546)
+++ head/net-mgmt/nagstamon/Makefile	(revision 568547)
@@ -1,35 +1,35 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nagstamon
 PORTVERSION=	3.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	https://nagstamon.ifw-dresden.de/files/stable/ \
 		LOCAL/ehaupt
 DISTNAME=	Nagstamon-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Nagios status monitor for your desktop
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-kerberos>0:security/py-requests-kerberos@${PY_FLAVOR}
 
 USES=		cpe python:3.6+ pyqt:5
 USE_PYTHON=	autoplist distutils noflavors
 USE_PYQT=	core_run dbus_run gui_run multimedia_run network_run sip_run \
 		svg_run widgets_run
 
 CPE_VENDOR=	henri_wahl
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/Nagstamon
 
 .include <bsd.port.mk>
Index: head/print/py-frescobaldi/Makefile
===================================================================
--- head/print/py-frescobaldi/Makefile	(revision 568546)
+++ head/print/py-frescobaldi/Makefile	(revision 568547)
@@ -1,41 +1,41 @@
 # Created by: martin.dieringer@gmx.de
 # $FreeBSD$
 
 PORTNAME=	frescobaldi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print kde python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Music score editor for lilypond
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5 #@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gmake pyqt:5 python:3.5+ qmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	frescobaldi
 USE_PYQT=	network printsupport sip svg webengine widgets
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	LILYPOND
 
 LILYPOND_DESC=	Use unstable LilyPond (lilypond-devel)
 
 LILYPOND_RUN_DEPENDS=		lilypond:print/lilypond-devel
 LILYPOND_RUN_DEPENDS_OFF=	lilypond:print/lilypond
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \
 		${WRKSRC}/setup.py
 post-build:
 	(cd ${WRKSRC} && ${GMAKE} -C linux)
 
 .include <bsd.port.mk>
Index: head/science/code_saturne/Makefile
===================================================================
--- head/science/code_saturne/Makefile	(revision 568546)
+++ head/science/code_saturne/Makefile	(revision 568547)
@@ -1,119 +1,119 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	code_saturne
 PORTVERSION=	6.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	EDF's general purpose Computational Fluid Dynamics (CFD) software
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libcgns.so:science/cgnslib	\
 		libhdf5.so:science/hdf5		\
 		libmedC.so:french/med
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}	\
 		xmgrace:math/grace	\
 		bash:shells/bash	\
 		xterm:x11/xterm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	code-saturne
 
 USES=		autoreconf bison compiler:c11 fortran gettext gnome gmake \
 		iconv libtool pyqt:5 python:3.6+ shebangfix
 
 USE_GNOME=	libxml2
 USE_PYQT=	core gui sip widgets xml_build
 SHEBANG_FILES=	install_saturne.py tests/unittests.py bin/*.py build-aux/*.py
 CFLAGS+=	-D__XSI_VISIBLE
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
 		--without-salome-gui --enable-python
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
 		pyuic5=pyuic5-${PYTHON_VER}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS MPICH SCOTCH
 OPTIONS_DEFAULT=	BATCH BLAS MPICH SCOTCH METIS
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
 BLAS_DESC=		Support of OpenBLAS
 BLAS_USES=		blaslapack
 BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-lib=${LOCALBASE}/lib --with-blas-libs=-lopenblas
 BLAS_LIB_DEPENDS=	libopenblas.so:math/openblas
 BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 MPICH_USES=		mpi
 MPICH_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 MPICH_CONFIGURE_WITH=	mpi
 METIS_DESC=		Support of METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 METIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include"
 PARMETIS_DESC=		Support of ParMETIS
 PARMETIS_LIB_DEPENDS=	libparmetis.so:math/parmetis
 PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
 PARMETIS_CONFIGURE_ENV=	LIBS=-lexecinfo
 SCOTCH_DESC=		Support of Scotch
 SCOTCH_LIB_DEPENDS=	libscotch.so:cad/scotch
 SCOTCH_CONFIGURE_ON=	--with-scotch-include="${LOCALBASE}/include"
 
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
 TERM=		vt100	# Force for pointyhat to override su
 .else
 TERM?=		vt100	# Default value needed for tput in jail or tinderbox
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs
 # /libsaturne.so:
 # undefined reference to `__atomic_compare_exchange'
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	tex:build
 BUILD_DEPENDS+=	fig2dev:print/fig2dev		\
 		doxygen:devel/doxygen		\
 		dot:graphics/graphviz		\
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 BINARY_ALIAS+=	sphinx-build=sphinx-build-${PYTHON_VER}
 ALL_TARGET=	all pdf
 DOCS=		AUTHORS ChangeLog README
 .endif
 
 pre-configure:
 	${FLEX} -o ${WRKSRC}/src/mei/mei_scanner.c ${WRKSRC}/src/mei/mei_scanner.l
 	${LOCALBASE}/bin/bison --defines=${WRKSRC}/src/mei/mei_parser.h	\
 		-o ${WRKSRC}/src/mei/mei_parser.c ${WRKSRC}/src/mei/mei_parser.y
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile.am
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/code_saturne/cs_solver
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/science/py-veusz/Makefile
===================================================================
--- head/science/py-veusz/Makefile	(revision 568546)
+++ head/science/py-veusz/Makefile	(revision 568547)
@@ -1,35 +1,35 @@
 # Created by: Stas Timokhin <devel@stasyan.com>
 # $FreeBSD$
 
 PORTNAME=	veusz
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific plotting package
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		compiler:c++11-lang python:3.5+ pyqt:5 qt:5 shebangfix
 USE_GITHUB=	yes
 USE_PYQT=	core gui printsupport svg widgets
 USE_PYTHON=	distutils concurrent autoplist
 USE_QT=		core gui xml widgets qmake_build
 SHEBANG_FILES=	examples/embedexample.py
 
 MAKE_ENV=	SIP_DIR=${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
 
 post-install:
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/veusz/helpers/*.so
 	# workaround for https://github.com/veusz/veusz/issues/475
 	${REINPLACE_CMD} -i '' -e 's|PyQt5||' ${STAGEDIR}${PYTHON_SITELIBDIR}/*/requires.txt
 
 .include <bsd.port.mk>
Index: head/sysutils/angrysearch/Makefile
===================================================================
--- head/sysutils/angrysearch/Makefile	(revision 568546)
+++ head/sysutils/angrysearch/Makefile	(revision 568547)
@@ -1,33 +1,33 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	angrysearch
 PORTVERSION=	1.0.2 # untagged, but specified in the setup.py
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quick search GUI tool for Unix-like systems
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DoTheEvo
 GH_PROJECT=	ANGRYsearch
 GH_TAGNAME=	6f8fccc
 
 USES=		python pyqt:5
 USE_PYTHON=	autoplist distutils noflavors
 USE_PYQT=	core_run gui_run widgets_run
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,Linux,${OPSYS}, ; s,linux,${OPSYS:tl}, \
 		; s,/usr/share,${PREFIX}/share,' ${WRKSRC}/setup.py \
 		${WRKSRC}/angrysearch.desktop
 
 .include <bsd.port.mk>
 
 PATCH_ARGS+=	-l
Index: head/textproc/retext/Makefile
===================================================================
--- head/textproc/retext/Makefile	(revision 568546)
+++ head/textproc/retext/Makefile	(revision 568547)
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	retext
 DISTVERSION=	7.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Markdown editor
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR}
 
 USES=		python:3.2+ desktop-file-utils pyqt:5 qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	retext-project
 GH_PROJECT=	retext
 USE_PYTHON=	distutils autoplist noflavors
 USE_QT=		linguisttools_build
 USE_PYQT=	core_run sip_run gui_run widgets_run printsupport_run \
 		network_run
 
 PYDISTUTILS_INSTALLARGS+=	--no-rename
 
 BINARY_ALIAS=	lrelease=${LRELEASE}
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e "s,lrelease,${LOCALBASE}/bin/lrelease," ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
Index: head/www/onionshare/Makefile
===================================================================
--- head/www/onionshare/Makefile	(revision 568546)
+++ head/www/onionshare/Makefile	(revision 568547)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	onionshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www python security
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Secure and anonymous file sharing via Tor
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-HTTPAuth>=0:security/py-flask-httpauth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stem>=0:security/py-stem@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.5+ pyqt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	micahflee
 USE_PYQT=	core gui sip widgets  # "sip" should be "sip_build", but "import PyQt5.QtCore" wants "sip". See bug#225040
 USE_PYTHON=	distutils autoplist noflavors
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/onionshare/common.py
 
 .include <bsd.port.mk>
Index: head/www/py-qt5-webengine/distinfo
===================================================================
--- head/www/py-qt5-webengine/distinfo	(revision 568546)
+++ head/www/py-qt5-webengine/distinfo	(revision 568547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614922541
-SHA256 (PyQtWebEngine-5.15.3.tar.gz) = 0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
-SIZE (PyQtWebEngine-5.15.3.tar.gz) = 48784
+TIMESTAMP = 1615473410
+SHA256 (PyQtWebEngine-5.15.4.tar.gz) = cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19
+SIZE (PyQtWebEngine-5.15.4.tar.gz) = 49022
Index: head/www/py-weboob-qt/Makefile
===================================================================
--- head/www/py-weboob-qt/Makefile	(revision 568546)
+++ head/www/py-weboob-qt/Makefile	(revision 568547)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	weboob-qt
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Web Outside of Browsers
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR}
 
 USES=		gmake pyqt:5 python:3.6+
 USE_PYQT=	core gui multimedia multimediawidgets sip widgets
 USE_PYTHON=	autoplist distutils
 
 BINARY_ALIAS=	pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER}
 
 NO_ARCH=	yes
 
 PYDISTUTILS_BUILDARGS=	${CONFIGURE_ARGS}
 PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS}
 
 # weboob-qt attempts to install __init__.py and the generated bytecode into
 # these directories which conflicts with those installed by weboob. We need to
 # delete these files and their entries in the generated plist post-install.
 COMMON_DIRS=	weboob \
 		weboob/applications \
 		weboob/tools \
 		weboob/tools/application
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
 	@(cd ${WRKSRC}/man && ${FIND} . -type f ! -name 'q*' -and ! -name '*qt.1' -delete)
 
 post-install:
 .for dir in ${COMMON_DIRS:S|/|\/|g}
 	@${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \
 		-e '/.*\/${dir}\/__pycache__.*/d' \
 		${WRKDIR}/.PLIST.pymodtmp
 .endfor
 .for dir in ${COMMON_DIRS}
 	@(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py)
 .endfor
 
 .include <bsd.port.mk>
Index: head/www/qutebrowser/Makefile
===================================================================
--- head/www/qutebrowser/Makefile	(revision 568546)
+++ head/www/qutebrowser/Makefile	(revision 568547)
@@ -1,60 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	qutebrowser
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Keyboard-focused browser with a minimal GUI
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
 		${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 
 USES=		desktop-file-utils python:3.6+ pyqt:5 qt:5
 USE_PYQT=	core opengl printsupport sql widgets qml
 USE_PYTHON=	distutils autoplist noflavors
 USE_QT=		sql-sqlite3
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 NO_ARCH=	yes
 PLIST_FILES=	share/applications/${PORTNAME}-${PYTHON_VER}.desktop
 
 OPTIONS_DEFINE_amd64=	ADBLOCK
 OPTIONS_DEFAULT=	WEBKIT
 OPTIONS_DEFAULT_amd64=	WEBENGINE ADBLOCK
 OPTIONS_DEFAULT_i386=	WEBENGINE
 OPTIONS_MULTI=	BACKEND
 OPTIONS_MULTI_BACKEND=	WEBKIT WEBENGINE
 
 ADBLOCK_DESC=		Enable the newer adblocking support
 WEBENGINE_DESC=		WebEngine webpage renderer support
 
 ADBLOCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}
 WEBENGINE_USE=	PYQT=webengine,webchannel
 WEBKIT_USE=	PYQT=webkit,webkitwidgets
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3700
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dataclasses>0:devel/py-dataclasses@${PY_FLAVOR}
 .endif
 
 .if ${PYTHON_REL} < 3900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop
 
 .include <bsd.port.post.mk>
Index: head/x11-toolkits/py-qt5-chart/distinfo
===================================================================
--- head/x11-toolkits/py-qt5-chart/distinfo	(revision 568546)
+++ head/x11-toolkits/py-qt5-chart/distinfo	(revision 568547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614228730
-SHA256 (PyQtChart-5.15.3.tar.gz) = 5f54d0689a54e50d4cc6ae1a2672d69fbe0831cc3562b61c6b30f34aee84bccf
-SIZE (PyQtChart-5.15.3.tar.gz) = 69064
+TIMESTAMP = 1615473408
+SHA256 (PyQtChart-5.15.4.tar.gz) = e47750632851e105eabc27fdfa8180989d120b822181e512f6643b3c5c4d8074
+SIZE (PyQtChart-5.15.4.tar.gz) = 69252