multimedia/phonon: qt5 flavor and qt6 as default

Based on landry@'s feedback, I think it makes sense to follow the
qt6/qt5 pattern of x11/polkit-qt here.

I need to do a proper test with all consumers but phonon-4.12.0 updates
to phonon-qt5-4.12.0p0 correct.

I would be very grateful for a review!

Rafael

diff --git a/devel/kf5/khtml/Makefile b/devel/kf5/khtml/Makefile
index ffcb0c8f6f4..149d183f2a6 100644
--- a/devel/kf5/khtml/Makefile
+++ b/devel/kf5/khtml/Makefile
@@ -1,5 +1,6 @@
COMMENT = original KDE HTML rendering engine
DISTNAME = khtml-${VERSION}
+REVISION = 0

SHARED_LIBS = KF5KHtml 6.0

@@ -35,7 +36,7 @@ LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
graphics/jpeg \
graphics/png \
x11/qt5/qtx11extras \
- multimedia/phonon
+ multimedia/phonon,qt5

IS_PORTING_AID = Yes

diff --git a/devel/kf5/knotifyconfig/Makefile b/devel/kf5/knotifyconfig/Makefile
index c99eec9d8d4..509a4dfee10 100644
--- a/devel/kf5/knotifyconfig/Makefile
+++ b/devel/kf5/knotifyconfig/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE configuration dialog for desktop notifications
DISTNAME = knotifyconfig-${VERSION}
+REVISION = 0

SHARED_LIBS = KF5NotifyConfig 6.0

@@ -13,10 +14,10 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kconfigwidgets>=${MODKF5_VERSION} \
devel/kf5/knotifications>=${MODKF5_VERSION} \
devel/kf5/kxmlgui>=${MODKF5_VERSION} \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtspeech

-RUN_DEPENDS = multimedia/phonon \
+RUN_DEPENDS = multimedia/phonon,qt5 \
x11/qt5/qtspeech

LIB_DEPENDS = devel/kf5/kcompletion>=${MODKF5_VERSION} \
diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index defccf287e7..7864f291d08 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =

# API.rev
-PKGNAME = quirks-7.11
+PKGNAME = quirks-7.12
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index 5ce5405cada..9eef5fe2caa 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -812,6 +812,7 @@ my $stem_extensions = {
'unison' => 'unison-gui',
'sendxmpp' => 'go-sendxmpp',
'libreddit' => 'redlib',
+ 'phonon' => 'phonon-qt5',
};

my $obsolete_reason = {};
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 740ef2927be..60b53291a2c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
-REVISION = 11
+REVISION = 12

SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
@@ -113,7 +113,7 @@ LIB_DEPENDS = converters/libiconv \
graphics/kdiagram \
graphics/lcms2 \
math/imath \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
print/poppler,-qt5 \
security/qca-qt5 \
x11/kde-applications/okular \
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 8c5325e795e..69d0ceb9f31 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -3,7 +3,7 @@ COMMENT = user-friendly TeX/LaTeX editor for KDE
CATEGORIES = editors

DISTNAME = kile-2.9.93
-REVISION = 6
+REVISION = 7

HOMEPAGE = https://kile.sourceforge.io

@@ -31,7 +31,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kinit \
x11/kde-applications/kate \
x11/kde-applications/okular \
- multimedia/phonon
+ multimedia/phonon,qt5

RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kdoctools \
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 24d1057f778..01912f2e7bc 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,14 +1,19 @@
-COMMENT = multimedia layer for Qt5/KDE5
+COMMENT = multimedia layer for Qt

CATEGORIES = multimedia devel

-VERSION = 4.12.0
-DISTNAME = phonon-${VERSION}
+V = 4.12.0
+REVISION = 0
+DISTNAME = phonon-${V}
+PKGNAME = phonon-qt5-${V}

# XXX major should be tweaked on any update, to unbreak
# IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
-SHARED_LIBS += phonon4qt5 4.0
-SHARED_LIBS += phonon4qt5experimental 4.0
+SHARED_LIBS += phonon4qt5 4.0
+SHARED_LIBS += phonon4qt5experimental 4.0
+
+SHARED_LIBS += phonon4qt6 0.0 # 0.0
+SHARED_LIBS += phonon4qt6experimental 0.0 # 0.0

HOMEPAGE = https://community.kde.org/Phonon

@@ -17,25 +22,37 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# LGPL v2.1
PERMIT_PACKAGE = Yes

-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m pulse
-WANTLIB += pulse-mainloop-glib
+FLAVORS= qt5
+FLAVOR ?=

CXXFLAGS_base-clang = -Wno-error=enum-constexpr-conversion

-SITES = ${SITE_KDE:=stable/phonon/${VERSION}/}
+SITES = ${SITE_KDE:=stable/phonon/${V}/}
+EXTRACT_SUFX = .tar.xz

-MODULES = devel/kf5
+MODULES = devel/cmake

LIB_DEPENDS = audio/pulseaudio

-BUILD_DEPENDS = x11/qt5/qtdeclarative

-RUN_DEPENDS = x11/qt5/qtdeclarative
+.if ${FLAVOR:Mqt5}
+FULLPKGNAME= phonon-qt5-${V}
+MODULES += x11/qt5
+BUILD_DEPENDS += x11/qt5/qtdeclarative
+CONFIGURE_ARGS += \
+ -DPHONON_BUILD_QT6=OFF \
+ -DPHONON_BUILD_QT5=ON \
+ -DECM_MKSPECS_INSTALL_DIR=${PREFIX}/share/kf5/mkspecs
+.else
+PKGNAME= phonon-qt6-${V}
+MODULES += x11/qt6
+BUILD_DEPENDS += x11/qt6/qtdeclarative
+LIB_DEPENDS += x11/qt6/qt5compat
+CONFIGURE_ARGS += -DPHONON_BUILD_QT6=ON \
+ -DPHONON_BUILD_QT5=OFF
+.endif

# Clashes with the one provided by Qt itself.
CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN=OFF

