Mk/bsd.kde4.mk:

- rework KDE4_BUILDENV

All ports:
- remove needless post-extract target
- make patches relative to ${PATCH_WRKSRC}
- clean up
- bump PORTREVISION when required

databases/akonadi:
- replace dependency on boost-python-libs with boost-libs
  (finally, boost-pyhton does not conflict with boost \o/)

deskutils/kdepim*:
- replace boost-python-libs with boost-libs
- reduce dependencies
- respect PREFIX
- fix build with qt3 installed

misc/kdeedu4:
- add dependency on astro/xplanet (for KStars)

misc/kdeutils4:
- add dependency on devel/qca (for okteta)
- make dependency on kdebase non-optional

multimedia/kdemultimedia4:
- add optional support for PulseAudio

x11/kdebase4:
- remove needless dependency on kdebase4-runtime

x11/kdebase4-runtime, x11/kdebase4-workspace
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users

x11/kdelibs4
- remove needless dependencies
- remove extra CMAKE_ARGS to fix build for qt3/kde3 users

21 files changed, 127 insertions, 88 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 4f3ef3b2ecf0..f0b770f809a2 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +18,8 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -26,36 +28,24 @@ USE_BZIP2=	yes
 USE_QT_VER=	4
 USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp kdebase
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
-OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off \
-		KONQUI		"Konqueror UI integration" off
+OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KONQUI)
-USE_KDE4+=	kdebase
-PLIST_SUB+=	KONQUI=""
-.else
-PLIST_SUB+=	KONQUI="@comment "
-
-.endif
-
 .if defined(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
 #disable printer-applet, it comes with print/kdeutils4-printer-applet
 	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
-		${WRKSRC}/../CMakeLists.txt
+		${PATCH_WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 7bf4309ec709..c364e5629318 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -23,7 +23,7 @@ lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
 lib/kde4/libarkpart.so
-%%KONQUI%%lib/kde4/libextracthere.so
+lib/kde4/libextracthere.so
 lib/kde4/libkbytearrayedit.so
 lib/kde4/liboktetapart.so
 lib/kde4/plasma_package_superkaramba.so
@@ -284,7 +284,7 @@ share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
-%%KONQUI%%share/kde4/services/ark_dndextract.desktop
+share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcm_lirc.desktop
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 830f2b1b0a3e..408c2dc079d8 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepim-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -14,38 +15,25 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
-		qca.2:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4
+USE_KDE4=	pimlibs kdeexp kdeprefix kdehier sharedmime automoc4
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		xml gui qmake_build moc_build rcc_build uic_build
-USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
-#fix build when kdepim3 is here
-CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 
 pre-configure:
 	#respect prefix
-	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+	${FIND} ${WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \
 	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
-	@${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \
-		${WRKSRC}/../resources/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4caa4a75c3fb
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./CMakeLists.txt.orig	2009-08-10 19:43:44.000000000 +1100
++++ ./CMakeLists.txt	2009-08-10 19:58:07.000000000 +1100
+@@ -47,7 +47,7 @@
+ 
+ ############### Needed commands before building anything ###############
+ 
+-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
++include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ 
+ 
diff --git a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
new file mode 100644
index 000000000000..aded1f763a22
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./resources/kolabproxy/CMakeLists.txt.orig	2009-08-04 09:09:41.000000000 +1100
++++ ./resources/kolabproxy/CMakeLists.txt	2009-08-10 19:40:23.000000000 +1100
+@@ -1,8 +1,10 @@
+ project(kolabproxy)
+ 
+ include_directories(
+-    ${kdepim-runtime_SOURCE_DIR}
++    ${QT_QTCORE_INCLUDE_DIR}
++    ${QT_QTGUI_INCLUDE_DIR}
+     ${QT_QTDBUS_INCLUDE_DIR}
++    ${kdepim-runtime_SOURCE_DIR}
+     ${Boost_INCLUDE_DIR}
+ )
+ 
diff --git a/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt
new file mode 100644
index 000000000000..d4ffc0a929d9
--- /dev/null
+++ b/deskutils/kdepim4-runtime/files/patch-resources__maildir__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./resources/maildir/CMakeLists.txt.orig	2009-08-09 08:40:35.000000000 +0000
++++ ./resources/maildir/CMakeLists.txt	2009-08-09 08:47:15.000000000 +0000
+@@ -36,4 +36,4 @@
+ 
+ install(TARGETS akonadi_maildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
+-        DESTINATION ${KDE4_DBUS_INTERFACES_DIR})
++        DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
index deb1a277bab8..a2f61f9b2add 100644
--- a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
+++ b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../xml/CMakeLists.txt.orig	2009-06-03 22:54:34.000000000 +1100
-+++ ../xml/CMakeLists.txt	2009-07-05 22:39:32.000000000 +1100
+--- ./xml/CMakeLists.txt.orig	2009-06-03 22:54:34.000000000 +1100
++++ ./xml/CMakeLists.txt	2009-07-05 22:39:32.000000000 +1100
 @@ -1,21 +1,24 @@
  project (akonadixml)
  
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 9ae4d7500692..bf84c52462aa 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -6,6 +6,7 @@ bin/akonadi_imap_resource
 bin/akonadi_kabc_resource
 bin/akonadi_kcal_resource
 bin/akonadi_knut_resource
+bin/akonadi_kolabproxy_resource
 bin/akonadi_localbookmarks_resource
 bin/akonadi_maildir_resource
 bin/akonadi_microblog_resource
@@ -61,6 +62,7 @@ share/akonadi/agents/imapresource.desktop
 share/akonadi/agents/kabcresource.desktop
 share/akonadi/agents/kcalresource.desktop
 share/akonadi/agents/knutresource.desktop
+share/akonadi/agents/kolabproxyresource.desktop
 share/akonadi/agents/localbookmarksresource.desktop
 share/akonadi/agents/maildirresource.desktop
 share/akonadi/agents/microblog.desktop
@@ -87,14 +89,15 @@ share/apps/akonadi_knut_resource/knut-template.xml
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/config/kres-migratorrc
 share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+share/icons/hicolor/64x64/apps/kolab.png
 share/kde4/services/akonadi.protocol
 share/kde4/services/kcm_akonadi.desktop
 share/kde4/services/kcm_akonadi_resources.desktop
 share/kde4/services/kcm_akonadi_server.desktop
 share/kde4/services/kresources/kabc/akonadi.desktop
 share/kde4/services/kresources/kcal/akonadi.desktop
-share/mime/packages/kdepim-mime.xml
 share/mime/application/x-vnd.kde.notes.xml
+share/mime/packages/kdepim-mime.xml
 @dirrm share/apps/akonadiconsole
 @dirrm share/apps/akonadi_knut_resource
 @dirrm share/apps/akonadi/plugins/serializer
@@ -104,3 +107,6 @@ share/mime/application/x-vnd.kde.notes.xml
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
 @dirrm include/akonadi/xml
+@dirrmtry include/akonadi
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index fe107376edaf..90e12a113140 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,14 +18,15 @@ COMMENT=	Libraries for KDE-PIM applications
 BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
+		boost_thread:${PORTSDIR}/devel/boost-libs \
 		mal.1:${PORTSDIR}/palm/libmal \
 		pisock.9:${PORTSDIR}/palm/pilot-link \
 		qca.2:${PORTSDIR}/devel/qca
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeexp pimlibs pimruntime \
+		akonadi kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
@@ -58,12 +60,9 @@ PLIST_SUB+=	GNOKII="@comment "
 # PLIST_SUB+=	KITCHENSYNC="@comment "
 # .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 pre-configure:
-	#respect prefix
-	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
-	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+# respect prefix
+	${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \
+	${REINPLACE_CMD} -e '/DESTINATION/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
index 830f2b1b0a3e..408c2dc079d8 100644
--- a/deskutils/kdepim44-runtime/Makefile
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepim-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -14,38 +15,25 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
-		qca.2:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdelibs kdeexp pimlibs runtime akonadi kdeprefix kdehier automoc4
+USE_KDE4=	pimlibs kdeexp kdeprefix kdehier sharedmime automoc4
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		xml gui qmake_build moc_build rcc_build uic_build
-USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
-#fix build when kdepim3 is here
-CMAKE_ARGS+=	-DGPGME_LIBRARY_DIR:PATH="${KDE4_PREFIX}/lib"
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 
 pre-configure:
 	#respect prefix
-	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+	${FIND} ${WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \
 	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
-	@${REINPLACE_CMD} -e 's|add_subdirectory( kolabproxy )||' \
-		${WRKSRC}/../resources/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4caa4a75c3fb
--- /dev/null
+++ b/deskutils/kdepim44-runtime/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./CMakeLists.txt.orig	2009-08-10 19:43:44.000000000 +1100
++++ ./CMakeLists.txt	2009-08-10 19:58:07.000000000 +1100
+@@ -47,7 +47,7 @@
+ 
+ ############### Needed commands before building anything ###############
+ 
+-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
++include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ 
+ 
diff --git a/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
new file mode 100644
index 000000000000..aded1f763a22
--- /dev/null
+++ b/deskutils/kdepim44-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./resources/kolabproxy/CMakeLists.txt.orig	2009-08-04 09:09:41.000000000 +1100
++++ ./resources/kolabproxy/CMakeLists.txt	2009-08-10 19:40:23.000000000 +1100
+@@ -1,8 +1,10 @@
+ project(kolabproxy)
+ 
+ include_directories(
+-    ${kdepim-runtime_SOURCE_DIR}
++    ${QT_QTCORE_INCLUDE_DIR}
++    ${QT_QTGUI_INCLUDE_DIR}
+     ${QT_QTDBUS_INCLUDE_DIR}
++    ${kdepim-runtime_SOURCE_DIR}
+     ${Boost_INCLUDE_DIR}
+ )
+ 
diff --git a/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt
new file mode 100644
index 000000000000..d4ffc0a929d9
--- /dev/null
+++ b/deskutils/kdepim44-runtime/files/patch-resources__maildir__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./resources/maildir/CMakeLists.txt.orig	2009-08-09 08:40:35.000000000 +0000
++++ ./resources/maildir/CMakeLists.txt	2009-08-09 08:47:15.000000000 +0000
+@@ -36,4 +36,4 @@
+ 
+ install(TARGETS akonadi_maildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
+-        DESTINATION ${KDE4_DBUS_INTERFACES_DIR})
++        DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
index deb1a277bab8..a2f61f9b2add 100644
--- a/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
+++ b/deskutils/kdepim44-runtime/files/patch-xml__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../xml/CMakeLists.txt.orig	2009-06-03 22:54:34.000000000 +1100
-+++ ../xml/CMakeLists.txt	2009-07-05 22:39:32.000000000 +1100
+--- ./xml/CMakeLists.txt.orig	2009-06-03 22:54:34.000000000 +1100
++++ ./xml/CMakeLists.txt	2009-07-05 22:39:32.000000000 +1100
 @@ -1,21 +1,24 @@
  project (akonadixml)
  
diff --git a/deskutils/kdepim44-runtime/pkg-plist b/deskutils/kdepim44-runtime/pkg-plist
index 9ae4d7500692..bf84c52462aa 100644
--- a/deskutils/kdepim44-runtime/pkg-plist
+++ b/deskutils/kdepim44-runtime/pkg-plist
@@ -6,6 +6,7 @@ bin/akonadi_imap_resource
 bin/akonadi_kabc_resource
 bin/akonadi_kcal_resource
 bin/akonadi_knut_resource
+bin/akonadi_kolabproxy_resource
 bin/akonadi_localbookmarks_resource
 bin/akonadi_maildir_resource
 bin/akonadi_microblog_resource
@@ -61,6 +62,7 @@ share/akonadi/agents/imapresource.desktop
 share/akonadi/agents/kabcresource.desktop
 share/akonadi/agents/kcalresource.desktop
 share/akonadi/agents/knutresource.desktop
+share/akonadi/agents/kolabproxyresource.desktop
 share/akonadi/agents/localbookmarksresource.desktop
 share/akonadi/agents/maildirresource.desktop
 share/akonadi/agents/microblog.desktop
@@ -87,14 +89,15 @@ share/apps/akonadi_knut_resource/knut-template.xml
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/config/kres-migratorrc
 share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+share/icons/hicolor/64x64/apps/kolab.png
 share/kde4/services/akonadi.protocol
 share/kde4/services/kcm_akonadi.desktop
 share/kde4/services/kcm_akonadi_resources.desktop
 share/kde4/services/kcm_akonadi_server.desktop
 share/kde4/services/kresources/kabc/akonadi.desktop
 share/kde4/services/kresources/kcal/akonadi.desktop
-share/mime/packages/kdepim-mime.xml
 share/mime/application/x-vnd.kde.notes.xml
+share/mime/packages/kdepim-mime.xml
 @dirrm share/apps/akonadiconsole
 @dirrm share/apps/akonadi_knut_resource
 @dirrm share/apps/akonadi/plugins/serializer
@@ -104,3 +107,6 @@ share/mime/application/x-vnd.kde.notes.xml
 @dirrm share/akonadi/agents
 @dirrm share/akonadi
 @dirrm include/akonadi/xml
+@dirrmtry include/akonadi
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index fe107376edaf..90e12a113140 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,14 +18,15 @@ COMMENT=	Libraries for KDE-PIM applications
 BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
+		boost_thread:${PORTSDIR}/devel/boost-libs \
 		mal.1:${PORTSDIR}/palm/libmal \
 		pisock.9:${PORTSDIR}/palm/pilot-link \
 		qca.2:${PORTSDIR}/devel/qca
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_KDE4=	kdelibs kdeexp pimlibs pimruntime runtime workspace akonadi kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeexp pimlibs pimruntime \
+		akonadi kdeprefix kdehier automoc4 oxygen
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
@@ -58,12 +60,9 @@ PLIST_SUB+=	GNOKII="@comment "
 # PLIST_SUB+=	KITCHENSYNC="@comment "
 # .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 pre-configure:
-	#respect prefix
-	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
-	${REINPLACE_CMD} -e '/^install/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
+# respect prefix
+	${FIND} ${PATCH_WRKSRC} -type f -name CMakeLists.txt | ${XARGS} \
+	${REINPLACE_CMD} -e '/DESTINATION/s,KDE4_DBUS_INTERFACES_DIR,DBUS_INTERFACES_INSTALL_DIR,g'
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 02d1ddde336c..617f302e9195 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Libraries for KDE-PIM applications
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
-		boost_python:${PORTSDIR}/devel/boost-python-libs \
+		boost_thread:${PORTSDIR}/devel/boost-libs \
 		ical.43:${PORTSDIR}/devel/libical
 
 USE_KDE4=	kdelibs kdeexp akonadi kdeprefix kdehier automoc4
@@ -38,8 +39,7 @@ PLIST_SUB+=	WITH_PTH='@comment '
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/../cmake/modules/*.cmake
+		${PATCH_WRKSRC}/cmake/modules/*.cmake
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
index efbbb2725999..989288c8810a 100644
--- a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@@ -1,5 +1,5 @@
---- ../cmake/modules/FindLibical.cmake.orgi	2009-02-27 17:59:51.000000000 +0100
-+++ ../cmake/modules/FindLibical.cmake	2009-02-27 18:00:20.000000000 +0100
+--- ./cmake/modules/FindLibical.cmake.orgi	2009-02-27 17:59:51.000000000 +0100
++++ ./cmake/modules/FindLibical.cmake	2009-02-27 18:00:20.000000000 +0100
 @@ -52,7 +52,7 @@
  
  if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 691e35f724f7..452013c02f22 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -29,18 +29,15 @@ QT_COMPONENTS=	corelib opengl dbus qt3support  webkit \
 
 MAKE_JOBS_SAFE=	yes
 
-post-extract:
-	${MKDIR} ${WRKSRC}
-
 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC}/.. | ${CUT} -d: -f1 | uniq | \
+	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 
 pre-configure:
 	#respect prefix, don't update mime when installing
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
 		-e '/^set/s,DBUS_INTERFACES_INSTALL_DIR,KDE4_DBUS_INTERFACES_DIR,g' \
-		${WRKSRC}/../applets/lancelot/app/src/CMakeLists.txt
+		${WRKSRC}/applets/lancelot/app/src/CMakeLists.txt
 
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
index 01c63002bcf8..82a7ae93bac2 100644
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../CMakeLists.txt.orig	2009-04-06 07:00:39.000000000 +1100
-+++ ../CMakeLists.txt	2009-06-26 11:00:58.000000000 +1100
+--- ./CMakeLists.txt.orig	2009-04-06 07:00:39.000000000 +1100
++++ ./CMakeLists.txt	2009-06-26 11:00:58.000000000 +1100
 @@ -26,16 +26,20 @@
  endif (DEPEND_PACKAGE_Marble)
  macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
diff --git a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
index 9f680c78f7f9..32ede91bbbe7 100644
--- a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
@@ -1,5 +1,5 @@
---- ../applets/frame/CMakeLists.txt.orig	2009-05-15 04:26:59.000000000 +1100
-+++ ../applets/frame/CMakeLists.txt	2009-06-26 10:37:04.000000000 +1100
+--- ./applets/frame/CMakeLists.txt.orig	2009-05-15 04:26:59.000000000 +1100
++++ ./applets/frame/CMakeLists.txt	2009-06-26 10:37:04.000000000 +1100
 @@ -1,7 +1,20 @@
  project(plasma-frame)
  include (MacroLogFeature)