multimedia/*phonon*: update and flavorize with @qt4/@qt5

Approved by:	portmgr (mat)
Differential Revision:	https://reviews.freebsd.org/D14632

39 files changed, 146 insertions, 234 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 5b7f316f4ac5..7e5c566ae2a0 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -360,10 +360,6 @@
     SUBDIR += qt4-mobility
     SUBDIR += qt4-multimedia
     SUBDIR += qt5-multimedia
-    SUBDIR += qt5-phonon4
-    SUBDIR += qt5-phonon4-designerplugin
-    SUBDIR += qt5-phonon4-gstreamer
-    SUBDIR += qt5-phonon4-vlc
     SUBDIR += quark
     SUBDIR += quodlibet
     SUBDIR += quvi
diff --git a/multimedia/dragon-kde4/Makefile b/multimedia/dragon-kde4/Makefile
index 91be6d377962..ab2f75197435 100644
--- a/multimedia/dragon-kde4/Makefile
+++ b/multimedia/dragon-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dragon
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
index 308ca0d7ec59..06b7d05887b3 100644
--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dragon
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde kde-applications
 PKGNAMESUFFIX=	-player
 
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index a4b946c32951..ccf9ef124f76 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/kaffeine/current
 
diff --git a/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile b/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
index 57485d1baa35..823a921c8eae 100644
--- a/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
+++ b/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayerthumbs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde kde-kde4
 PKGNAMEPREFIX=	kdemultimedia-
 PKGNAMESUFIFX=	-kde4
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 6c4eb555d79e..a69d52d53afa 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmplayer
 PORTVERSION=	0.11.5b
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio kde
 PKGNAMESUFFIX=	-kde4
diff --git a/multimedia/mediadownloader/Makefile b/multimedia/mediadownloader/Makefile
index ecb782e49d90..e4f58c973aa6 100644
--- a/multimedia/mediadownloader/Makefile
+++ b/multimedia/mediadownloader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mediadownloader
 PORTVERSION=	1.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia www
 MASTER_SITES=	SF/googleimagedown/project/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index b92d563d4291..c6c0100c4295 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	minitube
 DISTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	multimedia www
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
index 2f202426b7ed..f71a6a700d4e 100644
--- a/multimedia/phonon-designerplugin/Makefile
+++ b/multimedia/phonon-designerplugin/Makefile
@@ -1,26 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.9.1
+DISTVERSION=	4.10.1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
-PKGNAMESUFFIX=	-designerplugin
-DIST_SUBDIR=	KDE
+MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
+DIST_SUBDIR=	KDE/phonon
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Designer plugin for Phonon
 
 LICENSE=	LGPL21
 
-USE_QT4=	corelib designer gui phonon  \
-		qmake_build moc_build rcc_build uic_build
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
+
+qt4_PKGNAMESUFFIX=	-designerplugin-qt4
+qt5_PKGNAMESUFFIX=	-designerplugin-qt5
+
 USES=		cmake tar:xz
+
+.  if ${FLAVOR} == qt4
+USES+=		kde:4
+USE_QT4=	corelib designer gui phonon \
+		qmake_build moc_build rcc_build uic_build
+PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/libphononwidgets.so
+.  else
+USES+=		kde:5
+USE_KDE=	ecm
+USE_QT5=	core designer gui phonon4 widgets xml \
+		buildtools_build qmake_build
+CMAKE_ON=	PHONON_BUILD_PHONON4QT5
+PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/phononwidgets.so
+.  endif
+
 CMAKE_ARGS=	-DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer
 
 BUILD_WRKSRC=	${WRKSRC}/designer
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DISTINFO_FILE=	${.CURDIR:H}/phonon/distinfo
 
-PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/libphononwidgets.so
-
 .include <bsd.port.mk>
diff --git a/multimedia/phonon-designerplugin/pkg-descr b/multimedia/phonon-designerplugin/pkg-descr
index 129f8f4c1a4e..f060aee2af45 100644
--- a/multimedia/phonon-designerplugin/pkg-descr
+++ b/multimedia/phonon-designerplugin/pkg-descr
@@ -1,5 +1,5 @@
 Phonon is the framework responsible for an ubiquitous multimedia
-experience in KDE Software Compilation 4.
+experience in KDE Software Compilation 4 and Plasma Desktop.
 This port installs Qt Designer plugin for Phonon.
 
 WWW: http://phonon.kde.org
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index d89df8b63f11..f5177d3299d5 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -3,38 +3,57 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
-PKGNAMESUFFIX=	-gstreamer
-DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
-DIST_SUBDIR=	KDE
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION}
+DISTNAME=	${PORTNAME}-backend-${PHONON_PLUGIN}-${DISTVERSION}
+DIST_SUBDIR=	KDE/phonon
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	GStreamer backend for Phonon
 
 LICENSE=	LGPL21
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-backend//}
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
 
-USES=		cmake kde:4 pkgconfig tar:xz
+qt4_PKGNAMESUFFIX=	-${PHONON_PLUGIN}-qt4
+qt5_PKGNAMESUFFIX=	-${PHONON_PLUGIN}-qt5
+qt4_PLIST=	${.CURDIR}/pkg-plist.qt4
+qt5_PLIST=	${.CURDIR}/pkg-plist.qt5
+
+USES=		cmake pkgconfig tar:xz
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER1=	yes
+USE_XORG=	x11
+
+.  if ${FLAVOR} == qt4
+USES+=		kde:4
 USE_KDE=	automoc4
 USE_QT4=	corelib gui opengl phonon \
 		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11
-
+.  else
+USES+=		kde:5
+USE_KDE=	ecm
+USE_QT5=	core gui opengl phonon4 widgets x11extras \
+		buildtools_build qmake_build
+CMAKE_ON=	PHONON_BUILD_PHONON4QT5
+.  endif
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GST_PLUGINS
 GST_PLUGINS_DESC=	Install GStreamer plugins
 GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:multimedia/gstreamer1-plugins-all
 
+PHONON_PLUGIN=	gstreamer
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PHONON_PLUGIN}-${DISTVERSION}
+
+.  if ${FLAVOR} == qt4
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
-	${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \
+	${RLN} ${STAGEDIR}${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \
 		${STAGEDIR}${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+.  endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index 79a7b3fd7eeb..6cf8d5ea3b03 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472999348
-SHA256 (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1
-SIZE (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = 75960
+TIMESTAMP = 1520670379
+SHA256 (KDE/phonon/phonon-backend-gstreamer-4.9.0.tar.xz) = cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1
+SIZE (KDE/phonon/phonon-backend-gstreamer-4.9.0.tar.xz) = 75960
diff --git a/multimedia/phonon-gstreamer/pkg-descr b/multimedia/phonon-gstreamer/pkg-descr
index 8c51d42801b1..5a9b35d670d3 100644
--- a/multimedia/phonon-gstreamer/pkg-descr
+++ b/multimedia/phonon-gstreamer/pkg-descr
@@ -1,4 +1,4 @@
-Phonon is the multimedia framework for KDE Software Compilation 4.
+Phonon is the multimedia framework for KDE Software Compilation.
 This port provides the GStreamer backend.
 
 WWW: http://phonon.kde.org
diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist.qt4
index bf3ee3915298..bf3ee3915298 100644
--- a/multimedia/phonon-gstreamer/pkg-plist
+++ b/multimedia/phonon-gstreamer/pkg-plist.qt4
diff --git a/multimedia/qt5-phonon4-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist.qt5
index 86aad2fbc083..86aad2fbc083 100644
--- a/multimedia/qt5-phonon4-gstreamer/pkg-plist
+++ b/multimedia/phonon-gstreamer/pkg-plist.qt5
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 90a7dd5c78dd..7cbedab8ca2a 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	0.9.1
+DISTVERSION=	0.10.1
 PORTREVISION=	1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
-PKGNAMESUFFIX=	-vlc
-DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
-DIST_SUBDIR=	KDE
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION}
+PKGNAMESUFFIX=	-${PHONON_PLUGIN}-${FLAVOR}
+DISTNAME=	${PORTNAME}-backend-${PHONON_PLUGIN}-${DISTVERSION}
+DIST_SUBDIR=	KDE/phonon
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	VLC backend for Phonon
@@ -15,16 +15,39 @@ COMMENT=	VLC backend for Phonon
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libvlc.so:multimedia/vlc-qt4
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
 
-USES=		cmake:outsource kde:4 pkgconfig tar:xz
+qt4_LIB_DEPENDS=	libvlc.so:multimedia/vlc-qt4
+qt5_LIB_DEPENDS=	libvlc.so:multimedia/vlc
+
+USES=		cmake:outsource pkgconfig tar:xz
+
+.  if ${FLAVOR} == qt4
+USES+=		kde:4
 USE_KDE=	automoc4
 USE_QT4=	corelib gui phonon \
 		qmake_build moc_build rcc_build uic_build
+PLIST_FILES=	lib/kde4/plugins/phonon_backend/phonon_vlc.so \
+		share/kde4/services/phononbackends/vlc.desktop \
+		${QT_PLUGINDIR}/phonon_backend/libphonon_vlc.so
+.  else
+USES+=		kde:5
+USE_KDE=	ecm
+USE_QT5=	core gui widgets phonon4 \
+		buildtools_build qmake_build
+CMAKE_ON=	PHONON_BUILD_PHONON4QT5
+PLIST_FILES=	${QT_PLUGINDIR_REL}/phonon4qt5_backend/phonon_vlc.so
+.  endif
+
+PHONON_PLUGIN=	vlc
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PHONON_PLUGIN}-${DISTVERSION}
 
+.  if ${FLAVOR} == qt4
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
-	${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so \
+	${RLN} ${STAGEDIR}${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so \
 		${STAGEDIR}${QT_PLUGINDIR}/phonon_backend/libphonon_vlc.so
+.  endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo
index 7f1a5a970f58..67862d5a95c6 100644
--- a/multimedia/phonon-vlc/distinfo
+++ b/multimedia/phonon-vlc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489242326
-SHA256 (KDE/phonon-backend-vlc-0.9.1.tar.xz) = e698729ba8487299105309623722344f2cd84c46482516d51cd6609fac297313
-SIZE (KDE/phonon-backend-vlc-0.9.1.tar.xz) = 59972
+TIMESTAMP = 1520670394
+SHA256 (KDE/phonon/phonon-backend-vlc-0.10.1.tar.xz) = 09966da6aedeb1b3a6a7d64341682ea065cb4b2c7c06681fcfb3b9c4e7af072d
+SIZE (KDE/phonon/phonon-backend-vlc-0.10.1.tar.xz) = 61096
diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist
deleted file mode 100644
index 387892e64d68..000000000000
--- a/multimedia/phonon-vlc/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/kde4/plugins/phonon_backend/phonon_vlc.so
-share/kde4/services/phononbackends/vlc.desktop
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 30db2e270852..0c7d207988a4 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.4.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-xine
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 7cb177581e43..a60c2792e33c 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -2,46 +2,64 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.9.1
-PORTREVISION=	1
+DISTVERSION=	4.10.1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
-DIST_SUBDIR=	KDE
+MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
+DIST_SUBDIR=	KDE/phonon
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multimedia framework
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libqzeitgeist.so:sysutils/qzeitgeist
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
 
-USES=		cmake kde:4 pathfix tar:xz
+qt4_LIB_DEPENDS=	libqzeitgeist.so:sysutils/qzeitgeist
+qt4_PKGNAMESUFFIX=	-qt4
+qt5_PKGNAMESUFFIX=	-qt5
+qt4_PLIST=	${.CURDIR}/pkg-plist.qt4
+qt5_PLIST=	${.CURDIR}/pkg-plist.qt5
+
+USES=		cmake pathfix tar:xz
+CMAKE_ON=	PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT \
+		PHONON_NO_PLATFORMPLUGIN
+CMAKE_OFF=	PHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
+USE_LDCONFIG=	yes
+
+.  if ${FLAVOR} == qt4
+USES+=		kde:4
 USE_KDE=	automoc4
-USE_QT4=	corelib dbus declarative gui testlib\
+USE_QT4=	corelib dbus declarative gui testlib \
 		qmake_build moc_build rcc_build uic_build
-CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
-		-DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
-		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
-USE_LDCONFIG=	yes
+.  else
+USES+=		kde:5
+USE_KDE=	ecm
+USE_QT5=	core dbus gui opengl widgets \
+		buildtools_build qmake_build
+CMAKE_OFF+=	PHONON_BUILD_DECLARATIVE_PLUGIN
+CMAKE_ON+=	PHONON_BUILD_PHONON4QT5
+.  endif
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION}
+PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_USE=		GNOME=glib20
-PULSEAUDIO_CMAKE_ON=	-DWITH_PulseAudio:BOOL=ON
-PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
+PULSEAUDIO_CMAKE_BOOL=	WITH_PulseAudio
 
+.  if ${FLAVOR} == qt4
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_INCDIR}
 	${MKDIR} ${STAGEDIR}${QT_LIBDIR}
-	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/phonon
-	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/Phonon
-	${LN} -sf ${PREFIX}/include/KDE/Phonon ${STAGEDIR}${PREFIX}/include/phonon/Phonon
-.for lib in phonon phononexperimental
-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so
-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so.4
-.endfor
+	${RLN} ${STAGEDIR}${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/phonon
+	${RLN} ${STAGEDIR}${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/Phonon
+	${RLN} ${STAGEDIR}${PREFIX}/include/KDE/Phonon ${STAGEDIR}${PREFIX}/include/phonon/Phonon
+.    for lib in phonon phononexperimental
+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so.${DISTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so
+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so.${DISTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so.4
+.    endfor
+.  endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index deb570d11c6f..e43a3dfac2a7 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485336361
-SHA256 (KDE/phonon-4.9.1.tar.xz) = 67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-SIZE (KDE/phonon-4.9.1.tar.xz) = 321872
+TIMESTAMP = 1529146727
+SHA256 (KDE/phonon/phonon-4.10.1.tar.xz) = e5a98df31aeffc22493afc8d6adbca5d6f0c27cc2eed73b3be05195321e08db7
+SIZE (KDE/phonon/phonon-4.10.1.tar.xz) = 322100
diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr
index b48921fd39bd..063d5211dfdc 100644
--- a/multimedia/phonon/pkg-descr
+++ b/multimedia/phonon/pkg-descr
@@ -1,4 +1,4 @@
 Phonon is the framework responsible for an ubiquitous multimedia
-experience in KDE Software Compilation 4.
+experience in KDE Software Compilation 4 and KDe Plasma Desktop.
 
 WWW: http://phonon.kde.org
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist.qt4
index e55e0bf86996..e55e0bf86996 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist.qt4
diff --git a/multimedia/qt5-phonon4/pkg-plist b/multimedia/phonon/pkg-plist.qt5
index 647a0859b634..647a0859b634 100644
--- a/multimedia/qt5-phonon4/pkg-plist
+++ b/multimedia/phonon/pkg-plist.qt5
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 1b727cf28c8a..68b9c4303307 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	OpenLP
 PORTVERSION=	2.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index fcaa00bab994..f4ce1af0388b 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/qt5-phonon4-designerplugin/Makefile b/multimedia/qt5-phonon4-designerplugin/Makefile
deleted file mode 100644
index 391338e4e0cd..000000000000
--- a/multimedia/qt5-phonon4-designerplugin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	phonon
-PORTVERSION=	4.9.1
-CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	qt5-
-PKGNAMESUFFIX=	4
-PKGNAMESUFFIX=	-designerplugin
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt 5 Designer plugin for Phonon 4
-
-LICENSE=	LGPL21
-
-USES=		cmake:outsource kde:5 tar:xz
-USE_KDE=	ecm
-USE_QT5=	core designer gui phonon4 widgets xml \
-		buildtools_build qmake_build
-CMAKE_ARGS=	-DPHONON_QT_PLUGIN_INSTALL_DIR=${PREFIX}/${QT_PLUGINDIR_REL}/designer \
-		-DPHONON_BUILD_PHONON4QT5=ON
-
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}/designer
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DISTINFO_FILE=	${.CURDIR:H}/qt5-phonon4/distinfo
-
-PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/phononwidgets.so
-
-.include <bsd.port.mk>
diff --git a/multimedia/qt5-phonon4-designerplugin/pkg-descr b/multimedia/qt5-phonon4-designerplugin/pkg-descr
deleted file mode 100644
index 8975e8b9c9d1..000000000000
--- a/multimedia/qt5-phonon4-designerplugin/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port installs Qt 5 Designer plugin for Phonon 4.
-
-WWW: http://phonon.kde.org
diff --git a/multimedia/qt5-phonon4-gstreamer/Makefile b/multimedia/qt5-phonon4-gstreamer/Makefile
deleted file mode 100644
index 7f87b08f4131..000000000000
--- a/multimedia/qt5-phonon4-gstreamer/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	phonon
-PORTVERSION=	4.9.0
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend-gstreamer/${PORTVERSION}
-PKGNAMEPREFIX=	qt5-
-PKGNAMESUFFIX=	4-gstreamer
-DISTNAME=	${PORTNAME}-backend-gstreamer-${PORTVERSION}
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	GStreamer backend for Phonon 4 Qt 5
-
-LICENSE=	LGPL21
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-backend//}
-
-USES=		cmake:outsource kde:5 pkgconfig tar:xz
-USE_GL=		gl
-USE_GNOME=	glib20 libxml2
-USE_GSTREAMER1=	yes
-USE_KDE=	ecm
-USE_QT5=	buildtools_build qmake_build core gui opengl phonon4 widgets \
-		x11extras
-CMAKE_ARGS=	-DPHONON_BUILD_PHONON4QT5=ON
-
-OPTIONS_DEFINE=	GST_PLUGINS
-GST_PLUGINS_DESC=	Install GStreamer plugins
-GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:multimedia/gstreamer1-plugins-all
-
-.include <bsd.port.mk>
diff --git a/multimedia/qt5-phonon4-gstreamer/distinfo b/multimedia/qt5-phonon4-gstreamer/distinfo
deleted file mode 100644
index ff2af7bae749..000000000000
--- a/multimedia/qt5-phonon4-gstreamer/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1472999371
-SHA256 (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1
-SIZE (KDE/phonon-backend-gstreamer-4.9.0.tar.xz) = 75960
diff --git a/multimedia/qt5-phonon4-gstreamer/pkg-descr b/multimedia/qt5-phonon4-gstreamer/pkg-descr
deleted file mode 100644
index 295fadc9b5f8..000000000000
--- a/multimedia/qt5-phonon4-gstreamer/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port provides the GStreamer backend for Phonon 4 Qt 5.
-
-WWW: http://phonon.kde.org
diff --git a/multimedia/qt5-phonon4-vlc/Makefile b/multimedia/qt5-phonon4-vlc/Makefile
deleted file mode 100644
index f1ae6b2b5164..000000000000
--- a/multimedia/qt5-phonon4-vlc/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	phonon
-PORTVERSION=	0.9.1
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
-PKGNAMEPREFIX=	qt5-
-PKGNAMESUFFIX=	-vlc
-DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	VLC backend for Phonon 4 Qt 5
-
-LICENSE=	LGPL21+
-LICENSE_FILE=	${WRKSRC}/COPYING.LIB
-
-LIB_DEPENDS=	libvlc.so:multimedia/vlc
-
-USES=		cmake:outsource kde:5 pkgconfig tar:xz
-USE_KDE=	ecm
-USE_QT5=	core gui widgets phonon4 \
-		buildtools_build qmake_build
-CMAKE_ARGS=	-DPHONON_BUILD_PHONON4QT5=ON
-
-PLIST_FILES=	${QT_PLUGINDIR_REL}/phonon4qt5_backend/phonon_vlc.so
-
-.include <bsd.port.mk>
diff --git a/multimedia/qt5-phonon4-vlc/distinfo b/multimedia/qt5-phonon4-vlc/distinfo
deleted file mode 100644
index 362d24d352b3..000000000000
--- a/multimedia/qt5-phonon4-vlc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1490122036
-SHA256 (KDE/phonon-backend-vlc-0.9.1.tar.xz) = e698729ba8487299105309623722344f2cd84c46482516d51cd6609fac297313
-SIZE (KDE/phonon-backend-vlc-0.9.1.tar.xz) = 59972
diff --git a/multimedia/qt5-phonon4-vlc/pkg-descr b/multimedia/qt5-phonon4-vlc/pkg-descr
deleted file mode 100644
index b4fb5fce1334..000000000000
--- a/multimedia/qt5-phonon4-vlc/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port provides the VLC backend for Phonon 4 Qt 5.
-
-WWW: http://phonon.kde.org
diff --git a/multimedia/qt5-phonon4/Makefile b/multimedia/qt5-phonon4/Makefile
deleted file mode 100644
index f2e0d3ea9966..000000000000
--- a/multimedia/qt5-phonon4/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	phonon
-PORTVERSION=	4.9.1
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	qt5-
-PKGNAMESUFFIX=	4
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Phonon 4 transitional library for Qt 5
-
-LICENSE=	LGPL21
-
-USES=		cmake:outsource kde:5 pathfix tar:xz
-USE_KDE=	ecm
-USE_QT5=	core dbus gui opengl widgets \
-		buildtools_build qmake_build
-CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
-		-DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
-		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF \
-		-DPHONON_BUILD_DECLARATIVE_PLUGIN:BOOL=OFF \
-		-DPHONON_BUILD_PHONON4QT5=ON
-USE_LDCONFIG=	yes
-
-PLIST_SUB=	SHLIB_VER=${PORTVERSION}
-
-OPTIONS_DEFINE=	PULSEAUDIO
-
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_USE=		GNOME=glib20
-PULSEAUDIO_CMAKE_ON=	-DWITH_PulseAudio:BOOL=ON
-PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
-
-.include <bsd.port.mk>
diff --git a/multimedia/qt5-phonon4/distinfo b/multimedia/qt5-phonon4/distinfo
deleted file mode 100644
index dde126924bb2..000000000000
--- a/multimedia/qt5-phonon4/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1485336374
-SHA256 (KDE/phonon-4.9.1.tar.xz) = 67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-SIZE (KDE/phonon-4.9.1.tar.xz) = 321872
diff --git a/multimedia/qt5-phonon4/pkg-descr b/multimedia/qt5-phonon4/pkg-descr
deleted file mode 100644
index dee53e50404d..000000000000
--- a/multimedia/qt5-phonon4/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Phonon is a multimedia framework by KDE project. This port provides Phonon 4
-transitional library for Qt 5.
-
-WWW: http://phonon.kde.org
diff --git a/multimedia/qt5-phonon4/pkg-message b/multimedia/qt5-phonon4/pkg-message
deleted file mode 100644
index a943c101ccba..000000000000
--- a/multimedia/qt5-phonon4/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-======================================================================
-
-Please, consider installing backends for Phonon:
-- multimedia/qt5-phonon4-gstreamer	GStreamer backend
-- multimedia/qt5-phonon4-vlc		VLC backend
-
-======================================================================
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index c97f5257e146..7a6dcebc2208 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	subtitlecomposer
 PORTVERSION=	0.5.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia kde
 
 MAINTAINER=	ports@FreeBSD.org