KDE/FreeBSD team presents KDE SC 4.9.5 ports!

- kdebindings ports have been renamed to match upstream.
- kdemultimedia and kdenetwork have been split.
- New port games/pairs added.
- Trim Makefile header
- Convert to new option framework
- New USE_KDE4 components: libkcddb, libkcompactdisc
- Update:
	databases/akonadi to 1.9.0
	devel/grantlee to 0.3.0
	textproc/rasqal to 0.9.30
	textproc/redland-bindings to 1.0.16.1
	textproc/soprano to 2.9.0
	x11-toolkits/attica to 0.4.1

The area51 repository features commits by Schaich Alonso, avilla, dbn,
jhale, makc and rakuco.

Contributors:
- Oleg Sidorkin
- Tobias Berner
- Kurt Jaeger

4 files changed, 14 insertions, 20 deletions

diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 08667ec1bfbe..3eadb83b8319 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepim-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,9 +11,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
+		kgapi.0:${PORTSDIR}/devel/libkgapi \
+		kolab:${PORTSDIR}/devel/libkolab
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
+CONFLICTS=		akonadi-google-0.*
 CONFLICTS_INSTALL=	kdepim-runtime-4.4.*
 
 USE_XZ=	yes
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index faf099114a73..ffcd503ee4c4 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-runtime-4.8.4.tar.xz) = 57fbfe2dc6c7a1055486ef2ab307e47d51781abc1658dcd7891c02e5d8a333ec
-SIZE (KDE/kdepim-runtime-4.8.4.tar.xz) = 1184016
+SHA256 (KDE/kdepim-runtime-4.9.5.tar.xz) = 6a2d6aabf1bcb07c8929e45b5010d4eb2f145d6517197d93e7d098570cb39f6a
+SIZE (KDE/kdepim-runtime-4.9.5.tar.xz) = 1153120
diff --git a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
deleted file mode 100644
index aded1f763a22..000000000000
--- a/deskutils/kdepim4-runtime/files/patch-resources__kolabproxy__CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./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/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 3c3cb4894a6b..13feef7b1165 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -1,8 +1,9 @@
 bin/accountwizard
 bin/akonadi2xml
 bin/akonadi_birthdays_resource
-bin/akonadi_calendarsearch_agent
 bin/akonadi_davgroupware_resource
+bin/akonadi_googlecalendar_resource
+bin/akonadi_googlecontacts_resource
 bin/akonadi_imap_resource
 bin/akonadi_invitations_agent
 bin/akonadi_kabc_resource
@@ -74,9 +75,10 @@ lib/libnepomukfeederpluginlib.a
 share/akonadi/agents/akonadinepomukfeederagent.desktop
 share/akonadi/agents/akonotesresource.desktop
 share/akonadi/agents/birthdaysresource.desktop
-share/akonadi/agents/calendarsearchagent.desktop
 share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/davgroupwareresource.desktop
+share/akonadi/agents/googlecalendarresource.desktop
+share/akonadi/agents/googlecontactsresource.desktop
 share/akonadi/agents/icalresource.desktop
 share/akonadi/agents/imapresource.desktop
 share/akonadi/agents/invitationsagent.desktop
@@ -124,6 +126,9 @@ share/apps/akonadi/accountwizard/maildir/maildirwizard.ui
 share/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
 share/apps/akonadi/accountwizard/pop3/pop3wizard.js
 share/apps/akonadi/accountwizard/pop3/pop3wizard.ui
+share/apps/akonadi/accountwizard/tine20/tine20wizard.desktop
+share/apps/akonadi/accountwizard/tine20/tine20wizard.es
+share/apps/akonadi/accountwizard/tine20/tine20wizard.ui
 share/apps/akonadi/akonadi-xml.xsd
 share/apps/akonadi/firstrun/defaultaddressbook
 share/apps/akonadi/firstrun/defaultcalendar
@@ -185,6 +190,7 @@ share/ontology/kde/aneo.trig
 @dirrm share/apps/akonadi/plugins/serializer
 @dirrm share/apps/akonadi/plugins
 @dirrm share/apps/akonadi/firstrun
+@dirrm share/apps/akonadi/accountwizard/tine20
 @dirrm share/apps/akonadi/accountwizard/pop3
 @dirrm share/apps/akonadi/accountwizard/maildir
 @dirrm share/apps/akonadi/accountwizard/mailbox