Update PyQt to 5.15.0, py-sip to 4.19.24 and qscintilla2 to 2.11.5

- Update PyQt to 5.15.0, py-sip to 4.19.24 and qscintilla2 to 2.11.5 - Use pypi for PYQT [1] - Add devel/py-qt5-sip (Don't use it for now. It will be used in future updates of PyQt with py-sip >= 5) - Add missing py-qt5 ports: comms/py-qt5-sensors, devel/py-qt5-location, devel/py-qt5-remoteobjects, net/py-qt5-networkauth - Strip libs - Refactor *_PATH and *_PORT parts [1] RiverBankComputing doesn't offer links to download latest version of some ports PR: 247369 Reviewed by: tcberner Differential Revision: https://reviews.freebsd.org/D25749 Exp-run by: antoine
author: Loïc Bartoletti <lbartoletti@FreeBSD.org> 2020-10-05 15:50:03 +0000
committer: Loïc Bartoletti <lbartoletti@FreeBSD.org> 2020-10-05 15:50:03 +0000
commit: 2933bb22c330742a9a771b8a84abb127fc3e8cbc (patch)
tree: 4f76a634aa6b24065331c83abce53f1dfe75ebf9
parent: net-p2p/c-lightning: Upgrade from 0.8.2.1 to 0.9.1 (diff)
115 files changed, 729 insertions, 246 deletions
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 03f620b84628..3463944c435b 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -29,61 +29,88 @@ _INCLUDE_USES_PYQT_MK=	yes
 # option is for internal use by the py-sip ports.
 _PYQT_SUPPORTED=        5 sip
 
-.if empty(pyqt_ARGS)
+.  if empty(pyqt_ARGS)
 IGNORE=	pyqt needs a qt-version (${_PYQT_SUPPORTED})
-.endif
+.  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)
+.  for ver in ${_PYQT_SUPPORTED:O:u}
+.    if ${pyqt_ARGS:M${ver}}
+.      if empty(_PYQT_VERSION)
 _PYQT_VERSION=  ${ver}
-.    else
+.      else
 IGNORE?=        cannot be installed: different PYQT versions specified via pyqt:[${_PYQT_SUPPORTED:S/ //g}]
+.      endif
 .    endif
-.  endif
-.endfor
+.  endfor
 
-.if empty(_PYQT_VERSION)
+.  if empty(_PYQT_VERSION)
 IGNORE?=        USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED})
 _PYQT_VERSION=	0
-.endif
+.  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/
 # https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz
-MASTER_SITES_SIP=	RIVERBANK/sip/${PORTVERSION} \
-			SF/pyqt/sip/sip-${PORTVERSION} \
-			GENTOO
-MASTER_SITES_PYQT5=	RIVERBANK/PyQt5/${PORTVERSION} \
-			SF/pyqt/PyQt5/PyQt-${PORTVERSION} \
-			GENTOO
+MASTER_SITES_SIP=       RIVERBANK/sip/${PORTVERSION} \
+                        SF/pyqt/sip/sip-${PORTVERSION} \
+                        GENTOO
+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/
 #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz
 MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
 			GENTOO
 
-SIP_VERSION=		4.19.21
-QSCI2_VERSION=		2.11.4
-PYQT5_VERSION=		5.13.1
+SIP_VERSION=		4.19.24
+QSCI2_VERSION=		2.11.5
+PYQT5_VERSION=		5.15.0
+PYQTSIP_VERSION=	12.8.0
 
 SIP_DISTNAME=		sip-${SIP_VERSION}
