3 files changed, 15 insertions, 54 deletions
diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
index ed33dd672f9d..6935f5f785cd 100644
--- a/devel/gammaray/Makefile
+++ b/devel/gammaray/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gammaray
-DISTVERSION=	3.2.0
+DISTVERSION=	3.3.0
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/KDAB/GammaRay/releases/download/v${DISTVERSION}/
 
@@ -7,75 +7,41 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Debugging tool for Qt-application
 WWW=		https://www.kdab.com/development-resources/qt-tools/gammaray/
 
-LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL20+ LGPL21 LGPL21+ LGPL3 MIT
+LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ LGPL20+ LGPL21 LGPL3 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSES/BSD-2-Clause.txt
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSES/BSD-3-Clause.txt
-LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSES/GPL-2.0-only.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
-LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
-LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/LICENSES/LGPL-2.0-or-later.txt
 LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSES/LGPL-2.1-only.txt
-LICENSE_FILE_LGPL21+ =	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/LICENSES/LGPL-3.0-only.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSES/MIT.txt
 
-LIB_DEPENDS=	libdwarf.so:devel/libdwarf \
-		libelf.so:devel/libelf
 RUN_DEPENDS=	lsof:sysutils/lsof
 
-FLAVORS=	qt6 qt5
-FLAVOR?=	qt6
-
-qt5_PKGNAMESUFFIX=		-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}
-qt6_CONFLICTS_INSTALL=	${PORTNAME}-qt5
-
-USES=		cmake pkgconfig
+USES=		cmake kde:6 pkgconfig qt:6
 
 USE_KDE=	coreaddons syntaxhighlighting
-USE_QT=		3d declarative location svg webchannel
-
-.if ${FLAVOR} == qt5
-USES+=		kde:5 qt:5
-USE_QT+=	buildtools:build concurrent core designer gui help \
-		linguisttools network printsupport qdoc:build \
-		qmake:build script scripttools uiplugin widgets xml
-QT_VERSION=${QT5_VERSION:C/\./_/:C/\..*//}
-.else
-USES+=		gl kde:6 qt:6
-USE_GL=		gl
-USE_QT+=	base positioning shadertools tools:build
+USE_QT=		3d base declarative location positioning svg \
+		webchannel tools:build
 QT_VERSION=${QT6_VERSION:C/\./_/:C/\..*//}
-.endif
 
-CMAKE_ARGS+=	QT_VERSION_MAJOR=${_QT_VER}
 CMAKE_ON=	STACK_DETAILS_DWARF
 CMAKE_OFF=	STACK_DETAILS_AUTO_DETECT
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
-PLIST_SUB=	WEBENGINE=""
+PLIST_SUB+=	WEBENGINE=""
 USE_QT+=	webengine
 .else
-PLIST_SUB=	WEBENGINE="@comment "
-.endif
-
-.if ${FLAVOR} == qt5
-PLIST_SUB+=	QT5="" \
-		QT6="@comment "
-.else
-PLIST_SUB+=	QT5="@comment " \
-		QT6=""
+PLIST_SUB+=	WEBENGINE="@comment "
 .endif
 
 PLIST_SUB+=	ARCH=${ARCH:S/amd64/x86_64/:S/i386/i686/:C/armv./arm/} \
 		PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \
-		PORTVERSION=${PORTVERSION} \
-		QTVER=${QT_VERSION}
+		PORTVERSION=${PORTVERSION} QTVER=${QT_VERSION}
 
 WRKSRC=		${WRKDIR}/GammaRay-${DISTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/gammaray/distinfo b/devel/gammaray/distinfo
index 6de83d856282..beabfcee787a 100644
--- a/devel/gammaray/distinfo
+++ b/devel/gammaray/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748855717
-SHA256 (gammaray-3.2.0.tar.gz) = a7c00a5a33c400579002bbe535a667efdea1e726950ecddbf39cf3d8a3f50f07
-SIZE (gammaray-3.2.0.tar.gz) = 11033875
+TIMESTAMP = 1761244570
+SHA256 (gammaray-3.3.0.tar.gz) = 03fda338025d31b6a2794550f090d538996bbb6f4888eab3acb39db5a17127a8
+SIZE (gammaray-3.3.0.tar.gz) = 10976302
diff --git a/devel/gammaray/pkg-plist b/devel/gammaray/pkg-plist
index ef2a32c996de..66c53993e75d 100644
--- a/devel/gammaray/pkg-plist
+++ b/devel/gammaray/pkg-plist
@@ -72,8 +72,6 @@ lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_3dinspector_ui.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_3dinspector.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_actioninspector_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_actioninspector_ui_plugin.so
-%%QT5%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_codecbrowser_plugin.so
-%%QT5%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_codecbrowser_ui_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_eventmonitor_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_eventmonitor_ui_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_fontbrowser_plugin.so
@@ -102,11 +100,8 @@ lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_quickinspector.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_quickwidgetsupport.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_sceneinspector_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_sceneinspector_ui_plugin.so
-%%QT5%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_scriptenginedebugger_plugin.so
-%%QT5%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_scriptenginedebugger_ui_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_signalmonitor_ui.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_signalmonitor.so
-%%QT5%%lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_statemachineviewer_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_styleinspector_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_styleinspector_ui_plugin.so
 lib/gammaray/%%PORTMAJMIN%%/qt%%QTVER%%-%%ARCH%%/gammaray_sysinfo_plugin.so
@@ -152,8 +147,8 @@ mkspecs/modules/qt_GammaRayLauncherUi.pri
 mkspecs/modules/qt_GammaRayUi.pri
 share/metainfo/com.kdab.GammaRay.metainfo.xml
 share/applications/GammaRay.desktop
-%%QT6%%share/doc/GammaRay/gammaray-manual.qch
-%%QT6%%share/doc/GammaRay/gammaray.qhc
+share/doc/GammaRay/gammaray-manual.qch
+share/doc/GammaRay/gammaray.qhc
 share/icons/hicolor/16x16/apps/GammaRay.png
 share/icons/hicolor/16x16@2/apps/GammaRay.png
 share/icons/hicolor/16x16@3/apps/GammaRay.png