3 files changed, 63 insertions, 17 deletions

diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile
index 9db8753a9fd6..1687fbd1817e 100644
--- a/multimedia/qt4-phonon/Makefile
+++ b/multimedia/qt4-phonon/Makefile
@@ -42,8 +42,8 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include <bsd.port.pre.mk>
 
@@ -53,20 +53,21 @@ IGNORE=		conflicts with KDE4 phonon. Please, deinstall multimedia/phonon
 
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${MKDIR} ${WRKSRC}/../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 
-post-configure:
+pre-install:
 	${REINPLACE_CMD} \
 		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' \
-		${WRKSRC}/Makefile
+		${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-		${WRKSRC}/../../lib/pkgconfig/phonon.pc
+		${WRKSRC}/lib/pkgconfig/phonon.pc
 
 post-install:
-	${MKDIR} ${PREFIX}/lib/qt4/plugins/phonon_backend
+	${MKDIR} ${QT_PLUGINDIR}/phonon_backend
+	${LN} -sf ${LOCALBASE}/include/qt4/phonon ${LOCALBASE}/include/qt4/Phonon
+	${LN} -sf ${LOCALBASE}/include/qt4/Phonon/phononnamespace.h ${LOCALBASE}/include/qt4/Phonon/Global
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/qt4-phonon/distinfo b/multimedia/qt4-phonon/distinfo
index 1756af8b04d9..27b0949354e8 100644
--- a/multimedia/qt4-phonon/distinfo
+++ b/multimedia/qt4-phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0
-SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6
-SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803
+MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
+SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
+SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/multimedia/qt4-phonon/pkg-plist b/multimedia/qt4-phonon/pkg-plist
index 924ecf38c08f..6f138fe7c417 100644
--- a/multimedia/qt4-phonon/pkg-plist
+++ b/multimedia/qt4-phonon/pkg-plist
@@ -31,6 +31,50 @@ include/qt4/Qt/videowidgetinterface.h
 include/qt4/Qt/volumefadereffect.h
 include/qt4/Qt/volumefaderinterface.h
 include/qt4/Qt/volumeslider.h
+include/qt4/phonon/AbstractAudioOutput
+include/qt4/phonon/AbstractMediaStream
+include/qt4/phonon/AbstractVideoOutput
+include/qt4/phonon/AddonInterface
+include/qt4/phonon/AudioCaptureDevice
+include/qt4/phonon/AudioCaptureDeviceModel
+include/qt4/phonon/AudioChannelDescription
+include/qt4/phonon/AudioChannelDescriptionModel
+include/qt4/phonon/AudioOutput
+include/qt4/phonon/AudioOutputDevice
+include/qt4/phonon/AudioOutputDeviceModel
+include/qt4/phonon/AudioOutputInterface
+include/qt4/phonon/AudioOutputInterface40
+include/qt4/phonon/AudioOutputInterface42
+include/qt4/phonon/BackendCapabilities
+include/qt4/phonon/BackendInterface
+include/qt4/phonon/Effect
+include/qt4/phonon/EffectDescription
+include/qt4/phonon/EffectDescriptionModel
+include/qt4/phonon/EffectInterface
+include/qt4/phonon/EffectParameter
+include/qt4/phonon/EffectWidget
+include/qt4/phonon/Global
+include/qt4/phonon/MediaController
+include/qt4/phonon/MediaNode
+include/qt4/phonon/MediaObject
+include/qt4/phonon/MediaObjectInterface
+include/qt4/phonon/MediaSource
+include/qt4/phonon/ObjectDescription
+include/qt4/phonon/ObjectDescriptionData
+include/qt4/phonon/ObjectDescriptionModel
+include/qt4/phonon/ObjectDescriptionModelData
+include/qt4/phonon/Path
+include/qt4/phonon/PlatformPlugin
+include/qt4/phonon/SeekSlider
+include/qt4/phonon/StreamInterface
+include/qt4/phonon/SubtitleDescription
+include/qt4/phonon/SubtitleDescriptionModel
+include/qt4/phonon/VideoPlayer
+include/qt4/phonon/VideoWidget
+include/qt4/phonon/VideoWidgetInterface
+include/qt4/phonon/VolumeFaderEffect
+include/qt4/phonon/VolumeFaderInterface
+include/qt4/phonon/VolumeSlider
 include/qt4/phonon/abstractaudiooutput.h
 include/qt4/phonon/abstractmediastream.h
 include/qt4/phonon/abstractvideooutput.h
@@ -64,15 +108,16 @@ include/qt4/phonon/videowidgetinterface.h
 include/qt4/phonon/volumefadereffect.h
 include/qt4/phonon/volumefaderinterface.h
 include/qt4/phonon/volumeslider.h
+include/qt4/Phonon
 lib/qt4/libphonon.la
 lib/qt4/libphonon.prl
 lib/qt4/libphonon.so
 lib/qt4/libphonon.so.4
-lib/qt4/libphonon.so.4.1
-lib/qt4/libphonon.so.4.1.3
-%%DEBUG%%lib/qt4/libphonon.so.4.1.3.debug
+lib/qt4/libphonon.so.4.3
+lib/qt4/libphonon.so.4.3.1
+%%DEBUG%%lib/qt4/libphonon.so.4.3.1.debug
 libdata/pkgconfig/phonon.pc
 @dirrm include/qt4/phonon
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4
-@dirrmtry lib/qt4/plugins/phonon_backend
+@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend