Update KDE related ports:

databases/akonadi to 1.7.2
devel/libdbusmenu-qt to 0.9.2
devel/qtscriptgenerator to 0.2.0
multimedia/phonon to 4.6.0
multimedia/phonon-gstreamer to 4.6.0
multimedia/phonon-vlc to 0.5.0
sysutils/qzeitgeist to 0.8.0

8 files changed, 88 insertions, 93 deletions

diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 9e1e970494ec..0abd5b5cc27d 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdbusmenu-qt
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.2
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo
index 8caac0d66d9e..8660a6dd65a9 100644
--- a/devel/libdbusmenu-qt/distinfo
+++ b/devel/libdbusmenu-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdbusmenu-qt-0.9.0.tar.bz2) = 071d8215c17999cdef8f8361964b45e135edf96c955d6618f4ebf1eac662b175
-SIZE (libdbusmenu-qt-0.9.0.tar.bz2) = 37153
+SHA256 (libdbusmenu-qt-0.9.2.tar.bz2) = ae6c1cb6da3c683aefed39df3e859537a31d80caa04f3023315ff09e5e8919ec
+SIZE (libdbusmenu-qt-0.9.2.tar.bz2) = 37882
diff --git a/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in b/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in
deleted file mode 100644
index 60ac2e410397..000000000000
--- a/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./dbusmenu-qt.pc.in.orig	2010-09-23 10:08:35.000000000 +0000
-+++ ./dbusmenu-qt.pc.in	2010-11-12 14:49:39.000000000 +0000
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
- includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-qt
- 
- Name: libdbusmenu-qt
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index 1080963c83d0..42ecf1886da9 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -5,20 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	qtscriptgenerator
-PORTVERSION=	0.1.0.20101126
+PORTVERSION=	0.2.0
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://ns.ael.ru/~fluffy.khv/distfiles/
-MASTER_SITE_SUBDIR=	fluffy
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	syncer@gmail.com
-COMMENT=	Qt Script Generator is a tool that generates Qt bindings for Qt Script
+COMMENT=	Tool that generates Qt bindings for Qt Script
 
 OPTIONS=	PHONON	"Build Phonon support" on
 
-USE_GMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib declarative designer doc help help-tools gui \
 		iconengines imageformats inputmethods linguist network \
@@ -26,13 +22,13 @@ QT_COMPONENTS=	corelib declarative designer doc help help-tools gui \
 		qt3support qtestlib qvfb script scripttools \
 		sql svg webkit xml xmlpatterns xmlpatterns-tool \
 		qmake_build moc_build rcc_build uic_build
-HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
-INSTALL_QT_PLUGINS_DIR=	${PREFIX}/lib/qt4/plugins/
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PHONON)
+.if !defined(WITHOUT_PHONON)
 QT_COMPONENTS+=	phonon
 PLIST_SUB+=	PHONON=""
 .else
@@ -41,22 +37,31 @@ PLIST_SUB+=	PHONON="@comment "
 .endif
 
 do-configure:
-	@cd ${WRKSRC}/generator/ && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} generator.pro
+	@cd ${WRKSRC}/generator && \
+		${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
+		PREFIX=${PREFIX} \
+		generator.pro
 
 do-build:
 	@echo "--->  Building generator"
-	@cd ${WRKSRC}/generator && ${GMAKE} && ${SETENV} ${CONFIGURE_ENV} \
-		./generator --include-paths=${PREFIX}/include/:${PREFIX}/include/qt4/
-	@echo "--->  Configure generated files"
-	@cd ${WRKSRC}/qtbindings && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX} INCLUDEPATH+=${PREFIX}/include/qt4/phonon \
-		LIBS+=-L${PREFIX}/lib qtbindings.pro
+	@cd ${WRKSRC}/generator && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} && \
+		${SETENV} ${CONFIGURE_ENV} ./generator \
+		--include-paths=${PREFIX}/include/:${PREFIX}/include/qt4/
+	@echo "--->  Configuring generated files"
+	@cd ${WRKSRC}/qtbindings && \
+		${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
+		PREFIX=${PREFIX} \
+		INCLUDEPATH+=${PREFIX}/include/qt4/phonon \
+		LIBS+=-L${PREFIX}/lib \
+		qtbindings.pro
 	@echo "--->  Building generated files"
-	@cd ${WRKSRC}/qtbindings && ${SETENV} ${MAKE_ENV} && ${GMAKE}
+	@cd ${WRKSRC}/qtbindings && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS}
 
 do-install:
-	${MKDIR} ${INSTALL_QT_PLUGINS_DIR}/script
-	cd ${WRKSRC}/plugins/script/ && ${COPYTREE_SHARE} \* ${INSTALL_QT_PLUGINS_DIR}/script
+	${MKDIR} ${PREFIX}/${QT_PLUGINDIR_REL}/script
+	cd ${WRKSRC}/plugins/script && \
+		${COPYTREE_SHARE} \* ${PREFIX}/${QT_PLUGINDIR_REL}/script
 
 .include <bsd.port.mk>
diff --git a/devel/qtscriptgenerator/distinfo b/devel/qtscriptgenerator/distinfo
index 5088c09eac77..fdb451fa7201 100644
--- a/devel/qtscriptgenerator/distinfo
+++ b/devel/qtscriptgenerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtscriptgenerator-src-0.1.0.20101126.tar.gz) = e859e59eba4ead81d958792392a5ea16ce3807d933b3b56c0cfe6a00e1850608
-SIZE (qtscriptgenerator-src-0.1.0.20101126.tar.gz) = 371765
+SHA256 (qtscriptgenerator-src-0.2.0.tar.gz) = 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69
+SIZE (qtscriptgenerator-src-0.2.0.tar.gz) = 379776
diff --git a/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h b/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h
index d7b46bc5b144..5ce72659ee87 100644
--- a/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h
+++ b/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h
@@ -1,9 +1,13 @@
-diff -up ./generator/qtscript_masterinclude.h.kde_phonon ./generator/qtscript_masterinclude.h
---- ./generator/qtscript_masterinclude.h.kde_phonon	2010-10-26 02:53:53.000000000 -0500
-+++ ./generator/qtscript_masterinclude.h	2010-12-11 17:00:08.456338081 -0600
-@@ -58,7 +58,7 @@
+--- ./generator/qtscript_masterinclude.h.orig	2012-01-23 03:30:03.000000000 -0800
++++ ./generator/qtscript_masterinclude.h	2012-04-24 04:41:24.458404620 -0700
+@@ -53,12 +53,10 @@
+ #  include <QtXmlPatterns/QtXmlPatterns>
  #endif
  
+-#ifndef QT_NO_WEBKIT
+ #  include <QtWebKit/QtWebKit>
+-#endif
+ 
  #ifndef QT_NO_PHONON
 -#  include <phonon/phonon>
 +#  include <phonon/phononnamespace.h>
diff --git a/devel/qtscriptgenerator/pkg-descr b/devel/qtscriptgenerator/pkg-descr
index 254f751d26c6..81685d9ad6c6 100644
--- a/devel/qtscriptgenerator/pkg-descr
+++ b/devel/qtscriptgenerator/pkg-descr
@@ -1,10 +1,5 @@
-Qt Script Generator is a tool that generates Qt bindings for Qt Script.
-With the generated bindings you get access to substantial portions
-of the Qt API from within Qt Script.
-
-Qt is a cross-platform application framework for desktop and embedded
-development. It includes an intuitive API and a rich C++ class
-library, integrated tools for GUI development and internationalization,
-and support for Java? and C++ development.
+Qt Script Generator is a tool that generates Qt bindings for Qt
+Script. With the generated bindings you get access to substantial
+portions of the Qt API from within Qt Script.
 
 WWW: http://qtscriptgenerator.googlecode.com
diff --git a/devel/qtscriptgenerator/pkg-plist b/devel/qtscriptgenerator/pkg-plist
index a09e8c600230..41fbb1365a6f 100644
--- a/devel/qtscriptgenerator/pkg-plist
+++ b/devel/qtscriptgenerator/pkg-plist
@@ -1,45 +1,46 @@
-lib/qt4/plugins/script/libqtscript_core.so
-lib/qt4/plugins/script/libqtscript_core.so.1
-lib/qt4/plugins/script/libqtscript_core.so.1.0
-lib/qt4/plugins/script/libqtscript_core.so.1.0.0
-lib/qt4/plugins/script/libqtscript_gui.so
-lib/qt4/plugins/script/libqtscript_gui.so.1
-lib/qt4/plugins/script/libqtscript_gui.so.1.0
-lib/qt4/plugins/script/libqtscript_gui.so.1.0.0
-lib/qt4/plugins/script/libqtscript_network.so
-lib/qt4/plugins/script/libqtscript_network.so.1
-lib/qt4/plugins/script/libqtscript_network.so.1.0
-lib/qt4/plugins/script/libqtscript_network.so.1.0.0
-lib/qt4/plugins/script/libqtscript_opengl.so
-lib/qt4/plugins/script/libqtscript_opengl.so.1
-lib/qt4/plugins/script/libqtscript_opengl.so.1.0
-lib/qt4/plugins/script/libqtscript_opengl.so.1.0.0
-%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so
-%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1
-%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1.0
-%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1.0.0
-lib/qt4/plugins/script/libqtscript_sql.so
-lib/qt4/plugins/script/libqtscript_sql.so.1
-lib/qt4/plugins/script/libqtscript_sql.so.1.0
-lib/qt4/plugins/script/libqtscript_sql.so.1.0.0
-lib/qt4/plugins/script/libqtscript_svg.so
-lib/qt4/plugins/script/libqtscript_svg.so.1
-lib/qt4/plugins/script/libqtscript_svg.so.1.0
-lib/qt4/plugins/script/libqtscript_svg.so.1.0.0
-lib/qt4/plugins/script/libqtscript_uitools.so
-lib/qt4/plugins/script/libqtscript_uitools.so.1
-lib/qt4/plugins/script/libqtscript_uitools.so.1.0
-lib/qt4/plugins/script/libqtscript_uitools.so.1.0.0
-lib/qt4/plugins/script/libqtscript_webkit.so
-lib/qt4/plugins/script/libqtscript_webkit.so.1
-lib/qt4/plugins/script/libqtscript_webkit.so.1.0
-lib/qt4/plugins/script/libqtscript_webkit.so.1.0.0
-lib/qt4/plugins/script/libqtscript_xml.so
-lib/qt4/plugins/script/libqtscript_xml.so.1
-lib/qt4/plugins/script/libqtscript_xml.so.1.0
-lib/qt4/plugins/script/libqtscript_xml.so.1.0.0
-lib/qt4/plugins/script/libqtscript_xmlpatterns.so
-lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1
-lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0
-lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0.0
-@dirrm lib/qt4/plugins/script/
+%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0.0
+%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so
+%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1
+%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0
+%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0
+%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0.0
+@dirrm %%QT_PLUGINDIR_REL%%/script
+@dirrmtry %%QT_PLUGINDIR_REL%%