aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED4
-rw-r--r--Mk/bsd.qt.mk2
-rw-r--r--accessibility/kmousetool/Makefile1
-rw-r--r--astro/libkgeomap-kde4/Makefile2
-rw-r--r--astro/marble-kde4/Makefile2
-rw-r--r--astro/marble/Makefile1
-rw-r--r--astro/stellarium-qt4/Makefile1
-rw-r--r--audio/amarok-kde4/Makefile2
-rw-r--r--audio/audiocd-kio/Makefile1
-rw-r--r--audio/juk/Makefile1
-rw-r--r--audio/kmix-kde4/Makefile2
-rw-r--r--audio/kscd-kde4/Makefile2
-rw-r--r--audio/lastfm-desktop/Makefile4
-rw-r--r--audio/libkcompactdisc-kde4/Makefile2
-rw-r--r--audio/libkcompactdisc/Makefile1
-rw-r--r--audio/minitunes/Makefile2
-rw-r--r--audio/soundkonverter/Makefile2
-rw-r--r--chinese/qterm/Makefile2
-rw-r--r--converters/wkhtmltopdf/Makefile1
-rw-r--r--databases/qt4-sql/Makefile2
-rw-r--r--deskutils/kalarm/Makefile1
-rw-r--r--deskutils/korganizer/Makefile1
-rw-r--r--deskutils/plasma-applet-cwp/Makefile2
-rw-r--r--devel/kf5-knotifications/Makefile1
-rw-r--r--devel/kf5-knotifyconfig/Makefile1
-rw-r--r--devel/kio-extras/Makefile1
-rw-r--r--devel/pyside/Makefile2
-rw-r--r--devel/qt4/Makefile1
-rw-r--r--devel/qtscriptgenerator/Makefile2
-rw-r--r--devel/smokeqt-kde4/Makefile2
-rw-r--r--editors/calligra/Makefile1
-rw-r--r--finance/kmymoney-kde4/Makefile1
-rw-r--r--games/auralquiz/Makefile1
-rw-r--r--games/blinken/Makefile1
-rw-r--r--games/bomber/Makefile1
-rw-r--r--games/kblocks/Makefile1
-rw-r--r--games/kbounce/Makefile1
-rw-r--r--games/kolf/Makefile1
-rw-r--r--games/kollision/Makefile1
-rw-r--r--games/kpat/Makefile1
-rw-r--r--games/ksirk/Makefile1
-rw-r--r--games/ktuberling/Makefile1
-rw-r--r--games/libkdegames-kde4/Makefile2
-rw-r--r--games/pairs-kde4/Makefile2
-rw-r--r--graphics/gwenview/Makefile1
-rw-r--r--graphics/okular/Makefile2
-rw-r--r--irc/konversation/Makefile2
-rw-r--r--irc/quassel/Makefile1
-rw-r--r--japanese/qt4-codecs-jp/Makefile2
-rw-r--r--korean/qt4-codecs-kr/Makefile2
-rw-r--r--misc/bibletime/Makefile2
-rw-r--r--misc/klettres/Makefile1
-rw-r--r--misc/ktouch-kde4/Makefile2
-rw-r--r--misc/kwordquiz/Makefile1
-rw-r--r--misc/qt4-qtconfig/Makefile2
-rw-r--r--misc/qt4-qtdemo/Makefile2
-rw-r--r--misc/saaghar/Makefile1
-rw-r--r--misc/tellico-kde4/Makefile2
-rw-r--r--multimedia/Makefile4
-rw-r--r--multimedia/dragon-kde4/Makefile2
-rw-r--r--multimedia/dragon/Makefile1
-rw-r--r--multimedia/kaffeine/Makefile2
-rw-r--r--multimedia/kdemultimedia-mplayerthumbs-kde4/Makefile2
-rw-r--r--multimedia/kmplayer-kde4/Makefile2
-rw-r--r--multimedia/mediadownloader/Makefile2
-rw-r--r--multimedia/minitube/Makefile1
-rw-r--r--multimedia/phonon-designerplugin/Makefile32
-rw-r--r--multimedia/phonon-designerplugin/pkg-descr2
-rw-r--r--multimedia/phonon-gstreamer/Makefile39
-rw-r--r--multimedia/phonon-gstreamer/distinfo6
-rw-r--r--multimedia/phonon-gstreamer/pkg-descr2
-rw-r--r--multimedia/phonon-gstreamer/pkg-plist.qt4 (renamed from multimedia/phonon-gstreamer/pkg-plist)0
-rw-r--r--multimedia/phonon-gstreamer/pkg-plist.qt5 (renamed from multimedia/qt5-phonon4-gstreamer/pkg-plist)0
-rw-r--r--multimedia/phonon-vlc/Makefile39
-rw-r--r--multimedia/phonon-vlc/distinfo6
-rw-r--r--multimedia/phonon-vlc/pkg-plist3
-rw-r--r--multimedia/phonon-xine/Makefile2
-rw-r--r--multimedia/phonon/Makefile60
-rw-r--r--multimedia/phonon/distinfo6
-rw-r--r--multimedia/phonon/pkg-descr2
-rw-r--r--multimedia/phonon/pkg-plist.qt4 (renamed from multimedia/phonon/pkg-plist)0
-rw-r--r--multimedia/phonon/pkg-plist.qt5 (renamed from multimedia/qt5-phonon4/pkg-plist)0
-rw-r--r--multimedia/py-openlp/Makefile2
-rw-r--r--multimedia/py-qt4-phonon/Makefile2
-rw-r--r--multimedia/qt5-phonon4-designerplugin/Makefile30
-rw-r--r--multimedia/qt5-phonon4-designerplugin/pkg-descr3
-rw-r--r--multimedia/qt5-phonon4-gstreamer/Makefile34
-rw-r--r--multimedia/qt5-phonon4-gstreamer/distinfo3
-rw-r--r--multimedia/qt5-phonon4-gstreamer/pkg-descr3
-rw-r--r--multimedia/qt5-phonon4-vlc/Makefile29
-rw-r--r--multimedia/qt5-phonon4-vlc/distinfo3
-rw-r--r--multimedia/qt5-phonon4-vlc/pkg-descr3
-rw-r--r--multimedia/qt5-phonon4/Makefile37
-rw-r--r--multimedia/qt5-phonon4/distinfo3
-rw-r--r--multimedia/qt5-phonon4/pkg-descr4
-rw-r--r--multimedia/qt5-phonon4/pkg-message7
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile2
-rw-r--r--net-im/kopete/Makefile1
-rw-r--r--net-p2p/ktorrent/Makefile1
-rw-r--r--net/mailcommon/Makefile1
-rw-r--r--net/smb4k-kde4/Makefile2
-rw-r--r--sysutils/k3b-kde4/Makefile2
-rw-r--r--textproc/goldendict/Makefile2
-rw-r--r--www/kf5-khtml/Makefile1
-rw-r--r--x11-fm/dolphin/Makefile1
-rw-r--r--x11-toolkits/qt4-declarative/Makefile2
-rw-r--r--x11-toolkits/qt4-gui/Makefile2
-rw-r--r--x11/kde-runtime-kde4/Makefile2
-rw-r--r--x11/kdelibs-kde4/Makefile2
-rw-r--r--x11/libkonq-kde4/Makefile2
-rw-r--r--x11/plasma5-plasma-desktop/Makefile1
111 files changed, 222 insertions, 270 deletions
diff --git a/MOVED b/MOVED
index bfaba9cc6f06..3d11073a38c5 100644
--- a/MOVED
+++ b/MOVED
@@ -10284,3 +10284,7 @@ x11-themes/adwaita-qt4|x11-themes/adwaita-qt@qt4|2018-06-19|Move to flavored ver
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
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 551c43f62a88..ba80bb8d6b33 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -478,7 +478,7 @@ pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool
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
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 66a4f9073669..aee2d552442f 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kmousetool
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= accessibility kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/astro/libkgeomap-kde4/Makefile b/astro/libkgeomap-kde4/Makefile
index 1e509d9aaac5..f92adf9efd84 100644
--- a/astro/libkgeomap-kde4/Makefile
+++ b/astro/libkgeomap-kde4/Makefile
@@ -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
diff --git a/astro/marble-kde4/Makefile b/astro/marble-kde4/Makefile
index 941c740b1086..1db954d0ab22 100644
--- a/astro/marble-kde4/Makefile
+++ b/astro/marble-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= marble
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= astro kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index b317882818a6..91bb53b996eb 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -2,6 +2,7 @@
PORTNAME= marble
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= astro kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile
index 8465f40956a2..fe2f21dd7c4f 100644
--- a/astro/stellarium-qt4/Makefile
+++ b/astro/stellarium-qt4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stellarium
PORTVERSION= 0.12.9
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
PKGNAMESUFFIX= -qt4
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 44c1cae1ed07..47a93cdad9c6 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amarok
PORTVERSION= 2.8.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= audio kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/audiocd-kio/Makefile b/audio/audiocd-kio/Makefile
index 97903cba3254..124abace7036 100644
--- a/audio/audiocd-kio/Makefile
+++ b/audio/audiocd-kio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= audiocd-kio
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= audio kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 72555810a6a6..4968e5210641 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= juk
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= audio kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/kmix-kde4/Makefile b/audio/kmix-kde4/Makefile
index 0f760578415e..c74fc203f8c4 100644
--- a/audio/kmix-kde4/Makefile
+++ b/audio/kmix-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kmix
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/kscd-kde4/Makefile b/audio/kscd-kde4/Makefile
index 8a963896a41c..2c6ff23b1ca4 100644
--- a/audio/kscd-kde4/Makefile
+++ b/audio/kscd-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kscd
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 9e877a18b2ad..2e6e4d9bdaa6 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -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}
diff --git a/audio/libkcompactdisc-kde4/Makefile b/audio/libkcompactdisc-kde4/Makefile
index 6b772a071717..aa89b940dd2e 100644
--- a/audio/libkcompactdisc-kde4/Makefile
+++ b/audio/libkcompactdisc-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libkcompactdisc
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 2e04ad34f4df..409f30e6296d 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libkcompactdisc
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= audio kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index 4bc66d467ae6..f105f10a0e27 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= minitunes
PORTVERSION= 0.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://flavio.tordini.org/files/${PORTNAME}/
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 7da944520b52..369c3062482f 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -4,7 +4,7 @@
PORTNAME= soundkonverter
PORTVERSION= 2.2.2
DISTVERSIONPREFIX= v
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio kde
MAINTAINER= dbn@FreeBSD.org
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index b1ce4c68c5a4..b227fca586f4 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qterm
PORTVERSION= 0.5.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= chinese
MASTER_SITES= SF/qterm/qterm/${PORTVERSION}
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index 76f9a2748c18..b23e58f33274 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -4,6 +4,7 @@
PORTNAME= wkhtmltopdf
PORTVERSION= 0.12.5
PORTREVISION= 1
+PORTREVISION= 1
CATEGORIES= converters
MAINTAINER= pi@FreeBSD.org
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index b5b8e85013ae..1b74747a01f3 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sql
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases
PKGNAMEPREFIX= qt4-
diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile
index d7a7414b5581..bc4d36d9dbd5 100644
--- a/deskutils/kalarm/Makefile
+++ b/deskutils/kalarm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kalarm
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
index e0486572a722..2135db53f0e6 100644
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@@ -2,6 +2,7 @@
PORTNAME= korganizer
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index 9a4d72716dbb..051a40c0f75b 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -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-
diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile
index fac4d8be4f2d..19d844d43beb 100644
--- a/devel/kf5-knotifications/Makefile
+++ b/devel/kf5-knotifications/Makefile
@@ -2,6 +2,7 @@
PORTNAME= knotifications
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile
index 17b3389a274d..f185256ac337 100644
--- a/devel/kf5-knotifyconfig/Makefile
+++ b/devel/kf5-knotifyconfig/Makefile
@@ -2,6 +2,7 @@
PORTNAME= knotifyconfig
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile
index 8736b65b4bd8..05b8e961ce60 100644
--- a/devel/kio-extras/Makefile
+++ b/devel/kio-extras/Makefile
@@ -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
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index f5429b9a23dc..bb170fe6e9df 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -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}
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 54e72f8e4db4..4ff86d49b51e 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qt4
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index 1c9a0e037b5d..55b0549a2342 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qtscriptgenerator
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= syncer@gmail.com
diff --git a/devel/smokeqt-kde4/Makefile b/devel/smokeqt-kde4/Makefile
index f433b99fa37e..5978f19483ea 100644
--- a/devel/smokeqt-kde4/Makefile
+++ b/devel/smokeqt-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= smokeqt
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 9a226f7d941a..97c4397b13be 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -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}
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 8ba16893bcc8..8a9b82b742b5 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kmymoney
PORTVERSION= 4.8.2
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
PKGNAMESUFFIX= -kde4
diff --git a/games/auralquiz/Makefile b/games/auralquiz/Makefile
index cb66419a2b50..9d67e25d9e77 100644
--- a/games/auralquiz/Makefile
+++ b/games/auralquiz/Makefile
@@ -4,6 +4,7 @@
PORTNAME= auralquiz
PORTVERSION= 1.0.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SAVANNAH
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 08d5c270a15b..a1c7e79dbe7f 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blinken
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/bomber/Makefile b/games/bomber/Makefile
index d49397130e3a..85cbbee918f0 100644
--- a/games/bomber/Makefile
+++ b/games/bomber/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bomber
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile
index 11cba9f5d4f3..e1ac976bf911 100644
--- a/games/kblocks/Makefile
+++ b/games/kblocks/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kblocks
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile
index 15eaf188ea0b..23bf353e4174 100644
--- a/games/kbounce/Makefile
+++ b/games/kbounce/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kbounce
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/kolf/Makefile b/games/kolf/Makefile
index 056b985a6358..8f9323394b5f 100644
--- a/games/kolf/Makefile
+++ b/games/kolf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kolf
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/kollision/Makefile b/games/kollision/Makefile
index 65bf79870b72..27acb8c97722 100644
--- a/games/kollision/Makefile
+++ b/games/kollision/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kollision
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/kpat/Makefile b/games/kpat/Makefile
index a1f88c7f0aa1..a03f7b5eff3d 100644
--- a/games/kpat/Makefile
+++ b/games/kpat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kpat
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
index 6fcf95317882..a6d5fd34ed50 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ksirk
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile
index 7e384f925c3c..2ae09a770abf 100644
--- a/games/ktuberling/Makefile
+++ b/games/ktuberling/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ktuberling
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/games/libkdegames-kde4/Makefile b/games/libkdegames-kde4/Makefile
index 9a303d333c51..b8dec4541a62 100644
--- a/games/libkdegames-kde4/Makefile
+++ b/games/libkdegames-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libkdegames
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/games/pairs-kde4/Makefile b/games/pairs-kde4/Makefile
index bd7d72ce774c..d48209b74b9d 100644
--- a/games/pairs-kde4/Makefile
+++ b/games/pairs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pairs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 11d82be80068..7567d202b61f 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gwenview
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index a0b5cba558c5..fae686dbf221 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -2,7 +2,7 @@
PORTNAME= okular
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index a57cf48b7fda..0183aadffa19 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -3,7 +3,7 @@
PORTNAME= konversation
PORTVERSION= 1.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= irc kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/src
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index f6740efbb660..9fac71e734e9 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= quassel
PORTVERSION= 0.12.5
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://www.quassel-irc.org/pub/
diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile
index 956acb1af8d2..7af7f68cffea 100644
--- a/japanese/qt4-codecs-jp/Makefile
+++ b/japanese/qt4-codecs-jp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= codecs
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -jp
diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile
index 7ed6988ddbf9..271ecb524a23 100644
--- a/korean/qt4-codecs-kr/Makefile
+++ b/korean/qt4-codecs-kr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= codecs
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= korean
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -kr
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index e6157badcbab..ce2c09322b84 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -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
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index b538325caf5f..c1747da25c4d 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -2,6 +2,7 @@
PORTNAME= klettres
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/ktouch-kde4/Makefile b/misc/ktouch-kde4/Makefile
index 812019ec713d..5cd10e75685a 100644
--- a/misc/ktouch-kde4/Makefile
+++ b/misc/ktouch-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ktouch
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= misc kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 488b34cdfd84..dbb359e8eddd 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kwordquiz
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index ed75701b648f..a3ae6b248eb4 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qtconfig
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
PKGNAMEPREFIX= qt4-
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index 2bc7c4b10090..e922a9b03090 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qtdemo
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
PKGNAMEPREFIX= qt4-
diff --git a/misc/saaghar/Makefile b/misc/saaghar/Makefile
index c25ed2f9b02e..37d6efd68aa6 100644
--- a/misc/saaghar/Makefile
+++ b/misc/saaghar/Makefile
@@ -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
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index c8de0352baee..603e72542b6c 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tellico
PORTVERSION= 2.3.12
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= misc kde
MASTER_SITES= http://tellico-project.org/files/
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
diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index 64221c3968d8..af654fa800b9 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kopete
PORTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index f58689180347..5f366eee46c1 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -4,6 +4,7 @@
PORTNAME= ktorrent
DISTVERSION= 5.1.0
+PORTREVISION= 1
CATEGORIES= net-p2p kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:R}/
diff --git a/net/mailcommon/Makefile b/net/mailcommon/Makefile
index 7b7c75e7733d..e54988683d28 100644
--- a/net/mailcommon/Makefile
+++ b/net/mailcommon/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mailcommon
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index 4c11221356c9..f5219fd1e501 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smb4k-kde4
PORTVERSION= 0.10.9
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= net kde
MASTER_SITES= SF/smb4k
DISTNAME= smb4k-${PORTVERSION}
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index e2971c9f3d43..4f7d311a91fc 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= k3b
PORTVERSION= 2.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils multimedia kde
MASTER_SITES= KDE/stable/${PORTNAME}
DISTFILES= ${DISTNAME}a${EXTRACT_SUFX}
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 5cede86ac6ca..933e13a6cfe2 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -3,7 +3,7 @@
PORTNAME= goldendict
PORTVERSION= 1.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/www/kf5-khtml/Makefile b/www/kf5-khtml/Makefile
index 10478a185fdf..7479bc985d2b 100644
--- a/www/kf5-khtml/Makefile
+++ b/www/kf5-khtml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= khtml
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= www kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile
index 266d29ec701d..3cd12b1ad019 100644
--- a/x11-fm/dolphin/Makefile
+++ b/x11-fm/dolphin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dolphin
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-fm kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/x11-toolkits/qt4-declarative/Makefile b/x11-toolkits/qt4-declarative/Makefile
index c30d0270ff4e..cf001d247274 100644
--- a/x11-toolkits/qt4-declarative/Makefile
+++ b/x11-toolkits/qt4-declarative/Makefile
@@ -2,7 +2,7 @@
PORTNAME= declarative
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt4-
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index f905b81739c2..e151530d70f1 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gui
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt4-
diff --git a/x11/kde-runtime-kde4/Makefile b/x11/kde-runtime-kde4/Makefile
index e838283b4a6a..f87f4f795fbf 100644
--- a/x11/kde-runtime-kde4/Makefile
+++ b/x11/kde-runtime-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
diff --git a/x11/kdelibs-kde4/Makefile b/x11/kdelibs-kde4/Makefile
index ae78c3234bba..08411281caa3 100644
--- a/x11/kdelibs-kde4/Makefile
+++ b/x11/kdelibs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
diff --git a/x11/libkonq-kde4/Makefile b/x11/libkonq-kde4/Makefile
index b28748c95d41..332f30d0e164 100644
--- a/x11/libkonq-kde4/Makefile
+++ b/x11/libkonq-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libkonq
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 kde kde-kde4
DISTNAME= kde-baseapps-${PORTVERSION}
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index dacfc9f18acf..57d232f04e62 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-desktop
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org