-PYQT5_DISTNAME=		PyQt5_gpl-${PYQT5_VERSION}
+PYQT5_DISTNAME=		PyQt5-${PYQT5_VERSION}
+PYQTSIP_DISTNAME=	PyQt5_sip-${PYQTSIP_VERSION}
+PYQTCHART_DISTNAME=	PyQtChart-${PYQT_VERSION}
 PYQT5_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 QSCI2_DISTNAME=		QScintilla-${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=		core dbus dbussupport demo designer designerplugin \
-			gui help multimedia network opengl qscintilla2 \
-			sql svg test webkit xml xmlpatterns sip
-# List of components only in pyqt5
-_USE_PYQT5_ONLY=	multimediawidgets printsupport qml quickwidgets \
-			serialport webchannel webengine webkitwidgets \
-			websockets widgets
+_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
 
 # Unversioned variables for the rest of the file
 PYQT_VERSION=		${PYQT${_PYQT_VERSION}_VERSION}
@@ -94,117 +121,62 @@ 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-assistant_PATH=		${PYQT_PY_RELNAME}-assistant>=${PYQT_VERSION}
-py-core_PATH=			${PYQT_PY_RELNAME}-core>=${PYQT_VERSION}
-py-dbus_PATH=			${PYQT_PY_RELNAME}-dbus>=${PYQT_VERSION}
-py-dbussupport_PATH=		${PYQT_PY_RELNAME}-dbussupport>=${PYQT_VERSION}
-py-declarative_PATH=		${PYQT_PY_RELNAME}-declarative>=${PYQT_VERSION}
-py-demo_PATH=			${PYQT_PY_RELNAME}-demo>=${PYQT_VERSION}
-py-designer_PATH=		${PYQT_PY_RELNAME}-designer>=${PYQT_VERSION}
-py-designerplugin_PATH=		${PYQT_PY_RELNAME}-designerplugin>=${PYQT_VERSION}
-py-doc_PATH=			${PYQT_PY_RELNAME}-doc>=${PYQT_VERSION}
-py-gui_PATH=			${PYQT_PY_RELNAME}-gui>=${PYQT_VERSION}
-py-help_PATH=			${PYQT_PY_RELNAME}-help>=${PYQT_VERSION}
-py-multimedia_PATH=		${PYQT_PY_RELNAME}-multimedia>=${PYQT_VERSION}
-py-network_PATH=		${PYQT_PY_RELNAME}-network>=${PYQT_VERSION}
-py-opengl_PATH=			${PYQT_PY_RELNAME}-opengl>=${PYQT_VERSION}
-py-phonon_PATH=			${PYQT_PY_RELNAME}-phonon>=${PYQT_VERSION}
+# py-pysip_PATH=			${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
 py-qscintilla2_PATH=		${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
-py-script_PATH=			${PYQT_PY_RELNAME}-script>=${PYQT_VERSION}
-py-scripttools_PATH=		${PYQT_PY_RELNAME}-scripttools>=${PYQT_VERSION}
-py-sql_PATH=			${PYQT_PY_RELNAME}-sql>=${PYQT_VERSION}
-py-svg_PATH=			${PYQT_PY_RELNAME}-svg>=${PYQT_VERSION}
-py-test_PATH=			${PYQT_PY_RELNAME}-test>=${PYQT_VERSION}
-py-webchannel_PATH=		${PYQT_PY_RELNAME}-webchannel>=${PYQT_VERSION}
-py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=5.12.1
-py-webkit_PATH=			${PYQT_PY_RELNAME}-webkit>=${PYQT_VERSION}
-py-websockets_PATH=		${PYQT_PY_RELNAME}-websockets>=${PYQT_VERSION}
-py-xml_PATH=			${PYQT_PY_RELNAME}-xml>=${PYQT_VERSION}
-py-xmlpatterns_PATH=		${PYQT_PY_RELNAME}-xmlpatterns>=${PYQT_VERSION}
 
-py-multimediawidgets_PATH=	${PYQT_PY_RELNAME}-multimediawidgets>=${PYQT_VERSION}
-py-qml_PATH=			${PYQT_PY_RELNAME}-qml>=${PYQT_VERSION}
-py-quickwidgets_PATH=		${PYQT_PY_RELNAME}-quickwidgets>=${PYQT_VERSION}
-py-printsupport_PATH=		${PYQT_PY_RELNAME}-printsupport>=${PYQT_VERSION}
-py-serialport_PATH=		${PYQT_PY_RELNAME}-serialport>=${PYQT_VERSION}
-py-webkitwidgets_PATH=		${PYQT_PY_RELNAME}-webkitwidgets>=${PYQT_VERSION}
-py-widgets_PATH=		${PYQT_PY_RELNAME}-widgets>=${PYQT_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-assistant_PORT=		devel/${PYQT_RELNAME}-assistant
-py-core_PORT=			devel/${PYQT_RELNAME}-core
-py-dbus_PORT=			devel/${PYQT_RELNAME}-dbus
-py-dbussupport_PORT=		devel/${PYQT_RELNAME}-dbussupport
-py-declarative_PORT=		devel/${PYQT_RELNAME}-declarative
-py-demo_PORT=			misc/${PYQT_RELNAME}-demo
-py-designer_PORT=		devel/${PYQT_RELNAME}-designer
-py-designerplugin_PORT=		devel/${PYQT_RELNAME}-designerplugin
-py-doc_PORT=			misc/${PYQT_RELNAME}-doc
-py-gui_PORT=			x11-toolkits/${PYQT_RELNAME}-gui
-py-help_PORT=			devel/${PYQT_RELNAME}-help
-py-multimedia_PORT=		multimedia/${PYQT_RELNAME}-multimedia
-py-network_PORT=		net/${PYQT_RELNAME}-network
-py-opengl_PORT=			x11/${PYQT_RELNAME}-opengl
-py-phonon_PORT=			multimedia/${PYQT_RELNAME}-phonon
+# py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
-py-script_PORT=			devel/${PYQT_RELNAME}-script
-py-scripttools_PORT=		devel/${PYQT_RELNAME}-scripttools
-py-sql_PORT=			databases/${PYQT_RELNAME}-sql
-py-svg_PORT=			graphics/${PYQT_RELNAME}-svg
-py-test_PORT=			devel/${PYQT_RELNAME}-test
-py-webchannel_PORT=		www/${PYQT_RELNAME}-webchannel
-py-webengine_PORT=		www/${PYQT_RELNAME}-webengine
-py-webkit_PORT=			www/${PYQT_RELNAME}-webkit
-py-websockets_PORT=		www/${PYQT_RELNAME}-websockets
-py-xml_PORT=			textproc/${PYQT_RELNAME}-xml
-py-xmlpatterns_PORT=		textproc/${PYQT_RELNAME}-xmlpatterns
 
-py-multimediawidgets_PORT=	multimedia/py-qt5-multimediawidgets
-py-qml_PORT=			lang/py-qt5-qml
-py-quickwidgets_PORT=		x11-toolkits/py-qt5-quickwidgets
-py-printsupport_PORT=		print/py-qt5-printsupport
-py-serialport_PORT=		comms/py-qt5-serialport
-py-webkitwidgets_PORT=		www/py-qt5-webkitwidgets
-py-widgets_PORT=		x11-toolkits/py-qt5-widgets
+.  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-assistant_DESC=		Python bindings for QtAssistant module
 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-declarative_DESC=		Python bindings for QtDeclarative module
 py-demo_DESC=			PyQt demo and examples
 py-designer_DESC=		Python bindings for QtDesigner module
 py-designerplugin_DESC=		Python bindings for QtDesigner plugin
-py-doc_DESC=			PyQt documentation
 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-phonon_DESC=			Python bindings for Phonon 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-script_DESC=			Python bindings for QtScript module
-py-scripttools_DESC=		Python bindings for QtScriptTools module
+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-xml_DESC=			Python bindings for QtXml module
-py-xmlpatterns_DESC=		Python bindings for QtXmlPatterns module
-
-py-multimediawidgets_DESC=	Python bindings for QtMultimediaWidgets module
-py-qml_DESC=			Python bindings for Qml module
-py-quickwidgets_DESC=		Python bindings for QtQuickWidgets module
-py-printsupport_DESC=		Python bindings for Printsupport module
-py-serialport_DESC=		Python bindings for QtSerialPort
 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/sip-${PYTHON_VER}
@@ -236,7 +208,7 @@ PLIST_SUB+=	PYQT_APIDIR=${_APIDIR_REL} \
 		PYQT_QSCIVERSION=${QSCI2_VERSION} \
 		PYQT_PYQTVERSION=${PYQT_VERSION}
 
-.if defined(PYQT_DIST)
+.  if defined(PYQT_DIST)
 PORTVERSION=	${PYQT_VERSION}
 MASTER_SITES=	${PYQT_MASTERSITES}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
@@ -245,13 +217,13 @@ DISTINFO_FILE=	${PYQT_DISTINFO_FILE}
 LICENSE?=	${PYQT_LICENSE}
 HAS_CONFIGURE=	yes
 
-.if ${_PYQT_VERSION} > 4
+.    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
+.    endif
 
 PATCHDIR=	${.CURDIR}/../../devel/${PYQT_RELNAME}-core/files
 CONFIGURE_ARGS+=-b ${PREFIX}/bin \
@@ -260,31 +232,32 @@ CONFIGURE_ARGS+=-b ${PREFIX}/bin \
 		--confirm-license \
 		--sip ${SIP} \
 		--sipdir ${PYQT_SIPDIR}
-.if ${_PYQT_VERSION:M5}
+.    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
+.    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"
+.    if ${PORTNAME} != "dbussupport"
 EXTRACT_AFTER_ARGS+=	--exclude "${DISTNAME}/dbus"
-.endif  # ${PORTNAME} != "dbussupport"
+.    endif  # ${PORTNAME} != "dbussupport"
 
-.if !target(do-configure)
+.    if !target(do-configure)
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
-.endif  # !target(do-configure)
-.endif  # defined(PYQT_DIST)
+.    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_PYQT${_PYQT_VERSION}_ONLY}
-.for comp in ${_USE_PYQT_ALL:O:u}
+_USE_PYQT_ALL+=				${_USE_SIP_ALL} \
+					${_USE_QSCINTILLA}
+.  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}
@@ -292,17 +265,17 @@ 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
+.  endfor
 
 _USE_PYQT=      ${USE_PYQT:O:u}
-.for comp in ${_USE_PYQT}
-.  if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
+.  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
+.    else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
-.  endif
-.endfor
+.    endif
+.  endfor
 
 .endif # defined(_INCLUDE_USES_PYQT_MK)
diff --git a/audio/cadence/Makefile b/audio/cadence/Makefile
index 8f0da9b215ae..c244138db0e3 100644
--- a/audio/cadence/Makefile
+++ b/audio/cadence/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	cadence
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index bae1245b5775..8a910524f5be 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 1273f80f8af3..d64ade75b339 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	picard
 PORTVERSION=	2.4.4
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile
index 828d3922d2f3..32bc8c12da4b 100644
--- a/biology/py-ete3/Makefile
+++ b/biology/py-ete3/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ete3
 DISTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 970d0e99164b..0a4f194df343 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openscad
 PORTVERSION=	2020.01.04
-PORTREVISION=	2
+PORTREVISION=	3
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index ea46fa5d8048..113db03a7b28 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openscad
 PORTVERSION=	2019.05.10
-PORTREVISION=	6
+PORTREVISION=	7
 #PORTREVISION=	1
 CATEGORIES=	cad
 
diff --git a/cad/py-cq-editor/Makefile b/cad/py-cq-editor/Makefile
index 253f1161969d..678e013aa130 100644
--- a/cad/py-cq-editor/Makefile
+++ b/cad/py-cq-editor/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cq-editor
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile
index 66fa4d1361dc..d8a829598224 100644
--- a/cad/py-pyfda/Makefile
+++ b/cad/py-pyfda/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pyfda
 PORTVERSION=	0.1
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	rc6
 CATEGORIES=	cad python devel
 MASTER_SITES=	CHEESESHOP
diff --git a/comms/Makefile b/comms/Makefile
index d1750970a14e..0d7413593219 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -140,6 +140,7 @@
     SUBDIR += py-libconcord
     SUBDIR += py-lirc
     SUBDIR += py-pyserial
+    SUBDIR += py-qt5-sensors
     SUBDIR += py-qt5-serialport
     SUBDIR += py-xmodem
     SUBDIR += pyla
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index e796707c2cad..a292615901cc 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile
index 4190c9b30bb6..50b59d9634aa 100644
--- a/comms/nanovna-saver/Makefile
+++ b/comms/nanovna-saver/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	nanovna-saver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/py-qt5-sensors/Makefile b/comms/py-qt5-sensors/Makefile
new file mode 100644
index 000000000000..098faae045a2
--- /dev/null
+++ b/comms/py-qt5-sensors/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	sensors
+CATEGORIES=	comms devel python
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt5 toolkit, QtSensors module
+
+BUILD_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34}
+
+CONFIGURE_ARGS=	--enable QtSensors
+PYQT_DIST=	yes
+
+USES=		gl python pyqt:5 qt:5
+USE_GL=		gl
+USE_PYQT=	sip_build core_run 
+USE_PYTHON=	concurrent flavors py3kplist
+USE_QT=		core gui sensors qmake_build
+
+OPTIONS_DEFINE=	API DEBUG
+OPTIONS_DEFAULT=API
+OPTIONS_SUB=	yes
+
+API_DESC=		Install QtSensors API for QScintilla2
+API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
+API_CONFIGURE_OFF=	--no-qsci-api
+API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON=	--debug --trace
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSensors.so
+
+.include <bsd.port.mk>
diff --git a/comms/py-qt5-sensors/pkg-descr b/comms/py-qt5-sensors/pkg-descr
new file mode 100644
index 000000000000..32b00ca3bfd0
--- /dev/null
+++ b/comms/py-qt5-sensors/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtSensors module.
+
+WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/comms/py-qt5-sensors/pkg-plist b/comms/py-qt5-sensors/pkg-plist
new file mode 100644
index 000000000000..094231ef2feb
--- /dev/null
+++ b/comms/py-qt5-sensors/pkg-plist
@@ -0,0 +1,24 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtSensors.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtSensors.so
+%%API%%%%PYQT_APIDIR%%/api/python/QtSensors.api
+%%PYQT_SIPDIR%%/QtSensors/QtSensorsmod.sip
+%%PYQT_SIPDIR%%/QtSensors/qaccelerometer.sip
+%%PYQT_SIPDIR%%/QtSensors/qaltimeter.sip
+%%PYQT_SIPDIR%%/QtSensors/qambientlightsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qambienttemperaturesensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qcompass.sip
+%%PYQT_SIPDIR%%/QtSensors/qdistancesensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qgyroscope.sip
+%%PYQT_SIPDIR%%/QtSensors/qholstersensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qhumiditysensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qirproximitysensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qlidsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qlightsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qmagnetometer.sip
+%%PYQT_SIPDIR%%/QtSensors/qorientationsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qpressuresensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qproximitysensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qrotationsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qtapsensor.sip
+%%PYQT_SIPDIR%%/QtSensors/qtiltsensor.sip
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index 50d3ef8fcfcb..67918dc5cf30 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	serialport
-PORTREVISION=	1
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui serialport qmake_build
 
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSerialPort.so
+
 .include <bsd.port.mk>
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 9f1162e3c1d9..531e20edde89 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	sql
-PORTREVISION=	1
 CATEGORIES=	databases devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSql.so
