12 files changed, 22 insertions, 125 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 3d8c338fd75a..2a21bc303e34 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.5.1
 CATEGORIES=	databases kde ipv6
-MASTER_SITES=	http://download.${PORTNAME}-project.org/
+MASTER_SITES=	http://download.${PORTNAME}-project.org/ \
+		http://ktown.kde.org/~dirk/
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 0609490afc01..93cb29855e99 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.4.1.tar.bz2) = b90c22da8d78083ac78bb042a1ef32981bb697873dcdb1ba7ec4c06a4552cc36
-SIZE (KDE/akonadi-1.4.1.tar.bz2) = 229469
+SHA256 (KDE/akonadi-1.5.1.tar.bz2) = 7845e542cd53b9b728c3657e6a1285a9e7f5d6f12394477bb0c9d0e4c9102af4
+SIZE (KDE/akonadi-1.5.1.tar.bz2) = 209068
diff --git a/databases/akonadi/files/patch-1163073 b/databases/akonadi/files/patch-1163073
deleted file mode 100644
index 5df6bf299b6f..000000000000
--- a/databases/akonadi/files/patch-1163073
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./server/src/storage/dbconfigmysql.cpp	2010/08/05 08:53:57	1159381
-+++ ./server/src/storage/dbconfigmysql.cpp	2010/08/13 08:31:12	1163073
-@@ -250,11 +250,10 @@
-   // synthesize the mysqld command
-   QStringList arguments;
-   arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
-+  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
- #ifndef Q_WS_WIN
--  arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
-   arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory );
- #else
--  arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
-   arguments << QString::fromLatin1( "--shared-memory" );
- #endif
- 
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index dc51761d2c4a..07b41f4944b1 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -1,3 +1,5 @@
+bin/akonadi_agent_launcher
+bin/akonadi_agent_server
 bin/akonadi_control
 bin/akonadi_rds
 bin/akonadictl
@@ -11,12 +13,11 @@ include/akonadi/private/protocol_p.h
 include/akonadi/private/xdgbasedirs_p.h
 lib/cmake/Akonadi/AkonadiConfig.cmake
 lib/cmake/Akonadi/AkonadiConfigVersion.cmake
-lib/libakonadiprivate.so
-lib/libakonadiprivate.so.1
-lib/libakonadiprivate.so.1.4.1
+lib/cmake/Akonadi/AkonadiTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
 lib/libakonadiprotocolinternals.so
 lib/libakonadiprotocolinternals.so.1