-# Qt5 only port
-CONFIGURE_ARGS += -DPHONON_BUILD_QT6=OFF
-
.include <bsd.port.mk>
diff --git a/multimedia/phonon/pkg/PFRAG.no-qt5 b/multimedia/phonon/pkg/PFRAG.no-qt5
new file mode 100644
index 00000000000..7874a82603c
--- /dev/null
+++ b/multimedia/phonon/pkg/PFRAG.no-qt5
@@ -0,0 +1,130 @@
+include/phonon4qt6/
+include/phonon4qt6/phonon/
+include/phonon4qt6/phonon/AbstractAudioOutput
+include/phonon4qt6/phonon/AbstractMediaStream
+include/phonon4qt6/phonon/AbstractVideoOutput
+include/phonon4qt6/phonon/AddonInterface
+include/phonon4qt6/phonon/AudioCaptureDevice
+include/phonon4qt6/phonon/AudioCaptureDeviceModel
+include/phonon4qt6/phonon/AudioChannelDescription
+include/phonon4qt6/phonon/AudioChannelDescriptionModel
+include/phonon4qt6/phonon/AudioDataOutput
+include/phonon4qt6/phonon/AudioOutput
+include/phonon4qt6/phonon/AudioOutputDevice
+include/phonon4qt6/phonon/AudioOutputDeviceModel
+include/phonon4qt6/phonon/AudioOutputInterface
+include/phonon4qt6/phonon/AudioOutputInterface40
+include/phonon4qt6/phonon/AudioOutputInterface42
+include/phonon4qt6/phonon/AvCapture
+include/phonon4qt6/phonon/BackendCapabilities
+include/phonon4qt6/phonon/BackendInterface
+include/phonon4qt6/phonon/Effect
+include/phonon4qt6/phonon/EffectDescription
+include/phonon4qt6/phonon/EffectDescriptionModel
+include/phonon4qt6/phonon/EffectInterface
+include/phonon4qt6/phonon/EffectParameter
+include/phonon4qt6/phonon/EffectWidget
+include/phonon4qt6/phonon/Global
+include/phonon4qt6/phonon/GlobalDescriptionContainer
+include/phonon4qt6/phonon/MediaController
+include/phonon4qt6/phonon/MediaNode
+include/phonon4qt6/phonon/MediaObject
+include/phonon4qt6/phonon/MediaObjectInterface
+include/phonon4qt6/phonon/MediaSource
+include/phonon4qt6/phonon/Mrl
+include/phonon4qt6/phonon/ObjectDescription
+include/phonon4qt6/phonon/ObjectDescriptionData
+include/phonon4qt6/phonon/ObjectDescriptionModel
+include/phonon4qt6/phonon/ObjectDescriptionModelData
+include/phonon4qt6/phonon/Path
+include/phonon4qt6/phonon/PlatformPlugin
+include/phonon4qt6/phonon/SeekSlider
+include/phonon4qt6/phonon/StreamInterface
+include/phonon4qt6/phonon/SubtitleDescription
+include/phonon4qt6/phonon/SubtitleDescriptionModel
+include/phonon4qt6/phonon/VideoCaptureDevice
+include/phonon4qt6/phonon/VideoCaptureDeviceModel
+include/phonon4qt6/phonon/VideoPlayer
+include/phonon4qt6/phonon/VideoWidget
+include/phonon4qt6/phonon/VideoWidgetInterface
+include/phonon4qt6/phonon/VideoWidgetInterface44
+include/phonon4qt6/phonon/VideoWidgetInterfaceLatest
+include/phonon4qt6/phonon/VolumeFaderEffect
+include/phonon4qt6/phonon/VolumeFaderInterface
+include/phonon4qt6/phonon/VolumeSlider
+include/phonon4qt6/phonon/abstractaudiooutput.h
+include/phonon4qt6/phonon/abstractmediastream.h
+include/phonon4qt6/phonon/abstractvideooutput.h
+include/phonon4qt6/phonon/addoninterface.h
+include/phonon4qt6/phonon/audiodataoutput.h
+include/phonon4qt6/phonon/audiodataoutputinterface.h
+include/phonon4qt6/phonon/audiooutput.h
+include/phonon4qt6/phonon/audiooutputinterface.h
+include/phonon4qt6/phonon/backendcapabilities.h
+include/phonon4qt6/phonon/backendinterface.h
+include/phonon4qt6/phonon/effect.h
+include/phonon4qt6/phonon/effectinterface.h
+include/phonon4qt6/phonon/effectparameter.h
+include/phonon4qt6/phonon/effectwidget.h
+include/phonon4qt6/phonon/experimental/
+include/phonon4qt6/phonon/experimental/abstractaudiodataoutput.h
+include/phonon4qt6/phonon/experimental/abstractvideodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutput.h
+include/phonon4qt6/phonon/experimental/audiodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/audioformat.h
+include/phonon4qt6/phonon/experimental/avcapture.h
+include/phonon4qt6/phonon/experimental/avcaptureinterface.h
+include/phonon4qt6/phonon/experimental/backendcapabilities.h
+include/phonon4qt6/phonon/experimental/backendinterface.h
+include/phonon4qt6/phonon/experimental/export.h
+include/phonon4qt6/phonon/experimental/globalconfig.h
+include/phonon4qt6/phonon/experimental/mediasource.h
+include/phonon4qt6/phonon/experimental/objectdescription.h
+include/phonon4qt6/phonon/experimental/packet.h
+include/phonon4qt6/phonon/experimental/packetpool.h
+include/phonon4qt6/phonon/experimental/phononnamespace.h
+include/phonon4qt6/phonon/experimental/snapshotinterface.h
+include/phonon4qt6/phonon/experimental/videodataoutput.h
+include/phonon4qt6/phonon/experimental/videodataoutput2.h
+include/phonon4qt6/phonon/experimental/videodataoutputinterface.h
+include/phonon4qt6/phonon/experimental/videoframe.h
+include/phonon4qt6/phonon/experimental/videoframe2.h
+include/phonon4qt6/phonon/experimental/videowidget.h
+include/phonon4qt6/phonon/experimental/visualization.h
+include/phonon4qt6/phonon/globalconfig.h
+include/phonon4qt6/phonon/globaldescriptioncontainer.h
+include/phonon4qt6/phonon/mediacontroller.h
+include/phonon4qt6/phonon/medianode.h
+include/phonon4qt6/phonon/mediaobject.h
+include/phonon4qt6/phonon/mediaobjectinterface.h
+include/phonon4qt6/phonon/mediasource.h
+include/phonon4qt6/phonon/mrl.h
+include/phonon4qt6/phonon/objectdescription.h
+include/phonon4qt6/phonon/objectdescriptionmodel.h
+include/phonon4qt6/phonon/path.h
+include/phonon4qt6/phonon/phonon_export.h
+include/phonon4qt6/phonon/phonon_version.h
+include/phonon4qt6/phonon/phonondefs.h
+include/phonon4qt6/phonon/phononnamespace.h
+include/phonon4qt6/phonon/platformplugin.h
+include/phonon4qt6/phonon/pulsesupport.h
+include/phonon4qt6/phonon/seekslider.h
+include/phonon4qt6/phonon/streaminterface.h
+include/phonon4qt6/phonon/videoplayer.h
+include/phonon4qt6/phonon/videowidget.h
+include/phonon4qt6/phonon/videowidgetinterface.h
+include/phonon4qt6/phonon/volumefadereffect.h
+include/phonon4qt6/phonon/volumefaderinterface.h
+include/phonon4qt6/phonon/volumeslider.h
+lib/cmake/phonon4qt6/
+lib/cmake/phonon4qt6/Phonon4Qt6Config.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ConfigVersion.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfig.cmake
+lib/cmake/phonon4qt6/Phonon4Qt6ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt6/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononExperimentalTargets.cmake
+lib/cmake/phonon4qt6/PhononTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt6/PhononTargets.cmake
+@lib lib/libphonon4qt6.so.${LIBphonon4qt6_VERSION}
+@lib lib/libphonon4qt6experimental.so.${LIBphonon4qt6experimental_VERSION}
+lib/pkgconfig/phonon4qt6.pc
diff --git a/multimedia/phonon/pkg/PFRAG.qt5 b/multimedia/phonon/pkg/PFRAG.qt5
new file mode 100644
index 00000000000..5a3e188b0a3
--- /dev/null
+++ b/multimedia/phonon/pkg/PFRAG.qt5
@@ -0,0 +1,182 @@
+@conflict phonon-<=4.12.0
+@pkgpath multimedia/phonon
+include/phonon4qt5/
+include/phonon4qt5/KDE/
+include/phonon4qt5/KDE/Phonon/
+include/phonon4qt5/KDE/Phonon/AbstractAudioOutput
+include/phonon4qt5/KDE/Phonon/AbstractMediaStream
+include/phonon4qt5/KDE/Phonon/AbstractVideoOutput
+include/phonon4qt5/KDE/Phonon/AddonInterface
+include/phonon4qt5/KDE/Phonon/AudioDevice
+include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator
+include/phonon4qt5/KDE/Phonon/AudioOutput
+include/phonon4qt5/KDE/Phonon/AudioOutputDevice
+include/phonon4qt5/KDE/Phonon/AudioOutputDeviceModel
+include/phonon4qt5/KDE/Phonon/AudioOutputInterface
+include/phonon4qt5/KDE/Phonon/BackendCapabilities
+include/phonon4qt5/KDE/Phonon/BackendInterface
+include/phonon4qt5/KDE/Phonon/Effect
+include/phonon4qt5/KDE/Phonon/EffectDescription
+include/phonon4qt5/KDE/Phonon/EffectDescriptionModel
+include/phonon4qt5/KDE/Phonon/EffectInterface
+include/phonon4qt5/KDE/Phonon/EffectParameter
+include/phonon4qt5/KDE/Phonon/EffectWidget
+include/phonon4qt5/KDE/Phonon/Experimental/
+include/phonon4qt5/KDE/Phonon/Experimental/AbstractVideoDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/AudioDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/SnapshotInterface
+include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutput
+include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutputInterface
+include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame
+include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame2
+include/phonon4qt5/KDE/Phonon/Experimental/Visualization
+include/phonon4qt5/KDE/Phonon/Global
+include/phonon4qt5/KDE/Phonon/MediaController
+include/phonon4qt5/KDE/Phonon/MediaNode
+include/phonon4qt5/KDE/Phonon/MediaObject
+include/phonon4qt5/KDE/Phonon/MediaObjectInterface
+include/phonon4qt5/KDE/Phonon/MediaSource
+include/phonon4qt5/KDE/Phonon/ObjectDescription
+include/phonon4qt5/KDE/Phonon/ObjectDescriptionModel
+include/phonon4qt5/KDE/Phonon/Path
+include/phonon4qt5/KDE/Phonon/PlatformPlugin
+include/phonon4qt5/KDE/Phonon/SeekSlider
+include/phonon4qt5/KDE/Phonon/StreamInterface
+include/phonon4qt5/KDE/Phonon/VideoPlayer
+include/phonon4qt5/KDE/Phonon/VideoWidget
+include/phonon4qt5/KDE/Phonon/VideoWidgetInterface
+include/phonon4qt5/KDE/Phonon/VolumeFaderEffect
+include/phonon4qt5/KDE/Phonon/VolumeFaderInterface
+include/phonon4qt5/KDE/Phonon/VolumeSlider
+include/phonon4qt5/phonon/
+include/phonon4qt5/phonon/AbstractAudioOutput
+include/phonon4qt5/phonon/AbstractMediaStream
+include/phonon4qt5/phonon/AbstractVideoOutput
+include/phonon4qt5/phonon/AddonInterface
+include/phonon4qt5/phonon/AudioCaptureDevice
+include/phonon4qt5/phonon/AudioCaptureDeviceModel
+include/phonon4qt5/phonon/AudioChannelDescription
+include/phonon4qt5/phonon/AudioChannelDescriptionModel
+include/phonon4qt5/phonon/AudioDataOutput
+include/phonon4qt5/phonon/AudioOutput
+include/phonon4qt5/phonon/AudioOutputDevice
+include/phonon4qt5/phonon/AudioOutputDeviceModel
+include/phonon4qt5/phonon/AudioOutputInterface
+include/phonon4qt5/phonon/AudioOutputInterface40
+include/phonon4qt5/phonon/AudioOutputInterface42
+include/phonon4qt5/phonon/AvCapture
+include/phonon4qt5/phonon/BackendCapabilities
+include/phonon4qt5/phonon/BackendInterface
+include/phonon4qt5/phonon/Effect
+include/phonon4qt5/phonon/EffectDescription
+include/phonon4qt5/phonon/EffectDescriptionModel
+include/phonon4qt5/phonon/EffectInterface
+include/phonon4qt5/phonon/EffectParameter
+include/phonon4qt5/phonon/EffectWidget
+include/phonon4qt5/phonon/Global
+include/phonon4qt5/phonon/GlobalDescriptionContainer
+include/phonon4qt5/phonon/MediaController
+include/phonon4qt5/phonon/MediaNode
+include/phonon4qt5/phonon/MediaObject
+include/phonon4qt5/phonon/MediaObjectInterface
+include/phonon4qt5/phonon/MediaSource
+include/phonon4qt5/phonon/Mrl
+include/phonon4qt5/phonon/ObjectDescription
+include/phonon4qt5/phonon/ObjectDescriptionData
+include/phonon4qt5/phonon/ObjectDescriptionModel
+include/phonon4qt5/phonon/ObjectDescriptionModelData
+include/phonon4qt5/phonon/Path
+include/phonon4qt5/phonon/PlatformPlugin
+include/phonon4qt5/phonon/SeekSlider
+include/phonon4qt5/phonon/StreamInterface
+include/phonon4qt5/phonon/SubtitleDescription
+include/phonon4qt5/phonon/SubtitleDescriptionModel
+include/phonon4qt5/phonon/VideoCaptureDevice
+include/phonon4qt5/phonon/VideoCaptureDeviceModel
+include/phonon4qt5/phonon/VideoPlayer
+include/phonon4qt5/phonon/VideoWidget
+include/phonon4qt5/phonon/VideoWidgetInterface
+include/phonon4qt5/phonon/VideoWidgetInterface44
+include/phonon4qt5/phonon/VideoWidgetInterfaceLatest
+include/phonon4qt5/phonon/VolumeFaderEffect
+include/phonon4qt5/phonon/VolumeFaderInterface
+include/phonon4qt5/phonon/VolumeSlider
+include/phonon4qt5/phonon/abstractaudiooutput.h
+include/phonon4qt5/phonon/abstractmediastream.h
+include/phonon4qt5/phonon/abstractvideooutput.h
+include/phonon4qt5/phonon/addoninterface.h
+include/phonon4qt5/phonon/audiodataoutput.h
+include/phonon4qt5/phonon/audiodataoutputinterface.h
+include/phonon4qt5/phonon/audiooutput.h
+include/phonon4qt5/phonon/audiooutputinterface.h
+include/phonon4qt5/phonon/backendcapabilities.h
+include/phonon4qt5/phonon/backendinterface.h
+include/phonon4qt5/phonon/effect.h
+include/phonon4qt5/phonon/effectinterface.h
+include/phonon4qt5/phonon/effectparameter.h
+include/phonon4qt5/phonon/effectwidget.h
+include/phonon4qt5/phonon/experimental/
+include/phonon4qt5/phonon/experimental/abstractaudiodataoutput.h
+include/phonon4qt5/phonon/experimental/abstractvideodataoutput.h
+include/phonon4qt5/phonon/experimental/audiodataoutput.h
+include/phonon4qt5/phonon/experimental/audiodataoutputinterface.h
+include/phonon4qt5/phonon/experimental/audioformat.h
+include/phonon4qt5/phonon/experimental/avcapture.h
+include/phonon4qt5/phonon/experimental/avcaptureinterface.h
+include/phonon4qt5/phonon/experimental/backendcapabilities.h
+include/phonon4qt5/phonon/experimental/backendinterface.h
+include/phonon4qt5/phonon/experimental/export.h
+include/phonon4qt5/phonon/experimental/globalconfig.h
+include/phonon4qt5/phonon/experimental/mediasource.h
+include/phonon4qt5/phonon/experimental/objectdescription.h
+include/phonon4qt5/phonon/experimental/packet.h
+include/phonon4qt5/phonon/experimental/packetpool.h
+include/phonon4qt5/phonon/experimental/phononnamespace.h
+include/phonon4qt5/phonon/experimental/snapshotinterface.h
+include/phonon4qt5/phonon/experimental/videodataoutput.h
+include/phonon4qt5/phonon/experimental/videodataoutput2.h
+include/phonon4qt5/phonon/experimental/videodataoutputinterface.h
+include/phonon4qt5/phonon/experimental/videoframe.h
+include/phonon4qt5/phonon/experimental/videoframe2.h
+include/phonon4qt5/phonon/experimental/videowidget.h
+include/phonon4qt5/phonon/experimental/visualization.h
+include/phonon4qt5/phonon/globalconfig.h
+include/phonon4qt5/phonon/globaldescriptioncontainer.h
+include/phonon4qt5/phonon/mediacontroller.h
+include/phonon4qt5/phonon/medianode.h
+include/phonon4qt5/phonon/mediaobject.h
+include/phonon4qt5/phonon/mediaobjectinterface.h
+include/phonon4qt5/phonon/mediasource.h
+include/phonon4qt5/phonon/mrl.h
+include/phonon4qt5/phonon/objectdescription.h
+include/phonon4qt5/phonon/objectdescriptionmodel.h
+include/phonon4qt5/phonon/path.h
+include/phonon4qt5/phonon/phonon_export.h
+include/phonon4qt5/phonon/phonon_version.h
+include/phonon4qt5/phonon/phonondefs.h
+include/phonon4qt5/phonon/phononnamespace.h
+include/phonon4qt5/phonon/platformplugin.h
+include/phonon4qt5/phonon/pulsesupport.h
+include/phonon4qt5/phonon/seekslider.h
+include/phonon4qt5/phonon/streaminterface.h
+include/phonon4qt5/phonon/videoplayer.h
+include/phonon4qt5/phonon/videowidget.h
+include/phonon4qt5/phonon/videowidgetinterface.h
+include/phonon4qt5/phonon/volumefadereffect.h
+include/phonon4qt5/phonon/volumefaderinterface.h
+include/phonon4qt5/phonon/volumeslider.h
+lib/cmake/phonon4qt5/
+lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake
+lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake
+lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
+lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/phonon4qt5/PhononTargets.cmake
+@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
+@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
+lib/pkgconfig/phonon4qt5.pc
+share/kf5/
+share/kf5/mkspecs/
+share/kf5/mkspecs/qt_phonon4qt5.pri
diff --git a/multimedia/phonon/pkg/PLIST b/multimedia/phonon/pkg/PLIST
index cc2ea3f18e9..7df9806a911 100644
--- a/multimedia/phonon/pkg/PLIST
+++ b/multimedia/phonon/pkg/PLIST
@@ -1,187 +1,8 @@
-@conflict phonon-<4.11.1
@conflict phonon-qt5-<=4.10.3p0
@pkgpath multimedia/phonon-qt5
@bin bin/phononsettings
-include/phonon4qt5/
-include/phonon4qt5/KDE/
-include/phonon4qt5/KDE/Phonon/
-include/phonon4qt5/KDE/Phonon/AbstractAudioOutput
-include/phonon4qt5/KDE/Phonon/AbstractMediaStream
-include/phonon4qt5/KDE/Phonon/AbstractVideoOutput
-include/phonon4qt5/KDE/Phonon/AddonInterface
-include/phonon4qt5/KDE/Phonon/AudioDevice
-include/phonon4qt5/KDE/Phonon/AudioDeviceEnumerator
-include/phonon4qt5/KDE/Phonon/AudioOutput
-include/phonon4qt5/KDE/Phonon/AudioOutputDevice
-include/phonon4qt5/KDE/Phonon/AudioOutputDeviceModel
-include/phonon4qt5/KDE/Phonon/AudioOutputInterface
-include/phonon4qt5/KDE/Phonon/BackendCapabilities
-include/phonon4qt5/KDE/Phonon/BackendInterface
-include/phonon4qt5/KDE/Phonon/Effect
-include/phonon4qt5/KDE/Phonon/EffectDescription
-include/phonon4qt5/KDE/Phonon/EffectDescriptionModel
-include/phonon4qt5/KDE/Phonon/EffectInterface
-include/phonon4qt5/KDE/Phonon/EffectParameter
-include/phonon4qt5/KDE/Phonon/EffectWidget
-include/phonon4qt5/KDE/Phonon/Experimental/
-include/phonon4qt5/KDE/Phonon/Experimental/AbstractVideoDataOutput
-include/phonon4qt5/KDE/Phonon/Experimental/AudioDataOutput
-include/phonon4qt5/KDE/Phonon/Experimental/SnapshotInterface
-include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutput
-include/phonon4qt5/KDE/Phonon/Experimental/VideoDataOutputInterface
-include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame
-include/phonon4qt5/KDE/Phonon/Experimental/VideoFrame2
-include/phonon4qt5/KDE/Phonon/Experimental/Visualization
-include/phonon4qt5/KDE/Phonon/Global
-include/phonon4qt5/KDE/Phonon/MediaController
-include/phonon4qt5/KDE/Phonon/MediaNode
-include/phonon4qt5/KDE/Phonon/MediaObject
-include/phonon4qt5/KDE/Phonon/MediaObjectInterface
-include/phonon4qt5/KDE/Phonon/MediaSource
-include/phonon4qt5/KDE/Phonon/ObjectDescription
-include/phonon4qt5/KDE/Phonon/ObjectDescriptionModel
-include/phonon4qt5/KDE/Phonon/Path
-include/phonon4qt5/KDE/Phonon/PlatformPlugin
-include/phonon4qt5/KDE/Phonon/SeekSlider
-include/phonon4qt5/KDE/Phonon/StreamInterface
-include/phonon4qt5/KDE/Phonon/VideoPlayer
-include/phonon4qt5/KDE/Phonon/VideoWidget
-include/phonon4qt5/KDE/Phonon/VideoWidgetInterface
-include/phonon4qt5/KDE/Phonon/VolumeFaderEffect
-include/phonon4qt5/KDE/Phonon/VolumeFaderInterface
-include/phonon4qt5/KDE/Phonon/VolumeSlider
-include/phonon4qt5/phonon/
-include/phonon4qt5/phonon/AbstractAudioOutput
-include/phonon4qt5/phonon/AbstractMediaStream
-include/phonon4qt5/phonon/AbstractVideoOutput
-include/phonon4qt5/phonon/AddonInterface
-include/phonon4qt5/phonon/AudioCaptureDevice
-include/phonon4qt5/phonon/AudioCaptureDeviceModel
-include/phonon4qt5/phonon/AudioChannelDescription
-include/phonon4qt5/phonon/AudioChannelDescriptionModel
-include/phonon4qt5/phonon/AudioDataOutput
-include/phonon4qt5/phonon/AudioOutput
-include/phonon4qt5/phonon/AudioOutputDevice
-include/phonon4qt5/phonon/AudioOutputDeviceModel
-include/phonon4qt5/phonon/AudioOutputInterface
-include/phonon4qt5/phonon/AudioOutputInterface40
-include/phonon4qt5/phonon/AudioOutputInterface42
-include/phonon4qt5/phonon/AvCapture
-include/phonon4qt5/phonon/BackendCapabilities
-include/phonon4qt5/phonon/BackendInterface
-include/phonon4qt5/phonon/Effect
-include/phonon4qt5/phonon/EffectDescription
-include/phonon4qt5/phonon/EffectDescriptionModel
-include/phonon4qt5/phonon/EffectInterface
-include/phonon4qt5/phonon/EffectParameter
-include/phonon4qt5/phonon/EffectWidget
-include/phonon4qt5/phonon/Global
-include/phonon4qt5/phonon/GlobalDescriptionContainer
-include/phonon4qt5/phonon/MediaController
-include/phonon4qt5/phonon/MediaNode
-include/phonon4qt5/phonon/MediaObject
-include/phonon4qt5/phonon/MediaObjectInterface
-include/phonon4qt5/phonon/MediaSource
-include/phonon4qt5/phonon/Mrl
-include/phonon4qt5/phonon/ObjectDescription
-include/phonon4qt5/phonon/ObjectDescriptionData
-include/phonon4qt5/phonon/ObjectDescriptionModel
-include/phonon4qt5/phonon/ObjectDescriptionModelData
-include/phonon4qt5/phonon/Path
-include/phonon4qt5/phonon/PlatformPlugin
-include/phonon4qt5/phonon/SeekSlider
-include/phonon4qt5/phonon/StreamInterface
-include/phonon4qt5/phonon/SubtitleDescription
-include/phonon4qt5/phonon/SubtitleDescriptionModel
-include/phonon4qt5/phonon/VideoCaptureDevice
-include/phonon4qt5/phonon/VideoCaptureDeviceModel
-include/phonon4qt5/phonon/VideoPlayer
-include/phonon4qt5/phonon/VideoWidget
-include/phonon4qt5/phonon/VideoWidgetInterface
-include/phonon4qt5/phonon/VideoWidgetInterface44
-include/phonon4qt5/phonon/VideoWidgetInterfaceLatest
-include/phonon4qt5/phonon/VolumeFaderEffect
-include/phonon4qt5/phonon/VolumeFaderInterface
-include/phonon4qt5/phonon/VolumeSlider
-include/phonon4qt5/phonon/abstractaudiooutput.h
-include/phonon4qt5/phonon/abstractmediastream.h
-include/phonon4qt5/phonon/abstractvideooutput.h
-include/phonon4qt5/phonon/addoninterface.h
-include/phonon4qt5/phonon/audiodataoutput.h
-include/phonon4qt5/phonon/audiodataoutputinterface.h
-include/phonon4qt5/phonon/audiooutput.h
-include/phonon4qt5/phonon/audiooutputinterface.h
-include/phonon4qt5/phonon/backendcapabilities.h
-include/phonon4qt5/phonon/backendinterface.h
-include/phonon4qt5/phonon/effect.h
-include/phonon4qt5/phonon/effectinterface.h
-include/phonon4qt5/phonon/effectparameter.h
-include/phonon4qt5/phonon/effectwidget.h
-include/phonon4qt5/phonon/experimental/
-include/phonon4qt5/phonon/experimental/abstractaudiodataoutput.h
-include/phonon4qt5/phonon/experimental/abstractvideodataoutput.h
-include/phonon4qt5/phonon/experimental/audiodataoutput.h
-include/phonon4qt5/phonon/experimental/audiodataoutputinterface.h
-include/phonon4qt5/phonon/experimental/audioformat.h
-include/phonon4qt5/phonon/experimental/avcapture.h
-include/phonon4qt5/phonon/experimental/avcaptureinterface.h
-include/phonon4qt5/phonon/experimental/backendcapabilities.h
-include/phonon4qt5/phonon/experimental/backendinterface.h
-include/phonon4qt5/phonon/experimental/export.h
-include/phonon4qt5/phonon/experimental/globalconfig.h
-include/phonon4qt5/phonon/experimental/mediasource.h
-include/phonon4qt5/phonon/experimental/objectdescription.h
-include/phonon4qt5/phonon/experimental/packet.h
-include/phonon4qt5/phonon/experimental/packetpool.h
-include/phonon4qt5/phonon/experimental/phononnamespace.h
-include/phonon4qt5/phonon/experimental/snapshotinterface.h
-include/phonon4qt5/phonon/experimental/videodataoutput.h
-include/phonon4qt5/phonon/experimental/videodataoutput2.h
-include/phonon4qt5/phonon/experimental/videodataoutputinterface.h
-include/phonon4qt5/phonon/experimental/videoframe.h
-include/phonon4qt5/phonon/experimental/videoframe2.h
-include/phonon4qt5/phonon/experimental/videowidget.h
-include/phonon4qt5/phonon/experimental/visualization.h
-include/phonon4qt5/phonon/globalconfig.h
-include/phonon4qt5/phonon/globaldescriptioncontainer.h
-include/phonon4qt5/phonon/mediacontroller.h
-include/phonon4qt5/phonon/medianode.h
-include/phonon4qt5/phonon/mediaobject.h
-include/phonon4qt5/phonon/mediaobjectinterface.h
-include/phonon4qt5/phonon/mediasource.h
-include/phonon4qt5/phonon/mrl.h
-include/phonon4qt5/phonon/objectdescription.h
-include/phonon4qt5/phonon/objectdescriptionmodel.h
-include/phonon4qt5/phonon/path.h
-include/phonon4qt5/phonon/phonon_export.h
-include/phonon4qt5/phonon/phonon_version.h
-include/phonon4qt5/phonon/phonondefs.h
-include/phonon4qt5/phonon/phononnamespace.h
-include/phonon4qt5/phonon/platformplugin.h
-include/phonon4qt5/phonon/pulsesupport.h
-include/phonon4qt5/phonon/seekslider.h
-include/phonon4qt5/phonon/streaminterface.h
-include/phonon4qt5/phonon/videoplayer.h
-include/phonon4qt5/phonon/videowidget.h
-include/phonon4qt5/phonon/videowidgetinterface.h
-include/phonon4qt5/phonon/volumefadereffect.h
-include/phonon4qt5/phonon/volumefaderinterface.h
-include/phonon4qt5/phonon/volumeslider.h
-lib/cmake/phonon4qt5/
-lib/cmake/phonon4qt5/Phonon4Qt5Config.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ConfigVersion.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfig.cmake
-lib/cmake/phonon4qt5/Phonon4Qt5ExperimentalConfigVersion.cmake
-lib/cmake/phonon4qt5/PhononExperimentalTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/phonon4qt5/PhononExperimentalTargets.cmake
-lib/cmake/phonon4qt5/PhononTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/phonon4qt5/PhononTargets.cmake
-@lib lib/libphonon4qt5.so.${LIBphonon4qt5_VERSION}
-@lib lib/libphonon4qt5experimental.so.${LIBphonon4qt5experimental_VERSION}
-lib/pkgconfig/phonon4qt5.pc
-share/kf5/
-share/kf5/mkspecs/
-share/kf5/mkspecs/qt_phonon4qt5.pri
+%%qt5%%
+!%%qt5%%
share/locale/ar/LC_MESSAGES/libphonon_qt.qm
share/locale/ar/LC_MESSAGES/phononsettings_qt.qm
share/locale/az/LC_MESSAGES/libphonon_qt.qm
diff --git a/net/konversation/Makefile b/net/konversation/Makefile
index b054909a1ff..d6c2cb5ff74 100644
--- a/net/konversation/Makefile
+++ b/net/konversation/Makefile
@@ -1,4 +1,5 @@
COMMENT = IRC client for KDE
+REVISION = 0

