Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jun 2018 16:52:09 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472983 - in head: . Mk accessibility/kmousetool astro/libkgeomap-kde4 astro/marble astro/marble-kde4 astro/stellarium-qt4 audio/amarok-kde4 audio/audiocd-kio audio/juk audio/kmix-kde4 ...
Message-ID:  <201806211652.w5LGq961020858@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Thu Jun 21 16:52:09 2018
New Revision: 472983
URL: https://svnweb.freebsd.org/changeset/ports/472983

Log:
  multimedia/*phonon*: update and flavorize with @qt4/@qt5
  
  Approved by:	portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D14632

Added:
  head/multimedia/phonon-gstreamer/pkg-plist.qt4
     - copied unchanged from r472807, head/multimedia/phonon-gstreamer/pkg-plist
  head/multimedia/phonon-gstreamer/pkg-plist.qt5
     - copied, changed from r472982, head/multimedia/phonon-gstreamer/pkg-plist
  head/multimedia/phonon/pkg-plist.qt4
     - copied unchanged from r472807, head/multimedia/phonon/pkg-plist
  head/multimedia/phonon/pkg-plist.qt5
     - copied, changed from r472982, head/multimedia/phonon/pkg-plist
Deleted:
  head/multimedia/phonon-gstreamer/pkg-plist
  head/multimedia/phonon-vlc/pkg-plist
  head/multimedia/phonon/pkg-plist
  head/multimedia/qt5-phonon4/
  head/multimedia/qt5-phonon4-designerplugin/
  head/multimedia/qt5-phonon4-gstreamer/
  head/multimedia/qt5-phonon4-vlc/
Modified:
  head/MOVED
  head/Mk/bsd.qt.mk
  head/accessibility/kmousetool/Makefile
  head/astro/libkgeomap-kde4/Makefile
  head/astro/marble-kde4/Makefile
  head/astro/marble/Makefile
  head/astro/stellarium-qt4/Makefile
  head/audio/amarok-kde4/Makefile
  head/audio/audiocd-kio/Makefile
  head/audio/juk/Makefile
  head/audio/kmix-kde4/Makefile
  head/audio/kscd-kde4/Makefile
  head/audio/lastfm-desktop/Makefile
  head/audio/libkcompactdisc-kde4/Makefile
  head/audio/libkcompactdisc/Makefile
  head/audio/minitunes/Makefile
  head/audio/soundkonverter/Makefile
  head/chinese/qterm/Makefile
  head/converters/wkhtmltopdf/Makefile
  head/databases/qt4-sql/Makefile
  head/deskutils/kalarm/Makefile
  head/deskutils/korganizer/Makefile
  head/deskutils/plasma-applet-cwp/Makefile
  head/devel/kf5-knotifications/Makefile
  head/devel/kf5-knotifyconfig/Makefile
  head/devel/kio-extras/Makefile
  head/devel/pyside/Makefile
  head/devel/qt4/Makefile
  head/devel/qtscriptgenerator/Makefile
  head/devel/smokeqt-kde4/Makefile
  head/editors/calligra/Makefile
  head/finance/kmymoney-kde4/Makefile
  head/games/auralquiz/Makefile
  head/games/blinken/Makefile
  head/games/bomber/Makefile
  head/games/kblocks/Makefile
  head/games/kbounce/Makefile
  head/games/kolf/Makefile
  head/games/kollision/Makefile
  head/games/kpat/Makefile
  head/games/ksirk/Makefile
  head/games/ktuberling/Makefile
  head/games/libkdegames-kde4/Makefile
  head/games/pairs-kde4/Makefile
  head/graphics/gwenview/Makefile
  head/graphics/okular/Makefile
  head/irc/konversation/Makefile
  head/irc/quassel/Makefile
  head/japanese/qt4-codecs-jp/Makefile
  head/korean/qt4-codecs-kr/Makefile
  head/misc/bibletime/Makefile
  head/misc/klettres/Makefile
  head/misc/ktouch-kde4/Makefile
  head/misc/kwordquiz/Makefile
  head/misc/qt4-qtconfig/Makefile
  head/misc/qt4-qtdemo/Makefile
  head/misc/saaghar/Makefile
  head/misc/tellico-kde4/Makefile
  head/multimedia/Makefile
  head/multimedia/dragon-kde4/Makefile
  head/multimedia/dragon/Makefile
  head/multimedia/kaffeine/Makefile
  head/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
  head/multimedia/kmplayer-kde4/Makefile
  head/multimedia/mediadownloader/Makefile
  head/multimedia/minitube/Makefile
  head/multimedia/phonon-designerplugin/Makefile
  head/multimedia/phonon-designerplugin/pkg-descr
  head/multimedia/phonon-gstreamer/Makefile
  head/multimedia/phonon-gstreamer/distinfo
  head/multimedia/phonon-gstreamer/pkg-descr
  head/multimedia/phonon-vlc/Makefile
  head/multimedia/phonon-vlc/distinfo
  head/multimedia/phonon-xine/Makefile
  head/multimedia/phonon/Makefile
  head/multimedia/phonon/distinfo
  head/multimedia/phonon/pkg-descr
  head/multimedia/py-openlp/Makefile
  head/multimedia/py-qt4-phonon/Makefile
  head/multimedia/subtitlecomposer-kde4/Makefile
  head/net-im/kopete/Makefile
  head/net-p2p/ktorrent/Makefile
  head/net/mailcommon/Makefile
  head/net/smb4k-kde4/Makefile
  head/sysutils/k3b-kde4/Makefile
  head/textproc/goldendict/Makefile
  head/www/kf5-khtml/Makefile
  head/x11-fm/dolphin/Makefile
  head/x11-toolkits/qt4-declarative/Makefile
  head/x11-toolkits/qt4-gui/Makefile
  head/x11/kde-runtime-kde4/Makefile
  head/x11/kdelibs-kde4/Makefile
  head/x11/libkonq-kde4/Makefile
  head/x11/plasma5-plasma-desktop/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/MOVED	Thu Jun 21 16:52:09 2018	(r472983)
@@ -10284,3 +10284,7 @@ x11-themes/adwaita-qt4|x11-themes/adwaita-qt@qt4|2018-
 x11-themes/adwaita-qt5|x11-themes/adwaita-qt@qt5|2018-06-19|Move to flavored version
 net-p2p/qbittorrent-nox11|net-p2p/qbittorrent@nox|2018-06-20|Moved to a flavored version
 math/digitizer|graphics/engauge-digitizer|2018-06-20|The previously deleted port math/digitizer is now graphics/engauge-digitizer
+multimedia/qt5-phonon4|multimedia/phonon@qt5|2018-06-21|Moved to a flavored version
+multimedia/qt5-phonon4-designerplugin|multimedia/phonon-designerplugin@qt5|2018-06-21|Moved to a flavored version
+multimedia/qt5-phonon4-gstreamer|multimedia/phonon-gstreamer@qt5|2018-06-21|Moved to a flavored version
+multimedia/qt5-phonon4-vlc|multimedia/phonon-vlc@qt5|2018-06-21|Moved to a flavored version

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/Mk/bsd.qt.mk	Thu Jun 21 16:52:09 2018	(r472983)
@@ -478,7 +478,7 @@ pixeltool_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/pixelto
 phonon_PORT=		multimedia/phonon
 phonon_LIB=		libphonon.so
 
-phonon4_PORT=		multimedia/${_QT_RELNAME}-phonon4
+phonon4_PORT=		multimedia/phonon@${_QT_RELNAME}
 phonon4_LIB=		libphonon4${_QT_RELNAME}.so
 
 phonon-gst_PORT=	multimedia/phonon-gstreamer

Modified: head/accessibility/kmousetool/Makefile
==============================================================================
--- head/accessibility/kmousetool/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/accessibility/kmousetool/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmousetool
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	accessibility kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/astro/libkgeomap-kde4/Makefile
==============================================================================
--- head/astro/libkgeomap-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/astro/libkgeomap-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkgeomap
 PORTVERSION=	${KDE4_APPLICATIONS_VERSION}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4

Modified: head/astro/marble-kde4/Makefile
==============================================================================
--- head/astro/marble-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/astro/marble-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/astro/marble/Makefile
==============================================================================
--- head/astro/marble/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/astro/marble/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/astro/stellarium-qt4/Makefile
==============================================================================
--- head/astro/stellarium-qt4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/astro/stellarium-qt4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,6 +3,7 @@
 
 PORTNAME=	stellarium
 PORTVERSION=	0.12.9
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
 PKGNAMESUFFIX=	-qt4

Modified: head/audio/amarok-kde4/Makefile
==============================================================================
--- head/audio/amarok-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/amarok-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.8.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 

Modified: head/audio/audiocd-kio/Makefile
==============================================================================
--- head/audio/audiocd-kio/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/audiocd-kio/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	audiocd-kio
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/juk/Makefile
==============================================================================
--- head/audio/juk/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/juk/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	juk
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/kmix-kde4/Makefile
==============================================================================
--- head/audio/kmix-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/kmix-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmix
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/kscd-kde4/Makefile
==============================================================================
--- head/audio/kscd-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/kscd-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kscd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/lastfm-desktop/Makefile
==============================================================================
--- head/audio/lastfm-desktop/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/lastfm-desktop/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lastfm-desktop
 PORTVERSION=	2.1.36
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
@@ -39,7 +39,7 @@ OPTIONS_DEFAULT=	VLC
 GSTREAMER_DESC=		Multimedia via Phonon-GStreamer
 GSTREAMER_USE=		QT4=phonon-gst_run
 VLC_DESC=		Multimedia via Phonon-VLC
-VLC_RUN_DEPENDS=	phonon-vlc>=0.6.1:multimedia/phonon-vlc
+VLC_RUN_DEPENDS=	phonon-vlc-qt4>=0.6.1:multimedia/phonon-vlc@qt4
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/audio/libkcompactdisc-kde4/Makefile
==============================================================================
--- head/audio/libkcompactdisc-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/libkcompactdisc-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libkcompactdisc
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/libkcompactdisc/Makefile
==============================================================================
--- head/audio/libkcompactdisc/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/libkcompactdisc/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libkcompactdisc
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/audio/minitunes/Makefile
==============================================================================
--- head/audio/minitunes/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/minitunes/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	minitunes
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://flavio.tordini.org/files/${PORTNAME}/
 

Modified: head/audio/soundkonverter/Makefile
==============================================================================
--- head/audio/soundkonverter/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/audio/soundkonverter/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -4,7 +4,7 @@
 PORTNAME=	soundkonverter
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio kde
 
 MAINTAINER=	dbn@FreeBSD.org

Modified: head/chinese/qterm/Makefile
==============================================================================
--- head/chinese/qterm/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/chinese/qterm/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qterm
 PORTVERSION=	0.5.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese
 MASTER_SITES=	SF/qterm/qterm/${PORTVERSION}
 

Modified: head/converters/wkhtmltopdf/Makefile
==============================================================================
--- head/converters/wkhtmltopdf/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/converters/wkhtmltopdf/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -4,6 +4,7 @@
 PORTNAME=	wkhtmltopdf
 PORTVERSION=	0.12.5
 PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	converters
 
 MAINTAINER=	pi@FreeBSD.org

Modified: head/databases/qt4-sql/Makefile
==============================================================================
--- head/databases/qt4-sql/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/databases/qt4-sql/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sql
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 PKGNAMEPREFIX=	qt4-
 

Modified: head/deskutils/kalarm/Makefile
==============================================================================
--- head/deskutils/kalarm/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/deskutils/kalarm/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kalarm
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/deskutils/korganizer/Makefile
==============================================================================
--- head/deskutils/korganizer/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/deskutils/korganizer/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	korganizer
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/deskutils/plasma-applet-cwp/Makefile
==============================================================================
--- head/deskutils/plasma-applet-cwp/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/deskutils/plasma-applet-cwp/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cwp
 PORTVERSION=	1.12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	plasma-applet-

Modified: head/devel/kf5-knotifications/Makefile
==============================================================================
--- head/devel/kf5-knotifications/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/kf5-knotifications/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	knotifications
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/devel/kf5-knotifyconfig/Makefile
==============================================================================
--- head/devel/kf5-knotifyconfig/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/kf5-knotifyconfig/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	knotifyconfig
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/devel/kio-extras/Makefile
==============================================================================
--- head/devel/kio-extras/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/kio-extras/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kio-extras
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/devel/pyside/Makefile
==============================================================================
--- head/devel/pyside/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/pyside/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -4,7 +4,7 @@
 PORTNAME=	pyside
 PORTVERSION=	1.2.2
 DISTVERSIONPREFIX=	qt4.8+
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://download.qt-project.org/official_releases/pyside/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}

Modified: head/devel/qt4/Makefile
==============================================================================
--- head/devel/qt4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/qt4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qt4
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/devel/qtscriptgenerator/Makefile
==============================================================================
--- head/devel/qtscriptgenerator/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/qtscriptgenerator/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtscriptgenerator
 PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	syncer@gmail.com

Modified: head/devel/smokeqt-kde4/Makefile
==============================================================================
--- head/devel/smokeqt-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/devel/smokeqt-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	smokeqt
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/editors/calligra/Makefile
==============================================================================
--- head/editors/calligra/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/editors/calligra/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	calligra
 DISTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}

Modified: head/finance/kmymoney-kde4/Makefile
==============================================================================
--- head/finance/kmymoney-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/finance/kmymoney-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kmymoney
 PORTVERSION=	4.8.2
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4

Modified: head/games/auralquiz/Makefile
==============================================================================
--- head/games/auralquiz/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/auralquiz/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -4,6 +4,7 @@
 PORTNAME=	auralquiz
 PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 

Modified: head/games/blinken/Makefile
==============================================================================
--- head/games/blinken/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/blinken/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	blinken
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/bomber/Makefile
==============================================================================
--- head/games/bomber/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/bomber/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	bomber
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/kblocks/Makefile
==============================================================================
--- head/games/kblocks/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/kblocks/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kblocks
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/kbounce/Makefile
==============================================================================
--- head/games/kbounce/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/kbounce/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kbounce
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/kolf/Makefile
==============================================================================
--- head/games/kolf/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/kolf/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kolf
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/kollision/Makefile
==============================================================================
--- head/games/kollision/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/kollision/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kollision
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/kpat/Makefile
==============================================================================
--- head/games/kpat/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/kpat/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kpat
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/ksirk/Makefile
==============================================================================
--- head/games/ksirk/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/ksirk/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ksirk
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/ktuberling/Makefile
==============================================================================
--- head/games/ktuberling/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/ktuberling/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktuberling
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	games kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/libkdegames-kde4/Makefile
==============================================================================
--- head/games/libkdegames-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/libkdegames-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libkdegames
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/games/pairs-kde4/Makefile
==============================================================================
--- head/games/pairs-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/games/pairs-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pairs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/graphics/gwenview/Makefile
==============================================================================
--- head/graphics/gwenview/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/graphics/gwenview/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gwenview
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/graphics/okular/Makefile
==============================================================================
--- head/graphics/okular/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/graphics/okular/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	okular
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/irc/konversation/Makefile
==============================================================================
--- head/irc/konversation/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/irc/konversation/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	konversation
 PORTVERSION=	1.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/src
 

Modified: head/irc/quassel/Makefile
==============================================================================
--- head/irc/quassel/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/irc/quassel/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,6 +3,7 @@
 
 PORTNAME=	quassel
 PORTVERSION=	0.12.5
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 

Modified: head/japanese/qt4-codecs-jp/Makefile
==============================================================================
--- head/japanese/qt4-codecs-jp/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/japanese/qt4-codecs-jp/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-jp

Modified: head/korean/qt4-codecs-kr/Makefile
==============================================================================
--- head/korean/qt4-codecs-kr/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/korean/qt4-codecs-kr/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-kr

Modified: head/misc/bibletime/Makefile
==============================================================================
--- head/misc/bibletime/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/bibletime/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bibletime
 PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
 

Modified: head/misc/klettres/Makefile
==============================================================================
--- head/misc/klettres/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/klettres/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	klettres
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/misc/ktouch-kde4/Makefile
==============================================================================
--- head/misc/ktouch-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/ktouch-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ktouch
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/misc/kwordquiz/Makefile
==============================================================================
--- head/misc/kwordquiz/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/kwordquiz/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kwordquiz
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/misc/qt4-qtconfig/Makefile
==============================================================================
--- head/misc/qt4-qtconfig/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/qt4-qtconfig/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtconfig
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 

Modified: head/misc/qt4-qtdemo/Makefile
==============================================================================
--- head/misc/qt4-qtdemo/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/qt4-qtdemo/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtdemo
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 

Modified: head/misc/saaghar/Makefile
==============================================================================
--- head/misc/saaghar/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/saaghar/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	saaghar
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/saaghar/Source%20Code/:saaghar \
 		SF/ganjoor/s3db:ganjoor

Modified: head/misc/tellico-kde4/Makefile
==============================================================================
--- head/misc/tellico-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/misc/tellico-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	2.3.12
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc kde
 MASTER_SITES=	http://tellico-project.org/files/
 

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/dragon-kde4/Makefile
==============================================================================
--- head/multimedia/dragon-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/dragon-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dragon
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org

Modified: head/multimedia/dragon/Makefile
==============================================================================
--- head/multimedia/dragon/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/dragon/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	dragon
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde kde-applications
 PKGNAMESUFFIX=	-player
 

Modified: head/multimedia/kaffeine/Makefile
==============================================================================
--- head/multimedia/kaffeine/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/kaffeine/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/kaffeine/current
 

Modified: head/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile
==============================================================================
--- head/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayerthumbs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia kde kde-kde4
 PKGNAMEPREFIX=	kdemultimedia-
 PKGNAMESUFIFX=	-kde4

Modified: head/multimedia/kmplayer-kde4/Makefile
==============================================================================
--- head/multimedia/kmplayer-kde4/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/kmplayer-kde4/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmplayer
 PORTVERSION=	0.11.5b
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio kde
 PKGNAMESUFFIX=	-kde4

Modified: head/multimedia/mediadownloader/Makefile
==============================================================================
--- head/multimedia/mediadownloader/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/mediadownloader/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/minitube/Makefile
==============================================================================
--- head/multimedia/minitube/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/minitube/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -2,6 +2,7 @@
 
 PORTNAME=	minitube
 DISTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	multimedia www
 
 MAINTAINER=	ports@FreeBSD.org

Modified: head/multimedia/phonon-designerplugin/Makefile
==============================================================================
--- head/multimedia/phonon-designerplugin/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-designerplugin/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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>

Modified: head/multimedia/phonon-designerplugin/pkg-descr
==============================================================================
--- head/multimedia/phonon-designerplugin/pkg-descr	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-designerplugin/pkg-descr	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/phonon-gstreamer/Makefile
==============================================================================
--- head/multimedia/phonon-gstreamer/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-gstreamer/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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>

Modified: head/multimedia/phonon-gstreamer/distinfo
==============================================================================
--- head/multimedia/phonon-gstreamer/distinfo	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-gstreamer/distinfo	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/phonon-gstreamer/pkg-descr
==============================================================================
--- head/multimedia/phonon-gstreamer/pkg-descr	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-gstreamer/pkg-descr	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Copied: head/multimedia/phonon-gstreamer/pkg-plist.qt4 (from r472807, head/multimedia/phonon-gstreamer/pkg-plist)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/phonon-gstreamer/pkg-plist.qt4	Thu Jun 21 16:52:09 2018	(r472983, copy of r472807, head/multimedia/phonon-gstreamer/pkg-plist)
@@ -0,0 +1,9 @@
+lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
+%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
+share/icons/hicolor/128x128/apps/phonon-gstreamer.png
+share/icons/hicolor/16x16/apps/phonon-gstreamer.png
+share/icons/hicolor/22x22/apps/phonon-gstreamer.png
+share/icons/hicolor/48x48/apps/phonon-gstreamer.png
+share/icons/hicolor/64x64/apps/phonon-gstreamer.png
+share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
+share/kde4/services/phononbackends/gstreamer.desktop

Copied and modified: head/multimedia/phonon-gstreamer/pkg-plist.qt5 (from r472982, head/multimedia/phonon-gstreamer/pkg-plist)
==============================================================================
--- head/multimedia/phonon-gstreamer/pkg-plist	Thu Jun 21 16:23:15 2018	(r472982, copy source)
+++ head/multimedia/phonon-gstreamer/pkg-plist.qt5	Thu Jun 21 16:52:09 2018	(r472983)
@@ -1,9 +1,7 @@
-lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
+%%QT_PLUGINDIR%%/phonon4qt5_backend/phonon_gstreamer.so
 share/icons/hicolor/128x128/apps/phonon-gstreamer.png
 share/icons/hicolor/16x16/apps/phonon-gstreamer.png
 share/icons/hicolor/22x22/apps/phonon-gstreamer.png
 share/icons/hicolor/48x48/apps/phonon-gstreamer.png
 share/icons/hicolor/64x64/apps/phonon-gstreamer.png
 share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
-share/kde4/services/phononbackends/gstreamer.desktop

Modified: head/multimedia/phonon-vlc/Makefile
==============================================================================
--- head/multimedia/phonon-vlc/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-vlc/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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>

Modified: head/multimedia/phonon-vlc/distinfo
==============================================================================
--- head/multimedia/phonon-vlc/distinfo	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-vlc/distinfo	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/phonon-xine/Makefile
==============================================================================
--- head/multimedia/phonon-xine/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon-xine/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

Modified: head/multimedia/phonon/Makefile
==============================================================================
--- head/multimedia/phonon/Makefile	Thu Jun 21 16:23:15 2018	(r472982)
+++ head/multimedia/phonon/Makefile	Thu Jun 21 16:52:09 2018	(r472983)
@@ -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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806211652.w5LGq961020858>