diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile
index ac19824570ac..38b1d75a66e0 100644
--- a/devel/kf5-knotifications/Makefile
+++ b/devel/kf5-knotifications/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	knotifications
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 abstraction for system notifications
 
-LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libcanberra.so:audio/libcanberra
 
 USES=		cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
 USE_KDE=	codecs config coreaddons windowsystem \
 		ecm_build
 USE_QT=		core dbus declarative gui linguisttools network phonon4 widgets x11extras \
 		buildtools_build qmake_build
 USE_XORG=	x11 xtst
 
 OPTIONS_DEFINE=		AUDIO
 OPTIONS_DEFAULT=	AUDIO
 
 AUDIO_DESC=		Audio notifications/text-to-speech support
 AUDIO_LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 AUDIO_USE=		QT=speech
 AUDIO_USES=		pkgconfig
 
 .include <bsd.port.mk>
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index fcc99c5ac763..dac624ac4104 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	quassel
 DISTVERSION=	0.14.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT?=	Qt 5 based distributed IRC client (client and monolithic binary)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs
 
 USES=		cmake compiler:c++11-lib cpe pkgconfig qca qt:5 tar:xz
 USE_GITHUB=	nodefault
 #GH_ACCOUNT=	${PORTNAME}
 #GH_PROJECT=	${PORTNAME}
 USE_OPENLDAP=	yes
 USE_QT=		buildtools_build core network qmake_build
 
 CPE_VENDOR=	quassel-irc
 CPE_PRODUCT=	quassel_irc
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_MULTI=		MODULE DB
 OPTIONS_GROUP=		UI
 MODULE_DESC=		Quassel components
 UI_DESC=		Spellcheck and KDE integration for GUI app
 DB_DESC=		Database for Quassel core / monolithic
 OPTIONS_MULTI_MODULE=	CLIENT CORE MONO
 OPTIONS_MULTI_DB=	PGSQL SQLITE3
 OPTIONS_GROUP_UI=	KDE SPELL
 OPTIONS_DEFAULT=	CLIENT MONO SQLITE3
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Quassel client (for use with core)
 CLIENT_CMAKE_BOOL=	WANT_QTCLIENT
 CLIENT_USE=		qt=dbus,gui,multimedia,phonon4,webkit,widgets
-CLIENT_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt
+CLIENT_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5
 CLIENT_PREVENTS=	CORE
 CLIENT_PREVENTS_MSG=	Quassel core server should be installed via irc/quassel-core port
 
 CORE_DESC=		Quassel core server (for use with client)
 CORE_CMAKE_BOOL=	WANT_CORE
 CORE_USE=		qt=script,sql
 CORE_SUB_FILES=		pkg-message
 CORE_VARS=		use_rc_subr=quasselcore \
 			users=quasselcore \
 			groups=quasselcore \
 			plist=${NONEXISTENT} # allow core to override PLIST_FILES
 CORE_PLIST_FILES=	bin/quasselcore
 CORE_PREVENTS=		CLIENT MONO KDE SPELL
 
 MONO_DESC=		Quassel standalone (monolithic binary: core+client combined)
 MONO_CMAKE_BOOL=	WANT_MONO
 MONO_USE=		qt=dbus,gui,multimedia,phonon4,script,sql,webkit,widgets