DISTNAME = konversation-${MODKDE_VERSION}

@@ -31,7 +32,7 @@ MODULES = x11/kde-applications \
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kdoctools \
devel/kf5/kitemmodels \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtx11extras

RUN_DEPENDS = devel/desktop-file-utils \
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index 82071caf19b..3ebc7c8611a 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -3,7 +3,7 @@ USE_WXNEEDED = Yes
COMMENT = BitTorrent Client

DISTNAME = ktorrent-${MODKDE_VERSION}
-REVISION = 0
+REVISION = 1

SHARED_LIBS += ktcore 3.0 # 0.0

@@ -75,7 +75,7 @@ LIB_DEPENDS = audio/taglib \
x11/qt5/qtlocation \
x11/qt5/qtwebchannel \
x11/qt5/qtwebengine \
- multimedia/phonon
+ multimedia/phonon,qt5

CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_LibKWorkspace=ON

diff --git a/x11/kde-applications/blinken/Makefile b/x11/kde-applications/blinken/Makefile
index 7f8554a37ae..292642a9bf9 100644
--- a/x11/kde-applications/blinken/Makefile
+++ b/x11/kde-applications/blinken/Makefile
@@ -1,5 +1,6 @@
COMMENT = memory enhancement game
DISTNAME = blinken-${VERSION}
+REVISION = 0
CATEGORIES = games education