+
 .include <bsd.port.mk>
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index 032cd2255b5d..3cb74d9938c9 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqlitebrowser
 PORTVERSION=	3.12.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index ebf58e2cd203..35e19589f9bc 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	4.23.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 4e851e6867ce..f3ae04184a1d 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	treeline
 PORTVERSION=	3.1.3
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTVERSION}
diff --git a/devel/Makefile b/devel/Makefile
index a76449cfbbae..b31b1c0c88e4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4957,8 +4957,12 @@
     SUBDIR += py-qt5-designer
     SUBDIR += py-qt5-designerplugin
     SUBDIR += py-qt5-help
+    SUBDIR += py-qt5-location
     SUBDIR += py-qt5-qscintilla2
+    SUBDIR += py-qt5-remoteobjects
+    SUBDIR += py-qt5-sip
     SUBDIR += py-qt5-test
+    SUBDIR += py-qtbuilder
     SUBDIR += py-qtconsole
     SUBDIR += py-qutip
     SUBDIR += py-ramlfications
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 18f55ac2d37f..5e469e64efc3 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -3,6 +3,7 @@
 
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 
 # Note to MAINTAINER: this should be converted to USES=pyqt, USE_PYQT=[...]
diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile
index c5ab44efe93c..8e70ad682abe 100644
--- a/devel/git-cola/Makefile
+++ b/devel/git-cola/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=		git-cola
 DISTVERSIONPREFIX=	v
 DISTVERSION=		3.5
+PORTREVISION=	1
 CATEGORIES=		devel
 
 MAINTAINER=		dch@FreeBSD.org
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 9693216a0b19..46f4e67d80ae 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	core
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -56,5 +55,6 @@ post-install:
 	# This Qt.so masks the Qt.py which is supposed to import
 	# all of the Qt submodules.
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qt.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtCore.so
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt5-core/pkg-plist b/devel/py-qt5-core/pkg-plist
index 5b4813386de3..b7a1e03b8afc 100644
--- a/devel/py-qt5-core/pkg-plist
+++ b/devel/py-qt5-core/pkg-plist
@@ -112,6 +112,7 @@ bin/pyuic5
 %%PYQT_SIPDIR%%/QtCore/qbuffer.sip
 %%PYQT_SIPDIR%%/QtCore/qbytearray.sip
 %%PYQT_SIPDIR%%/QtCore/qbytearraymatcher.sip
+%%PYQT_SIPDIR%%/QtCore/qcalendar.sip
 %%PYQT_SIPDIR%%/QtCore/qcborcommon.sip
 %%PYQT_SIPDIR%%/QtCore/qcborstream.sip
 %%PYQT_SIPDIR%%/QtCore/qchar.sip
@@ -173,7 +174,6 @@ bin/pyuic5
 %%PYQT_SIPDIR%%/QtCore/qpoint.sip
 %%PYQT_SIPDIR%%/QtCore/qprocess.sip
 %%PYQT_SIPDIR%%/QtCore/qpropertyanimation.sip
-%%PYQT_SIPDIR%%/QtCore/qpycore_onexit.sip
 %%PYQT_SIPDIR%%/QtCore/qpycore_qhash.sip
 %%PYQT_SIPDIR%%/QtCore/qpycore_qlist.sip
 %%PYQT_SIPDIR%%/QtCore/qpycore_qmap.sip
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 630fd9a8d4d3..398adb1bc146 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +13,7 @@ CONFIGURE_ARGS=	--enable QtDBus
 PYQT_DIST=	yes
 
 USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core dbus qmake_build
 
@@ -28,4 +27,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtDBus.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile
index b695930bdf03..201db4e2a2e1 100644
--- a/devel/py-qt5-dbussupport/Makefile
+++ b/devel/py-qt5-dbussupport/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	dbussupport
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -11,12 +10,13 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} \
 		${PY_ENUM34}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} \
 		${PY_ENUM34}
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 CONFIGURE_ARGS=	--enable QtCore
 PYQT_DIST=	yes
 
 USES=		pkgconfig python pyqt:5 qt:5
-USE_PYQT=	sip_build
+USE_PYQT=	sip_build 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core buildtools_build qmake_build
 
@@ -28,4 +28,7 @@ INSTALL_WRKSRC=	${WRKSRC}/dbus
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/dbus/mainloop/pyqt5.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index 21e1e185544f..0dac5c69d6bb 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	designer
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +13,7 @@ CONFIGURE_ARGS=	--enable QtDesigner --no-designer-plugin
 PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
-USE_GL=		yes
+USE_GL=		gl
 USE_PYQT=	sip_build core_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui designer widgets xml \
@@ -30,4 +29,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtDesigner.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-designerplugin/Makefile b/devel/py-qt5-designerplugin/Makefile
index c4d5d60ee1d2..0227f274af74 100644
--- a/devel/py-qt5-designerplugin/Makefile
+++ b/devel/py-qt5-designerplugin/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	designerplugin
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -20,7 +19,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build
+USE_PYQT=	sip_build 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core designer gui xml widgets \
 		buildtools_build qmake_build
diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile
index 32a827318315..ecb97fad5fa5 100644
--- a/devel/py-qt5-help/Makefile
+++ b/devel/py-qt5-help/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	help
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtHelp.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-help/pkg-plist b/devel/py-qt5-help/pkg-plist
index 57bd529301b3..9ff4807e809a 100644
--- a/devel/py-qt5-help/pkg-plist
+++ b/devel/py-qt5-help/pkg-plist
@@ -7,7 +7,9 @@
 %%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpfilterdata.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpfilterengine.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelpfiltersettingswidget.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip
