diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index 1383c2417c5a..cc733d94d6a6 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -1,296 +1,306 @@
 # Handle PyQt related ports
 #
 # Feature:	pyqt
-# Usage:	USES=pyqt:ARGS
-# Valid ARGS:	5, 6
+# Usage:	USES=pyqt:<version>[,dist]
+# Versions:	5, 6
+# Internal use ARGS:	dist
+#    This port is part of PyQt5/6 itself. Variables and
+#    targets are then set assuming a certain tarball and
+#    port layout.
 #
 # MAINTAINER:	kde@FreeBSD.org
 #
-# Internal Port variables for PyQt ports:
-# PYQT_DIST	- This port is part of PyQt5/6 itself. Variables and
-#		targets are then set assuming a certain tarball and
-#		port layout.
+# Port variables for PyQt ports:
 # USE_PYQT	- List of PyQt components to depend on
 #		* foo:build    only build depend
 #		* foo:run      only run depend
 #		* foo:test     only test depend
 #		* foo          build and run depend (default)
 # PYQT_SIPDIR	- where sip files will be installed to
 # PYQT_APIDIR	- where api files will be installed to
 # PYQT_DOCDIR	- where doc files will be installed to
 # PYQT_EXAMPLESDIR	- where examples will be installed to
 
 .if !defined(_INCLUDE_USES_PYQT_MK)
 _INCLUDE_USES_PYQT_MK=	yes
 
 # At the moment we support PyQt bindings versions 5 and 6.
 # The sip argument is for internal use by devel/py-sip.
 _PYQT_SUPPORTED=	5 6 sip
 
 .  if empty(pyqt_ARGS)
 IGNORE=		pyqt needs a qt-version (${_PYQT_SUPPORTED})
 .  endif
 
 .  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
 
+.  if ${pyqt_ARGS:Mdist}
+_PYQT_DIST=	yes
+.  endif
+
 PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
 MASTER_SITE_RBDEV=	https://www.riverbankcomputing.com/pypi/packages/%SUBDIR%/
 
 # Qt version-agnostic components
 MASTER_SITES_PYQTBUILDER=	PYPI/source/P/PyQt-builder
 MASTER_SITES_QSCI2=		RIVERBANK/QScintilla/${PORTVERSION} \
 				SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
 				GENTOO
 MASTER_SITES_SIP=		PYPI/source/s/sip
 
 # Qt 5 components
 MASTER_SITES_PYQT5SIP=		PYPI/source/P/PyQt5-sip
 MASTER_SITES_PYQT5=		PYPI/source/P/PyQt5
+MASTER_SITES_PYQT53D=		PYPI/source/P/PyQt3D
 MASTER_SITES_PYQT5CHART=	PYPI/source/P/PyQtChart
