7 files changed, 53 insertions, 31 deletions

diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 0481b3c9e273..cf4a9b4b679b 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -14,33 +14,40 @@ DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	The GStreamer backend for Phonon
+COMMENT=	GStreamer backend for Phonon
 
 CONFLICTS=	qt4-phonon-gst-4*
 
 PHONON_BRANCH=	stable
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdehier automoc4 kdeprefix
+
+USE_GNOME=	glib20 libxml2
+USE_GSTREAMER=	yes
+USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus xml opengl phonon \
+QT_COMPONENTS=	gui opengl phonon xml \
 		qmake_build moc_build rcc_build uic_build
-USE_GSTREAMER=	yes
+USE_XORG=	x11
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
 
-# Explicitly disable alsa, see for details:
+# FIXME: Remove this in the next release; phonon-gstreamer does not
+# depend on ALSA anymore.
+# Explicitly disable ALSA, see for details:
 # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
 CMAKE_ARGS+=	-DWITH_Alsa:BOOL=OFF
 
 .if defined(WITH_QT_PHONON)
-IGNORE=		conflicts with Qt4 phonon. Please, deinstall qt4-phonon-gst and set WITH_KDE_PHONON to continue
+IGNORE=		conflicts with Qt 4 Phonon. Please, deinstall qt4-phonon-gst and unset WITH_QT_PHONON to continue
 .endif
 
 pre-su-install:
 	${MKDIR} ${QT_PLUGINDIR}/phonon_backend
 
 post-install:
-	${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+	${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_gstreamer.so \
+		${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon-gstreamer/pkg-descr b/multimedia/phonon-gstreamer/pkg-descr
index df2c5bb43cf5..e91edea6be70 100644
--- a/multimedia/phonon-gstreamer/pkg-descr
+++ b/multimedia/phonon-gstreamer/pkg-descr
@@ -1,5 +1,4 @@
-Phonon is multimedia framework for QT4/KDE4.
-This port provides GStreamer backend.
+Phonon is the multimedia framework for KDE 4.
+This port provides the GStreamer backend.
 
-WWW:	http://www.gstreamer.net
 WWW:	http://phonon.kde.org
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 1ee1f3c7fe5a..84985b532eb3 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	phonon
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-vlc
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo
index 7d62acb9d603..15842b3a9f7f 100644
--- a/multimedia/phonon-vlc/distinfo
+++ b/multimedia/phonon-vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-vlc-0.4.0.tar.bz2) = a6595a5ac4ac87a5494723312b68e8345488dd2fe2e1401d67f9c2a8925110f2
-SIZE (KDE/phonon-backend-vlc-0.4.0.tar.bz2) = 54665
+SHA256 (KDE/phonon-backend-vlc-0.4.1.tar.bz2) = 168da93f71ec00b35d006a501f434a50134c51d8f80a8338e340c835d24b2da4
+SIZE (KDE/phonon-backend-vlc-0.4.1.tar.bz2) = 55020
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 05b2e239f420..ea2b188d9a80 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -6,31 +6,37 @@
 
 PORTNAME=	phonon
 PORTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Multimedia framework for KDE4
+COMMENT=	Multimedia framework for KDE 4
+
+LIB_DEPENDS=	qzeitgeist.0:${PORTSDIR}/sysutils/qzeitgeist
 
 CONFLICTS=	qt4-phonon-4*
 
 PHONON_BRANCH=	stable
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdehier automoc4 kdeprefix
+
+USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qtestlib \
+QT_COMPONENTS=	dbus gui \
 		qmake_build moc_build rcc_build uic_build
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS=	PULSEAUDIO	"Support playback via PulseAudio" off
 #		DESIGNER	"Install Qt Designer plugin" off \
-#		ZEITGEIST	"Log playback activity via Zeitgeist" off
 
 .include <bsd.port.options.mk>
 
+# FIXME: Enable this option with Qt 4.8 (qt4-webkit does not depend on
+# phonon anymore).
 # qt4-designer depends on qt4-webkit, hence on phonon. Disable this
 # option to avoid a circular dependency.
 .undef WITH_DESIGNER
@@ -51,12 +57,6 @@ CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=ON
 CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
 .endif
 
-.ifdef(WITH_ZEITGEIST)
-CMAKE_ARGS+=	-DWITH_QtZeitgeist:BOOL=ON
-.else
-CMAKE_ARGS+=	-DWITH_QtZeitgeist:BOOL=OFF
-.endif
-
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
 
 .ifdef(WITH_QT_PHONON)
@@ -67,7 +67,13 @@ pre-configure:
 	${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \
 		-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
 		${PATCH_WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \
+		${PATCH_WRKSRC}/${PORTNAME}/experimental/CMakeLists.txt
 
+# FIXME: We need to pass -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=1
+# to install the designer plugin and the Qt .pri file into the
+# system-wide Qt directory in the next release.
+# Reference: http://commits.kde.org/phonon/664035456f0c9dc85b65c893f431b82118c281c0
 post-install:
 	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/phonon
 	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/Phonon
diff --git a/multimedia/phonon/files/patch-phonon__globalconfig.cpp b/multimedia/phonon/files/patch-phonon__globalconfig.cpp
new file mode 100644
index 000000000000..627aec68274a
--- /dev/null
+++ b/multimedia/phonon/files/patch-phonon__globalconfig.cpp
@@ -0,0 +1,11 @@
+--- ./phonon/globalconfig.cpp.orig	2011-09-09 13:27:00.943109464 +0200
++++ ./phonon/globalconfig.cpp	2011-09-09 15:22:15.732984584 +0200
+@@ -35,6 +35,8 @@
+ #include <QtCore/QList>
+ #include <QtCore/QVariant>
+ 
++#define QT_NO_PHONON_PLATFORMPLUGIN
++
+ QT_BEGIN_NAMESPACE
+ 
+ namespace Phonon
diff --git a/multimedia/phonon/pkg-message b/multimedia/phonon/pkg-message
index c30d21f30391..009097a2bcef 100644
--- a/multimedia/phonon/pkg-message
+++ b/multimedia/phonon/pkg-message
@@ -1,4 +1,3 @@
-Please consider to install backends for phonon:
-multimedia/phonon-gstreamer	Gstreamer backend
+Please, consider installing backends for Phonon:
+multimedia/phonon-gstreamer	GStreamer backend
 multimedia/phonon-vlc		VLC backend
-multimedia/phonon-xine		Xine backend