svn commit: r473065 - in head: Mk audio/soundkonverter multimedia/kmplayer-kde4 x11/kde-workspace-kde4 x11/libkonq-kde4

[Tobias C. Berner]

Author: tcberner
Date: Fri Jun 22 20:22:32 2018
New Revision: 473065
URL: https://svnweb.freebsd.org/changeset/ports/473065

Log:
  Make flavors explicit for phonon.
  
  Reported by:	VVD (via irc)

Modified:
  head/Mk/bsd.qt.mk
  head/audio/soundkonverter/Makefile
  head/multimedia/kmplayer-kde4/Makefile
  head/x11/kde-workspace-kde4/Makefile
  head/x11/libkonq-kde4/Makefile

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Fri Jun 22 20:18:40 2018	(r473064)
+++ head/Mk/bsd.qt.mk	Fri Jun 22 20:22:32 2018	(r473065)
@@ -475,13 +475,13 @@ paths_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qtpaths
 pixeltool_PORT=		graphics/${_QT_RELNAME}-pixeltool
 pixeltool_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/pixeltool
 
-phonon_PORT=		multimedia/phonon
+phonon_PORT=		multimedia/phonon@${_QT_RELNAME}
 phonon_LIB=		libphonon.so
 
 phonon4_PORT=		multimedia/phonon@${_QT_RELNAME}
 phonon4_LIB=		libphonon4${_QT_RELNAME}.so
 
-phonon-gst_PORT=	multimedia/phonon-gstreamer
+phonon-gst_PORT=	multimedia/phonon-gstreamer@${_QT_RELNAME}
 phonon-gst_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/phonon_backend/libphonon_gstreamer.so
 
 plugininfo_PORT=		sysutils/${_QT_RELNAME}-qtplugininfo

Modified: head/audio/soundkonverter/Makefile
==============================================================================
--- head/audio/soundkonverter/Makefile	Fri Jun 22 20:18:40 2018	(r473064)
+++ head/audio/soundkonverter/Makefile	Fri Jun 22 20:22:32 2018	(r473065)
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtag.so:audio/taglib \
 		libcdda_paranoia.so:audio/cdparanoia \
-		libphonon.so:multimedia/phonon
+		libphonon.so:multimedia/phonon at qt4
 
 GH_ACCOUNT=	HessiJames
 USES=		cmake compiler:c++11-lang kde:4

Modified: head/multimedia/kmplayer-kde4/Makefile
==============================================================================
--- head/multimedia/kmplayer-kde4/Makefile	Fri Jun 22 20:18:40 2018	(r473064)
+++ head/multimedia/kmplayer-kde4/Makefile	Fri Jun 22 20:22:32 2018	(r473065)
@@ -19,7 +19,7 @@ NOT_FOR_ARCHS_REASON=	prcpucfg.h:764:2: error: "Unknow
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libphonon.so:multimedia/phonon \
+		libphonon.so:multimedia/phonon at qt4 \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	mplayer:multimedia/mplayer

Modified: head/x11/kde-workspace-kde4/Makefile
==============================================================================
--- head/x11/kde-workspace-kde4/Makefile	Fri Jun 22 20:18:40 2018	(r473064)
+++ head/x11/kde-workspace-kde4/Makefile	Fri Jun 22 20:22:32 2018	(r473065)
@@ -105,7 +105,7 @@ UPOWER_DESC=		Power management via UPower
 UPOWER_RUN_DEPENDS=	${LOCALBASE}/libexec/upowerd:sysutils/upower
 
 VLC_DESC=		Multimedia via Phonon-VLC
-VLC_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc
+VLC_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc at qt4
 
 WALLPAPERS_DESC=	Install official KDE wallpapers
 WALLPAPERS_RUN_DEPENDS=	${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde-wallpapers-kde4 \

Modified: head/x11/libkonq-kde4/Makefile
==============================================================================
--- head/x11/libkonq-kde4/Makefile	Fri Jun 22 20:18:40 2018	(r473064)
+++ head/x11/libkonq-kde4/Makefile	Fri Jun 22 20:22:32 2018	(r473065)
@@ -9,7 +9,7 @@ DISTNAME=	kde-baseapps-${PORTVERSION}
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Core library for Konqueror
 
-LIB_DEPENDS=	libphonon.so:multimedia/phonon
+LIB_DEPENDS=	libphonon.so:multimedia/phonon at qt4
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4 soprano