+MASTER_SITES_PYQT5DATAVIS3D=	PYPI/source/P/PyQtDataVisualization
 MASTER_SITES_PYQT5NETWORKAUTH=	PYPI/source/P/PyQtNetworkAuth
 MASTER_SITES_PYQT5WEBENGINE=	PYPI/source/P/PyQtWebEngine
 
 # Qt 6 components
 MASTER_SITES_PYQT6SIP=		PYPI/source/P/PyQt6-sip
 MASTER_SITES_PYQT6=		PYPI/source/P/PyQt6 \
 				RBDEV/PyQt6
 MASTER_SITES_PYQT63D=		PYPI/source/P/PyQt6-3D \
 				RBDEV/PyQt6-3D
 MASTER_SITES_PYQT6CHART=	PYPI/source/P/PyQt6-Charts \
 				RBDEV/PyQt6-Charts
 MASTER_SITES_PYQT6DATAVIS3D=	PYPI/source/P/PyQt6-DataVisualization \
 				RBDEV/PyQt6-DataVisualization
 MASTER_SITES_PYQT6NETWORKAUTH=	PYPI/source/P/PyQt6-NetworkAuth \
 				RBDEV/PyQt6-NetworkAuth
 MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
 				RBDEV/PyQt6-WebEngine
 
 # Unversioned MASTER_SITES
 MASTER_SITES_PYQT=		${MASTER_SITES_PYQT${_PYQT_VERSION}}
 MASTER_SITES_PYQTSIP=		${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
 MASTER_SITES_PYQT3D=		${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
 MASTER_SITES_PYQTCHART=		${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
 MASTER_SITES_PYQTDATAVIS3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
 MASTER_SITES_PYQTNETWORKAUTH=	${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
 MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 
 # PORTEPOCH is important here, because version-comparisons in *_DEPENDS
 # take it into account (visually, 6.5.1 >= 5.5.3,1, but it isn't).
 # Adding the epoch directly into the version here cannot be done,
 # because the DISTVERSION of each of these ports is obtained from the
 # *_VERSION variable (and PORTEPOCH is set in each individual port).
 #
 # Where noted, the ports are epoched and the py-${comp}-PATH variables,
 # below, should have a suitable epoch appended to the version.
 
 # Qt version-agnostic components
-# PyQt-builder >= 1.16.0 requires setuptools >= 64
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
-PYQTBUILDER_VERSION=		1.15.4
+PYQTBUILDER_VERSION=		1.16.4
 QSCI2_VERSION=			2.14.1
-SIP_VERSION=			6.8.3	# ,1
+SIP_VERSION=			6.8.6	# ,1
 
 # Qt 5 components
-PYQT5SIP_VERSION=		12.13.0
-PYQT5_VERSION=			5.15.10
-PYQT5CHART_VERSION=		5.15.6
-PYQT5NETWORKAUTH_VERSION=	5.15.5
-PYQT5WEBENGINE_VERSION=		5.15.6
+PYQT5SIP_VERSION=		12.15.0
+PYQT5_VERSION=			5.15.11
+PYQT53D_VERSION=		5.15.7
+PYQT5CHART_VERSION=		5.15.7
+PYQT5DATAVIS3D_VERSION=		5.15.6
+PYQT5NETWORKAUTH_VERSION=	5.15.6
+PYQT5WEBENGINE_VERSION=		5.15.7
 
 # Qt 6 components
-PYQT6SIP_VERSION=		13.6.0
-PYQT6_VERSION=			6.7.0
+PYQT6SIP_VERSION=		13.8.0
+PYQT6_VERSION=			6.7.1
 PYQT63D_VERSION=		6.7.0
 PYQT6CHART_VERSION=		6.7.0
 PYQT6DATAVIS3D_VERSION=		6.7.0
 PYQT6NETWORKAUTH_VERSION=	6.7.0
 PYQT6WEBENGINE_VERSION=		6.7.0
 
 # Qt version-agnostic components
-#PYQTBUILDER_DISTNAME=		pyqt_builder-${PYQTBUILDER_VERSION}
+PYQTBUILDER_DISTNAME=		pyqt_builder-${PYQTBUILDER_VERSION}
 QSCI2_DISTNAME=			QScintilla_src-${QSCI2_VERSION}
 
 # Qt 5 components
 PYQT5SIP_DISTNAME=		PyQt5_sip-${PYQT5SIP_VERSION}
 PYQT5_DISTNAME=			PyQt5-${PYQT5_VERSION}
+PYQT53D_DISTNAME=		PyQt3D-${PYQT53D_VERSION}
 PYQT5CHART_DISTNAME=		PyQtChart-${PYQT5CHART_VERSION}
+PYQT5DATAVIS3D_DISTNAME=	PyQtDataVisualization-${PYQT5DATAVIS3D_VERSION}
 PYQT5NETWORKAUTH_DISTNAME=	PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION}
 PYQT5WEBENGINE_DISTNAME=	PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
 
 # Qt 6 components
 PYQT6SIP_DISTNAME=		PyQt6_sip-${PYQT6SIP_VERSION}
 PYQT6_DISTNAME=			PyQt6-${PYQT6_VERSION}
 PYQT63D_DISTNAME=		PyQt6_3D-${PYQT63D_VERSION}
 PYQT6CHART_DISTNAME=		PyQt6_Charts-${PYQT6CHART_VERSION}
 PYQT6DATAVIS3D_DISTNAME=	PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}
 PYQT6NETWORKAUTH_DISTNAME=	PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}
 PYQT6WEBENGINE_DISTNAME=	PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}
 
 PYQT5_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 PYQT6_DISTINFO_FILE=	${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
 
 PYQT5_LICENSE=		GPLv3
 PYQT6_LICENSE=		GPLv3
 
 _USE_PYQT_ALL=		pyqt5 pyqt6 3d chart datavis3d networkauth webengine
-_USE_SIP_ALL=		sip pysip
+_USE_SIP_ALL=		pysip sip
 _USE_QSCINTILLA=	qscintilla2
 _USE_PYQTBUILDER=	qtbuilder
 
 # Unversioned variables for the rest of the file
+PYQTSIP_VERSION=		${PYQT${_PYQT_VERSION}SIP_VERSION}
 PYQT_VERSION=			${PYQT${_PYQT_VERSION}_VERSION}
 PYQT3D_VERSION=			${PYQT${_PYQT_VERSION}3D_VERSION}
 PYQTCHART_VERSION=		${PYQT${_PYQT_VERSION}CHART_VERSION}
 PYQTDATAVIS3D_VERSION=		${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION}
 PYQTNETWORKAUTH_VERSION=	${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION}
 PYQTWEBENGINE_VERSION=		${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}
 
-PYQT_RELNAME=			py-qt${_PYQT_VERSION}
-PYQT_PY_RELNAME=		${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION}
-PYQT_MASTERSITES=		${MASTER_SITES_PYQT${_PYQT_VERSION}}
-
+PYQTSIP_DISTNAME=		${PYQT${_PYQT_VERSION}SIP_DISTNAME}
 PYQT_DISTNAME=			${PYQT${_PYQT_VERSION}_DISTNAME}
 PYQT3D_DISTNAME=		${PYQT${_PYQT_VERSION}3D_DISTNAME}
 PYQTCHART_DISTNAME=		${PYQT${_PYQT_VERSION}CHART_DISTNAME}
 PYQTDATAVIS3D_DISTNAME=		${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME}
 PYQTNETWORKAUTH_DISTNAME=	${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME}
 PYQTWEBENGINE_DISTNAME=		${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME}
 
 PYQT_DISTINFO_FILE=		${PYQT${_PYQT_VERSION}_DISTINFO_FILE}
 PYQT_LICENSE=			${PYQT${_PYQT_VERSION}_LICENSE}
 
+PYQT_RELNAME=			py-qt${_PYQT_VERSION}
+PYQT_PY_RELNAME=		${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION}
+
 # PATH (see note about epochs, above)
 py-sip_PATH=			${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION},1
-py-pysip_PATH=			${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
+py-pysip_PATH=			${PYTHON_PKGNAMEPREFIX}PyQt${_PYQT_VERSION}-sip>=${PYQTSIP_VERSION}
 py-qscintilla2_PATH=		${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
 py-qtbuilder_PATH=		${PYTHON_PKGNAMEPREFIX}PyQt-builder>=${PYQTBUILDER_VERSION}
 py-pyqt5_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
 py-pyqt6_PATH=			${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
 py-3d_PATH=			${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION}
 py-chart_PATH=			${PYQT_PY_RELNAME}-chart>=${PYQTCHART_VERSION}
 py-datavis3d_PATH=		${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION}
 py-networkauth_PATH=		${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION}
 py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
 
 # PORT
 py-sip_PORT=			devel/py-sip
 py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
 py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pyqt5_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-pyqt6_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-3d_PORT=			graphics/${PYQT_RELNAME}-3d
 py-chart_PORT=			x11-toolkits/${PYQT_RELNAME}-chart
 py-datavis3d_PORT=		x11-toolkits/${PYQT_RELNAME}-datavis3d
 py-networkauth_PORT=		net/${PYQT_RELNAME}-networkauth
 py-webengine_PORT=		www/${PYQT_RELNAME}-webengine
 
 # The versioned executable of sip
 SIP=		${LOCALBASE}/bin/sip-build-${PYTHON_VER}
 
 # Relative directories
 _VERSION_SUBDIR_REL=	PyQt${_PYQT_VERSION}/${PYTHON_VER}
 _APIDIR_REL=		share/${_VERSION_SUBDIR_REL}/qsci
 _DOCDIR_REL=		share/doc/${_VERSION_SUBDIR_REL}
 _EXAMPLEDIR_REL=	share/examples/${_VERSION_SUBDIR_REL}
 _SIPDIR_REL=		PyQt${_PYQT_VERSION}/bindings
 _DESIGNERDIR_REL=	${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
 _QMLDIR_REL=		${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
 
 # Absolute directories
 PYQT_APIDIR=		${PREFIX}/${_APIDIR_REL}
 PYQT_DOCDIR=		${PREFIX}/${_DOCDIR_REL}
 PYQT_EXAMPLEDIR=	${PREFIX}/${_EXAMPLEDIR_REL}
 PYQT_SIPDIR?=		${PYTHON_SITELIBDIR}/${_SIPDIR_REL}
 PYQT_DESIGNERDIR=	${PREFIX}/${_DESIGNERDIR_REL}
 PYQT_QMLDIR=		${PREFIX}/${_QMLDIR_REL}
 
 PLIST_SUB+=	PYQT_APIDIR=${_APIDIR_REL} \
 		PYQT_DOCDIR=${_DOCDIR_REL} \
 		PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \
 		PYQT_SIPDIR=${PYQT_SIPDIR} \
 		PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
 		PYQT_QMLDIR=${_QMLDIR_REL} \
 		PYQT_SIPVERSION=${SIP_VERSION} \
 		PYQT_QSCIVERSION=${QSCI2_VERSION} \
 		PYQT_PYQTVERSION=${PYQT_VERSION}
 
-.  if defined(PYQT_DIST)
+.  if defined(_PYQT_DIST)
 
 LICENSE?=	${PYQT_LICENSE}
 
 PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
 
 SIP_ARGS+=	--qmake ${QMAKE} \
 		--verbose \
 		--build-dir build \
 		--protected-is-public \
 		--api-dir ${PYQT_APIDIR} \
 		--jobs ${MAKE_JOBS_NUMBER}
 .    if ${PORTNAME} == "pyqt"
 SIP_ARGS+=	--confirm-license
 .    endif
 
 .    if ${PORTNAME} == "pyqt"
 .      if !target(post-patch)
 post-patch:
 	${REINPLACE_CMD} -e "s#%%PYQT_DESIGNERDIR%%#${PYQT_DESIGNERDIR}#" ${WRKSRC}/project.py
 	${REINPLACE_CMD} -e "s#%%PYQT_QMLDIR%%#${PYQT_QMLDIR}#" ${WRKSRC}/project.py
 .      endif  # !target(post-patch)
 .    endif
 
 .    if !target(do-build)
 do-build:
 	(cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build)
 
 .    endif  # !target(do-build)
 
 .    if !target(do-install)
 do-install:
 	(cd ${WRKSRC} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
 .    endif  # !target(do-install)
 
-.  endif  # defined(PYQT_DIST)
+.  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_PREFIXED+=		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_PREFIXED:Mpy-${comp}}
 BUILD_DEPENDS+=		${py-${comp:S/:/_/}_BUILD_DEPENDS}
 RUN_DEPENDS+=		${py-${comp:S/:/_/}_RUN_DEPENDS}
 TEST_DEPENDS+=		${py-${comp:S/:/_/}_TEST_DEPENDS}
 .    else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
 .    endif
 .  endfor
 
 .endif # defined(_INCLUDE_USES_PYQT_MK)
diff --git a/devel/py-qt5-pyqt/Makefile b/devel/py-qt5-pyqt/Makefile
index 3385d87109eb..1b0aeb04cc59 100644
--- a/devel/py-qt5-pyqt/Makefile
+++ b/devel/py-qt5-pyqt/Makefile
@@ -1,50 +1,45 @@
 PORTNAME=	pyqt
-PORTVERSION=	${PYQT_VERSION}
-PORTREVISION=	2
+DISTVERSION=	${PYQT_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtCore module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-PYQT_DIST=	yes
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5 \
-		libdbus-1.so:devel/dbus
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
-
-USES=		gl pkgconfig python pyqt:5 qt:5
+USES=		gl pkgconfig python pyqt:5,dist qt:5
 USE_GL=		gl
-USE_PYTHON=	concurrent flavors py3kplist
-USE_PYQT=	qtbuilder sip pysip
+USE_PYQT=	pysip qtbuilder:build sip:build
+USE_PYTHON=	concurrent flavors
 USE_QT=		connectivity core dbus declarative designer gui help imageformats location \
 		multimedia network opengl printsupport quick3d remoteobjects \
 		sensors serialport speech sql svg testlib webchannel websockets \
 		widgets x11extras xml xmlpatterns \
 		buildtools:build qmake:build
 
 SIP_ARGS=	--disable QtWebKit --disable QtWebKitWidgets
 
 PORTSCOUT?=	limit:^${_QT_VERSION:R}
 
 post-extract:
 	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/dbus/mainloop \
+		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-pyqt/distinfo b/devel/py-qt5-pyqt/distinfo
index abb940c25e87..539d29b4fa37 100644
--- a/devel/py-qt5-pyqt/distinfo
+++ b/devel/py-qt5-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697315085
-SHA256 (PyQt5-5.15.10.tar.gz) = d46b7804b1b10a4ff91753f8113e5b5580d2b4462f3226288e2d84497334898a
-SIZE (PyQt5-5.15.10.tar.gz) = 3242654
+TIMESTAMP = 1729214257
+SHA256 (PyQt5-5.15.11.tar.gz) = fda45743ebb4a27b4b1a51c6d8ef455c4c1b5d610c90d2934c7802b5c1557c52
+SIZE (PyQt5-5.15.11.tar.gz) = 3216775
diff --git a/devel/py-qt5-sip/Makefile b/devel/py-qt5-sip/Makefile
index 1442426e2530..4b5df982318d 100644
--- a/devel/py-qt5-sip/Makefile
+++ b/devel/py-qt5-sip/Makefile
@@ -1,23 +1,22 @@
-PORTNAME=	sip
-PORTVERSION=	${PYQT5SIP_VERSION}
+PORTNAME=	PyQt5-sip
+DISTVERSION=	${PYQTSIP_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT5SIP}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
-DISTNAME=	${PYQT5SIP_DISTNAME}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PYQTSIP_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
-WWW=		http://www.riverbankcomputing.co.uk/software/sip/
+WWW=		https://pypi.org/project/PyQt5-sip/
 
-LICENSE=		SIP GPLv2 GPLv3
-LICENSE_COMB=		multi
-LICENSE_GROUPS_SIP=	FSF GPL OSI
-LICENSE_NAME_SIP=	SIP License
-LICENSE_FILE_SIP=	${FILESDIR}/LICENSE
-LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python pyqt:sip
-USE_PYTHON=	autoplist concurrent distutils flavors
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python pyqt:5
+USE_PYTHON=	autoplist concurrent pep517
 USE_PYQT=	#
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt5-sip/distinfo b/devel/py-qt5-sip/distinfo
index fe023aa9c89b..6d329e843fcf 100644
--- a/devel/py-qt5-sip/distinfo
+++ b/devel/py-qt5-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697314928
-SHA256 (PyQt5_sip-12.13.0.tar.gz) = 7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91
-SIZE (PyQt5_sip-12.13.0.tar.gz) = 123225
+TIMESTAMP = 1729208010
+SHA256 (PyQt5_sip-12.15.0.tar.gz) = d23fdfcf363b5cedd9d39f8a9c5710e7d52804f5b08a58e91c638b36eafcb702
+SIZE (PyQt5_sip-12.15.0.tar.gz) = 104024
diff --git a/devel/py-qt5-sip/files/LICENSE b/devel/py-qt5-sip/files/LICENSE
deleted file mode 100644
index 715675451dc2..000000000000
--- a/devel/py-qt5-sip/files/LICENSE
+++ /dev/null
@@ -1,48 +0,0 @@
-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-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index d4e8db6e6194..e42e1e71b0c9 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -1,45 +1,42 @@
 PORTNAME=	pyqt
 DISTVERSION=	${PYQT_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-PYQT_DIST=	yes
+LICENSE=	${PYQT6_LICENSE}
 
-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libqscintilla2_qt6.so:devel/qscintilla2@qt6
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 
-USES=		gl pkgconfig python pyqt:6 qt:6
+USES=		gl pkgconfig pyqt:6,dist python qt:6
 USE_GL=		opengl
+USE_PYQT=	pysip qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
-USE_PYQT=	pysip qtbuilder sip
 USE_QT=		base connectivity declarative imageformats multimedia \
 		pdf positioning quick3d remoteobjects sensors serialport \
 		shadertools speech svg tools translations webchannel \
 		websockets
 
 PORTSCOUT?=	limit:^${_QT_VERSION:R}
 
 post-extract:
 	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
index d03553ac245f..302c3c02add5 100644
--- a/devel/py-qt6-pyqt/distinfo
+++ b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714270793
-SHA256 (PyQt6-6.7.0.tar.gz) = 3d31b2c59dc378ee26e16586d9469842483588142fc377280aad22aaf2fa6235
-SIZE (PyQt6-6.7.0.tar.gz) = 1050408
+TIMESTAMP = 1729210525
+SHA256 (PyQt6-6.7.1.tar.gz) = 3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9
+SIZE (PyQt6-6.7.1.tar.gz) = 1051212
diff --git a/devel/py-qt6-sip/Makefile b/devel/py-qt6-sip/Makefile
index 4f52293e68b7..6fbd8f8658ee 100644
--- a/devel/py-qt6-sip/Makefile
+++ b/devel/py-qt6-sip/Makefile
@@ -1,23 +1,22 @@
-PORTNAME=	sip
-PORTVERSION=	${PYQT6SIP_VERSION}
+PORTNAME=	PyQt6-sip
+DISTVERSION=	${PYQTSIP_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT6SIP}
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt6-
-DISTNAME=	${PYQT6SIP_DISTNAME}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PYQTSIP_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
-WWW=		http://www.riverbankcomputing.co.uk/software/sip/
+WWW=		https://pypi.org/project/PyQt6-sip/
 
-LICENSE=		SIP GPLv2 GPLv3
-LICENSE_COMB=		multi
-LICENSE_GROUPS_SIP=	FSF GPL OSI
-LICENSE_NAME_SIP=	SIP License
-LICENSE_FILE_SIP=	${FILESDIR}/LICENSE
-LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python pyqt:6
-USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
+USE_PYTHON=	autoplist concurrent pep517
 USE_PYQT=	#
 
 .include <bsd.port.mk>
diff --git a/devel/py-qt6-sip/distinfo b/devel/py-qt6-sip/distinfo
index 746708f45d36..1e6d16ef8a0f 100644
--- a/devel/py-qt6-sip/distinfo
+++ b/devel/py-qt6-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697481464
-SHA256 (PyQt6_sip-13.6.0.tar.gz) = 2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778
-SIZE (PyQt6_sip-13.6.0.tar.gz) = 111576
+TIMESTAMP = 1729208051
+SHA256 (PyQt6_sip-13.8.0.tar.gz) = 2f74cf3d6d9cab5152bd9f49d570b2dfb87553ebb5c4919abfde27f5b9fd69d4
+SIZE (PyQt6_sip-13.8.0.tar.gz) = 92264
diff --git a/devel/py-qt6-sip/files/LICENSE b/devel/py-qt6-sip/files/LICENSE
deleted file mode 100644
index 715675451dc2..000000000000
--- a/devel/py-qt6-sip/files/LICENSE
+++ /dev/null
@@ -1,48 +0,0 @@
-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-qtbuilder/Makefile b/devel/py-qtbuilder/Makefile
index b7c2a65a957c..cbb99818a7b5 100644
--- a/devel/py-qtbuilder/Makefile
+++ b/devel/py-qtbuilder/Makefile
@@ -1,29 +1,25 @@
 PORTNAME=	PyQt-builder
 PORTVERSION=	${PYQTBUILDER_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQTBUILDER}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PYQTBUILDER_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	The PEP 517 compliant PyQt build system
-WWW=		https://www.riverbankcomputing.com/software/pyqt-builder/
+WWW=		https://github.com/Python-PyQt/PyQt-builder
 
-LICENSE=		SIP GPLv2 GPLv3
-LICENSE_COMB=		multi
-LICENSE_NAME_SIP=	SIP License
-LICENSE_GROUPS_SIP=	FSF GPL OSI
-LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_SIP=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-GPL2
-LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPL3
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
-USES=		python pyqt:5
+USES=		python pyqt:6
+USE_PYQT=	sip
 USE_PYTHON=	autoplist concurrent pep517
-USE_PYQT=	#
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo
index 39c7b8e8cced..ca8cc7b31d22 100644
--- a/devel/py-qtbuilder/distinfo
+++ b/devel/py-qtbuilder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702419984
-SHA256 (PyQt-builder-1.15.4.tar.gz) = 39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1
-SIZE (PyQt-builder-1.15.4.tar.gz) = 3766458
+TIMESTAMP = 1729155151
+SHA256 (pyqt_builder-1.16.4.tar.gz) = 4515e41ae379be2e54f88a89ecf47cd6e4cac43e862c4abfde18389c2666afdf
+SIZE (pyqt_builder-1.16.4.tar.gz) = 3672095
diff --git a/devel/py-qtbuilder/files/patch-pyproject.toml b/devel/py-qtbuilder/files/patch-pyproject.toml
new file mode 100644
index 000000000000..b20272d1fd1f
--- /dev/null
+++ b/devel/py-qtbuilder/files/patch-pyproject.toml
@@ -0,0 +1,16 @@
+Reduce setuptools requirement until [1] is resolved. Seems to work fine
+with 63.x.
+
+[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
+
+--- pyproject.toml.orig	2024-04-20 11:55:50 UTC
++++ pyproject.toml
+@@ -1,7 +1,7 @@
+ # The project configuration for sip.
+ 
+ [build-system]
+-requires = ["setuptools>=64", "setuptools_scm>=8"]
++requires = ["setuptools>=63", "setuptools_scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [tool.setuptools_scm]
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index c9144716f5fd..5596f8a478f4 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -1,33 +1,28 @@
 PORTNAME=	sip
 PORTVERSION=	${SIP_VERSION}
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_SIP}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python to C and C++ bindings generator
-WWW=		http://www.riverbankcomputing.co.uk/software/sip/
+WWW=		https://github.com/Python-SIP/sip
 
-LICENSE=		SIP GPLv2 GPLv3
-LICENSE_COMB=		multi
-LICENSE_NAME_SIP=	SIP License
-LICENSE_GROUPS_SIP=	FSF GPL OSI
-LICENSE_PERMS_SIP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_SIP=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-GPL2
-LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPL3
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
-		${PY_TOMLI}
+RUN_DEPENDS=	${PY_SETUPTOOLS} \
+		${PY_TOMLI} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		python pyqt:sip
 USE_PYTHON=	autoplist concurrent pep517
 USE_PYQT=	#
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo
index 849315c68951..4736fccef7a5 100644
--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707690734
-SHA256 (sip-6.8.3.tar.gz) = 888547b018bb24c36aded519e93d3e513d4c6aa0ba55b7cc1affbd45cf10762c
-SIZE (sip-6.8.3.tar.gz) = 987656
+TIMESTAMP = 1729152451
+SHA256 (sip-6.8.6.tar.gz) = 7fc959e48e6ec5d5af8bd026f69f5e24d08b3cb8abb342176f5ab8030cc07d7a
+SIZE (sip-6.8.6.tar.gz) = 420778
diff --git a/devel/py-sip/files/patch-pyproject.toml b/devel/py-sip/files/patch-pyproject.toml
new file mode 100644
index 000000000000..328cc1e6ef5a
--- /dev/null
+++ b/devel/py-sip/files/patch-pyproject.toml
@@ -0,0 +1,16 @@
+Reduce setuptools requirement until [1] is resolved. Seems to work fine
+with 63.x.
+
+[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
+
+--- pyproject.toml.orig	2024-06-22 11:21:00 UTC
++++ pyproject.toml
+@@ -1,7 +1,7 @@
+ # The project configuration for sip.
+ 
+ [build-system]
+-requires = ["setuptools>=64", "setuptools_scm>=8"]
++requires = ["setuptools>=63", "setuptools_scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [tool.setuptools_scm]
diff --git a/devel/py-sip/files/patch-sipbuild_project.py b/devel/py-sip/files/patch-sipbuild_project.py
index 766224e23c2b..8c2feb2c845e 100644
--- a/devel/py-sip/files/patch-sipbuild_project.py
+++ b/devel/py-sip/files/patch-sipbuild_project.py
@@ -1,14 +1,14 @@
---- sipbuild/project.py.orig	2023-11-30 12:14:32 UTC
+--- sipbuild/project.py.orig	2024-07-12 11:20:17 UTC
 +++ sipbuild/project.py
-@@ -387,9 +387,9 @@ class Project(AbstractProject, Configurable):
+@@ -408,9 +408,9 @@ class Project(AbstractProject, Configurable):
              generator=None, wheel_tag=None, generator_version=None):
          """ Return a sequence of command line arguments to invoke sip-distinfo.
          """
 -
 +        flavor = '{}-{}.{}'.format(sip_distinfo, self.py_major_version, self.py_minor_version)
          args = [
 -            sip_distinfo,
 +            flavor,
  
              '--inventory',
              inventory,
diff --git a/graphics/Makefile b/graphics/Makefile
index 146689d3a7a7..f819baa2cc88 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,1273 +1,1274 @@
     COMMENT = Graphics tools and libraries
 
     SUBDIR += 3d-ascii-viewer
     SUBDIR += 4va
     SUBDIR += Coin
     SUBDIR += GraphicsMagick
     SUBDIR += Hermes
     SUBDIR += ImageMagick6
     SUBDIR += ImageMagick7
     SUBDIR += O2-tools
     SUBDIR += R-cran-DiagrammeR
     SUBDIR += R-cran-GDD
     SUBDIR += R-cran-RColorBrewer
     SUBDIR += R-cran-colorspace
     SUBDIR += R-cran-cowplot
     SUBDIR += R-cran-diagram
     SUBDIR += R-cran-dichromat
     SUBDIR += R-cran-dygraphs
     SUBDIR += R-cran-farver
     SUBDIR += R-cran-ggplot2
     SUBDIR += R-cran-ggrepel
     SUBDIR += R-cran-gridBase
     SUBDIR += R-cran-gridExtra
     SUBDIR += R-cran-jpeg
     SUBDIR += R-cran-latticeExtra
     SUBDIR += R-cran-magick
     SUBDIR += R-cran-munsell
     SUBDIR += R-cran-pROC
     SUBDIR += R-cran-pixmap
     SUBDIR += R-cran-png
     SUBDIR += R-cran-qcc
     SUBDIR += R-cran-ragg
     SUBDIR += R-cran-s2
     SUBDIR += R-cran-scales
     SUBDIR += R-cran-shape
     SUBDIR += R-cran-viridis
     SUBDIR += R-cran-viridisLite
     SUBDIR += R-cran-visNetwork
     SUBDIR += SciPlot
     SUBDIR += a2png
     SUBDIR += aalib
     SUBDIR += aaphoto
     SUBDIR += acidwarp-sdl
     SUBDIR += aeskulap
     SUBDIR += agg
     SUBDIR += airsaned
     SUBDIR += akira
     SUBDIR += alembic
     SUBDIR += alizams
     SUBDIR += aloadimage
     SUBDIR += alpng
     SUBDIR += ampasACES-container
     SUBDIR += ampasCTL
     SUBDIR += animorph
     SUBDIR += ansilove
     SUBDIR += anttweakbar
     SUBDIR += aoi
     SUBDIR += apngasm
     SUBDIR += apngdis
     SUBDIR += appleseed
     SUBDIR += argyllcms
     SUBDIR += art
     SUBDIR += asciinema-agg
     SUBDIR += asciio
     SUBDIR += aseprite
     SUBDIR += atril
     SUBDIR += atril-lite
     SUBDIR += autopano-sift-c
     SUBDIR += autotrace
     SUBDIR += aview
     SUBDIR += avir
     SUBDIR += azpainter
     SUBDIR += azpainterb
     SUBDIR += barcode
     SUBDIR += batik
     SUBDIR += bgfx
     SUBDIR += birdfont
     SUBDIR += bitmap
     SUBDIR += blend2d
     SUBDIR += blender
     SUBDIR += blender-doc
     SUBDIR += bmeps
     SUBDIR += bmp2html
     SUBDIR += bonzomatic
     SUBDIR += box
     SUBDIR += brunsli
     SUBDIR += bsd-plotutils
     SUBDIR += c-a-i-r
     SUBDIR += cadubi
     SUBDIR += cairo
     SUBDIR += cairomm
     SUBDIR += cal3d
     SUBDIR += camerakit
     SUBDIR += catimg
     SUBDIR += cbonsai
     SUBDIR += cbviewer
     SUBDIR += cegui
     SUBDIR += cenon
     SUBDIR += cfdg
     SUBDIR += cgif
     SUBDIR += chafa
     SUBDIR += charls
     SUBDIR += cimg
     SUBDIR += cloudcompare
     SUBDIR += clutter
     SUBDIR += clutter-gtk3
     SUBDIR += cluttermm
     SUBDIR += cogl
     SUBDIR += colmap
     SUBDIR += colord
     SUBDIR += colord-gtk
     SUBDIR += compupic
     SUBDIR += converseen
     SUBDIR += corrupter
     SUBDIR += cosmoplayer
     SUBDIR += cptutils
     SUBDIR += crw
     SUBDIR += ctl
     SUBDIR += curator
     SUBDIR += curtail
     SUBDIR += cuttlefish
     SUBDIR += cxxplot
     SUBDIR += darktable
     SUBDIR += dataplot
     SUBDIR += dbow2
     SUBDIR += dc20pack
     SUBDIR += dcmtk
     SUBDIR += dcp2icc
     SUBDIR += dcraw
     SUBDIR += dcraw-m
     SUBDIR += delaboratory
     SUBDIR += derelict-gl3
     SUBDIR += devil
     SUBDIR += dia
     SUBDIR += diff-pdf
     SUBDIR += diffpdf
     SUBDIR += dify
     SUBDIR += digikam
     SUBDIR += dilay
     SUBDIR += diplib
     SUBDIR += ditaa
     SUBDIR += djview4
     SUBDIR += djvulibre
     SUBDIR += dmtx-utils
     SUBDIR += drawing
     SUBDIR += drawio
     SUBDIR += drawpile
     SUBDIR += drm-510-kmod
     SUBDIR += drm-515-kmod
     SUBDIR += drm-61-kmod
     SUBDIR += drm-kmod
     SUBDIR += drm_info
     SUBDIR += dspdfviewer
     SUBDIR += dssim
     SUBDIR += duhdraw
     SUBDIR += durdraw
     SUBDIR += dust3d
     SUBDIR += dynamechs
     SUBDIR += ebsynth
     SUBDIR += edje_viewer
     SUBDIR += egl-wayland
     SUBDIR += eglexternalplatform
     SUBDIR += elastix
     SUBDIR += elementary-photos
     SUBDIR += embree
     SUBDIR += enblend
     SUBDIR += engauge-digitizer
     SUBDIR += entangle
     SUBDIR += entice
     SUBDIR += eog
     SUBDIR += eog-plugins
     SUBDIR += eom
     SUBDIR += eos-movrec
     SUBDIR += epdfview
     SUBDIR += ephoto
     SUBDIR += epix
     SUBDIR += eps2png
     SUBDIR += epsonscan2
     SUBDIR += epsonscan2-non-free-plugin
     SUBDIR += epstool
     SUBDIR += eterm-bg
     SUBDIR += evince
     SUBDIR += evolvotron
     SUBDIR += exif
     SUBDIR += exifprobe
     SUBDIR += exiftags
     SUBDIR += exiftran
     SUBDIR += exiv2
     SUBDIR += exrtools
     SUBDIR += f3d
     SUBDIR += facedetect
     SUBDIR += farbfeld
     SUBDIR += feh
     SUBDIR += fig2sxd
     SUBDIR += filament
     SUBDIR += filmulator
     SUBDIR += flam3
     SUBDIR += flasm
     SUBDIR += flif
     SUBDIR += flphoto
     SUBDIR += fly
     SUBDIR += fortytwo
     SUBDIR += fotocx
     SUBDIR += founts
     SUBDIR += fracplanet
     SUBDIR += fractgen
     SUBDIR += fraqtive
     SUBDIR += freeglut
     SUBDIR += freeimage
     SUBDIR += freetype-gl
     SUBDIR += frei0r
     SUBDIR += frei0r-plugins
     SUBDIR += frei0r-plugins-cairo
     SUBDIR += frei0r-plugins-gavl
     SUBDIR += frei0r-plugins-opencv
     SUBDIR += frogr
     SUBDIR += ftgl
     SUBDIR += fusefs-gphotofs
     SUBDIR += fv
     SUBDIR += fyre
     SUBDIR += g2
     SUBDIR += gauche-gl
     SUBDIR += gcolor2
     SUBDIR += gcolor3
     SUBDIR += gd
     SUBDIR += gdal
     SUBDIR += gdal-grass
     SUBDIR += gdchart
     SUBDIR += gdk-pixbuf2
     SUBDIR += gdk-pixbuf2-xlib
     SUBDIR += gdtclft
     SUBDIR += geeqie
     SUBDIR += gegl
     SUBDIR += geoapi
     SUBDIR += geomorph
     SUBDIR += geomview
     SUBDIR += geos
     SUBDIR += geoserver
     SUBDIR += gexiv2
     SUBDIR += giflib
     SUBDIR += gifmerge
     SUBDIR += gifsicle
     SUBDIR += gifski
     SUBDIR += giftool
     SUBDIR += gimageview
     SUBDIR += gimp
     SUBDIR += gimp-app
     SUBDIR += gimp-beautify-plugin
     SUBDIR += gimp-data-extras
     SUBDIR += gimp-jxl-plugin
     SUBDIR += gimp-lensfun-plugin
     SUBDIR += gimp-lqr-plugin
     SUBDIR += gimp-refocus-plugin
     SUBDIR += gimp-resynthesizer
     SUBDIR += gkrellkam2
     SUBDIR += glad
     SUBDIR += glaxnimate
     SUBDIR += glbinding
     SUBDIR += gle
     SUBDIR += glee
     SUBDIR += glew
     SUBDIR += glew-wayland
     SUBDIR += glexcess
     SUBDIR += glfw
     SUBDIR += glfw2
     SUBDIR += gliv
     SUBDIR += glosm
     SUBDIR += glpng
     SUBDIR += glslang
     SUBDIR += glvis
     SUBDIR += glx-utils
     SUBDIR += gmic
     SUBDIR += gmic-qt
     SUBDIR += gmt
     SUBDIR += gmt-dcw
     SUBDIR += gmt-gshhg
     SUBDIR += gnash
     SUBDIR += gnome-color-manager
     SUBDIR += gnome-video-effects
     SUBDIR += gocr
     SUBDIR += goocanvas2
     SUBDIR += goocanvas3
     SUBDIR += goocanvasmm2
     SUBDIR += goom
     SUBDIR += gource
     SUBDIR += goxel
     SUBDIR += gpaint
     SUBDIR += gphoto2
     SUBDIR += gpicview
     SUBDIR += gpsmanshp
     SUBDIR += gpu-firmware-amd-kmod
     SUBDIR += gpu-firmware-intel-kmod
     SUBDIR += gpu-firmware-kmod
     SUBDIR += gpu-firmware-radeon-kmod
     SUBDIR += gpxsee
     SUBDIR += gracula
     SUBDIR += grads
     SUBDIR += grafx2
     SUBDIR += graphene
     SUBDIR += graphite2
     SUBDIR += graphos
     SUBDIR += graphviz
     SUBDIR += grx
     SUBDIR += gscan2pdf
     SUBDIR += gstreamer1-plugins-aalib
     SUBDIR += gstreamer1-plugins-cairo
     SUBDIR += gstreamer1-plugins-gdkpixbuf
     SUBDIR += gstreamer1-plugins-gl
     SUBDIR += gstreamer1-plugins-jpeg
     SUBDIR += gstreamer1-plugins-kms
     SUBDIR += gstreamer1-plugins-libcaca
     SUBDIR += gstreamer1-plugins-libvisual
     SUBDIR += gstreamer1-plugins-opencv
     SUBDIR += gstreamer1-plugins-openexr
     SUBDIR += gstreamer1-plugins-openjpeg
     SUBDIR += gstreamer1-plugins-png
     SUBDIR += gstreamer1-plugins-rsvg
     SUBDIR += gstreamer1-plugins-vulkan
     SUBDIR += gstreamer1-plugins-webp
     SUBDIR += gstreamer1-plugins-zbar
     SUBDIR += gthumb
     SUBDIR += gtimelapse
     SUBDIR += gtk-update-icon-cache
     SUBDIR += gtkam
     SUBDIR += gts
     SUBDIR += guetzli
     SUBDIR += guile-cairo
     SUBDIR += guilib
     SUBDIR += gwenview
     SUBDIR += gwenview-devel
     SUBDIR += h3
     SUBDIR += halftone
     SUBDIR += hdr_tools
     SUBDIR += heimer
     SUBDIR += hiptext
     SUBDIR += hobbes-icons-xpm
     SUBDIR += hppsmtools
     SUBDIR += hugin
     SUBDIR += icat
     SUBDIR += icc-profiles-adobe-cs4
     SUBDIR += icc-profiles-basiccolor
     SUBDIR += icc-profiles-openicc
     SUBDIR += iccxml
     SUBDIR += icon-slicer
     SUBDIR += icontact
     SUBDIR += icoutils
     SUBDIR += ida
     SUBDIR += iec16022
     SUBDIR += igt-gpu-tools
     SUBDIR += iiview
     SUBDIR += imageindex
     SUBDIR += imageviewer
     SUBDIR += imageworsener
     SUBDIR += imc
     SUBDIR += imlib2
     SUBDIR += imlib2-jxl
     SUBDIR += imlib2-webp
     SUBDIR += imlib2_loaders
     SUBDIR += impressive
     SUBDIR += imv
     SUBDIR += inkscape
     SUBDIR += inkscape-open-symbols
     SUBDIR += instant-meshes
     SUBDIR += intergif
     SUBDIR += ipe
     SUBDIR += jalbum
     SUBDIR += jasper
     SUBDIR += jave6
     SUBDIR += jbig2dec
     SUBDIR += jbigkit
     SUBDIR += jdraw
     SUBDIR += jgraph
     SUBDIR += jhead
     SUBDIR += jogamp-jogl
     SUBDIR += jogl
     SUBDIR += jp
     SUBDIR += jp2a
     SUBDIR += jpatch
     SUBDIR += jpeg-turbo
     SUBDIR += jpeginfo
     SUBDIR += jpegoptim
     SUBDIR += jpgtn
     SUBDIR += jslice
     SUBDIR += kamera
     SUBDIR += kamerka
     SUBDIR += katarakt
     SUBDIR += kcolorchooser
     SUBDIR += kcolorpicker
     SUBDIR += kdegraphics
     SUBDIR += kdegraphics-mobipocket
     SUBDIR += kdegraphics-svgpart
     SUBDIR += kdegraphics-thumbnailers
     SUBDIR += kdiagram
     SUBDIR += kdiagram-qt6
     SUBDIR += kf5-kimageformats
     SUBDIR += kf5-kplotting
     SUBDIR += kf5-kquickcharts
     SUBDIR += kf5-prison
     SUBDIR += kf6-kimageformats
     SUBDIR += kf6-kplotting
     SUBDIR += kf6-kquickcharts
     SUBDIR += kf6-ksvg
     SUBDIR += kf6-prison
     SUBDIR += kgeotag
     SUBDIR += kgraphviewer
     SUBDIR += khronos-texture
     SUBDIR += kimageannotator
     SUBDIR += kimagemapeditor
     SUBDIR += kipi-plugins
     SUBDIR += klatexformula
     SUBDIR += kludge3d
     SUBDIR += kmscube
     SUBDIR += knotter
     SUBDIR += kolourpaint
     SUBDIR += kontrast
     SUBDIR += kooka
     SUBDIR += kphotoalbum
     SUBDIR += kplot
     SUBDIR += kqtquickcharts
     SUBDIR += kquickimageeditor
     SUBDIR += krita
     SUBDIR += krita-gmic-plugin
     SUBDIR += ksanecore
     SUBDIR += kseexpr
     SUBDIR += ksnip
     SUBDIR += kxstitch
     SUBDIR += l2p
     SUBDIR += largetifftools
     SUBDIR += laternamagica
     SUBDIR += lazpaint
     SUBDIR += lcdtest
     SUBDIR += lcms
     SUBDIR += lcms2
     SUBDIR += leafpak
     SUBDIR += lensfun
     SUBDIR += lepton
     SUBDIR += leptonica
     SUBDIR += lerc
     SUBDIR += lfview
     SUBDIR += lib3ds
     SUBDIR += libGLU
     SUBDIR += libQGLViewer
     SUBDIR += libafterimage
     SUBDIR += libansilove
     SUBDIR += libart_lgpl
     SUBDIR += libavif
     SUBDIR += libboard
     SUBDIR += libbpg
     SUBDIR += libcaca
     SUBDIR += libcdr01
     SUBDIR += libchamplain
     SUBDIR += libdicom
     SUBDIR += libdmtx
     SUBDIR += libdrm
     SUBDIR += libecwj2
     SUBDIR += libemf
     SUBDIR += libepoxy
     SUBDIR += libetonyek01
     SUBDIR += libexif
     SUBDIR += libexif-gtk
     SUBDIR += libfpx
     SUBDIR += libfreehand
     SUBDIR += libgeotiff
     SUBDIR += libgltext
     SUBDIR += libgltf
     SUBDIR += libglvnd
     SUBDIR += libgnomecanvas
     SUBDIR += libgnomecanvasmm26
     SUBDIR += libgphoto2
     SUBDIR += libgxps
     SUBDIR += libheif
     SUBDIR += libimagequant
     SUBDIR += libimg
     SUBDIR += libiptcdata
     SUBDIR += libjpeg-turbo
     SUBDIR += libjxl
     SUBDIR += libjxr
     SUBDIR += libkdcraw
     SUBDIR += libkexiv2
     SUBDIR += libkexiv2-devel
     SUBDIR += libkipi
     SUBDIR += libksane
     SUBDIR += libliftoff
     SUBDIR += liblqr-1
     SUBDIR += libmng
     SUBDIR += libmorph
     SUBDIR += libmypaint
     SUBDIR += libnsbmp
     SUBDIR += libnsgif
     SUBDIR += libopenraw
     SUBDIR += libosmesa
     SUBDIR += libpano13
     SUBDIR += libpcd
     SUBDIR += libpgf
     SUBDIR += libpillowfight
     SUBDIR += libplacebo
     SUBDIR += libpotrace
     SUBDIR += libprojectm
     SUBDIR += libpuzzle
     SUBDIR += libqrencode
     SUBDIR += librasterlite2
     SUBDIR += libraw
     SUBDIR += librsvg2
     SUBDIR += librsvg2-rust
     SUBDIR += librtprocess
     SUBDIR += libsixel
     SUBDIR += libspiro
     SUBDIR += libspng
     SUBDIR += libsvgtiny
     SUBDIR += libvisual
     SUBDIR += libvisual04
     SUBDIR += libvisual04-plugins
     SUBDIR += libwmf
     SUBDIR += libwpg03
     SUBDIR += libxisf
     SUBDIR += libyuv
     SUBDIR += libzmf
     SUBDIR += lightzone
     SUBDIR += linplasma
     SUBDIR += linux-c7-cairo
     SUBDIR += linux-c7-cairo-gobject
     SUBDIR += linux-c7-dri
     SUBDIR += linux-c7-gdk-pixbuf2
     SUBDIR += linux-c7-glx-utils
     SUBDIR += linux-c7-graphite2
     SUBDIR += linux-c7-jasper
     SUBDIR += linux-c7-jbigkit
     SUBDIR += linux-c7-jpeg
     SUBDIR += linux-c7-libdrm
     SUBDIR += linux-c7-libepoxy
     SUBDIR += linux-c7-libglvnd
     SUBDIR += linux-c7-librsvg2
     SUBDIR += linux-c7-png
     SUBDIR += linux-c7-sdl_image
     SUBDIR += linux-c7-sdl_ttf
     SUBDIR += linux-c7-tiff
     SUBDIR += linux-c7-wayland
     SUBDIR += linux-rl9-cairo
     SUBDIR += linux-rl9-cairo-gobject
     SUBDIR += linux-rl9-dri
     SUBDIR += linux-rl9-gdk-pixbuf2
     SUBDIR += linux-rl9-graphite2
     SUBDIR += linux-rl9-jasper
     SUBDIR += linux-rl9-jbigkit
     SUBDIR += linux-rl9-jpeg
     SUBDIR += linux-rl9-libdrm
     SUBDIR += linux-rl9-libepoxy
     SUBDIR += linux-rl9-libglvnd
     SUBDIR += linux-rl9-librsvg2
     SUBDIR += linux-rl9-openjpeg
     SUBDIR += linux-rl9-png
     SUBDIR += linux-rl9-tiff
     SUBDIR += linux-rl9-vulkan
     SUBDIR += linux-rl9-wayland
     SUBDIR += linux-rl9-webp
     SUBDIR += lua-gd
     SUBDIR += luminance-qt5
     SUBDIR += lux
     SUBDIR += lximage-qt
     SUBDIR += magnum
     SUBDIR += magnum-plugins
     SUBDIR += mahotas
     SUBDIR += maim
     SUBDIR += mandelbulber
     SUBDIR += mapcache
     SUBDIR += mapnik
     SUBDIR += mapserver
     SUBDIR += mapyrus
     SUBDIR += matplotlib-cpp
     SUBDIR += matplotplusplus
     SUBDIR += meh
     SUBDIR += menyoki
     SUBDIR += mesa-demos
     SUBDIR += mesa-devel
     SUBDIR += mesa-dri
     SUBDIR += mesa-gallium-va
     SUBDIR += mesa-gallium-vdpau
     SUBDIR += mesa-gallium-xa
     SUBDIR += mesa-libs
     SUBDIR += metacam
     SUBDIR += metapixel
     SUBDIR += milton
     SUBDIR += minder
     SUBDIR += mirtk
     SUBDIR += movit
     SUBDIR += mozjpeg
     SUBDIR += mscgen
     SUBDIR += msl
     SUBDIR += mtpaint
     SUBDIR += multican
     SUBDIR += mupdf
     SUBDIR += mxp
     SUBDIR += mypaint
     SUBDIR += mypaint-brushes
     SUBDIR += mypaint-brushes2
     SUBDIR += nanort
     SUBDIR += nanosvg
     SUBDIR += netpbm
     SUBDIR += nip2
     SUBDIR += noaa-apt
     SUBDIR += nomacs
     SUBDIR += nplot
     SUBDIR += npretty
     SUBDIR += nsxiv
     SUBDIR += nurbs++
     SUBDIR += nvidia-drm-510-kmod
     SUBDIR += nvidia-drm-515-kmod
     SUBDIR += nvidia-drm-61-kmod
     SUBDIR += nvidia-drm-kmod
     SUBDIR += nvidia-texture-tools
     SUBDIR += ocaml-cairo
     SUBDIR += ocaml-images
     SUBDIR += ocaml-lablgl
     SUBDIR += ocrad
     SUBDIR += ocrs
     SUBDIR += oculante
     SUBDIR += ogre3d
     SUBDIR += ogre3d19
     SUBDIR += oidn
     SUBDIR += okular
     SUBDIR += okular-devel
     SUBDIR += open3d
     SUBDIR += opencollada
     SUBDIR += opencolorio
     SUBDIR += opencolorio-tools
     SUBDIR += opencoloriov1
     SUBDIR += opencsg
     SUBDIR += opencv
     SUBDIR += opendx
     SUBDIR += openexr
     SUBDIR += openexr-website-docs
     SUBDIR += openfx-arena
     SUBDIR += openfx-misc
     SUBDIR += opengl-man
     SUBDIR += opengv
     SUBDIR += openicc-config
     SUBDIR += openimageio
     SUBDIR += openjpeg
     SUBDIR += openjpeg15
     SUBDIR += openjph
     SUBDIR += openjump
     SUBDIR += openmvs
     SUBDIR += opennurbs
     SUBDIR += openorienteering-mapper
     SUBDIR += openpgl
     SUBDIR += openrm
     SUBDIR += openshadinglanguage
     SUBDIR += openslide
     SUBDIR += opensubdiv
     SUBDIR += openvkl
     SUBDIR += openxr
     SUBDIR += optar
     SUBDIR += optipng
     SUBDIR += osg
     SUBDIR += osg34
     SUBDIR += osgearth
     SUBDIR += ospray
     SUBDIR += ospray-studio
     SUBDIR += ossim
     SUBDIR += oxipng
     SUBDIR += oyranos
     SUBDIR += p5-Acme-Steganography-Image-Png
     SUBDIR += p5-Algorithm-Line-Bresenham
     SUBDIR += p5-Alien-Gimp
     SUBDIR += p5-Barcode-ZBar
     SUBDIR += p5-CAD-Drawing
     SUBDIR += p5-CAD-Drawing-Template
     SUBDIR += p5-Cairo
     SUBDIR += p5-Captcha-reCAPTCHA
     SUBDIR += p5-Captcha-reCAPTCHA-Mailhide
     SUBDIR += p5-Chart
     SUBDIR += p5-Chart-Clicker
     SUBDIR += p5-Chart-Gnuplot
     SUBDIR += p5-Chart-Graph
     SUBDIR += p5-Chart-PNGgraph
     SUBDIR += p5-Color-Calc
     SUBDIR += p5-Color-Library
     SUBDIR += p5-Color-Palette
     SUBDIR += p5-Color-Rgb
     SUBDIR += p5-Color-Scheme
     SUBDIR += p5-Convert-Color
     SUBDIR += p5-Convert-Color-XTerm
     SUBDIR += p5-Data-Google-Visualization-DataSource
     SUBDIR += p5-Data-Google-Visualization-DataTable
     SUBDIR += p5-GD
     SUBDIR += p5-GD-Arrow
     SUBDIR += p5-GD-Barcode
     SUBDIR += p5-GD-Graph
     SUBDIR += p5-GD-Graph-histogram
     SUBDIR += p5-GD-Graph-ohlc
     SUBDIR += p5-GD-Graph3d
     SUBDIR += p5-GD-SVG
     SUBDIR += p5-GD-TextUtil
     SUBDIR += p5-GD-Thumbnail
     SUBDIR += p5-Geo-EOP
     SUBDIR += p5-Geo-GDAL-FFI
     SUBDIR += p5-Geo-GML
     SUBDIR += p5-Geo-Gpx
     SUBDIR += p5-Geometry-Primitive
     SUBDIR += p5-Gimp
     SUBDIR += p5-Google-Chart
     SUBDIR += p5-Graph-Easy
     SUBDIR += p5-Graph-ReadWrite
     SUBDIR += p5-Graph-SocialMap
     SUBDIR += p5-Graph-Writer-GraphViz
     SUBDIR += p5-GraphViz
     SUBDIR += p5-GraphViz-Data-Structure
     SUBDIR += p5-GraphViz-Traverse
     SUBDIR += p5-GraphViz2
     SUBDIR += p5-GraphViz2-DBI
     SUBDIR += p5-GraphViz2-Data-Grapher
     SUBDIR += p5-GraphViz2-Parse-ISA
     SUBDIR += p5-GraphViz2-Parse-RecDescent
     SUBDIR += p5-GraphViz2-Parse-XML
     SUBDIR += p5-Graphics-Color
     SUBDIR += p5-Graphics-ColorNames
     SUBDIR += p5-Graphics-ColorNames-WWW
     SUBDIR += p5-Graphics-ColorUtils
     SUBDIR += p5-Graphics-GnuplotIF
     SUBDIR += p5-Graphics-Primitive
     SUBDIR += p5-Graphics-Primitive-Driver-Cairo
     SUBDIR += p5-Graphics-TIFF
     SUBDIR += p5-Image-Base
     SUBDIR += p5-Image-Base-SVG
     SUBDIR += p5-Image-Caa
     SUBDIR += p5-Image-Compare
     SUBDIR += p5-Image-ExifTool
     SUBDIR += p5-Image-ExifTool-devel
     SUBDIR += p5-Image-Grab
     SUBDIR += p5-Image-Heatmap
     SUBDIR += p5-Image-IPTCInfo
     SUBDIR += p5-Image-Imgur
     SUBDIR += p5-Image-Imlib2
     SUBDIR += p5-Image-Info
     SUBDIR += p5-Image-LibExif
     SUBDIR += p5-Image-Magick-Iterator
     SUBDIR += p5-Image-Math-Constrain
     SUBDIR += p5-Image-MetaData-GQview
     SUBDIR += p5-Image-MetaData-JPEG
     SUBDIR += p5-Image-OCR-Tesseract
     SUBDIR += p5-Image-PBMlib
     SUBDIR += p5-Image-PNG-Libpng
     SUBDIR += p5-Image-PNG-QRCode
     SUBDIR += p5-Image-Pngslimmer
     SUBDIR += p5-Image-Sane
     SUBDIR += p5-Image-Scale
     SUBDIR += p5-Image-Size
     SUBDIR += p5-Imager
     SUBDIR += p5-Imager-Graph
     SUBDIR += p5-Imager-Plot
     SUBDIR += p5-Imager-QRCode
     SUBDIR += p5-Imlib2
     SUBDIR += p5-Layout-Manager
     SUBDIR += p5-OpenGL
     SUBDIR += p5-PGPLOT
     SUBDIR += p5-SVG-DOM2
     SUBDIR += p5-SVG-Graph
     SUBDIR += p5-SVG-Metadata
     SUBDIR += p5-SWF-Builder
     SUBDIR += p5-SWF-File
     SUBDIR += p5-Sane
     SUBDIR += p5-SpringGraph
     SUBDIR += p5-Tk-JPEG-Lite
     SUBDIR += p5-URI-GoogleChart
     SUBDIR += p5-VCG
     SUBDIR += p5-Visio
     SUBDIR += p5-feedgnuplot
     SUBDIR += panoglview
     SUBDIR += panomatic
     SUBDIR += partio
     SUBDIR += pastel
     SUBDIR += pcl-pointclouds
     SUBDIR += pdf2svg
     SUBDIR += pdfpc
     SUBDIR += pear-Horde_Image
     SUBDIR += pear-Image_3D
     SUBDIR += pear-Image_Barcode
     SUBDIR += pear-Image_Barcode2
     SUBDIR += pear-Image_Canvas
     SUBDIR += pear-Image_Color
     SUBDIR += pear-Image_Graph
     SUBDIR += pear-Image_GraphViz
     SUBDIR += pear-Image_Transform
     SUBDIR += pecl-geospatial
     SUBDIR += pecl-imagick
     SUBDIR += pecl-qrencode
     SUBDIR += pecl-vips
     SUBDIR += pencil2d
     SUBDIR += peps
     SUBDIR += perceptualdiff
     SUBDIR += peruse
     SUBDIR += pfstools
     SUBDIR += pgplot
     SUBDIR += pho
     SUBDIR += photivo
     SUBDIR += photoflare
     SUBDIR += photopc
     SUBDIR += photoqt
     SUBDIR += phototonic
     SUBDIR += php-facedetect
     SUBDIR += php-geos
     SUBDIR += php81-exif
     SUBDIR += php81-gd
     SUBDIR += php82-exif
     SUBDIR += php82-gd
     SUBDIR += php83-exif
     SUBDIR += php83-gd
     SUBDIR += php84-exif
     SUBDIR += php84-gd
     SUBDIR += phplot
     SUBDIR += picpuz
     SUBDIR += piddle
     SUBDIR += piglit
     SUBDIR += pikchr
     SUBDIR += pikopixel
     SUBDIR += pinpoint
     SUBDIR += pinta
     SUBDIR += pixd
     SUBDIR += pixelize
     SUBDIR += pixen
     SUBDIR += pixie
     SUBDIR += plantuml
     SUBDIR += plasma-kmod
     SUBDIR += plotutils
     SUBDIR += png
     SUBDIR += png++
     SUBDIR += png2html
     SUBDIR += png2ico
     SUBDIR += pngcheck
     SUBDIR += pnglite
     SUBDIR += pngnq
     SUBDIR += pngquant
     SUBDIR += pngrewrite
     SUBDIR += pngwriter
     SUBDIR += podofo
     SUBDIR += podofo09
     SUBDIR += polyclipping
     SUBDIR += poppler
     SUBDIR += poppler-data
     SUBDIR += poppler-glib
     SUBDIR += poppler-qt5
     SUBDIR += poppler-qt6
     SUBDIR += poppler-utils
     SUBDIR += potrace
     SUBDIR += povray-meta
     SUBDIR += povray37
     SUBDIR += povray38
     SUBDIR += ppmcaption
     SUBDIR += ppminfo
     SUBDIR += ppsei
     SUBDIR += pqiv
     SUBDIR += preview
     SUBDIR += price
     SUBDIR += processing
     SUBDIR += proj
     SUBDIR += proj-data
     SUBDIR += pstoedit
     SUBDIR += ptex
     SUBDIR += py-ManimPango
     SUBDIR += py-OWSLib
     SUBDIR += py-PyOpenGL
     SUBDIR += py-PyOpenGL-accelerate
     SUBDIR += py-actdiag
     SUBDIR += py-albucore
     SUBDIR += py-albumentations
     SUBDIR += py-altair
     SUBDIR += py-asciitree
     SUBDIR += py-beziers
     SUBDIR += py-blockdiag
     SUBDIR += py-blockdiagcontrib-cisco
     SUBDIR += py-box2d-py
     SUBDIR += py-cairo
     SUBDIR += py-cairocffi
     SUBDIR += py-cairosvg
     SUBDIR += py-cartopy
     SUBDIR += py-chart-studio
     SUBDIR += py-cogdumper
     SUBDIR += py-colorcet
     SUBDIR += py-colorthief
     SUBDIR += py-colorz
     SUBDIR += py-colour
     SUBDIR += py-contextily
     SUBDIR += py-descartes
     SUBDIR += py-diplib
     SUBDIR += py-django-easy-thumbnails
     SUBDIR += py-djvulibre
     SUBDIR += py-exifread
     SUBDIR += py-f3d
     SUBDIR += py-face_recognition
     SUBDIR += py-face_recognition_models
     SUBDIR += py-fiona
     SUBDIR += py-fotokilof
     SUBDIR += py-freeimagepy
     SUBDIR += py-fury
     SUBDIR += py-gdal
     SUBDIR += py-geomdl
     SUBDIR += py-geopandas
     SUBDIR += py-geosnap
     SUBDIR += py-giddy
     SUBDIR += py-gizeh
     SUBDIR += py-glcontext
     SUBDIR += py-glfw
     SUBDIR += py-glooey
     SUBDIR += py-gphoto2
     SUBDIR += py-gprof2dot
     SUBDIR += py-graphlib-backport
     SUBDIR += py-graphviz
     SUBDIR += py-graphy
     SUBDIR += py-gvgen
     SUBDIR += py-h3
     SUBDIR += py-haishoku
     SUBDIR += py-hiplot
     SUBDIR += py-hsluv
     SUBDIR += py-imagecodecs
     SUBDIR += py-imageio
     SUBDIR += py-imageio-ffmpeg
     SUBDIR += py-imagesize
     SUBDIR += py-img2pdf
     SUBDIR += py-imutils
     SUBDIR += py-leather
     SUBDIR += py-lerc
     SUBDIR += py-mapclassify
     SUBDIR += py-mayavi
     SUBDIR += py-mcomix
     SUBDIR += py-mgwr
     SUBDIR += py-moderngl
     SUBDIR += py-moderngl-window
     SUBDIR += py-momepy
     SUBDIR += py-mpl-interactions
     SUBDIR += py-mpl-scatter-density
     SUBDIR += py-nwdiag
     SUBDIR += py-opencolorio
     SUBDIR += py-openimageio
     SUBDIR += py-openshadinglanguage
     SUBDIR += py-openslide-python
     SUBDIR += py-optimize-images
     SUBDIR += py-osmnet
     SUBDIR += py-pandana
     SUBDIR += py-pdf2image
     SUBDIR += py-photocollage
     SUBDIR += py-piexif
     SUBDIR += py-pillow
     SUBDIR += py-pillow-heif
     SUBDIR += py-pivy
     SUBDIR += py-plotly
     SUBDIR += py-png
     SUBDIR += py-pointpats
     SUBDIR += py-projpicker
     SUBDIR += py-proplot
     SUBDIR += py-pycha
     SUBDIR += py-pycollada
     SUBDIR += py-pydot
     SUBDIR += py-pydotplus
     SUBDIR += py-pyepsg
     SUBDIR += py-pygal
     SUBDIR += py-pyganim
     SUBDIR += py-pygeoapi
     SUBDIR += py-pygeos
     SUBDIR += py-pyglet
     SUBDIR += py-pyglet1
     SUBDIR += py-pygltflib
     SUBDIR += py-pygraph
     SUBDIR += py-pygraphviz
     SUBDIR += py-pyinsane2
     SUBDIR += py-pymaging
     SUBDIR += py-pymaging-png
     SUBDIR += py-pyocr
     SUBDIR += py-pypillowfight
     SUBDIR += py-pyproj
     SUBDIR += py-pyqrcode
     SUBDIR += py-pyqtgraph
     SUBDIR += py-pyrsgis
     SUBDIR += py-pytesseract
     SUBDIR += py-python-barcode
     SUBDIR += py-python-poppler-qt5
     SUBDIR += py-pyvips
     SUBDIR += py-pyvista
     SUBDIR += py-pyx
     SUBDIR += py-pyzbar
     SUBDIR += py-qpageview
     SUBDIR += py-qrencode
+    SUBDIR += py-qt5-3d
     SUBDIR += py-qt6-3d
     SUBDIR += py-qudida
     SUBDIR += py-railroad-diagrams
     SUBDIR += py-rasterio
     SUBDIR += py-rasterstats
     SUBDIR += py-rawkit
     SUBDIR += py-rawpy
     SUBDIR += py-rich-pixels
     SUBDIR += py-s2
     SUBDIR += py-scikit-image
     SUBDIR += py-seqdiag
     SUBDIR += py-simplejpeg
     SUBDIR += py-sorl-thumbnail
     SUBDIR += py-spectra
     SUBDIR += py-sqlalchemy-imageattach
     SUBDIR += py-svg.path
     SUBDIR += py-svgwrite
     SUBDIR += py-termtosvg
     SUBDIR += py-tifffile
     SUBDIR += py-tkcolorpicker
     SUBDIR += py-toyplot
     SUBDIR += py-traitsui
     SUBDIR += py-ueberzug
     SUBDIR += py-urbanaccess
     SUBDIR += py-urbansim
     SUBDIR += py-utm
     SUBDIR += py-vecrec
     SUBDIR += py-vispy
     SUBDIR += py-visvis
     SUBDIR += py-wand
     SUBDIR += py-webcolors
     SUBDIR += py-willow
     SUBDIR += py-yaswfp
     SUBDIR += py-zbar-py
     SUBDIR += pywal
     SUBDIR += qcomicbook
     SUBDIR += qcustomplot
     SUBDIR += qgis
     SUBDIR += qgis-ltr
     SUBDIR += qimgv
     SUBDIR += qiv
     SUBDIR += qr-code-generator
     SUBDIR += qt5-3d
     SUBDIR += qt5-graphicaleffects
     SUBDIR += qt5-imageformats
     SUBDIR += qt5-opengl
     SUBDIR += qt5-pixeltool
     SUBDIR += qt5-svg
     SUBDIR += qt5-wayland
     SUBDIR += qt6-3d
     SUBDIR += qt6-imageformats
     SUBDIR += qt6-lottie
     SUBDIR += qt6-quickeffectmaker
     SUBDIR += qt6-svg
     SUBDIR += qt6-wayland
     SUBDIR += qtawesome
     SUBDIR += qtpbfimageplugin
     SUBDIR += qtqr
     SUBDIR += quat
     SUBDIR += quat-gui
     SUBDIR += quesa
     SUBDIR += quesoglc
     SUBDIR += quickqanava
     SUBDIR += qvge
     SUBDIR += qview
     SUBDIR += radius-engine
     SUBDIR += rapid-photo-downloader
     SUBDIR += raster3d
     SUBDIR += rawstudio
     SUBDIR += rawtherapee
     SUBDIR += reactphysics3d
     SUBDIR += realesrgan-ncnn-vulkan
     SUBDIR += reallyslick
     SUBDIR += realsr-ncnn-vulkan
     SUBDIR += recastnavigation
     SUBDIR += recoverjpeg
     SUBDIR += renrot
     SUBDIR += repng2jpeg
     SUBDIR += resvg
     SUBDIR += resvg-capi
     SUBDIR += rgbpaint
     SUBDIR += rigsofrods-caelum
     SUBDIR += rigsofrods-pagedgeometry
     SUBDIR += ristretto
     SUBDIR += rlottie
     SUBDIR += ruby-gd
     SUBDIR += rubygem-blurhash
     SUBDIR += rubygem-cairo
     SUBDIR += rubygem-captcha
     SUBDIR += rubygem-chunky_png
     SUBDIR += rubygem-clutter
     SUBDIR += rubygem-clutter-gdk
     SUBDIR += rubygem-clutter-gtk
     SUBDIR += rubygem-dragonfly
     SUBDIR += rubygem-emoji
     SUBDIR += rubygem-exifr
     SUBDIR += rubygem-ezprint
     SUBDIR += rubygem-fastimage
     SUBDIR += rubygem-flamegraph
     SUBDIR += rubygem-gd2
     SUBDIR += rubygem-gdk_pixbuf2
     SUBDIR += rubygem-gemojione
     SUBDIR += rubygem-gemojione32
     SUBDIR += rubygem-geokit
     SUBDIR += rubygem-gitlab_emoji
     SUBDIR += rubygem-gruff
     SUBDIR += rubygem-histogram
     SUBDIR += rubygem-image_processing
     SUBDIR += rubygem-image_science
     SUBDIR += rubygem-imagesize
     SUBDIR += rubygem-invisible_captcha
     SUBDIR += rubygem-mini_magick
     SUBDIR += rubygem-mini_magick4
     SUBDIR += rubygem-opengl
     SUBDIR += rubygem-pdfkit
     SUBDIR += rubygem-png
     SUBDIR += rubygem-railroad
     SUBDIR += rubygem-red-colors
     SUBDIR += rubygem-rmagick
     SUBDIR += rubygem-rsvg2
     SUBDIR += rubygem-ruby-graphviz
     SUBDIR += rubygem-ruby-vips
     SUBDIR += rubygem-scruffy
     SUBDIR += rubygem-tanuki_emoji
     SUBDIR += rx
     SUBDIR += s10sh
     SUBDIR += s2
     SUBDIR += s2tc
     SUBDIR += sam2p
     SUBDIR += sampleicc
     SUBDIR += sane-airscan
     SUBDIR += sane-backends
     SUBDIR += sane-epkowa
     SUBDIR += satty
     SUBDIR += scale2x
     SUBDIR += scantailor
     SUBDIR += scr2png
     SUBDIR += scrot
     SUBDIR += scwm-icons
     SUBDIR += sdl2_gfx
     SUBDIR += sdl2_gpu
     SUBDIR += sdl2_image
     SUBDIR += sdl2_ttf
     SUBDIR += sdl_gfx
     SUBDIR += sdl_image
     SUBDIR += sdl_ttf
     SUBDIR += sdump
     SUBDIR += seejpeg
     SUBDIR += seexpr
     SUBDIR += sekrit-twc-zimg
     SUBDIR += seom
     SUBDIR += separate
     SUBDIR += seq2gif
     SUBDIR += shaderc
     SUBDIR += shared-color-profiles
     SUBDIR += sharpconstruct
     SUBDIR += shotwell
     SUBDIR += showimage
     SUBDIR += silgraphite
     SUBDIR += simage
     SUBDIR += simple-scan
     SUBDIR += simpleitk
     SUBDIR += simpleviewer
     SUBDIR += skanlite
     SUBDIR += skanpage
     SUBDIR += spectacle
     SUBDIR += spectacle-devel
     SUBDIR += spirv-cross
     SUBDIR += spirv-tools
     SUBDIR += springgraph
     SUBDIR += squish
     SUBDIR += ssocr
     SUBDIR += sswf
     SUBDIR += stamp
     SUBDIR += svgalib
     SUBDIR += svgbob
     SUBDIR += svgpp
     SUBDIR += swappy
     SUBDIR += swfmill
     SUBDIR += swftools
     SUBDIR += synaesthesia
     SUBDIR += synfig
     SUBDIR += synfigstudio
     SUBDIR += tachyon
     SUBDIR += telak
     SUBDIR += tesseract
     SUBDIR += tesseract-data
     SUBDIR += tgif
     SUBDIR += tif22pnm
     SUBDIR += tiff
     SUBDIR += tifmerge
     SUBDIR += tikzit
     SUBDIR += tiled
     SUBDIR += timeless
     SUBDIR += timg
     SUBDIR += tintfu
     SUBDIR += tinyows
     SUBDIR += tippecanoe
     SUBDIR += tkpng
     SUBDIR += togl
     SUBDIR += tslib
     SUBDIR += ttygif
     SUBDIR += ttyplot
     SUBDIR += tumble
     SUBDIR += tweeny
     SUBDIR += ufraw
     SUBDIR += unpaper
     SUBDIR += upscaler
     SUBDIR += urho3d
     SUBDIR += vapoursynth-fmtconv
     SUBDIR += vapoursynth-waifu2x-ncnn-vulkan
     SUBDIR += vapoursynth-waifu2x-w2xc
     SUBDIR += variety
     SUBDIR += vcg
     SUBDIR += vhs
     SUBDIR += viewnior
     SUBDIR += vigra
     SUBDIR += vips
     SUBDIR += visprint
     SUBDIR += viu
     SUBDIR += volpack
     SUBDIR += vp
     SUBDIR += vpaint
     SUBDIR += vulkan-caps-viewer
     SUBDIR += vulkan-extension-layer
     SUBDIR += vulkan-headers
     SUBDIR += vulkan-loader
     SUBDIR += vulkan-tools
     SUBDIR += vulkan-utility-libraries
     SUBDIR += vulkan-validation-layers
     SUBDIR += vv
     SUBDIR += waffle
     SUBDIR += waifu2x-converter-cpp
     SUBDIR += waifu2x-ncnn-vulkan
     SUBDIR += wayland
     SUBDIR += wayland-protocols
     SUBDIR += wayland-utils
     SUBDIR += waylandpp
     SUBDIR += webp
     SUBDIR += webp-pixbuf-loader
     SUBDIR += wings
     SUBDIR += wmicons
     SUBDIR += wrapland
     SUBDIR += wxsvg
     SUBDIR += xaos
     SUBDIR += xbmbrowser
     SUBDIR += xcftools
     SUBDIR += xd3d
     SUBDIR += xdgagrab
     SUBDIR += xfig
     SUBDIR += xfractint
     SUBDIR += xglurbules
     SUBDIR += xgrasp
     SUBDIR += ximaging
     SUBDIR += xli
     SUBDIR += xmedcon
     SUBDIR += xmlgraphics-commons
     SUBDIR += xmountains
     SUBDIR += xnview
     SUBDIR += xoris
     SUBDIR += xournal
     SUBDIR += xournalpp
     SUBDIR += xpaint
     SUBDIR += xpdf
     SUBDIR += xpdf3
     SUBDIR += xpdf4
     SUBDIR += xpeps
     SUBDIR += xpx
     SUBDIR += xsane
     SUBDIR += xtexcad
     SUBDIR += xv
     SUBDIR += xv-m17n
     SUBDIR += xviewer
     SUBDIR += xwpick
     SUBDIR += xzgv
     SUBDIR += yacreader
     SUBDIR += yafaray
     SUBDIR += yed
     SUBDIR += yukon
     SUBDIR += zathura
     SUBDIR += zathura-cb
     SUBDIR += zathura-djvu
     SUBDIR += zathura-pdf-mupdf
     SUBDIR += zathura-pdf-poppler
     SUBDIR += zathura-ps
     SUBDIR += zbar
     SUBDIR += zeno
     SUBDIR += zgv
     SUBDIR += zimg
     SUBDIR += zint
 
 .include <bsd.port.subdir.mk>
diff --git a/graphics/py-qt6-3d/Makefile b/graphics/py-qt5-3d/Makefile
similarity index 54%
copy from graphics/py-qt6-3d/Makefile
copy to graphics/py-qt5-3d/Makefile
index 7ae2d8e90d3b..7d96e83dcf68 100644
--- a/graphics/py-qt6-3d/Makefile
+++ b/graphics/py-qt5-3d/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	3d
 DISTVERSION=	${PYQT3D_VERSION}
-CATEGORIES=	graphics python
+CATEGORIES=	graphics devel python
 MASTER_SITES=	${MASTER_SITES_PYQT3D}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT3D_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt6 3D framework
+COMMENT=	Python bindings for the Qt5 toolkit, 3D module
 WWW=		https://www.riverbankcomputing.com/software/pyqt3d/
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
+LICENSE=	${PYQT5_LICENSE}
 
-USES=		gl pyqt:6 python qt:6
-USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder:build
+USES=		gl pyqt:5,dist python qt:5
+USE_GL=		gl
+USE_PYQT=	pyqt5 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
-USE_QT=		3d base
+USE_QT=		3d core declarative gui widgets \
+		qmake:build
 
-PLIST_SUB=	PYQT3D_VERSION=${DISTVERSION} \
+PLIST_SUB=      PYQT3D_VERSION=${DISTVERSION} \
 		PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \
 		PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]]
 
 post-install:
-	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/graphics/py-qt5-3d/distinfo b/graphics/py-qt5-3d/distinfo
new file mode 100644
index 000000000000..a47d039c3988
--- /dev/null
+++ b/graphics/py-qt5-3d/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1729216863
+SHA256 (PyQt3D-5.15.7.tar.gz) = ea783eb546c7dad2d5eaaf82ea5050dde45255a9842e0a1d7584881e9e25a951
+SIZE (PyQt3D-5.15.7.tar.gz) = 7478907
diff --git a/graphics/py-qt5-3d/pkg-descr b/graphics/py-qt5-3d/pkg-descr
new file mode 100644
index 000000000000..fe6144508818
--- /dev/null
+++ b/graphics/py-qt5-3d/pkg-descr
@@ -0,0 +1,2 @@
+PyQt5 is a set of Python bindings for Qt5 application framework.
+This package provides the extra Qt3D module.
diff --git a/graphics/py-qt5-3d/pkg-plist b/graphics/py-qt5-3d/pkg-plist
new file mode 100644
index 000000000000..fd938793109a
--- /dev/null
+++ b/graphics/py-qt5-3d/pkg-plist
@@ -0,0 +1,251 @@
+%%PYTHON_SITELIBDIR%%/PyQt3D-%%PYQT3D_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQt3D-%%PYQT3D_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQt3D-%%PYQT3D_VERSION%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DAnimation.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DCore.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DExtras.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DInput.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DLogic.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/Qt3DRender.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/Qt3DAnimation.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/Qt3DAnimationmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qabstractanimation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qabstractanimationclip.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qabstractchannelmapping.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qabstractclipanimator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qabstractclipblendnode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qadditiveclipblend.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationaspect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationclip.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationclipdata.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationcliploader.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationcontroller.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qanimationgroup.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qblendedclipanimator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qchannel.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qchannelcomponent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qchannelmapper.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qchannelmapping.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qclipanimator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qclipblendnodecreatedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qclipblendvalue.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qclock.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qkeyframe.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qkeyframeanimation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qlerpclipblend.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qmorphinganimation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qmorphtarget.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qskeletonmapping.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DAnimation/qvertexblendanimation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/Qt3DCore.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/Qt3DCoremod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qabstractaspect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qabstractskeleton.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qarmature.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qaspectengine.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qbackendnode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qcomponent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qcomponentaddedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qcomponentremovedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qdynamicpropertyupdatedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qentity.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qjoint.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qnode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qnodecommand.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qnodecreatedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qnodedestroyedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qnodeid.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertynodeaddedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertynoderemovedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyupdatedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyupdatedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyvalueaddedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyvalueaddedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyvalueremovedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qpropertyvalueremovedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qscenechange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qsharedpointer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qskeleton.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qskeletonloader.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qstaticpropertyupdatedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qstaticpropertyvalueaddedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qstaticpropertyvalueremovedchangebase.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DCore/qtransform.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/Qt3DExtras.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/Qt3DExtrasmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qabstractcameracontroller.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qabstractspritesheet.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qconegeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qconemesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qcuboidgeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qcuboidmesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qcylindergeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qcylindermesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qdiffusemapmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qdiffusespecularmapmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qdiffusespecularmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qextrudedtextgeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qextrudedtextmesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qfirstpersoncameracontroller.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qforwardrenderer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qgoochmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qmetalroughmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qmorphphongmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qnormaldiffusemapalphamaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qnormaldiffusemapmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qnormaldiffusespecularmapmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qorbitcameracontroller.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qpervertexcolormaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qphongalphamaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qphongmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qplanegeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qplanemesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qskyboxentity.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qspheregeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qspheremesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qspritegrid.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qspritesheet.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qspritesheetitem.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qt3dwindow.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qtext2dentity.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qtexturedmetalroughmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qtexturematerial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qtorusgeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DExtras/qtorusmesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/Qt3DInput.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/Qt3DInputmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qabstractactioninput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qabstractaxisinput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qabstractphysicaldevice.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qaction.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qactioninput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qanalogaxisinput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qaxis.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qaxisaccumulator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qaxissetting.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qbuttonaxisinput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qinputaspect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qinputchord.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qinputsequence.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qinputsettings.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qkeyboarddevice.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qkeyboardhandler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qkeyevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qlogicaldevice.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qmousedevice.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qmouseevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qmousehandler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DInput/qphysicaldevicecreatedchange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DLogic/Qt3DLogic.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DLogic/Qt3DLogicmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DLogic/qframeaction.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DLogic/qlogicaspect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/Qt3DRender.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/Qt3DRendermod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qabstractfunctor.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qabstractlight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qabstractraycaster.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qabstracttexture.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qabstracttextureimage.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qalphacoverage.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qalphatest.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qattribute.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qblendequation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qblendequationarguments.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qblitframebuffer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qbuffer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qbufferdatagenerator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcamera.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcameralens.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcameraselector.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qclearbuffers.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qclipplane.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcolormask.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcomputecommand.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qcullface.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qdepthrange.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qdepthtest.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qdirectionallight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qdispatchcompute.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qdithering.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qeffect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qenvironmentlight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qfilterkey.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qframegraphnode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qfrontface.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qfrustumculling.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qgeometry.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qgeometryfactory.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qgeometryrenderer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qgraphicsapifilter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlayer.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlayerfilter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlevelofdetail.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlevelofdetailboundingsphere.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlevelofdetailswitch.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qlinewidth.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qmaterial.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qmemorybarrier.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qmesh.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qmultisampleantialiasing.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qnodepthmask.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qnodraw.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qnopicking.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qobjectpicker.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpaintedtextureimage.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qparameter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpickevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpickingsettings.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpicklineevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpickpointevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpicktriangleevent.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpointlight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpointsize.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qpolygonoffset.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qproximityfilter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrastermode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qraycaster.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qraycasterhit.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrenderaspect.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendercapabilities.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendercapture.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrenderpass.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrenderpassfilter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendersettings.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrenderstate.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrenderstateset.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendersurfaceselector.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendertarget.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendertargetoutput.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qrendertargetselector.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qsceneloader.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qscissortest.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qscreenraycaster.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qseamlesscubemap.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qsetfence.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qshaderdata.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qshaderimage.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qshaderprogram.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qshaderprogrambuilder.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qsortpolicy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qspotlight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qstencilmask.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qstenciloperation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qstenciloperationarguments.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qstenciltest.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qstenciltestarguments.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qsubtreeenabler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtechnique.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtechniquefilter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtexture.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtexturedata.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtexturedataupdate.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtexturegenerator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtextureimage.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtextureimagedata.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtextureimagedatagenerator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qtexturewrapmode.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qvector.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qviewport.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/Qt3DRender/qwaitfence.sip
+%%PYQT_APIDIR%%/PyQt3D.api
diff --git a/graphics/py-qt6-3d/Makefile b/graphics/py-qt6-3d/Makefile
index 7ae2d8e90d3b..c9c55e4b0e89 100644
--- a/graphics/py-qt6-3d/Makefile
+++ b/graphics/py-qt6-3d/Makefile
@@ -1,30 +1,27 @@
 PORTNAME=	3d
 DISTVERSION=	${PYQT3D_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITES_PYQT3D}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT3D_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 3D framework
 WWW=		https://www.riverbankcomputing.com/software/pyqt3d/
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
-
-USES=		gl pyqt:6 python qt:6
+USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder:build
+USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		3d base
 
 PLIST_SUB=	PYQT3D_VERSION=${DISTVERSION} \
 		PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \
 		PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]]
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile
index 04869889520e..746c2a651303 100644
--- a/net/py-qt5-networkauth/Makefile
+++ b/net/py-qt5-networkauth/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	networkauth
-PORTVERSION=	${PYQTNETWORKAUTH_VERSION}
-PORTREVISION=	5
+DISTVERSION=	${PYQTNETWORKAUTH_VERSION}
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQTNETWORKAUTH}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTNETWORKAUTH_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtNetworkAuth module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		qmake-qt5:devel/qt5-qmake
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
+LICENSE=	${PYQT5_LICENSE}
+
+USES=		pyqt:5,dist python qt:5
+USE_PYQT=	pyqt5 qtbuilder:build sip:build
+USE_PYTHON=	concurrent flavors
+USE_QT=		core network networkauth \
+		qmake:build
+
+PLIST_SUB=	PYQTNETWORKAUTH_VERSION=${DISTVERSION}
 
-USES=		gl pyqt:5 python qt:5
-USE_GL=		gl
-USE_PYQT=	sip:build pyqt5
-USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core gui network networkauth
+post-install:
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
+		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/net/py-qt5-networkauth/distinfo b/net/py-qt5-networkauth/distinfo
index d75e7261d8f6..6ffd3e64a125 100644
--- a/net/py-qt5-networkauth/distinfo
+++ b/net/py-qt5-networkauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643824949
-SHA256 (PyQtNetworkAuth-5.15.5.tar.gz) = 2230b6f56f4c9ad2e88bf5ac648e2f3bee9cd757550de0fb98fe0bcb31217b16
-SIZE (PyQtNetworkAuth-5.15.5.tar.gz) = 35467
+TIMESTAMP = 1729219754
+SHA256 (PyQtNetworkAuth-5.15.6.tar.gz) = 85ada0c82b9787ffd614abff93bd6d9314d6528265f5f1d23a1922ef0cbeecb9
+SIZE (PyQtNetworkAuth-5.15.6.tar.gz) = 19113
diff --git a/net/py-qt5-networkauth/pkg-plist b/net/py-qt5-networkauth/pkg-plist
index a15fed37ad8f..6852795e77e2 100644
--- a/net/py-qt5-networkauth/pkg-plist
+++ b/net/py-qt5-networkauth/pkg-plist
@@ -1,15 +1,15 @@
 %%PYQT_APIDIR%%/PyQtNetworkAuth.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
 %%PYTHON_SITELIBDIR%%/PyQt5/QtNetworkAuth.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtNetworkAuth/QtNetworkAuth.toml
-%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-5.15.5.dist-info/INSTALLER
-%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-5.15.5.dist-info/METADATA
-%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-5.15.5.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQtNetworkAuth-%%PYQTNETWORKAUTH_VERSION%%.dist-info/RECORD
diff --git a/net/py-qt6-networkauth/Makefile b/net/py-qt6-networkauth/Makefile
index 5ad80b222f88..a12de94a4bde 100644
--- a/net/py-qt6-networkauth/Makefile
+++ b/net/py-qt6-networkauth/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	networkauth
 DISTVERSION=	${PYQTNETWORKAUTH_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net devel python
 MASTER_SITES=	${MASTER_SITES_PYQTNETWORKAUTH}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTNETWORKAUTH_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtNetworkAuth module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
+LICENSE=	${PYQT6_LICENSE}
 
-USES=		gl pyqt:6 python qt:6
+USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder
+USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base networkauth
 
 PLIST_SUB=	PYQTNETWORKAUTH_VERSION=${DISTVERSION}
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index ea0d86226d66..605695ac5f4b 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	webengine
 DISTVERSION=	${PYQTWEBENGINE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITES_PYQTWEBENGINE}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTWEBENGINE_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtWebEngine module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-LICENSE=	GPLv3
-
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
+LICENSE=	${PYQT5_LICENSE}
 
-USES=		gl python pyqt:5 qt:5
+USES=		gl pyqt:5,dist python qt:5
 USE_GL=		gl
-USE_PYQT=	sip:build pyqt5
-USE_PYTHON=	concurrent flavors py3kplist
+USE_PYQT=	pyqt5 qtbuilder:build sip:build
+USE_PYTHON=	concurrent flavors
 USE_QT=		core declarative gui location network printsupport webchannel \
 		webengine widgets qmake:build
 
 PLIST_SUB=	PYQT_WEBENGINE_VERSION=${DISTVERSION}
 
+post-install:
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
+		-name '*.so*' -exec ${STRIP_CMD} {} +
+
 .include <bsd.port.mk>
diff --git a/www/py-qt5-webengine/distinfo b/www/py-qt5-webengine/distinfo
index e259e3481059..78b51f06fe7e 100644
--- a/www/py-qt5-webengine/distinfo
+++ b/www/py-qt5-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666112567
-SHA256 (PyQtWebEngine-5.15.6.tar.gz) = ae241ef2a61c782939c58b52c2aea53ad99b30f3934c8358d5e0a6ebb3fd0721
-SIZE (PyQtWebEngine-5.15.6.tar.gz) = 48871
+TIMESTAMP = 1729214353
+SHA256 (PyQtWebEngine-5.15.7.tar.gz) = f121ac6e4a2f96ac289619bcfc37f64e68362f24a346553f5d6c42efa4228a4d
+SIZE (PyQtWebEngine-5.15.7.tar.gz) = 32223
diff --git a/www/py-qt6-webengine/Makefile b/www/py-qt6-webengine/Makefile
index 34ac80810678..81ae168450ea 100644
--- a/www/py-qt6-webengine/Makefile
+++ b/www/py-qt6-webengine/Makefile
@@ -1,32 +1,29 @@
 PORTNAME=	webengine
 DISTVERSION=	${PYQTWEBENGINE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITES_PYQTWEBENGINE}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTWEBENGINE_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtWebEngine module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
-
-USES=		gl python pyqt:6 qt:6
+USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6
+USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base declarative positioning webchannel webengine
 
 PLIST_SUB=	PYQT_WEBENGINE_VERSION=${DISTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \
 		${WRKSRC}/pyproject.toml
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index bbd932d2a3b1..8f467233fa00 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -1,267 +1,268 @@
     COMMENT = X11 toolkits
 
     SUBDIR += SoXt
     SUBDIR += Xaw3d
     SUBDIR += Xmt
     SUBDIR += amtk
     SUBDIR += aquamarine
     SUBDIR += blt
     SUBDIR += bwidget
     SUBDIR += color-widgets-qt5
     SUBDIR += como
     SUBDIR += copperspice
     SUBDIR += ctk
     SUBDIR += fltk
     SUBDIR += fox16
     SUBDIR += fox17
     SUBDIR += fxscintilla
     SUBDIR += gdl
     SUBDIR += girara
     SUBDIR += gnome-pty-helper
     SUBDIR += gnustep-back
     SUBDIR += gnustep-gui
     SUBDIR += granite
     SUBDIR += granite7
     SUBDIR += gstreamer1-plugins-gtk
     SUBDIR += gstreamer1-plugins-pango
     SUBDIR += gstreamer1-plugins-qt5
     SUBDIR += gstreamer1-plugins-qt6
     SUBDIR += gtk-layer-shell
     SUBDIR += gtk-session-lock
     SUBDIR += gtk-sharp-beans
     SUBDIR += gtk-sharp20
     SUBDIR += gtk-sharp30
     SUBDIR += gtk20
     SUBDIR += gtk30
     SUBDIR += gtk4-layer-shell
     SUBDIR += gtk40
     SUBDIR += gtkd
     SUBDIR += gtkdatabox
     SUBDIR += gtkextra
     SUBDIR += gtkglarea2
     SUBDIR += gtkglext
     SUBDIR += gtkglextmm
     SUBDIR += gtkimageview
     SUBDIR += gtkmm24
     SUBDIR += gtkmm30
     SUBDIR += gtksourceview2
     SUBDIR += gtksourceview3
     SUBDIR += gtksourceview4
     SUBDIR += gtksourceview5
     SUBDIR += gtksourceviewmm3
     SUBDIR += guile-gnome-platform
     SUBDIR += imgui
     SUBDIR += irrlicht
     SUBDIR += itk
     SUBDIR += iwidgets
     SUBDIR += kddockwidgets
     SUBDIR += kf5-attica
     SUBDIR += kf5-kcompletion
     SUBDIR += kf5-kconfigwidgets
     SUBDIR += kf5-kdesignerplugin
     SUBDIR += kf5-kguiaddons
     SUBDIR += kf5-kirigami2
     SUBDIR += kf5-kitemviews
     SUBDIR += kf5-kjobwidgets
     SUBDIR += kf5-ktextwidgets
     SUBDIR += kf5-kwidgetsaddons
     SUBDIR += kf5-kxmlgui
     SUBDIR += kf6-attica
     SUBDIR += kf6-kcompletion
     SUBDIR += kf6-kconfigwidgets
     SUBDIR += kf6-kguiaddons
     SUBDIR += kf6-kirigami
     SUBDIR += kf6-kitemviews
     SUBDIR += kf6-kjobwidgets
     SUBDIR += kf6-ktextwidgets
     SUBDIR += kf6-kwidgetsaddons
     SUBDIR += kf6-kxmlgui
     SUBDIR += kirigami-addons
     SUBDIR += kirigami-addons-devel
     SUBDIR += kproperty
     SUBDIR += lesstif
     SUBDIR += libXaw
     SUBDIR += libXmu
     SUBDIR += libXt
     SUBDIR += libadwaita
     SUBDIR += libdazzle
     SUBDIR += libdecor
     SUBDIR += libgdiplus
     SUBDIR += libhandy
     SUBDIR += libhandy0
     SUBDIR += libshumate
     SUBDIR += libspelling
     SUBDIR += libunique3
     SUBDIR += libwnck
     SUBDIR += libwnck3
     SUBDIR += libxaw3dxft
     SUBDIR += linux-c7-gtk2
     SUBDIR += linux-c7-gtk3
     SUBDIR += linux-c7-openmotif
     SUBDIR += linux-c7-pango
     SUBDIR += linux-c7-qt-x11
     SUBDIR += linux-c7-tk85
     SUBDIR += linux-rl9-gtk2
     SUBDIR += linux-rl9-gtk3
     SUBDIR += linux-rl9-pango
     SUBDIR += movingmotif
     SUBDIR += mowitz
     SUBDIR += mygui
     SUBDIR += mygui-dummy
     SUBDIR += mygui-ogre
     SUBDIR += mygui-opengl
     SUBDIR += nanogui
     SUBDIR += neXtaw
     SUBDIR += ntk
     SUBDIR += nuklear
     SUBDIR += ocaml-graphics
     SUBDIR += ocaml-lablgtk2
     SUBDIR += ocaml-lablgtk3
     SUBDIR += ocaml-labltk
     SUBDIR += open-motif
     SUBDIR += open-motif-devel
     SUBDIR += osm-gps-map
     SUBDIR += otk
     SUBDIR += p5-Alien-wxWidgets
     SUBDIR += p5-Gtk2
     SUBDIR += p5-Gtk2-Chmod
     SUBDIR += p5-Gtk2-Ex-FormFactory
     SUBDIR += p5-Gtk2-Ex-PodViewer
     SUBDIR += p5-Gtk2-Ex-Simple-List
     SUBDIR += p5-Gtk2-Ex-Utils
     SUBDIR += p5-Gtk2-ImageView
     SUBDIR += p5-Gtk2-PathButtonBar
     SUBDIR += p5-Gtk3
     SUBDIR += p5-Gtk3-ImageView
     SUBDIR += p5-Gtk3-SimpleList
     SUBDIR += p5-Pango
     SUBDIR += p5-Prima
     SUBDIR += p5-Test-Tk
     SUBDIR += p5-Tk
     SUBDIR += p5-Tk-Action
     SUBDIR += p5-Tk-Autoscroll
     SUBDIR += p5-Tk-ColourChooser
     SUBDIR += p5-Tk-Contrib
     SUBDIR += p5-Tk-CursorControl
     SUBDIR += p5-Tk-DKW
     SUBDIR += p5-Tk-Date
     SUBDIR += p5-Tk-DynaTabFrame
     SUBDIR += p5-Tk-Enscript
     SUBDIR += p5-Tk-FontDialog
     SUBDIR += p5-Tk-GBARR
     SUBDIR += p5-Tk-Getopt
     SUBDIR += p5-Tk-HistEntry
     SUBDIR += p5-Tk-JComboBox
     SUBDIR += p5-Tk-ResizeButton
     SUBDIR += p5-Tk-Role-Dialog
     SUBDIR += p5-Tk-Role-HasWidgets
     SUBDIR += p5-Tk-Splashscreen
     SUBDIR += p5-Tk-Sugar
     SUBDIR += p5-Tk-TableMatrix
     SUBDIR += p5-Tk-ToolBar
     SUBDIR += p5-Tk-WaitBox
     SUBDIR += pango
     SUBDIR += pangolin
     SUBDIR += pangomm
     SUBDIR += pangox-compat
     SUBDIR += plasma5-kdeplasma-addons
     SUBDIR += plasma6-kdeplasma-addons
     SUBDIR += plib
     SUBDIR += py-AnyQt
     SUBDIR += py-Pmw
     SUBDIR += py-awesometkinter
     SUBDIR += py-customtkinter
     SUBDIR += py-easygui
     SUBDIR += py-fltk
     SUBDIR += py-guietta
     SUBDIR += py-kivy
     SUBDIR += py-python-xlib
     SUBDIR += py-qt5-chart
     SUBDIR += py-qt6-chart
+    SUBDIR += py-qt5-datavis3d
     SUBDIR += py-qt6-datavis3d
     SUBDIR += py-superqt
     SUBDIR += py-tkinter
     SUBDIR += py-tktreectrl
     SUBDIR += py-wxPython4
     SUBDIR += pythonqt
     SUBDIR += qhotkey
     SUBDIR += qml-box2d
     SUBDIR += qt5-charts
     SUBDIR += qt5-datavis3d
     SUBDIR += qt5-declarative
     SUBDIR += qt5-declarative-test
     SUBDIR += qt5-gamepad
     SUBDIR += qt5-gui
     SUBDIR += qt5-quick3d
     SUBDIR += qt5-quickcontrols
     SUBDIR += qt5-quickcontrols2
     SUBDIR += qt5-quicktimeline
     SUBDIR += qt5-uiplugin
     SUBDIR += qt5-virtualkeyboard
     SUBDIR += qt5-widgets
     SUBDIR += qt5pas
     SUBDIR += qt6-charts
     SUBDIR += qt6-datavis3d
     SUBDIR += qt6-declarative
     SUBDIR += qt6-graphs
     SUBDIR += qt6-quick3d
     SUBDIR += qt6-quicktimeline
     SUBDIR += qt6-shadertools
     SUBDIR += qt6-virtualkeyboard
     SUBDIR += qt6pas
     SUBDIR += qtermwidget
     SUBDIR += qtermwidget-qt5
     SUBDIR += qwt5-qt5
     SUBDIR += qwt6
     SUBDIR += redkite
     SUBDIR += rep-gtk2
     SUBDIR += rubygem-gdk3
     SUBDIR += rubygem-gdk4
     SUBDIR += rubygem-gtk2
     SUBDIR += rubygem-gtk3
     SUBDIR += rubygem-gtk4
     SUBDIR += rubygem-gtksourceview3
     SUBDIR += rubygem-gtksourceview4
     SUBDIR += rubygem-pango
     SUBDIR += rubygem-poppler
     SUBDIR += rubygem-tk
     SUBDIR += rubygem-uh
     SUBDIR += rubygem-vte3
     SUBDIR += rubygem-vte4
     SUBDIR += scenefx
     SUBDIR += scintilla
     SUBDIR += sdl2_pango
     SUBDIR += sdl_pango
     SUBDIR += shared-desktop-ontologies
     SUBDIR += skinlf
     SUBDIR += soqt
     SUBDIR += swt
     SUBDIR += tepl6
     SUBDIR += termit
     SUBDIR += tix
     SUBDIR += tk-wrapper
     SUBDIR += tk86
     SUBDIR += tk87
     SUBDIR += tk90
     SUBDIR += tkdnd
     SUBDIR += tkshape
     SUBDIR += tktable
     SUBDIR += tktray
     SUBDIR += tktreectrl
     SUBDIR += unique
     SUBDIR += viewklass
     SUBDIR += vte
     SUBDIR += vte3
     SUBDIR += wlroots
     SUBDIR += wlroots015
     SUBDIR += wlroots017
     SUBDIR += wmapp
     SUBDIR += wxgtk30
     SUBDIR += wxgtk32
     SUBDIR += xbae
     SUBDIR += xforms
     SUBDIR += xmhtml
     SUBDIR += xwallpaper
     SUBDIR += ztoolkit
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile
index 7623549c83e5..1cecf7448dc1 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-chart/Makefile
@@ -1,28 +1,26 @@
 PORTNAME=	chart
-PORTVERSION=	${PYQTCHART_VERSION}
-PORTREVISION=	4
+DISTVERSION=	${PYQTCHART_VERSION}
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTCHART_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt5 toolkit, QtChart module
 WWW=		https://riverbankcomputing.com/software/pyqtchart
 
 LICENSE=	${PYQT5_LICENSE}
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
-LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2@qt5
-
-USES=		gl python pyqt:5 qt:5
+USES=		gl pyqt:5,dist python qt:5
 USE_GL=		gl
-USE_PYQT=	sip:build pyqt5
-USE_PYTHON=	concurrent flavors py3kplist
+USE_PYQT=	pyqt5 qtbuilder:build sip:build
+USE_PYTHON=	concurrent flavors
 USE_QT=		charts core declarative gui qmake:build widgets
 
 PLIST_SUB=      PYQT_CHART_VERSION=${DISTVERSION}
 
+post-install:
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
+		-name '*.so*' -exec ${STRIP_CMD} {} +
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-chart/distinfo b/x11-toolkits/py-qt5-chart/distinfo
index b266b712e406..d30185943ab5 100644
--- a/x11-toolkits/py-qt5-chart/distinfo
+++ b/x11-toolkits/py-qt5-chart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666112557
-SHA256 (PyQtChart-5.15.6.tar.gz) = 2691796fe92a294a617592a5c5c35e785dc91f7759def9eb22da79df63762339
-SIZE (PyQtChart-5.15.6.tar.gz) = 68297
+TIMESTAMP = 1729214297
+SHA256 (PyQtChart-5.15.7.tar.gz) = bc9f1d26c725e820b0fff8db6e906e8b286128a14b3a98c59a0cd0c3d9924095
+SIZE (PyQtChart-5.15.7.tar.gz) = 48482
diff --git a/x11-toolkits/py-qt5-chart/files/patch-configure.py b/x11-toolkits/py-qt5-chart/files/patch-configure.py
deleted file mode 100644
index 01781a2e7480..000000000000
--- a/x11-toolkits/py-qt5-chart/files/patch-configure.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.py.orig	2021-10-26 11:10:38 UTC
-+++ configure.py
-@@ -1549,10 +1549,10 @@ INSTALLS += sip
- 
-     # These optimisations could apply to other platforms.
-     if module_config.no_exceptions:
--        if target_config.py_platform.startswith('linux') or target_config.py_platform == 'darwin':
-+        if target_config.py_platform.startswith('linux') or target_config.py_platform.startswith('freebsd') or target_config.py_platform == 'darwin':
-             pro.write('QMAKE_CXXFLAGS += -fno-exceptions\n')
- 
--    if target_config.py_platform.startswith('linux') and not opts.static:
-+    if target_config.py_platform.startswith('linux') or target_config.py_platform.startswith('freebsd') and not opts.static:
-         if target_config.py_version >= 0x030000:
-             entry_point = 'PyInit_%s' % mname
-         else:
diff --git a/x11-toolkits/py-qt6-datavis3d/Makefile b/x11-toolkits/py-qt5-datavis3d/Makefile
similarity index 51%
copy from x11-toolkits/py-qt6-datavis3d/Makefile
copy to x11-toolkits/py-qt5-datavis3d/Makefile
index 406433e4b2cb..dc262572825a 100644
--- a/x11-toolkits/py-qt6-datavis3d/Makefile
+++ b/x11-toolkits/py-qt5-datavis3d/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	datavis3d
 DISTVERSION=	${PYQTDATAVIS3D_VERSION}
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTDATAVIS3D}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTDATAVIS3D_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt6 data visualization library
-WWW=		https://riverbankcomputing.com/software/pyqtdatavisualization/
+COMMENT=	Python bindings for the Qt5 toolkit, DataVisualization module
+WWW=		https://www.riverbankcomputing.com/software/pyqtdatavisualization/
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
+LICENSE=	${PYQT5_LICENSE}
 
-USES=		gl pyqt:6 python qt:6
-USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder:build
+USES=		gl python pyqt:5,dist qt:5
+USE_GL=		gl
+USE_PYQT=	pyqt5 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
-USE_QT=		base datavis3d
+USE_QT=		core datavis3d declarative gui widgets \
+		qmake:build
 
-PLIST_SUB=	PYQTDATAVIS3D_VERSION=${DISTVERSION} \
+PLIST_SUB=      PYQT_DATAVIS3D_VERSION=${DISTVERSION} \
 		PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \
 		PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]]
 
 post-install:
-	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-datavis3d/distinfo b/x11-toolkits/py-qt5-datavis3d/distinfo
new file mode 100644
index 000000000000..f0d6c3788f79
--- /dev/null
+++ b/x11-toolkits/py-qt5-datavis3d/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1729215776
+SHA256 (PyQtDataVisualization-5.15.6.tar.gz) = 9ed33b20e747bc69e1d619f147bb1625cc00d6ef404dbf076ba13a9ff6f6061d
+SIZE (PyQtDataVisualization-5.15.6.tar.gz) = 215833
diff --git a/x11-toolkits/py-qt5-datavis3d/pkg-descr b/x11-toolkits/py-qt5-datavis3d/pkg-descr
new file mode 100644
index 000000000000..f36711292c38
--- /dev/null
+++ b/x11-toolkits/py-qt5-datavis3d/pkg-descr
@@ -0,0 +1,2 @@
+PyQt5 is a set of Python bindings for Qt5 application framework.
+This package provides the extra QtChart module.
diff --git a/x11-toolkits/py-qt5-datavis3d/pkg-plist b/x11-toolkits/py-qt5-datavis3d/pkg-plist
new file mode 100644
index 000000000000..99f2d42f6ff7
--- /dev/null
+++ b/x11-toolkits/py-qt5-datavis3d/pkg-plist
@@ -0,0 +1,46 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/QtDataVisualization.abi%%PYTHON_MAJOR_VER%%.so
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/QtDataVisualization.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/QtDataVisualizationmod.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dbars.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dcamera.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dinputhandler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dlight.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dobject.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dscatter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dscene.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dsurface.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/q3dtheme.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qabstract3daxis.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qabstract3dgraph.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qabstract3dinputhandler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qabstract3dseries.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qabstractdataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qbar3dseries.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qbardataitem.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qbardataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qcategory3daxis.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qcustom3ditem.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qcustom3dlabel.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qcustom3dvolume.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qdatavisualizationglobal.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qheightmapsurfacedataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qitemmodelbardataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qitemmodelscatterdataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qitemmodelsurfacedataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qlist.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qlogvalue3daxisformatter.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qscatter3dseries.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qscatterdataitem.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qscatterdataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qsurface3dseries.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qsurfacedataitem.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qsurfacedataproxy.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qtdatavisualizationversion.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qtouch3dinputhandler.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qutils.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qvalue3daxis.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtDataVisualization/qvalue3daxisformatter.sip
+%%PYTHON_SITELIBDIR%%/PyQtDataVisualization-%%PYQT_DATAVIS3D_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQtDataVisualization-%%PYQT_DATAVIS3D_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQtDataVisualization-%%PYQT_DATAVIS3D_VERSION%%.dist-info/RECORD
+%%PYQT_APIDIR%%/PyQtDataVisualization.api
diff --git a/x11-toolkits/py-qt6-chart/Makefile b/x11-toolkits/py-qt6-chart/Makefile
index 41c873ca0509..0d500d5e765e 100644
--- a/x11-toolkits/py-qt6-chart/Makefile
+++ b/x11-toolkits/py-qt6-chart/Makefile
@@ -1,30 +1,27 @@
 PORTNAME=	chart
 DISTVERSION=	${PYQTCHART_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTCHART}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTCHART_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtChart module
 WWW=		https://riverbankcomputing.com/software/pyqtchart
 
 LICENSE=	${PYQT6_LICENSE}
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
-
-USES=		gl pyqt:6 python qt:6
+USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder
+USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base charts
 
 PLIST_SUB=	PYQTCHART_VERSION=${DISTVERSION}
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt6-datavis3d/Makefile b/x11-toolkits/py-qt6-datavis3d/Makefile
index 406433e4b2cb..28aad958c471 100644
--- a/x11-toolkits/py-qt6-datavis3d/Makefile
+++ b/x11-toolkits/py-qt6-datavis3d/Makefile
@@ -1,30 +1,27 @@
 PORTNAME=	datavis3d
 DISTVERSION=	${PYQTDATAVIS3D_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTDATAVIS3D}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTDATAVIS3D_DISTNAME}
 
-PYQT_DIST=	yes
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 data visualization library
 WWW=		https://riverbankcomputing.com/software/pyqtdatavisualization/
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
-
-USES=		gl pyqt:6 python qt:6
+USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
-USE_PYQT=	sip:build pyqt6 qtbuilder:build
+USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base datavis3d
 
 PLIST_SUB=	PYQTDATAVIS3D_VERSION=${DISTVERSION} \
 		PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \
 		PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]]
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
 		-name '*.so*' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>