HOMEPAGE = https://www.kde.org/applications/education/blinken/
@@ -27,6 +28,6 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
x11/qt5/qtsvg \
- multimedia/phonon
+ multimedia/phonon,qt5

.include <bsd.port.mk>
diff --git a/x11/kde-applications/dolphin/Makefile b/x11/kde-applications/dolphin/Makefile
index 76d6e381bec..f71808cff69 100644
--- a/x11/kde-applications/dolphin/Makefile
+++ b/x11/kde-applications/dolphin/Makefile
@@ -1,6 +1,7 @@
COMMENT = KDE File Manager
DISTNAME = dolphin-${VERSION}
PKGNAME = dolphin-kf5-${VERSION}
+REVISION = 0
CATEGORIES = x11

HOMEPAGE = https://apps.kde.org/dolphin
@@ -64,7 +65,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kwidgetsaddons \
devel/kf5/solid \
devel/kf5/sonnet \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
productivity/kuserfeedback \
x11/kde-applications/baloo-widgets>=${MODKDE_VERSION}

diff --git a/x11/kde-applications/dragon/Makefile b/x11/kde-applications/dragon/Makefile
index 4d8f3cc0a57..b62245966c2 100644
--- a/x11/kde-applications/dragon/Makefile
+++ b/x11/kde-applications/dragon/Makefile
@@ -1,5 +1,6 @@
COMMENT = simple video player for KDE
DISTNAME = dragon-${VERSION}
+REVISION = 0
CATEGORIES = multimedia

WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
@@ -38,7 +39,7 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/kwidgetsaddons \
devel/kf5/kwindowsystem \
devel/kf5/kxmlgui \
- multimedia/phonon
+ multimedia/phonon,qt5

TEST_IS_INTERACTIVE = X11

diff --git a/x11/kde-applications/gwenview/Makefile b/x11/kde-applications/gwenview/Makefile
index 436f9b97e9d..4473ad19fce 100644
--- a/x11/kde-applications/gwenview/Makefile
+++ b/x11/kde-applications/gwenview/Makefile
@@ -1,7 +1,7 @@
COMMENT = KDE image viewer
DISTNAME = gwenview-${VERSION}
CATEGORIES = graphics x11
-REVISION = 0
+REVISION = 1

SHARED_LIBS += gwenviewlib 59.4 # 4.97

@@ -61,7 +61,7 @@ LIB_DEPENDS = devel/kf5/baloo \
graphics/lcms2 \
graphics/png \
math/cfitsio \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/kde-applications/libkdcraw>=${MODKDE_VERSION} \
x11/qt5/qtsvg \
x11/qt5/qtx11extras \
diff --git a/x11/kde-applications/juk/Makefile b/x11/kde-applications/juk/Makefile
index 66354f90dfc..fc15487b2a2 100644
--- a/x11/kde-applications/juk/Makefile
+++ b/x11/kde-applications/juk/Makefile
@@ -1,5 +1,6 @@
COMMENT = music collection manager and player for KDE
DISTNAME = juk-${VERSION}
+REVISION = 0
CATEGORIES = audio

