4 files changed, 44 insertions, 23 deletions

diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index df05245ad39e..05b2e239f420 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.4.4
+PORTVERSION=	4.5.0
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/
@@ -21,46 +21,61 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdehier automoc4 kdeprefix
 USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus xml qtestlib \
+QT_COMPONENTS=	dbus gui qtestlib \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
-OPTIONS=	PULSEAUDIO "Phonon support for PulseAudio" off
+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>
 
-.if defined(WITH_PULSEAUDIO)
-CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=ON
+# qt4-designer depends on qt4-webkit, hence on phonon. Disable this
+# option to avoid a circular dependency.
+.undef WITH_DESIGNER
+.ifdef(WITH_DESIGNER)
+QT_COMPONENTS+=	designer
+CMAKE_ARGS+=	-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=ON
+PLIST_SUB+=	DESIGNER=""
+.else
+CMAKE_ARGS+=	-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
+PLIST_SUB+=	DESIGNER="@comment "
+.endif
+
+.ifdef(WITH_PULSEAUDIO)
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 USE_GNOME+=	glib20
+CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=ON
 .else
 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}
 
-.if defined(WITH_QT_PHONON)
-IGNORE=		conflicts with Qt4 phonon. Please, deinstall qt4-phonon and set WITH_KDE_PHONON to continue
+.ifdef(WITH_QT_PHONON)
+IGNORE=		conflicts with Qt 4 phonon. Please, deinstall qt4-phonon and unset WITH_QT_PHONON to continue
 .endif
 
-post-patch:
-#fix finding automoc when PREFIX is not matched KDE4_PREFIX
-	${REINPLACE_CMD} -e 's|NO_DEFAULT_PATH|${KDE4_PREFIX} NO_DEFAULT_PATH|' \
-		${PATCH_WRKSRC}/cmake/FindAutomoc4.cmake
-
 pre-configure:
 	${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \
-			-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
+		-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 post-install:
 	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/phonon
 	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/Phonon
 	${LN} -sf ${PREFIX}/include/KDE/Phonon ${PREFIX}/include/phonon/Phonon
-	${LN} -sf ${PREFIX}/lib/libphonon.so.4.4.0 ${QT_LIBDIR}/libphonon.so
-	${LN} -sf ${PREFIX}/lib/libphonon.so.4.4.0 ${QT_LIBDIR}/libphonon.so.4
-	${LN} -sf ${PREFIX}/lib/libphononexperimental.so.4.4.0 ${QT_LIBDIR}/libphononexperimental.so
-	${LN} -sf ${PREFIX}/lib/libphononexperimental.so.4.4.0 ${QT_LIBDIR}/libphononexperimental.so.4
+.for lib in phonon phononexperimental
+	${LN} -sf ${PREFIX}/lib/lib${lib}.so.4.5.0 ${QT_LIBDIR}/lib${lib}.so
+	${LN} -sf ${PREFIX}/lib/lib${lib}.so.4.5.0 ${QT_LIBDIR}/lib${lib}.so.4
+.endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 77acacd2f4e3..13cf2b0fe9be 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-4.4.4.tar.bz2) = 4c1d74eb06d58757bd2d81c29a3e9e86ff2e0751c8b4beec5a3365dda34d85f6
-SIZE (KDE/phonon-4.4.4.tar.bz2) = 362249
+SHA256 (KDE/phonon-4.5.0.tar.bz2) = 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
+SIZE (KDE/phonon-4.5.0.tar.bz2) = 322043
diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr
index 728f87100012..bfb440853438 100644
--- a/multimedia/phonon/pkg-descr
+++ b/multimedia/phonon/pkg-descr
@@ -1,3 +1,4 @@
-Phonon is multimedia framework for QT4/KDE4.
+Phonon is the framework responsible for an ubiquitous multimedia
+experience in KDE 4.
 
 WWW:	http://phonon.kde.org
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index a01ec4486366..93c1fb830537 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -50,12 +50,14 @@ include/phonon/AudioCaptureDevice
 include/phonon/AudioCaptureDeviceModel
 include/phonon/AudioChannelDescription
 include/phonon/AudioChannelDescriptionModel
+include/phonon/AudioDataOutput
 include/phonon/AudioOutput
 include/phonon/AudioOutputDevice
 include/phonon/AudioOutputDeviceModel
 include/phonon/AudioOutputInterface
 include/phonon/AudioOutputInterface40
 include/phonon/AudioOutputInterface42
+include/phonon/AvCapture
 include/phonon/BackendCapabilities
 include/phonon/BackendInterface
 include/phonon/Effect
@@ -70,6 +72,7 @@ include/phonon/MediaNode
 include/phonon/MediaObject
 include/phonon/MediaObjectInterface
 include/phonon/MediaSource
+include/phonon/Mrl
 include/phonon/ObjectDescription
 include/phonon/ObjectDescriptionData
 include/phonon/ObjectDescriptionModel
@@ -135,6 +138,7 @@ include/phonon/medianode.h
 include/phonon/mediaobject.h
 include/phonon/mediaobjectinterface.h
 include/phonon/mediasource.h
+include/phonon/mrl.h
 include/phonon/objectdescription.h
 include/phonon/objectdescriptionmodel.h
 include/phonon/path.h
@@ -153,15 +157,16 @@ include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
 lib/libphonon.so
 lib/libphonon.so.4
-lib/libphonon.so.4.4.0
+lib/libphonon.so.4.5.0
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
-lib/libphononexperimental.so.4.4.0
+lib/libphononexperimental.so.4.5.0
+%%DESIGNER%%lib/kde4/libphononwidgets.so
 libdata/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
+share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS
 share/phonon-buildsystem/FindAutomoc4.cmake
 share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake
-share/phonon-buildsystem/FindPhonon.cmake
 share/phonon-buildsystem/FindPhononInternal.cmake
 share/phonon-buildsystem/FindQt4.cmake
 share/phonon-buildsystem/MacroEnsureVersion.cmake