+%%PYQT_SIPDIR%%/QtHelp/qhelplink.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpsearchresultwidget.sip
diff --git a/devel/py-qt5-location/Makefile b/devel/py-qt5-location/Makefile
new file mode 100644
index 000000000000..3ee5f8080df4
--- /dev/null
+++ b/devel/py-qt5-location/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	location
+CATEGORIES=	devel python
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt5 toolkit, QtLocation module
+
+BUILD_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34}
+
+CONFIGURE_ARGS=	--enable QtLocation
+PYQT_DIST=	yes
+
+USES=		gl python pyqt:5 qt:5
+USE_GL=		gl
+USE_PYQT=	sip_build core_run widgets_run
+USE_PYTHON=	concurrent flavors py3kplist
+USE_QT=		core declarative gui location network buildtools_build qmake_build
+
+OPTIONS_DEFINE=	API DEBUG
+OPTIONS_DEFAULT=API
+OPTIONS_SUB=	yes
+
+API_DESC=		Install QtLocation API for QScintilla2
+API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
+API_CONFIGURE_OFF=	--no-qsci-api
+API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON=	--debug --trace
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtLocation.so
+
+.include <bsd.port.mk>
diff --git a/devel/py-qt5-location/pkg-descr b/devel/py-qt5-location/pkg-descr
new file mode 100644
index 000000000000..d46c14cd4c2a
--- /dev/null
+++ b/devel/py-qt5-location/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtLocation module.
+
+WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/devel/py-qt5-location/pkg-plist b/devel/py-qt5-location/pkg-plist
new file mode 100644
index 000000000000..c14205849e9f
--- /dev/null
+++ b/devel/py-qt5-location/pkg-plist
@@ -0,0 +1,43 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtLocation.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtLocation.so
+%%PYQT_APIDIR%%/api/python/QtLocation.api
+%%PYQT_SIPDIR%%/QtLocation/QtLocationmod.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeocodereply.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeocodingmanager.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeocodingmanagerengine.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeomaneuver.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoroute.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoroutereply.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeorouterequest.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoroutesegment.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoroutingmanager.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoroutingmanagerengine.sip
+%%PYQT_SIPDIR%%/QtLocation/qgeoserviceprovider.sip
+%%PYQT_SIPDIR%%/QtLocation/qlocation.sip
+%%PYQT_SIPDIR%%/QtLocation/qplace.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceattribute.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacecategory.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacecontactdetail.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacecontent.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacecontentreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacecontentrequest.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacedetailsreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceeditorial.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceicon.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceidreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceimage.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacemanager.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacemanagerengine.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacematchreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacematchrequest.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceproposedsearchresult.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceratings.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacereply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceresult.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacereview.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacesearchreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacesearchrequest.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacesearchresult.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacesearchsuggestionreply.sip
+%%PYQT_SIPDIR%%/QtLocation/qplacesupplier.sip
+%%PYQT_SIPDIR%%/QtLocation/qplaceuser.sip
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 998c3f20788c..6d9957039b3e 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -19,22 +19,25 @@ HAS_CONFIGURE=	yes
 
 USES=		python pyqt:5 gl qmake:no_env qt:5
 USE_GL=		gl
-USE_PYQT=	sip core gui printsupport widgets
+USE_PYQT=	core gui printsupport widgets
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui printsupport widgets buildtools_build qmake_build
 
-OPTIONS_DEFINE=		DEBUG
-DEBUG_CONFIGURE_ON=	--debug --trace
+OPTIONS_DEFINE=         DEBUG
+DEBUG_CONFIGURE_ON=     --debug --trace
 
-QSCIDIR=	${PREFIX}/share/qt5/qsci
-CONFIGURE_ARGS=	--pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${PYQT_SIPDIR} \
-		--apidir ${PYQT_APIDIR} --qmake ${QMAKE} --pyqt-sipdir ${PYQT_SIPDIR} \
-		--sip ${SIP}
-WRKSRC=		${WRKDIR}/${DISTNAME}/Python
-ALL_TARGET=	#empty
+QSCIDIR=        ${PREFIX}/share/qt5/qsci
+CONFIGURE_ARGS= --pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${PYQT_SIPDIR} \
+                --apidir ${PYQT_APIDIR} --qmake ${QMAKE} --pyqt-sipdir ${PYQT_SIPDIR} \
+                --sip ${SIP} --qsci-sipdir ${PYQT_SIPDIR} --qsci-incdir ${QT_INCDIR} --qsci-libdir ${QT_LIBDIR}
+WRKSRC=         ${WRKDIR}/${DISTNAME}/Python
+ALL_TARGET=     #empty
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qsci.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-remoteobjects/Makefile b/devel/py-qt5-remoteobjects/Makefile
new file mode 100644
index 000000000000..b2750bf8a385
--- /dev/null
+++ b/devel/py-qt5-remoteobjects/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	remoteobjects
+CATEGORIES=	devel python
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt5 toolkit, QtRemoteObjects module
+
+BUILD_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34}
+
+CONFIGURE_ARGS=	--enable QtRemoteObjects
+PYQT_DIST=	yes
+
+USES=		gl python pyqt:5 qt:5
+USE_GL=		gl
+USE_PYQT=	sip_build core_run widgets_run
+USE_PYTHON=	concurrent flavors py3kplist
+USE_QT=		core declarative gui remoteobjects network buildtools_build qmake_build
+
+OPTIONS_DEFINE=	API DEBUG
+OPTIONS_DEFAULT=API
+OPTIONS_SUB=	yes
+
+API_DESC=		Install QtRemoteObjects API for QScintilla2
+API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
+API_CONFIGURE_OFF=	--no-qsci-api
+API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON=	--debug --trace
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtRemoteObjects.so
+
+.include <bsd.port.mk>
diff --git a/devel/py-qt5-remoteobjects/pkg-descr b/devel/py-qt5-remoteobjects/pkg-descr
new file mode 100644
index 000000000000..4ae46800b453
--- /dev/null
+++ b/devel/py-qt5-remoteobjects/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtRemoteObjects module.
+
+WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/devel/py-qt5-remoteobjects/pkg-plist b/devel/py-qt5-remoteobjects/pkg-plist
new file mode 100644
index 000000000000..ffdc574ea70f
--- /dev/null
+++ b/devel/py-qt5-remoteobjects/pkg-plist
@@ -0,0 +1,10 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtRemoteObjects.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtRemoteObjects.so
+%%API%%%%PYQT_APIDIR%%/api/python/QtRemoteObjects.api
+%%PYQT_SIPDIR%%/QtRemoteObjects/QtRemoteObjectsmod.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qremoteobjectabstractitemmodelreplica.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qremoteobjectdynamicreplica.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qremoteobjectnode.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qremoteobjectregistry.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qremoteobjectreplica.sip
+%%PYQT_SIPDIR%%/QtRemoteObjects/qtremoteobjectglobal.sip
diff --git a/devel/py-qt5-sip/Makefile b/devel/py-qt5-sip/Makefile
new file mode 100644
index 000000000000..fd192c1d286f
--- /dev/null
+++ b/devel/py-qt5-sip/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME=	sip
+PORTVERSION=	${PYQTSIP_VERSION}
+CATEGORIES=	devel python
+MASTER_SITES=	${MASTER_SITES_PYQTSIP}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
+DISTNAME=	${PYQTSIP_DISTNAME}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python to C and C++ bindings generator
+
+LICENSE=		SIP GPLv2 GPLv3
+LICENSE_COMB=		multi
+LICENSE_GROUPS_SIP=	FSF GPL OSI
+LICENSE_NAME_SIP=	SIP License
+LICENSE_FILE_SIP=	${FILESDIR}/LICENSE
+LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USES=		python:3.5+ pyqt:sip
+USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
+USE_PYQT=	#
+
+.include <bsd.port.mk>
diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo
new file mode 100644
index 000000000000..1e4ab36cc06b
--- /dev/null
+++ b/devel/py-qt5-sip/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1595277725
+SHA256 (PyQt5_sip-12.8.0.tar.gz) = 0a34b6596bdd28d52da3a51fa8d9bb0b287bcb605c2512aa3251b9028cc71f4d
+SIZE (PyQt5_sip-12.8.0.tar.gz) = 102132
diff --git a/devel/py-qt5-sip/files/LICENSE b/devel/py-qt5-sip/files/LICENSE
new file mode 100644
index 000000000000..715675451dc2
--- /dev/null
+++ b/devel/py-qt5-sip/files/LICENSE
@@ -0,0 +1,48 @@
+RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP
+
+1. This LICENSE AGREEMENT is between Riverbank Computing Limited ("Riverbank"),
+and the Individual or Organization ("Licensee") accessing and otherwise using
+SIP software in source or binary form and its associated documentation.  SIP
+comprises a software tool for generating Python bindings for software C and C++
+libraries, and a Python extension module used at runtime by those generated
+bindings.
+
+2. Subject to the terms and conditions of this License Agreement, Riverbank
+hereby grants Licensee a nonexclusive, royalty-free, world-wide license to
+reproduce, analyze, test, perform and/or display publicly, prepare derivative
+works, distribute, and otherwise use SIP alone or in any derivative version,
+provided, however, that Riverbank's License Agreement and Riverbank's notice of
+copyright, e.g., "Copyright (c) 2015 Riverbank Computing Limited; All Rights
+Reserved" are retained in SIP alone or in any derivative version prepared by
+Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+incorporates SIP or any part thereof, and wants to make the derivative work
+available to others as provided herein, then Licensee hereby agrees to include
+in any such work a brief summary of the changes made to SIP.
+
+4. Licensee may not use SIP to generate Python bindings for any C or C++
+library for which bindings are already provided by Riverbank.
+
+5. Riverbank is making SIP available to Licensee on an "AS IS" basis.
+RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY
+OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND DISCLAIMS ANY
+REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF SIP WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SIP FOR ANY
+INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING,
+DISTRIBUTING, OR OTHERWISE USING SIP, OR ANY DERIVATIVE THEREOF, EVEN IF
+ADVISED OF THE POSSIBILITY THEREOF.
+
+7. This License Agreement will automatically terminate upon a material breach
+of its terms and conditions.
+
+8. Nothing in this License Agreement shall be deemed to create any relationship
+of agency, partnership, or joint venture between Riverbank and Licensee.  This
+License Agreement does not grant permission to use Riverbank trademarks or
+trade name in a trademark sense to endorse or promote products or services of
+Licensee, or any third party.
+
+9. By copying, installing or otherwise using SIP, Licensee agrees to be bound
+by the terms and conditions of this License Agreement.
diff --git a/devel/py-qt5-sip/pkg-descr b/devel/py-qt5-sip/pkg-descr
new file mode 100644
index 000000000000..96de81986667
--- /dev/null
+++ b/devel/py-qt5-sip/pkg-descr
@@ -0,0 +1,3 @@
+SIP is a tool for generating Python bindings for C and C++ libraries.
+
+WWW: http://www.riverbankcomputing.co.uk/software/sip/
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index 6bf17765774a..627c15aecb07 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	test
-PORTREVISION=	1
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -30,4 +29,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtTest.so
+
 .include <bsd.port.mk>
diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile
index 82ad72e9afba..f01820c8c89c 100644
--- a/devel/py-qt5/Makefile
+++ b/devel/py-qt5/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	qt5
 PORTVERSION=	${PYQT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,13 +11,14 @@ COMMENT=	Python bindings for the Qt 5 toolkit (meta port)
 USES=		metaport python pyqt:5
 USE_PYTHON=	concurrent flavors py3kplist
 
-# Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT5_ONLY in Mk/Use/pyqt.mk
-# portedit merge -i -e "OPTIONS_DEFINE=$(make -V _USE_PYQT_ALL:tu -V _USE_PYQT5_ONLY:tu | tr '\n' ' ')" .
-OPTIONS_DEFINE=		CORE DBUS DBUSSUPPORT DEMO DESIGNER DESIGNERPLUGIN GUI \
-			HELP MULTIMEDIA MULTIMEDIAWIDGETS NETWORK OPENGL \
-			PRINTSUPPORT QML QSCINTILLA2 QUICKWIDGETS SERIALPORT \
-			SIP SQL SVG TEST WEBCHANNEL WEBENGINE WEBKIT \
-			WEBKITWIDGETS WIDGETS XML XMLPATTERNS
+# Keep these synchronized with _USE_PYQT_ALL in Mk/Use/pyqt.mk
+# portedit merge -i -e "OPTIONS_DEFINE=$(make -V _USE_PYQT_ALL:tu | tr '\n' ' ')" .
+OPTIONS_DEFINE=		CORE CHART DBUS DBUSSUPPORT DEMO DESIGNER DESIGNERPLUGIN \
+			GUI HELP MULTIMEDIA MULTIMEDIAWIDGETS NETWORK NETWORKAUTH \
+			OPENGL PRINTSUPPORT QML QSCINTILLA2 QUICK QUICKWIDGETS \
+			SENSORS SERIALPORT SQL SVG TEST WEBCHANNEL WEBENGINE \
+			WEBKIT WEBKITWIDGETS WIDGETS WEBSOCKETS XML XMLPATTERNS \
+			SIP
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE:NWEBENGINE}
 
 .for opt in ${OPTIONS_DEFINE}
diff --git a/devel/py-qt5/distinfo b/devel/py-qt5/distinfo
index 80040e111762..31a5db41e223 100644
--- a/devel/py-qt5/distinfo
+++ b/devel/py-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571389169
-SHA256 (PyQt5_gpl-5.13.1.tar.gz) = 54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af
-SIZE (PyQt5_gpl-5.13.1.tar.gz) = 3162737
+TIMESTAMP = 1595064383
+SHA256 (PyQt5-5.15.0.tar.gz) = c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
+SIZE (PyQt5-5.15.0.tar.gz) = 3262004
diff --git a/devel/py-qtbuilder/Makefile b/devel/py-qtbuilder/Makefile
new file mode 100644
index 000000000000..2fa5b6333ec5
--- /dev/null
+++ b/devel/py-qtbuilder/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	qtbuilder
+PORTVERSION=	1.4.0 # ${QTBUILDER_VERSION}
+CATEGORIES=	devel python
+MASTER_SITES=	https://pypi.io/packages/source/P/PyQt-builder/  # ${MASTER_SITES_QTBUILDER}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	PyQt-builder-${PORTVERSION} # ${QTBUILDER_DISTNAME}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	The PEP 517 compliant PyQt build system
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
+USE_PYQT=	#
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo
new file mode 100644
index 000000000000..d85445ed09df
--- /dev/null
+++ b/devel/py-qtbuilder/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1595223568
+SHA256 (PyQt-builder-1.4.0.tar.gz) = be7fb8436e6ffb21b7e42266f0fa4776b7d62b0c7e06c63f8a066ff90554fcdc
+SIZE (PyQt-builder-1.4.0.tar.gz) = 5472834
diff --git a/devel/py-qtbuilder/pkg-descr b/devel/py-qtbuilder/pkg-descr
new file mode 100644
index 000000000000..96de81986667
--- /dev/null
+++ b/devel/py-qtbuilder/pkg-descr
@@ -0,0 +1,3 @@
+SIP is a tool for generating Python bindings for C and C++ libraries.
+
+WWW: http://www.riverbankcomputing.co.uk/software/sip/
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 02b79a3f079e..de94fac07c96 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qtconsole
 PORTVERSION=	4.7.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 0ab49fe095bc..d8b1562a301d 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585893550
-SHA256 (sip-4.19.21.tar.gz) = 6af9979ab41590e8311b8cc94356718429ef96ba0e3592bdd630da01211200ae
-SIZE (sip-4.19.21.tar.gz) = 1050654
+TIMESTAMP = 1600752207
+SHA256 (sip-4.19.24.tar.gz) = edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
+SIZE (sip-4.19.24.tar.gz) = 1055461
diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index e2f829231f9a..6011c0b740c2 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2-qt5/distinfo
index ec26e2bf6ca9..4eacf15dd96c 100644
--- a/devel/qscintilla2-qt5/distinfo
+++ b/devel/qscintilla2-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585893540
-SHA256 (QScintilla-2.11.4.tar.gz) = 723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20
-SIZE (QScintilla-2.11.4.tar.gz) = 3007719
+TIMESTAMP = 1592928082
+SHA256 (QScintilla-2.11.5.tar.gz) = 9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b
+SIZE (QScintilla-2.11.5.tar.gz) = 3007564
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index a19ea43607e1..2c28693775ec 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	tortoisehg
 DISTVERSION=	5.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile
index e693f3c11abb..e181fbb13148 100644
--- a/devel/vitables/Makefile
+++ b/devel/vitables/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	vitables
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile
index 934ae80639de..25aa6c2ab8b3 100644
--- a/emulators/fs-uae-launcher/Makefile
+++ b/emulators/fs-uae-launcher/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fs-uae-launcher
 PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://fs-uae.net/stable/${PORTVERSION}/
 
diff --git a/games/anki/Makefile b/games/anki/Makefile
index 1345489cb026..75fc0e63e91c 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anki
 DISTVERSION=	2.1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	https://apps.ankiweb.net/downloads/archive/
 DISTNAME=	anki-${PORTVERSION}-source
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 0371baeb36ed..f8ea23c713dc 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mnemosyne
 PORTVERSION=		2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	games python
 MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
index bae62f05299c..02c0191624cb 100644
--- a/graphics/py-python-poppler-qt5/Makefile
+++ b/graphics/py-python-poppler-qt5/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	python-poppler-qt5
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.75.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index c49ca85ebbb6..971ccb720ac6 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	svg
-PORTREVISION=	1
 CATEGORIES=	graphics devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSvg.so
+
 .include <bsd.port.mk>