HOMEPAGE = https://kde.org/applications/multimedia/org.kde.juk
@@ -51,7 +52,7 @@ LIB_DEPENDS = audio/taglib \
devel/kf5/solid \
devel/kf5/sonnet \
x11/qt5/qtsvg \
- multimedia/phonon
+ multimedia/phonon,qt5

TEST_IS_INTERACTIVE = X11
PORTHOME = ${WRKDIR}
diff --git a/x11/kde-applications/kalarm/Makefile b/x11/kde-applications/kalarm/Makefile
index a10bb8fe4b9..57555916094 100644
--- a/x11/kde-applications/kalarm/Makefile
+++ b/x11/kde-applications/kalarm/Makefile
@@ -1,5 +1,6 @@
COMMENT = personal alarm message, command and email scheduler
DISTNAME = kalarm-${VERSION}
+REVISION = 0
CATEGORIES = productivity

SHARED_LIBS += kalarmcalendar 3.0 # 0.0
@@ -65,7 +66,7 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/solid \
devel/kf5/sonnet \
textproc/ktextaddons \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/kde-applications/akonadi-contacts>=${MODKDE_VERSION} \
x11/kde-applications/akonadi-mime>=${MODKDE_VERSION} \
x11/kde-applications/akonadi>=${MODKDE_VERSION} \
diff --git a/x11/kde-applications/kio-extras/Makefile b/x11/kde-applications/kio-extras/Makefile
index 0cbad9a40d9..082c2595b52 100644
--- a/x11/kde-applications/kio-extras/Makefile
+++ b/x11/kde-applications/kio-extras/Makefile
@@ -1,5 +1,6 @@
COMMENT = extra functionality for kioslaves
DISTNAME = kio-extras-${VERSION}
+REVISION = 0
CATEGORIES = productivity net

