diff --git a/x11-toolkits/py-qt6-graphs/Makefile b/x11-toolkits/py-qt6-graphs/Makefile
index 5428ac927867..d03d1fe5a821 100644
--- a/x11-toolkits/py-qt6-graphs/Makefile
+++ b/x11-toolkits/py-qt6-graphs/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	graphs
 DISTVERSION=	${PYQTGRAPHS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits devel python
 MASTER_SITES=	${MASTER_SITES_PYQTGRAPHS}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQTGRAPHS_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtGraphs module
 WWW=		https://riverbankcomputing.com/software/pyqtgraphs
 
 LICENSE=	${PYQT6_LICENSE}
 
 USES=		gl pyqt:6,dist python qt:6
 USE_GL=		opengl
 USE_PYQT=	pyqt6 qtbuilder:build sip:build
 USE_PYTHON=	concurrent flavors
-USE_QT=		base graphs
+USE_QT=		base declarative graphs quick3d shadertools
 
-PLIST_SUB=	PYQTGRAPHS_VERSION=${DISTVERSION}
+PLIST_SUB=	PYQTGRAPHS_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/x11-toolkits/py-qt6-graphs/pkg-plist b/x11-toolkits/py-qt6-graphs/pkg-plist
index a9f8db172d3d..bffe18f0e4ec 100644
--- a/x11-toolkits/py-qt6-graphs/pkg-plist
+++ b/x11-toolkits/py-qt6-graphs/pkg-plist
@@ -1,59 +1,59 @@
 %%PYQT_APIDIR%%/PyQt6-Graphs.api
 %%PYQT_SIPDIR%%/QtGraphs/QtGraphs.toml
 %%PYQT_SIPDIR%%/QtGraphs/QtGraphsmod.sip
-%%PYQT_SIPDIR%%/QtGraphs/q%%PYTHON_MAJOR_VER%%dscene.sip
-%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%daxis.sip
-%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%dseries.sip
+%%PYQT_SIPDIR%%/QtGraphs/q3dscene.sip
+%%PYQT_SIPDIR%%/QtGraphs/qabstract3daxis.sip
+%%PYQT_SIPDIR%%/QtGraphs/qabstract3dseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qabstractaxis.sip
 %%PYQT_SIPDIR%%/QtGraphs/qabstractdataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qabstractseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qareaseries.sip
-%%PYQT_SIPDIR%%/QtGraphs/qbar%%PYTHON_MAJOR_VER%%dseries.sip
+%%PYQT_SIPDIR%%/QtGraphs/qbar3dseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbarcategoryaxis.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbardataitem.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbardataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbarmodelmapper.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbarseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qbarset.sip
-%%PYQT_SIPDIR%%/QtGraphs/qcategory%%PYTHON_MAJOR_VER%%daxis.sip
-%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%ditem.sip
-%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dlabel.sip
-%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dvolume.sip
+%%PYQT_SIPDIR%%/QtGraphs/qcategory3daxis.sip
+%%PYQT_SIPDIR%%/QtGraphs/qcustom3ditem.sip
+%%PYQT_SIPDIR%%/QtGraphs/qcustom3dlabel.sip
+%%PYQT_SIPDIR%%/QtGraphs/qcustom3dvolume.sip
 %%PYQT_SIPDIR%%/QtGraphs/qdatetimeaxis.sip
-%%PYQT_SIPDIR%%/QtGraphs/qgraphs%%PYTHON_MAJOR_VER%%dnamespace.sip
+%%PYQT_SIPDIR%%/QtGraphs/qgraphs3dnamespace.sip
 %%PYQT_SIPDIR%%/QtGraphs/qgraphstheme.sip
 %%PYQT_SIPDIR%%/QtGraphs/qheightmapsurfacedataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qitemmodelbardataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qitemmodelscatterdataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qitemmodelsurfacedataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qlineseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qlist.sip
-%%PYQT_SIPDIR%%/QtGraphs/qlogvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip
+%%PYQT_SIPDIR%%/QtGraphs/qlogvalue3daxisformatter.sip
 %%PYQT_SIPDIR%%/QtGraphs/qpiemodelmapper.sip
 %%PYQT_SIPDIR%%/QtGraphs/qpieseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qpieslice.sip
-%%PYQT_SIPDIR%%/QtGraphs/qscatter%%PYTHON_MAJOR_VER%%dseries.sip
+%%PYQT_SIPDIR%%/QtGraphs/qscatter3dseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qscatterdataitem.sip
 %%PYQT_SIPDIR%%/QtGraphs/qscatterdataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qscatterseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qsplineseries.sip
-%%PYQT_SIPDIR%%/QtGraphs/qsurface%%PYTHON_MAJOR_VER%%dseries.sip
+%%PYQT_SIPDIR%%/QtGraphs/qsurface3dseries.sip
 %%PYQT_SIPDIR%%/QtGraphs/qsurfacedataitem.sip
 %%PYQT_SIPDIR%%/QtGraphs/qsurfacedataproxy.sip
 %%PYQT_SIPDIR%%/QtGraphs/qutils.sip
-%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxis.sip
-%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip
+%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxis.sip
+%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxisformatter.sip
 %%PYQT_SIPDIR%%/QtGraphs/qvalueaxis.sip
 %%PYQT_SIPDIR%%/QtGraphs/qxymodelmapper.sip
 %%PYQT_SIPDIR%%/QtGraphs/qxyseries.sip
 %%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgets.toml
 %%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgetsmod.sip
-%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dbarswidgetitem.sip
-%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dgraphswidgetitem.sip
-%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dscatterwidgetitem.sip
-%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dsurfacewidgetitem.sip
+%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dbarswidgetitem.sip
+%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dgraphswidgetitem.sip
+%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dscatterwidgetitem.sip
+%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dsurfacewidgetitem.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/QtGraphs.abi%%PYTHON_MAJOR_VER%%.so
 %%PYTHON_SITELIBDIR%%/PyQt6/QtGraphsWidgets.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/INSTALLER
-%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/METADATA
-%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/RECORD