-MONO_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt
+MONO_LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5
 MONO_PREVENTS=		CORE
 MONO_PREVENTS_MSG=	Quassel core server should be installed via irc/quassel-core port
 
 KDE_DESC=		Enable KDE integration for client / monolitic
 KDE_CMAKE_BOOL=		WITH_KDE
 KDE_USE=		kde=configwidgets,coreaddons,notifications,notifyconfig,textwidgets,widgetsaddons,xmlgui,ecm_build
 KDE_USES=		kde:5
 
 SPELL_DESC=		Enable spellcheck in client / monolitic via KF5Sonnet
 SPELL_USE=		kde=sonnet,ecm_build
 SPELL_USES=		kde:5
 
 NLS_USE=		QT=linguisttools_build
 
 PGSQL_USE=		qt=sql-pgsql
 
 SQLITE3_USE=		qt=sql-sqlite3_run
 
 _LIBVERSION=		0.14.0
 PLIST_SUB=		LIBVERSION=${_LIBVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MMONO}
 PLIST_SUB+=	GUI=""
 .else
 PLIST_SUB+=	GUI="@comment "
 .endif
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-CLIENT-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselclient
 post-install-CORE-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselcore
 post-install-MONO-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quassel
 
 .include <bsd.port.mk>
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index ba445449c5a2..1903b04deb3d 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	telegram-desktop
 DISTVERSION=	4.1.1
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Telegram Desktop messaging app
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	does not build, webrtc related
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	Only little endian is supported
 
 BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib \
 		microsoft-gsl>0:devel/microsoft-gsl \
 		pulseaudio>0:audio/pulseaudio \
 		range-v3>0:devel/range-v3 \
 		tl-expected>0:devel/tl-expected \
 		v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm \
 		${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libavformat.so:multimedia/ffmpeg \
 		libdbus-1.so:devel/dbus \
-		libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+		libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libenchant-2.so:textproc/enchant2 \
 		libevent.so:devel/libevent \
 		libhunspell-1.7.so:textproc/hunspell \
 		libjpeg.so:graphics/jpeg-turbo \
 		liblz4.so:archivers/liblz4 \
 		librnnoise.so:audio/rnnoise \
 		libopenal.so:audio/openal-soft \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libqrcodegencpp.so:graphics/qr-code-generator \
 		libusrsctp.so:net/libusrsctp \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxxhash.so:devel/xxhash \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gl \
 		gnome pkgconfig python:3.7+,build qt:5 ssl xorg
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
 USE_GL=		gl
 USE_GNOME=	glib20 glibmm
 USE_QT=		core dbus gui imageformats network widgets buildtools_build \
 		qmake_build wayland svg
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrender xrandr xtst
 
 CMAKE_ARGS=	-DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
 		-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
 		-Ddisable_autoupdate=1
 CMAKE_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
 		DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 CMAKE_OFF=	DESKTOP_APP_USE_PACKAGED_FONTS \
 		DESKTOP_APP_QT6
 
 # Disable DCHECKs, otherwise video calls will crash.
 CXXFLAGS+=	-DNDEBUG
 
 # see Bugzilla #245452 for details
 NO_CCACHE=	yes
 
 # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
 # It dynamically loads PulseAudio, and if this fails, it loads ALSA.
 # If both of them are not installed, then voice calls do not work, but other functionalities still work.
 OPTIONS_DEFINE=		WEBKIT
 OPTIONS_DEFAULT=	ALSA
 OPTIONS_MULTI=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=	Audio backend for voice calls
 WEBKIT_DESC=	WebKit-gtk integration for payments
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 WEBKIT_CMAKE_BOOL_OFF=	DESKTOP_APP_DISABLE_WEBKITGTK
 WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 WEBKIT_USE=	GNOME=cairo,gtk30
 
 # Telegram asks each custom build to have its own API ID and hash.
 TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d
 TELEGRAM_API_ID=	601761
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_VERSION} < 130
 LLVM_VER=	13
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CC=		${LOCALBASE}/bin/clang${LLVM_VER}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_VER}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/lxqt-qtplugin/Makefile b/sysutils/lxqt-qtplugin/Makefile
index 64c463695fb9..61402bfa827a 100644
--- a/sysutils/lxqt-qtplugin/Makefile
+++ b/sysutils/lxqt-qtplugin/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	lxqt-qtplugin
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	LXQT
 
 MAINTAINER=	jsm@FreeBSD.org
 COMMENT=	LXQt system integration plugin for Qt
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libexif.so:graphics/libexif
 
 USES=	cmake compiler:c++14-lang gnome kde:5 lxqt pkgconfig tar:xz qt:5 \
 	gettext-runtime xorg
 
 USE_XORG=xcb
 USE_GNOME=glib20
 USE_QT=	buildtools_build qmake_build core dbus gui svg widgets \
 	x11extras xml
 USE_KDE=	windowsystem
 USE_LXQT=	buildtools qtxdg libfmqt
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	${QT_PLUGINDIR}/platformthemes/libqtlxqt.so
 
 .include <bsd.port.mk>