SHARED_LIBS += kioarchive 4.0 # 5.97
@@ -54,7 +55,7 @@ LIB_DEPENDS = audio/taglib \
devel/kf5/syntax-highlighting \
devel/libmtp \
graphics/openexr \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
net/kdsoap \
net/samba \
security/libssh \
diff --git a/x11/kde-applications/klettres/Makefile b/x11/kde-applications/klettres/Makefile
index 83bb1636d75..c6c997b2ae8 100644
--- a/x11/kde-applications/klettres/Makefile
+++ b/x11/kde-applications/klettres/Makefile
@@ -1,4 +1,5 @@
COMMENT = alphabet learning application for KDE
+REVISION = 0
DISTNAME = klettres-${VERSION}

CATEGORIES = education
@@ -32,6 +33,6 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/kxmlgui \
x11/qt5/qtsvg \
devel/libinotify \
- multimedia/phonon
+ multimedia/phonon,qt5

.include <bsd.port.mk>
diff --git a/x11/kde-applications/kmousetool/Makefile b/x11/kde-applications/kmousetool/Makefile
index 464e44b255b..41e37f10879 100644
--- a/x11/kde-applications/kmousetool/Makefile
+++ b/x11/kde-applications/kmousetool/Makefile
@@ -1,4 +1,5 @@
COMMENT = KDE mouse clicker for accessibility users
+REVISION = 0
DISTNAME = kmousetool-${VERSION}
CATEGORIES = x11 inputmethods