diff --git a/graphics/py-visvis/Makefile b/graphics/py-visvis/Makefile
index 85576bb118f8..f7badb6e8a5b 100644
--- a/graphics/py-visvis/Makefile
+++ b/graphics/py-visvis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	visvis
 PORTVERSION=	1.12.4
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 75a5cd9b4758..0f2f18b86860 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_10_10
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 6843b389bf99..609512507a4f 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_14_16
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@FreeBSD.org
diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile
index 7bd137573980..ff4b309050d5 100644
--- a/graphics/qtqr/Makefile
+++ b/graphics/qtqr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtqr
 DISTVERSION=	2.0.bzr39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	LOCAL/ehaupt
 DISTNAME=	qr-tools-${DISTVERSION}
diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile
index 2d7d78710b98..d3d6b5f07cf1 100644
--- a/graphics/rapid-photo-downloader/Makefile
+++ b/graphics/rapid-photo-downloader/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rapid-photo-downloader
 DISTVERSION=	0.9.24
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
 
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index d6e1354aa661..e88d8ac82a70 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	qml
-PORTREVISION=	1
 CATEGORIES=	lang devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQml.so
+
 .include <bsd.port.mk>
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 391a156a2fad..d8f0bd4da064 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	convertall
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/doug-101/ConvertAll/releases/download/v${PORTVERSION}/
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index fcc577a4e6aa..e04c19444a94 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index 8c22abadf950..9da6087596c0 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpcalc
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile
index 765fd171ab4e..711a185db248 100644
--- a/misc/orange3/Makefile
+++ b/misc/orange3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	orange3
 DISTVERSION=	3.19.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/py-QSpectrumAnalyzer/Makefile b/misc/py-QSpectrumAnalyzer/Makefile
index 92368b80fafa..06229d39af6d 100644
--- a/misc/py-QSpectrumAnalyzer/Makefile
+++ b/misc/py-QSpectrumAnalyzer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	QSpectrumAnalyzer
 DISTVERSION=	2.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile
index 3f4d15d1db9d..64e09c333320 100644
--- a/misc/py-qt5-demo/Makefile
+++ b/misc/py-qt5-demo/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	demo
 PORTVERSION=	${PYQT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc devel python
 MASTER_SITES=	${MASTER_SITES_PYQT5}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
@@ -19,10 +18,11 @@ PORTSCOUT=	limit:^${PYQT5_VERSION}
 USES=		python pyqt:5
 USE_PYQT=	core_run dbus_run designer_run \
 		designerplugin_run gui_run multimedia_run \
-		multimediawidgets_run network_run opengl_run qscintilla2_run \
-		sql_run svg_run test_run webkit_run xml_run \
-		xmlpatterns_run sip_run qscintilla2_run \
-		printsupport_run serialport_run webkitwidgets_run widgets_run
+		multimediawidgets_run network_run opengl_run \
+		printsupport_run qscintilla2_run serialport_run sql_run \
+		sip_run svg_run test_run webkit_run webkitwidgets_run \
+		widgets_run xml_run xmlpatterns_run
+		
 USE_PYTHON=	concurrent flavors py3kplist
 NO_ARCH=	yes
 
diff --git a/misc/urh/Makefile b/misc/urh/Makefile
index cfa14deca250..cc30e777f62c 100644
--- a/misc/urh/Makefile
+++ b/misc/urh/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	urh
 DISTVERSION=	2.8.9
+PORTREVISION=	1
 CATEGORIES=	misc hamradio python
 MASTER_SITES=	CHEESESHOP
 
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index f62d9f7a5700..a75781497398 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	openshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1-369
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gcc1735bd
 CATEGORIES=	multimedia
 
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 48a153670e00..adae464a5750 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	OpenLP
 PORTVERSION=	2.4.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia python
 MASTER_SITES=	https://get.openlp.org/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 60f36a02e4e1..5133763260e2 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	multimedia
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run gui_run network_run
+USE_PYQT=	sip_build core_run gui_run network_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui multimedia network qmake_build
 
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimedia.so
+
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimedia/pkg-plist b/multimedia/py-qt5-multimedia/pkg-plist
index 7244f284f8c9..5736b5809346 100644
--- a/multimedia/py-qt5-multimedia/pkg-plist
+++ b/multimedia/py-qt5-multimedia/pkg-plist
@@ -1,5 +1,6 @@
-%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.so
 %%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.so
+%%PYQT_APIDIR%%/api/python/QtMultimedia.api
 %%PYQT_SIPDIR%%/QtMultimedia/QtMultimediamod.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qabstractvideobuffer.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qabstractvideofilter.sip
@@ -7,38 +8,75 @@
 %%PYQT_SIPDIR%%/QtMultimedia/qaudio.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudiobuffer.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudiodecoder.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudiodecodercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudiodeviceinfo.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudioencodersettingscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudioformat.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudioinput.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudioinputselectorcontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudiooutput.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudiooutputselectorcontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudioprobe.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qaudiorecorder.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qaudiorolecontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcamera.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameracapturebufferformatcontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameracapturedestinationcontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameracontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcameraexposure.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameraexposurecontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcamerafeedbackcontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameraflashcontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcamerafocus.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcamerafocuscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcameraimagecapture.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameraimagecapturecontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcameraimageprocessing.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameraimageprocessingcontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcamerainfo.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcamerainfocontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameralockscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qcameraviewfindersettings.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcameraviewfindersettingscontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcamerazoomcontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qcustomaudiorolecontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qimageencodercontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediaaudioprobecontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediaavailabilitycontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediabindableinterface.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediacontainercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediacontent.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediacontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaencodersettings.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediagaplessplaybackcontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediametadata.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmedianetworkaccesscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaobject.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaplayer.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediaplayercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaplaylist.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediarecorder.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediarecordercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaresource.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediaservice.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediastreamscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmediatimerange.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmediavideoprobecontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmetadatareadercontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qmetadatawritercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qmultimedia.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qpymultimedia_qlist.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qradiodata.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qradiodatacontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qradiotuner.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qradiotunercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qsound.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qsoundeffect.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qvideodeviceselectorcontrol.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qvideoencodersettingscontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qvideoframe.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qvideoprobe.sip
+%%PYQT_SIPDIR%%/QtMultimedia/qvideorenderercontrol.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qvideosurfaceformat.sip
-%%API%%%%PYQT_APIDIR%%/api/python/QtMultimedia.api
+%%PYQT_SIPDIR%%/QtMultimedia/qvideowindowcontrol.sip
+
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index fb8095f90d2f..73fc38d83ac6 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	multimediawidgets
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtMultimediaWidgets.so
+
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt5-multimediawidgets/pkg-plist b/multimedia/py-qt5-multimediawidgets/pkg-plist
index 0a139cfa1e70..e12a0e2664ff 100644
--- a/multimedia/py-qt5-multimediawidgets/pkg-plist
+++ b/multimedia/py-qt5-multimediawidgets/pkg-plist
@@ -4,4 +4,5 @@
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/qcameraviewfinder.sip
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.sip
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/qvideowidget.sip
+%%PYQT_SIPDIR%%/QtMultimediaWidgets/qvideowidgetcontrol.sip
 %%API%%%%PYQT_APIDIR%%/api/python/QtMultimediaWidgets.api
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index c3eb44dca604..f0fd7e0f437c 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagstamon
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	https://nagstamon.ifw-dresden.de/files/stable/ \
 		LOCAL/ehaupt
diff --git a/net/Makefile b/net/Makefile
index d84d7326ee0b..efab8525652e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1077,6 +1077,7 @@
     SUBDIR += py-pyvmomi
     SUBDIR += py-pyzmq
     SUBDIR += py-qt5-network
+    SUBDIR += py-qt5-networkauth
     SUBDIR += py-rabbitpy
     SUBDIR += py-radix
     SUBDIR += py-raet
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index be84fa5a3986..046a8d281989 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	network
-PORTREVISION=	1
 CATEGORIES=	net devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +13,7 @@ CONFIGURE_ARGS=	--enable QtNetwork
 PYQT_DIST=	yes
 
 USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core network qmake_build
 
@@ -28,4 +27,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtNetwork.so
+
 .include <bsd.port.mk>
diff --git a/net/py-qt5-network/pkg-plist b/net/py-qt5-network/pkg-plist
index 47ab93fea5b3..d6ad4b55da01 100644
--- a/net/py-qt5-network/pkg-plist
+++ b/net/py-qt5-network/pkg-plist
@@ -8,6 +8,7 @@
 %%PYQT_SIPDIR%%/QtNetwork/qhostaddress.sip
 %%PYQT_SIPDIR%%/QtNetwork/qhostinfo.sip
 %%PYQT_SIPDIR%%/QtNetwork/qhstspolicy.sip
+%%PYQT_SIPDIR%%/QtNetwork/qhttp2configuration.sip
 %%PYQT_SIPDIR%%/QtNetwork/qhttpmultipart.sip
 %%PYQT_SIPDIR%%/QtNetwork/qlocalserver.sip
 %%PYQT_SIPDIR%%/QtNetwork/qlocalsocket.sip
diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
new file mode 100644
index 000000000000..5b34f55095ed
--- /dev/null
+++ b/net/py-qt5-networkauth/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+PORTNAME=	networkauth
+CATEGORIES=	net devel python
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt5 toolkit, QtNetworkAuth module
+
+BUILD_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34}
+
+CONFIGURE_ARGS=	--enable QtNetworkAuth
+PYQT_DIST=	yes
+
+USES=		python pyqt:5 qt:5
+USE_PYQT=	sip_build core_run 
+USE_PYTHON=	concurrent flavors py3kplist
+USE_QT=		core network networkauth qmake_build
+
+OPTIONS_DEFINE=	API DEBUG
+OPTIONS_DEFAULT=API
+OPTIONS_SUB=	yes
+
+API_DESC=		Install QtNetworkAuth API for QScintilla2
+API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
+API_CONFIGURE_OFF=	--no-qsci-api
+API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON=	--debug --trace
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtNetworkAuth.so
+
+.include <bsd.port.mk>
diff --git a/net/py-qt5-networkauth/pkg-descr b/net/py-qt5-networkauth/pkg-descr
new file mode 100644
index 000000000000..da21c59ee4f5
--- /dev/null
+++ b/net/py-qt5-networkauth/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtNetworkAuth module.
+
+WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/net/py-qt5-networkauth/pkg-plist b/net/py-qt5-networkauth/pkg-plist
new file mode 100644
index 000000000000..aae55df20e83
--- /dev/null
+++ b/net/py-qt5-networkauth/pkg-plist
@@ -0,0 +1,12 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtNetworkAuth.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtNetworkAuth.so
+%%API%%%%PYQT_APIDIR%%/api/python/QtNetworkAuth.api
+%%PYQT_SIPDIR%%/QtNetworkAuth/QtNetworkAuthmod.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth2.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauthreplyhandler.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qoauth1.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qoauth1signature.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qoauth2authorizationcodeflow.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qoauthhttpserverreplyhandler.sip
+%%PYQT_SIPDIR%%/QtNetworkAuth/qoauthoobreplyhandler.sip
diff --git a/print/py-frescobaldi/Makefile b/print/py-frescobaldi/Makefile
index cc7f5a15f7b1..15bd76428e1d 100644
--- a/print/py-frescobaldi/Makefile
+++ b/print/py-frescobaldi/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	frescobaldi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print kde python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index cd8b209d526c..6dd1c6ac995e 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	printsupport
-PORTREVISION=	1
 CATEGORIES=	print python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,6 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtPrintSupport.so
 .include <bsd.port.mk>
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index 02369d876e67..4d0af6cf4295 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	code_saturne
 PORTVERSION=	6.1.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science parallel
 
diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
index 102c664f82bf..0f934e3ba836 100644
--- a/science/py-veusz/Makefile
+++ b/science/py-veusz/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	veusz
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/sysutils/angrysearch/Makefile b/sysutils/angrysearch/Makefile
index edddf71c8f3c..add5aea70235 100644
--- a/sysutils/angrysearch/Makefile
+++ b/sysutils/angrysearch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	angrysearch
 PORTVERSION=	1.0.2 # untagged, but specified in the setup.py
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index b5c12a2d8b24..c775269eb93e 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	xml
-PORTREVISION=	1
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,7 +13,7 @@ CONFIGURE_ARGS=	--enable QtXml
 PYQT_DIST=	yes
 
 USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core xml buildtools_build qmake_build
 
@@ -35,5 +34,8 @@ post-install:
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtXml.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/pyrcc.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/pylupdate.so
 
 .include <bsd.port.mk>
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 7e18656359c1..79468ffafb26 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	xmlpatterns
-PORTREVISION=	1
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -28,4 +27,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtXmlPatterns.so
+
 .include <bsd.port.mk>
diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile
index e0bdb91a2060..3a8bec4c9674 100644
--- a/textproc/retext/Makefile
+++ b/textproc/retext/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	retext
 DISTVERSION=	7.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	arved@FreeBSD.org
diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile
index f748ec46dfcb..ea5e7c2b739f 100644
--- a/www/onionshare/Makefile
+++ b/www/onionshare/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	onionshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python security
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile
index c45abea51dac..a3ca4cbacb3f 100644
--- a/www/py-qt5-webchannel/Makefile
+++ b/www/py-qt5-webchannel/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	webchannel
-PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,7 +12,7 @@ BUILD_DEPENDS=	${PY_ENUM34}
 RUN_DEPENDS=	${PY_ENUM34}
 
 USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run gui_run network_run qml_run widgets_run
+USE_PYQT=	sip_build core_run gui_run qml_run network_run widgets_run
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative qmake_build gui network webchannel widgets
 
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 2df338211072..483d6b862676 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	webengine
-DISTVERSION=	5.12.1
-PORTREVISION=	1
+DISTVERSION=	${PYQT_VERSION}
 CATEGORIES=	www devel python
-MASTER_SITES=	RIVERBANK/PyQtWebEngine/${DISTVERSION}
+MASTER_SITES=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
-DISTNAME=	PyQtWebEngine_gpl-${DISTVERSION}
+DISTNAME=	PyQtWebEngine-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebEngine module
diff --git a/www/py-qt5-webengine/distinfo b/www/py-qt5-webengine/distinfo
index 0ac62a0cf426..82eb88fab2ce 100644
--- a/www/py-qt5-webengine/distinfo
+++ b/www/py-qt5-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553936960
-SHA256 (PyQtWebEngine_gpl-5.12.1.tar.gz) = 860704672ea1b616e1347be1f347bc1c749e64ed378370863fe209e84e9bd473
-SIZE (PyQtWebEngine_gpl-5.12.1.tar.gz) = 42474
+TIMESTAMP = 1595258707
+SHA256 (PyQtWebEngine-5.15.0.tar.gz) = 670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
+SIZE (PyQtWebEngine-5.15.0.tar.gz) = 48308
diff --git a/www/py-qt5-webengine/pkg-plist b/www/py-qt5-webengine/pkg-plist
index 419f3237cab9..331c9f11be2e 100644
--- a/www/py-qt5-webengine/pkg-plist
+++ b/www/py-qt5-webengine/pkg-plist
@@ -13,8 +13,11 @@
 %%PYQT_SIPDIR%%/QtWebEngine/qquickwebenginescript.sip
 %%PYQT_SIPDIR%%/QtWebEngine/qtwebengineglobal.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/QtWebEngineCoremod.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecookiestore.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefindtextresult.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginehttprequest.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginenotification.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginequotarequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestinfo.sip
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 63b278a39138..25f8e93a19be 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run gui_run network_run
+USE_PYQT=	sip_build core_run gui_run network_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui network webkit qmake_build
 
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebKit.so
+
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index 51f04019c1bd..eb5a509f0629 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	webkitwidgets
-PORTREVISION=	1
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -30,4 +29,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebKitWidgets.so
+
 .include <bsd.port.mk>
diff --git a/www/py-qt5-websockets/Makefile b/www/py-qt5-websockets/Makefile
index 0f8947be9191..78d57aa1e7b3 100644
--- a/www/py-qt5-websockets/Makefile
+++ b/www/py-qt5-websockets/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	websockets
-PORTREVISION=	1
 CATEGORIES=	www net devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,9 +13,9 @@ CONFIGURE_ARGS=	--enable QtWebSockets
 PYQT_DIST=	yes
 
 USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core qmake_build websockets
+USE_QT=		core qmake_build network websockets
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
@@ -28,4 +27,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWebSockets.so
+
 .include <bsd.port.mk>
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index 1992156cb1b2..5f4d585a7abc 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qutebrowser
 DISTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	CHEESESHOP
 
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 23cf3a501102..fdd021032869 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -169,6 +169,7 @@
     SUBDIR += py-qt5-chart
     SUBDIR += py-qt5-gui
     SUBDIR += py-qt5-quick
+    SUBDIR += py-qt5-quick3d
     SUBDIR += py-qt5-quickwidgets
     SUBDIR += py-qt5-widgets
     SUBDIR += py-tkinter
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
index 7c2c7186542f..1c4974f10780 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-chart/Makefile
@@ -3,9 +3,9 @@
 PORTNAME=	chart
 PORTVERSION=	${PYQT5_VERSION}
 CATEGORIES=	x11-toolkits devel python
