3 files changed, 23 insertions, 15 deletions

diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile
index 51f977dd6e5f..cd3dab4f21e0 100644
--- a/multimedia/qt4-phonon-gst/Makefile
+++ b/multimedia/qt4-phonon-gst/Makefile
@@ -29,23 +29,30 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/network \
-		src/qt3support src/script src/sql src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/webkit
+		src/activeqt src/dbus src/multimedia src/network src/openvg \
+		src/qt3support src/s60installs src/s60main src/script \
+		src/scripttools src/sql src/svg src/testlib src/tools \
+		src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \
+		src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \
+		src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/webkit
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/plugins/phonon/gstreamer
-CONFIGURE_WRKSRC=${WRKSRC}/../../../../
+BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}/gstreamer
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+
+.if defined(WITH_KDE_PHONON)
+IGNORE=		conflicts with multimedia/phonon-gstreamer. You have defined WITH_KDE_PHONON to override Qt4 phonon
+.endif
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${ECHO_CMD} "DEFINES+= QT_OPENGL" >> ${WRKSRC}/gstreamer.pro
-	${MKDIR} ${WRKSRC}/../../../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
+	${ECHO_CMD} "DEFINES+= QT_OPENGL" >> ${BUILD_WRKSRC}/gstreamer.pro
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 
 .include <bsd.port.mk>
diff --git a/multimedia/qt4-phonon-gst/pkg-descr b/multimedia/qt4-phonon-gst/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/multimedia/qt4-phonon-gst/pkg-descr
+++ b/multimedia/qt4-phonon-gst/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/multimedia/qt4-phonon-gst/pkg-plist b/multimedia/qt4-phonon-gst/pkg-plist
index d96b9a932b09..7d2d4843ecb1 100644
--- a/multimedia/qt4-phonon-gst/pkg-plist
+++ b/multimedia/qt4-phonon-gst/pkg-plist
@@ -1,3 +1,4 @@
-lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
-%%DEBUG%%lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so.debug
-@dirrmtry lib/qt4/plugins/phonon_backend
+%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so
+%%DEBUG%%%%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so.debug
+@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
+@dirrmtry %%QT_PLUGINDIR_REL%%