-lib/libakonadiprotocolinternals.so.1.4.1
+lib/libakonadiprotocolinternals.so.1.5.1
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf
@@ -26,6 +27,7 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
+share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index a7a55c0e1767..5428760cbf76 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdbusmenu-qt
-PORTVERSION=	0.6.6
+PORTVERSION=	0.8.0
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo
index 84d5df31068b..e91df91f711e 100644
--- a/devel/libdbusmenu-qt/distinfo
+++ b/devel/libdbusmenu-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdbusmenu-qt-0.6.6.tar.bz2) = a928e083218c7b0007010ee30073b5c1d964e43f68d3975cfdd2feb3cd6ec940
-SIZE (libdbusmenu-qt-0.6.6.tar.bz2) = 31195
+SHA256 (libdbusmenu-qt-0.8.0.tar.bz2) = f35a14a9263a6a718eec7654f1e19965ba80b362fb64901b78811b03f5060530
+SIZE (libdbusmenu-qt-0.8.0.tar.bz2) = 32424
diff --git a/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt b/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
index 08e86c283bc7..c3d1c17a1364 100644
--- a/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
+++ b/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./src/CMakeLists.txt.orig	2010-12-08 10:29:39.000000000 +0100
-+++ ./src/CMakeLists.txt	2010-12-20 12:18:44.673410726 +0100
-@@ -74,7 +74,10 @@
+--- ./src/CMakeLists.txt.orig	2011-02-25 03:13:16.133359336 +0000
++++ ./src/CMakeLists.txt	2011-02-25 03:13:53.113370403 +0000
+@@ -73,7 +73,10 @@
      )
  
  install(TARGETS dbusmenu-qt
diff --git a/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp b/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp
deleted file mode 100644
index d16fde80fe59..000000000000
--- a/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/dbusmenuexporter.cpp.orig	2010-12-08 10:29:39.000000000 +0100
-+++ ./src/dbusmenuexporter.cpp	2010-12-20 12:18:44.673410726 +0100
-@@ -84,6 +84,7 @@
- {
-     QVariantMap map;
-     map.insert("enabled", false);
-+    map.insert("x-kde-title", true);
- 
-     const QWidgetAction *widgetAction = qobject_cast<const QWidgetAction *>(action_);
-     DMRETURN_VALUE_IF_FAIL(widgetAction, map);
diff --git a/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp b/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp
deleted file mode 100644
index c252a3d9f8cc..000000000000
--- a/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./src/dbusmenuimporter.cpp.orig	2010-09-23 10:08:35.000000000 +0000
-+++ ./src/dbusmenuimporter.cpp	2010-11-12 14:49:39.000000000 +0000
-@@ -32,6 +32,8 @@
- #include <QSignalMapper>
- #include <QTime>
- #include <QTimer>
-+#include <QToolButton>
-+#include <QWidgetAction>
- 
- // Local
- #include "dbusmenuitem_p.h"
-@@ -41,7 +43,6 @@
- 
- //#define BENCHMARK
- #ifdef BENCHMARK
--#include <QTime>
- static QTime sChrono;
- #endif
- 
-@@ -66,6 +67,29 @@
-     DBusMenuImporterMethod m_method;
- };
- 
-+class EventSniffer : public QObject
-+{
-+public:
-+    EventSniffer(QObject *parent = 0)
-+        : QObject(parent) { }
-+
-+    ~EventSniffer() { }
-+
-+    bool eventFilter(QObject *object, QEvent *event)
-+    {
-+        Q_UNUSED(object);
-+
-+        if (event->type() == QEvent::Paint ||
-+            event->type() == QEvent::KeyPress ||
-+            event->type() == QEvent::KeyRelease) {
-+            return false;
-+        }
-+
-+        event->accept();
-+        return true;
-+    }
-+};
-+
- class DBusMenuImporterPrivate
- {
- public:
-@@ -143,8 +167,30 @@
-                 group->addAction(action);
-             }
-         }
-+
-+        bool isMenuTitle = map.take("x-kde-title").toBool();
-+
-         updateAction(action, map, map.keys());
- 
-+        if (isMenuTitle) {
-+            QAction *buttonAction = action;
-+            QFont font = buttonAction->font();
-+            font.setBold(true);
-+            buttonAction->setFont(font);
-+            buttonAction->setEnabled(true);
-+
-+            QWidgetAction *action = new QWidgetAction(parent);
-+            action->setObjectName("kmenu_title");
-+            QToolButton *titleButton = new QToolButton(0);
-+            EventSniffer *eventSniffer = new EventSniffer(titleButton);
-+            titleButton->installEventFilter(eventSniffer); // prevent clicks on the title of the menu
-+            titleButton->setDefaultAction(buttonAction);
-+            titleButton->setDown(true); // prevent hover style changes in some styles
-+            titleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-+            action->setDefaultWidget(titleButton);
-+            return action;
-+        }
-+
-         return action;
-     }
- 
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index 5af10b5e0c7b..05b502bdb7d4 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -4,6 +4,6 @@ include/dbusmenu-qt/dbusmenuexporter.h
 include/dbusmenu-qt/dbusmenuimporter.h
 lib/libdbusmenu-qt.so
 lib/libdbusmenu-qt.so.2
-lib/libdbusmenu-qt.so.2.3.6
+lib/libdbusmenu-qt.so.2.5.0
 libdata/pkgconfig/dbusmenu-qt.pc
 @dirrm include/dbusmenu-qt
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 3b407ae0d771..8d28e59fc13d 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	soprano
-PORTVERSION=	2.5.3
-CATEGORIES?=	textproc
+PORTVERSION=	2.6.0
+CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/Soprano/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/textproc/soprano/distinfo b/textproc/soprano/distinfo
index 5ce82ca0b068..6538ab3d8130 100644
--- a/textproc/soprano/distinfo
+++ b/textproc/soprano/distinfo
@@ -1,2 +1,2 @@
-SHA256 (soprano-2.5.3.tar.bz2) = 8992d78bf5776e65d3843636a5dfcdce59a82ff2bb47c0b44ca200b8ac34ac43
-SIZE (soprano-2.5.3.tar.bz2) = 1943566
+SHA256 (soprano-2.6.0.tar.bz2) = 02f754662cff357d54f4e978f648574e3c29b8c4235c3e76e5b388cd2061cd35
+SIZE (soprano-2.6.0.tar.bz2) = 1946107