-MASTER_SITES=	RIVERBANK/PyQtChart/${PYQT5_VERSION}/
+MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
-DISTNAME=	PyQtChart-${PYQT5_VERSION}
+DISTNAME=	${PYQTCHART_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtChart module
@@ -46,4 +46,7 @@ do-configure:
 		${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
 .endif  # !target(do-configure)
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtChart.so
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-chart/distinfo b/x11-toolkits/py-qt5-chart/distinfo
index 0a09be1498f2..be0da0c0d804 100644
--- a/x11-toolkits/py-qt5-chart/distinfo
+++ b/x11-toolkits/py-qt5-chart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590894095
-SHA256 (PyQtChart-5.13.1.tar.gz) = 49960a1483527857b38c1527f9b6328d30bdcc84521f579c0a561a892f54130e
-SIZE (PyQtChart-5.13.1.tar.gz) = 65027
+TIMESTAMP = 1595281551
+SHA256 (PyQtChart-5.15.0.tar.gz) = 796b1a966759c78859d019bbac6b88b8e1c72ffebf65acf2be3cd9f45c756661
+SIZE (PyQtChart-5.15.0.tar.gz) = 68423
diff --git a/x11-toolkits/py-qt5-gui/Makefile b/x11-toolkits/py-qt5-gui/Makefile
index d9c8b9126861..0f22276e5866 100644
--- a/x11-toolkits/py-qt5-gui/Makefile
+++ b/x11-toolkits/py-qt5-gui/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	gui
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run
+USE_PYQT=	sip_build core_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui qmake_build imageformats_run
 
@@ -27,4 +26,7 @@ API_DESC=		Install QtGui API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtGui.so
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-gui/pkg-plist b/x11-toolkits/py-qt5-gui/pkg-plist
index 9ca8cc661a88..d4e5c96185a0 100644
--- a/x11-toolkits/py-qt5-gui/pkg-plist
+++ b/x11-toolkits/py-qt5-gui/pkg-plist
@@ -8,6 +8,8 @@
 %%PYQT_SIPDIR%%/QtGui/qbrush.sip
 %%PYQT_SIPDIR%%/QtGui/qclipboard.sip
 %%PYQT_SIPDIR%%/QtGui/qcolor.sip
+%%PYQT_SIPDIR%%/QtGui/qcolorspace.sip
+%%PYQT_SIPDIR%%/QtGui/qcolortransform.sip
 %%PYQT_SIPDIR%%/QtGui/qcursor.sip
 %%PYQT_SIPDIR%%/QtGui/qdesktopservices.sip
 %%PYQT_SIPDIR%%/QtGui/qdrag.sip
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index 7354183bde40..cffbeb61682a 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	quick
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,10 +12,11 @@ RUN_DEPENDS=	${PY_ENUM34}
 CONFIGURE_ARGS=	--enable QtQuick
 PYQT_DIST=	yes
 
-USES=		python pyqt:5 qt:5
-USE_PYQT=	sip_build core_run gui_run
+USES=		gl python pyqt:5 qt:5
+USE_GL=		gl
+USE_PYQT=	sip_build core_run gui_run 
 USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core declarative qmake_build
+USE_QT=		core declarative gui qmake_build network
 
 OPTIONS_DEFINE=	API DEBUG
 OPTIONS_DEFAULT=API
@@ -28,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuick.so
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quick/pkg-plist b/x11-toolkits/py-qt5-quick/pkg-plist
index e106c4fc10a7..399eeff088f6 100644
--- a/x11-toolkits/py-qt5-quick/pkg-plist
+++ b/x11-toolkits/py-qt5-quick/pkg-plist
@@ -14,9 +14,10 @@
 %%PYQT_SIPDIR%%/QtQuick/qsgengine.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgflatcolormaterial.sip
 %%PYQT_SIPDIR%%/QtQuick/qsggeometry.sip
+%%PYQT_SIPDIR%%/QtQuick/qsgimagenode.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgmaterial.sip
+%%PYQT_SIPDIR%%/QtQuick/qsgmaterialrhishader.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgnode.sip
-%%PYQT_SIPDIR%%/QtQuick/qsgimagenode.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgrectanglenode.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgrendererinterface.sip
 %%PYQT_SIPDIR%%/QtQuick/qsgrendernode.sip
diff --git a/x11-toolkits/py-qt5-quick3d/Makefile b/x11-toolkits/py-qt5-quick3d/Makefile
new file mode 100644
index 000000000000..61a8a8081f31
--- /dev/null
+++ b/x11-toolkits/py-qt5-quick3d/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PORTNAME=	quick3d
+CATEGORIES=	x11-toolkits devel python
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Python bindings for the Qt5 toolkit, QtQuick3D module
+
+BUILD_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34}
+
+CONFIGURE_ARGS=	--enable QtQuick3D
+PYQT_DIST=	yes
+
+USES=		gl python pyqt:5 qt:5
+USE_GL=		gl
+USE_PYQT=	sip_build core_run gui_run 
+USE_PYTHON=	concurrent flavors py3kplist
+USE_QT=		core declarative gui qmake_build network quick3d
+
+OPTIONS_DEFINE=	API DEBUG
+OPTIONS_DEFAULT=API
+OPTIONS_SUB=	yes
+
+API_DESC=		Install QtQuick API for QScintilla2
+API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
+API_CONFIGURE_OFF=	--no-qsci-api
+API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
+DEBUG_CONFIGURE_ON=	--debug --trace
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuick3D.so
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quick3d/pkg-descr b/x11-toolkits/py-qt5-quick3d/pkg-descr
new file mode 100644
index 000000000000..7dd23ca0a1a4
--- /dev/null
+++ b/x11-toolkits/py-qt5-quick3d/pkg-descr
@@ -0,0 +1,4 @@
+PyQt5 is a set of Python bindings for Digia's Qt5 application framework.
+This package provides the QtQuick module.
+
+WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/x11-toolkits/py-qt5-quick3d/pkg-plist b/x11-toolkits/py-qt5-quick3d/pkg-plist
new file mode 100644
index 000000000000..bf0cad345b56
--- /dev/null
+++ b/x11-toolkits/py-qt5-quick3d/pkg-plist
@@ -0,0 +1,7 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtQuick3D.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtQuick3D.so
+%%API%%%%PYQT_APIDIR%%/api/python/QtQuick3D.api
+%%PYQT_SIPDIR%%/QtQuick3D/QtQuick3Dmod.sip
+%%PYQT_SIPDIR%%/QtQuick3D/qquick3d.sip
+%%PYQT_SIPDIR%%/QtQuick3D/qquick3dgeometry.sip
+%%PYQT_SIPDIR%%/QtQuick3D/qquick3dobject.sip
diff --git a/x11-toolkits/py-qt5-quickwidgets/Makefile b/x11-toolkits/py-qt5-quickwidgets/Makefile
index 1191dcb3096c..d9e219f599ac 100644
--- a/x11-toolkits/py-qt5-quickwidgets/Makefile
+++ b/x11-toolkits/py-qt5-quickwidgets/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	quickwidgets
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +11,7 @@ RUN_DEPENDS=	${PY_ENUM34}
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run gui_run
+USE_PYQT=	core_run gui_run sip_build 
 PYQT_DIST=	yes
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core declarative gui network widgets \
@@ -30,4 +29,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtQuickWidgets.so
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index ad67fc64427c..08ce38c0eba7 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	widgets
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST=	yes
 
 USES=		gl python pyqt:5 qt:5
 USE_GL=		gl
-USE_PYQT=	sip_build core_run gui_run
+USE_PYQT=	sip_build core_run gui_run 
 USE_PYTHON=	concurrent flavors py3kplist
 USE_QT=		core gui widgets qmake_build
 
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWidgets.so
+
 .include <bsd.port.mk>
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index 567444ece5b1..a83cb2fe2562 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTREVISION=	1
 CATEGORIES=	x11 devel python
 
 MAINTAINER=	kde@FreeBSD.org
@@ -29,4 +28,7 @@ API_CONFIGURE_OFF=	--no-qsci-api
 API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
+port-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtOpenGl.so
+
 .include <bsd.port.mk>
author	Loïc Bartoletti <lbartoletti@FreeBSD.org>	2020-10-05 15:50:03 +0000
committer	Loïc Bartoletti <lbartoletti@FreeBSD.org>	2020-10-05 15:50:03 +0000
commit	2933bb22c330742a9a771b8a84abb127fc3e8cbc (patch)
tree	4f76a634aa6b24065331c83abce53f1dfe75ebf9
parent	net-p2p/c-lightning: Upgrade from 0.8.2.1 to 0.9.1 (diff)