diff --git a/x11-wm/lxqt-panel/Makefile b/x11-wm/lxqt-panel/Makefile
index 379501057a9c..4b6a4a50b4c6 100644
--- a/x11-wm/lxqt-panel/Makefile
+++ b/x11-wm/lxqt-panel/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	lxqt-panel
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	LXQT
 
 MAINTAINER=	jsm@FreeBSD.org
 COMMENT=	Panel for the LXQt desktop
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxcb-util.so:x11/xcb-util \
 		libsysstat-qt5.so:sysutils/libsysstat \
 		libxcb-image.so:x11/xcb-util-image
 RUN_DEPENDS=	lxmenu-data>=0.1.2:x11/lxmenu-data
 
 USES=	cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 gnome \
 	localbase:ldflags lxqt pkgconfig tar:xz xorg
 USE_QT=	buildtools_build qmake_build core dbus gui svg widgets \
 	x11extras xml concurrent
 USE_KDE=	windowsystem
 USE_LXQT=	buildtools lxqt globalkeys qtxdg
 USE_XORG=	ice sm x11 xcb xcomposite xdamage xext xfixes xrender xtst
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 OPTIONS_RADIO=	SOUND
 OPTIONS_RADIO_SOUND=	ALSA PULSEAUDIO
 OPTIONS_DEFINE=	CPULOAD MOUNT
 OPTIONS_DEFAULT=	PULSEAUDIO
 
 CPULOAD_DESC=	CPU stat plugin
 MOUNT_DESC=	Mount removable devices support
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=	-DVOLUME_USE_PULSEAUDIO:BOOL=OFF
 CPULOAD_LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 CPULOAD_CMAKE_OFF=	-DCPULOAD_PLUGIN:BOOL=OFF
 PULSEAUDIO_CMAKE_ON=	-DVOLUME_USE_ALSA:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 MOUNT_USE=	kde=solid
 MOUNT_CMAKE_OFF=	-DMOUNT_PLUGIN:BOOL=OFF
 OPTIONS_SUB=	yes
 
 LDFLAGS+=	-Xlinker --export-dynamic
 
 CMAKE_ARGS+=	-DSENSORS_PLUGIN:BOOL=OFF \
 	-DNETWORKMONITOR_PLUGIN:BOOL=OFF \
 	-DWITH_SCREENSAVER_FALLBACK:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MALSA} && ! ${PORT_OPTIONS:MPULSEAUDIO}
 CMAKE_ARGS+=	-DVOLUME_PLUGIN:BOOL=OFF
 PLIST_SUB+=	SOUND="@comment "
 .elif ${PORT_OPTIONS:MALSA} || ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=	SOUND=""
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index 15b12511bd3d..cdf8c7ef20ba 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 Plasma workspace
 
 LIB_DEPENDS=	libcln.so:math/cln \
-		libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+		libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libicui18n.so:devel/icu \
 		libqalculate.so:math/libqalculate \
 		libwayland-client.so:graphics/wayland \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-util.so:x11/xcb-util
 RUN_DEPENDS=	ck-launch-session:sysutils/consolekit2\
 		iceauth:x11/iceauth \
 		xmessage:x11/xmessage \
 		xrdb:x11/xrdb \
 		xset:x11/xset \
 		xsetroot:x11/xsetroot \
 		${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config \
 		iso-codes>=0:misc/iso-codes \
 		${LOCALBASE}/bin/genv:sysutils/coreutils \
 		accountsservice>=0:sysutils/accountsservice
 
 USES=		cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \
 		pkgconfig qt:5 tar:xz xorg
 USE_KDE=	activities activities-stats activitymanagerd archive attica \
 		auth baloo bookmarks codecs completion config configwidgets \
 		coreaddons crash dbusaddons emoticons filemetadata globalaccel \
 		guiaddons holidays i18n iconthemes idletime init itemmodels \
 		itemviews jobwidgets js jsembed kcmutils kdeclarative kdesu \
 		kdewebkit kio kscreenlocker kwin libkscreen libksysguard \
 		newstuff notifications notifyconfig package parts people \
 		plasma-framework plasma-integration prison pty runner service \
 		solid sonnet texteditor textwidgets unitconversion wallet \
 		wayland widgetsaddons windowsystem xmlgui xmlrpcclient \
 		doctools_build ecm_build \
 		breeze-icons_run breeze_run kded_run kquickcharts_run \
 		milou_run oxygen-icons5_run
 USE_QT=		concurrent core dbus declarative graphicaleffects gui network \
 		phonon4 printsupport qdbus script sql svg wayland webkit \
 		widgets x11extras xml \
 		buildtools_build qmake_build testlib_build \
 		paths_run quickcontrols_run
 USE_XORG=	ice sm x11 xau xcb xcomposite xcursor xext xfixes xft xkbfile xrender xtst
 
 CPE_VENDOR=	kde
 
 CMAKE_OFF=	BUILD_TESTING
 
 # In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace:
 CONFLICTS_INSTALL=	plasma5-plasma-desktop-5.14.*
 
 post-stage:
 	${INSTALL_SCRIPT} ${FILESDIR}/startplasma-wayland.sh ${STAGEDIR}/${LOCALBASE}/bin/
 
 .include <bsd.port.mk>