@@ -24,6 +25,6 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/kf5/knotifications \
devel/kf5/kwidgetsaddons \
devel/kf5/kxmlgui \
- multimedia/phonon
+ multimedia/phonon,qt5

.include <bsd.port.mk>
diff --git a/x11/kde-applications/ksirk/Makefile b/x11/kde-applications/ksirk/Makefile
index add67a50aec..6fbf5e2f642 100644
--- a/x11/kde-applications/ksirk/Makefile
+++ b/x11/kde-applications/ksirk/Makefile
@@ -1,5 +1,6 @@
COMMENT = world domination strategy game
DISTNAME = ksirk-${VERSION}
+REVISION = 0
CATEGORIES = games

HOMEPAGE = https://www.kde.org/applications/games/ksirk
@@ -40,6 +41,6 @@ LIB_DEPENDS = devel/kf5/kauth \
x11/kde-applications/libkdegames>=${MODKDE_VERSION} \
x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
- multimedia/phonon
+ multimedia/phonon,qt5

.include <bsd.port.mk>
diff --git a/x11/kde-applications/libkcompactdisc/Makefile b/x11/kde-applications/libkcompactdisc/Makefile
index bb2ff8b2b56..8a1e2d8b9d9 100644
--- a/x11/kde-applications/libkcompactdisc/Makefile
+++ b/x11/kde-applications/libkcompactdisc/Makefile
@@ -1,6 +1,7 @@
COMMENT = library for interfacing with CDs
DISTNAME = libkcompactdisc-${VERSION}
PKGNAME = libkcompactdisc-kf5-${VERSION}
+REVISION = 0
CATEGORIES = devel multimedia

SHARED_LIBS += KF5CompactDisc 2.0 # 5.0
@@ -13,6 +14,6 @@ MODKF5_L10N_CONFLICT = yes

LIB_DEPENDS = devel/kf5/ki18n \
devel/kf5/solid \
- multimedia/phonon
+ multimedia/phonon,qt5

.include <bsd.port.mk>
diff --git a/x11/kde-applications/mailcommon/Makefile b/x11/kde-applications/mailcommon/Makefile
index 28c1043f9ea..f702128f96e 100644
--- a/x11/kde-applications/mailcommon/Makefile
+++ b/x11/kde-applications/mailcommon/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE PIM common mail library
DISTNAME = mailcommon-${VERSION}
+REVISION = 0
CATEGORIES = devel mail

SHARED_LIBS += KPim5MailCommon 2.0 # 0.0
@@ -61,7 +62,7 @@ LIB_DEPENDS = devel/kf5/karchive \
x11/kde-applications/mailimporter>=${MODKDE_VERSION} \
x11/kde-applications/messagelib>=${MODKDE_VERSION} \
x11/kde-applications/pimcommon>=${MODKDE_VERSION} \
- multimedia/phonon
+ multimedia/phonon,qt5

TEST_IS_INTERACTIVE = X11

diff --git a/x11/kde-applications/marble/Makefile b/x11/kde-applications/marble/Makefile
index b7b5455d9fe..d2b57cf75e9 100644
--- a/x11/kde-applications/marble/Makefile
+++ b/x11/kde-applications/marble/Makefile
@@ -3,6 +3,7 @@ USE_WXNEEDED = Yes
COMMENT = virtual globe and world atlas
DISTNAME = marble-${VERSION}
PKGNAME = marble-kf5-${VERSION}
+REVISION = 0
CATEGORIES = geo

HOMEPAGE = https://marble.kde.org/
@@ -57,7 +58,7 @@ LIB_DEPENDS = devel/kf5/kauth \
devel/protobuf \
devel/shapelib \
misc/gpsd \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtdeclarative \
x11/qt5/qtlocation \
x11/qt5/qtserialport \
diff --git a/x11/kde-applications/okular/Makefile b/x11/kde-applications/okular/Makefile
index 487b4424b7d..5191e5b0f1a 100644
--- a/x11/kde-applications/okular/Makefile
+++ b/x11/kde-applications/okular/Makefile
@@ -1,5 +1,6 @@
COMMENT = KDE document viewer
DISTNAME = okular-${VERSION}
+REVISION = 0
CATEGORIES = textproc

HOMEPAGE = https://okular.kde.org/
@@ -66,7 +67,7 @@ LIB_DEPENDS = devel/chmlib \
devel/kf5/threadweaver \
graphics/djvulibre \
graphics/tiff \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
print/poppler,-qt5>=23.05.0 \
print/libspectre \
textproc/discount \
diff --git a/x11/kde-plasma/plasma-workspace/Makefile b/x11/kde-plasma/plasma-workspace/Makefile
index 8ad087ef01c..70bf0c6f62e 100644
--- a/x11/kde-plasma/plasma-workspace/Makefile
+++ b/x11/kde-plasma/plasma-workspace/Makefile
@@ -1,6 +1,6 @@
COMMENT = various components needed to run a Plasma-based environment
DISTNAME = plasma-workspace-${VERSION}
-REVISION = 1
+REVISION = 2

SHARED_LIBS += colorcorrect 0.0 # 0.0
SHARED_LIBS += kfontinst 0.0 # 0.0
@@ -108,7 +108,7 @@ LIB_DEPENDS = devel/kf5/attica \
devel/kf5/syntax-highlighting \
math/libqalculate \
productivity/kuserfeedback \
- multimedia/phonon \
+ multimedia/phonon,qt5 \
x11/qt5/qtdeclarative \
x11/kde-applications/libkexiv2 \
x11/kde-plasma/kpipewire>=${VERSION} \