19 files changed, 13 insertions, 193 deletions

diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 5a755862bc23..8b6f5ebfa858 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -56,7 +56,7 @@ Kde_Include_MAINTAINER=	kde@FreeBSD.org
 
 KDE4_VERSION=		4.6.2
 KDE4_BRANCH?=		stable
-KDEPIM4_VERSION=	4.4.10
+KDEPIM4_VERSION=	4.4.11.1
 KDEPIM4_BRANCH?=	stable
 KOFFICE2_VERSION=	2.3.2
 KOFFICE2_BRANCH?=	stable
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index 54f7f58f0848..873466a4b02d 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-runtime-4.4.10.tar.bz2) = cce52ecc2deee8bc732863bcae82ec9075c42bb3768c673a3358fbf7b4824b2c
-SIZE (KDE/kdepim-runtime-4.4.10.tar.bz2) = 616467
+SHA256 (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
+SIZE (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 619924
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index e493d123e9d6..7c29a5009e0c 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -29,6 +29,7 @@ lib/kde4/akonadi_serializer_addressee.so
 lib/kde4/akonadi_serializer_bookmark.so
 lib/kde4/akonadi_serializer_contactgroup.so
 lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_kcalcore.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akonadi_serializer_microblog.so
 lib/kde4/kabc_akonadi.so
@@ -79,6 +80,7 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
 share/apps/akonadi_knut_resource/knut-template.xml
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 1902c8862328..ce22ee241e3a 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDEPIM4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEPIM4_BRANCH}/kdepim-${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index e0d6801ef33b..d09596e75e92 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-4.4.10.tar.bz2) = 9e1770cb8d4bf1f95c3a2006877e7b49bc2a641591c990d07411d7424ea33099
-SIZE (KDE/kdepim-4.4.10.tar.bz2) = 9071402
+SHA256 (KDE/kdepim-4.4.11.1.tar.bz2) = a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
+SIZE (KDE/kdepim-4.4.11.1.tar.bz2) = 8964708
diff --git a/deskutils/kdepim4/files/patch-kaddressbook__main.cpp b/deskutils/kdepim4/files/patch-kaddressbook__main.cpp
deleted file mode 100644
index 9e9e0d8ffd10..000000000000
--- a/deskutils/kdepim4/files/patch-kaddressbook__main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- kaddressbook/main.cpp
-+++ kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
-   MainWindow *window = new MainWindow;
-   window->show();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   if ( !Akonadi::Control::start( window ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   return app.exec();
- }
diff --git a/deskutils/kdepim4/files/patch-kmail__kmmainwidget.cpp b/deskutils/kdepim4/files/patch-kmail__kmmainwidget.cpp
deleted file mode 100644
index 05c026f8bda5..000000000000
--- a/deskutils/kdepim4/files/patch-kmail__kmmainwidget.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- kmail/kmmainwidget.cpp
-+++ kmail/kmmainwidget.cpp
-@@ -165,6 +165,9 @@ using KMail::TemplateParser;
- 
- #include <errno.h> // ugh
- 
-+#include <akonadi/control.h>
-+#include <akonadi/servermanager.h>
-+
- #include "kmmainwidget.moc"
- 
- K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
-@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
-     mVacationIndicatorActive( false ),
-     mGoToFirstUnreadMessageInSelectedFolder( false )
- {
-+#if KDE_IS_VERSION(4,6,0)
-+  Akonadi::Control::widgetNeedsAkonadi(this);
-+  Akonadi::ServerManager::start();
-+#endif
-   // must be the first line of the constructor:
-   mStartupDone = false;
-   mWasEverShown = false;
diff --git a/deskutils/kdepim4/files/patch-kmail__main.cpp b/deskutils/kdepim4/files/patch-kmail__main.cpp
deleted file mode 100644
index bbdfc3e86f7d..000000000000
--- a/deskutils/kdepim4/files/patch-kmail__main.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kmail/main.cpp
-+++ kmail/main.cpp
-@@ -145,12 +145,14 @@ int main(int argc, char *argv[])
-   app.setEventLoopReached();
-   app.delayedInstanceCreation();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // Start Akonadi
-   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   // Go!
-   int ret = qApp->exec();
diff --git a/deskutils/kdepim4/files/patch-kmail__popaccount.cpp b/deskutils/kdepim4/files/patch-kmail__popaccount.cpp
deleted file mode 100644
index 8c8c83e8ecf4..000000000000
--- a/deskutils/kdepim4/files/patch-kmail__popaccount.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmail/popaccount.cpp
-+++ kmail/popaccount.cpp
-@@ -959,11 +959,13 @@ void PopAccount::slotData( KIO::Job* job, const QByteArray &data)
-            .subs( numBytesToRead/1024 ).subs( mLogin ).subs( mHost )
-            .toString();
-       }
--      mMailCheckProgressItem->setStatus( msg );
--      mMailCheckProgressItem->setProgress(
--        (numBytesToRead <= 100) ? 50  // We never know what the server tells us
--        // This way of dividing is required for > 21MB of mail
--        : (numBytesRead / (numBytesToRead / 100)) );
-+      if( mMailCheckProgressItem ) {
-+          mMailCheckProgressItem->setStatus( msg );
-+          mMailCheckProgressItem->setProgress(
-+           (numBytesToRead <= 100) ? 50  // We never know what the server tells us
-+           // This way of dividing is required for > 21MB of mail
-+           : (numBytesRead / (numBytesToRead / 100)) );
-+      }
-     }
-     return;
-   }
diff --git a/deskutils/kdepim4/files/patch-kontact__src__main.cpp b/deskutils/kdepim4/files/patch-kontact__src__main.cpp
deleted file mode 100644
index 1e6ce7237350..000000000000
--- a/deskutils/kdepim4/files/patch-kontact__src__main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kontact/src/main.cpp
-+++ kontact/src/main.cpp
-@@ -199,9 +199,11 @@ int main( int argc, char **argv )
- 
-   KontactApp app;
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // KDE 4.4: do akonadi startup before creating any window, since creating
-   // the window loads kmail. In 4.5 we'll do this startup async instead.
-   Akonadi::Control::start( 0 );
-+#endif
- 
-   // Qt doesn't treat the system tray as a window, and therefore Qt would quit
-   // the event loop when an error message is clicked away while Kontact is in the
diff --git a/deskutils/kdepim44-runtime/distinfo b/deskutils/kdepim44-runtime/distinfo
index 54f7f58f0848..873466a4b02d 100644
--- a/deskutils/kdepim44-runtime/distinfo
+++ b/deskutils/kdepim44-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-runtime-4.4.10.tar.bz2) = cce52ecc2deee8bc732863bcae82ec9075c42bb3768c673a3358fbf7b4824b2c
-SIZE (KDE/kdepim-runtime-4.4.10.tar.bz2) = 616467
+SHA256 (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
+SIZE (KDE/kdepim-runtime-4.4.11.1.tar.bz2) = 619924
diff --git a/deskutils/kdepim44-runtime/pkg-plist b/deskutils/kdepim44-runtime/pkg-plist
index e493d123e9d6..7c29a5009e0c 100644
--- a/deskutils/kdepim44-runtime/pkg-plist
+++ b/deskutils/kdepim44-runtime/pkg-plist
@@ -29,6 +29,7 @@ lib/kde4/akonadi_serializer_addressee.so
 lib/kde4/akonadi_serializer_bookmark.so
 lib/kde4/akonadi_serializer_contactgroup.so
 lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_kcalcore.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akonadi_serializer_microblog.so
 lib/kde4/kabc_akonadi.so
@@ -79,6 +80,7 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
 share/apps/akonadi_knut_resource/knut-template.xml
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 1902c8862328..ce22ee241e3a 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDEPIM4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDEPIM4_BRANCH}/kdepim-${PORTVERSION}/src
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index e0d6801ef33b..d09596e75e92 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepim-4.4.10.tar.bz2) = 9e1770cb8d4bf1f95c3a2006877e7b49bc2a641591c990d07411d7424ea33099
-SIZE (KDE/kdepim-4.4.10.tar.bz2) = 9071402
+SHA256 (KDE/kdepim-4.4.11.1.tar.bz2) = a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
+SIZE (KDE/kdepim-4.4.11.1.tar.bz2) = 8964708
diff --git a/deskutils/kdepim44/files/patch-kaddressbook__main.cpp b/deskutils/kdepim44/files/patch-kaddressbook__main.cpp
deleted file mode 100644
index 9e9e0d8ffd10..000000000000
--- a/deskutils/kdepim44/files/patch-kaddressbook__main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- kaddressbook/main.cpp
-+++ kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
-   MainWindow *window = new MainWindow;
-   window->show();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   if ( !Akonadi::Control::start( window ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   return app.exec();
- }
diff --git a/deskutils/kdepim44/files/patch-kmail__kmmainwidget.cpp b/deskutils/kdepim44/files/patch-kmail__kmmainwidget.cpp
deleted file mode 100644
index 05c026f8bda5..000000000000
--- a/deskutils/kdepim44/files/patch-kmail__kmmainwidget.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- kmail/kmmainwidget.cpp
-+++ kmail/kmmainwidget.cpp
-@@ -165,6 +165,9 @@ using KMail::TemplateParser;
- 
- #include <errno.h> // ugh
- 
-+#include <akonadi/control.h>
-+#include <akonadi/servermanager.h>
-+
- #include "kmmainwidget.moc"
- 
- K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
-@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
-     mVacationIndicatorActive( false ),
-     mGoToFirstUnreadMessageInSelectedFolder( false )
- {
-+#if KDE_IS_VERSION(4,6,0)
-+  Akonadi::Control::widgetNeedsAkonadi(this);
-+  Akonadi::ServerManager::start();
-+#endif
-   // must be the first line of the constructor:
-   mStartupDone = false;
-   mWasEverShown = false;
diff --git a/deskutils/kdepim44/files/patch-kmail__main.cpp b/deskutils/kdepim44/files/patch-kmail__main.cpp
deleted file mode 100644
index bbdfc3e86f7d..000000000000
--- a/deskutils/kdepim44/files/patch-kmail__main.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kmail/main.cpp
-+++ kmail/main.cpp
-@@ -145,12 +145,14 @@ int main(int argc, char *argv[])
-   app.setEventLoopReached();
-   app.delayedInstanceCreation();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // Start Akonadi
-   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   // Go!
-   int ret = qApp->exec();
diff --git a/deskutils/kdepim44/files/patch-kmail__popaccount.cpp b/deskutils/kdepim44/files/patch-kmail__popaccount.cpp
deleted file mode 100644
index 8c8c83e8ecf4..000000000000
--- a/deskutils/kdepim44/files/patch-kmail__popaccount.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmail/popaccount.cpp
-+++ kmail/popaccount.cpp
-@@ -959,11 +959,13 @@ void PopAccount::slotData( KIO::Job* job, const QByteArray &data)
-            .subs( numBytesToRead/1024 ).subs( mLogin ).subs( mHost )
-            .toString();
-       }
--      mMailCheckProgressItem->setStatus( msg );
--      mMailCheckProgressItem->setProgress(
--        (numBytesToRead <= 100) ? 50  // We never know what the server tells us
--        // This way of dividing is required for > 21MB of mail
--        : (numBytesRead / (numBytesToRead / 100)) );
-+      if( mMailCheckProgressItem ) {
-+          mMailCheckProgressItem->setStatus( msg );
-+          mMailCheckProgressItem->setProgress(
-+           (numBytesToRead <= 100) ? 50  // We never know what the server tells us
-+           // This way of dividing is required for > 21MB of mail
-+           : (numBytesRead / (numBytesToRead / 100)) );
-+      }
-     }
-     return;
-   }
diff --git a/deskutils/kdepim44/files/patch-kontact__src__main.cpp b/deskutils/kdepim44/files/patch-kontact__src__main.cpp
deleted file mode 100644
index 1e6ce7237350..000000000000
--- a/deskutils/kdepim44/files/patch-kontact__src__main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kontact/src/main.cpp
-+++ kontact/src/main.cpp
-@@ -199,9 +199,11 @@ int main( int argc, char **argv )
- 
-   KontactApp app;
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // KDE 4.4: do akonadi startup before creating any window, since creating
-   // the window loads kmail. In 4.5 we'll do this startup async instead.
-   Akonadi::Control::start( 0 );
-+#endif
- 
-   // Qt doesn't treat the system tray as a window, and therefore Qt would quit
-   // the event loop when an error message is clicked away while Kontact is in the