23 files changed, 259 insertions, 143 deletions

diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 2ca96e8684e7..149f2d7923bf 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	akonadi
-PORTVERSION=	1.12.1
-PORTREVISION=	1
+PORTVERSION=	1.13.0
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=	KDE
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 # Let process generate meaningful backtrace on core dump.
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
-USE_KDE4=	kdehier kdeprefix automoc4 soprano
+USE_KDE4=	kdeprefix automoc4 soprano
 USES=		cmake:outsource execinfo shared-mime-info compiler:c++11-lang tar:bzip2
 USE_QT4=	corelib dbus gui network qtestlib_build sql xml \
 		moc_build qmake_build rcc_build uic_build
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 6556f1b59ab9..642fcd3e4eea 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/akonadi-1.12.1.tar.bz2) = a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145
-SIZE (KDE/akonadi-1.12.1.tar.bz2) = 251899
+SHA256 (KDE/akonadi-1.13.0.tar.bz2) = 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2
+SIZE (KDE/akonadi-1.13.0.tar.bz2) = 294198
diff --git a/databases/akonadi/files/patch-cmake__modules__FindSqlite.cmake b/databases/akonadi/files/patch-cmake__modules__FindSqlite.cmake
new file mode 100644
index 000000000000..93d59a9d74e9
--- /dev/null
+++ b/databases/akonadi/files/patch-cmake__modules__FindSqlite.cmake
@@ -0,0 +1,32 @@
+commit b60702e0b7041c56a3cb52c209204d28406f3ce5
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Wed Aug 13 14:43:04 2014 +0300
+
+    FindSqlite: Use CMAKE_FLAGS the right way in try_compile().
+    
+    This fixes f90774f1 ("Check whether Sqlite is compiled with
+    SQLITE_ENABLE_UNLOCK_NOTIFY"), so that SQLITE_INCLUDE_DIR is really
+    passed to the try_compile() call. So far, it was just a NOP and the
+    compilation only worked if sqlite3.h was in a directory the compiler
+    uses automatically.
+    
+    try_compile()'s syntax is a bit complicated, and CMAKE_FLAGS expects a
+    series of arguments as if they had been passed to the command line, so
+    instead of "CMAKE_FLAGS INCLUDE_DIRECTORIES /some/dir" one needs to use
+    "CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=/some/dir".
+    
+    REVIEW: 119762
+
+diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake
+index ad8cdb4..c43a7b5 100644
+--- cmake/modules/FindSqlite.cmake
++++ cmake/modules/FindSqlite.cmake
+@@ -94,7 +94,7 @@ if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h)
+                 ${CMAKE_BINARY_DIR}/sqlite_check_unlock_notify
+                 ${CMAKE_BINARY_DIR}/sqlite_check_unlock_notify.cpp
+                 LINK_LIBRARIES ${SQLITE_LIBRARIES}
+-                CMAKE_FLAGS INCLUDE_DIRECTORIES ${SQLITE_INCLUDE_DIR})
++                CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${SQLITE_INCLUDE_DIR}")
+     if (NOT SQLITE_HAS_UNLOCK_NOTIFY)
+         message(STATUS "Sqlite ${SQLITE_VERSION} was found, but it is not compiled with -DSQLITE_ENABLE_UNLOCK_NOTIFY")
+     endif()
diff --git a/databases/akonadi/files/patch-git_21465191 b/databases/akonadi/files/patch-git_21465191
new file mode 100644
index 000000000000..43eb8f78c3a1
--- /dev/null
+++ b/databases/akonadi/files/patch-git_21465191
@@ -0,0 +1,70 @@
+commit 2146519108ec66300328b7b3979477c7789795d3
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Wed Aug 13 23:22:11 2014 +0300
+
+    Do not enter the test/ directories if AKONADI_BUILD_TESTS is off.
+    
+    enable_testing() only determines whether a "test" target and the related
+    CTest files will be created. And in Akonadi's case it is actually
+    invoked regardless of the value of the AKONADI_BUILD_TESTS option
+    because Akonadi includes the CTest module, which calls enable_testing()
+    based on the value of another variable, BUILD_TESTING.
+    
+    In any case, whether the executables and libraries that compose
+    Akonadi's unit tests will be built has nothing to do with
+    enable_testing(). To make AKONADI_BUILD_TESTS really disable the build
+    of the unit tests we now avoid entering the tests/ directories at all
+    when it is off, so that neither tests nor targets they depend on get
+    built.
+    
+    REVIEW: 119776
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ include(FeatureSummary)
+ 
+ ############### Build Options ###############
+ 
+-include(CTest)
++include(CTest)  # Calls enable_testing().
+ include(CTestConfig.cmake)
+ option(AKONADI_BUILD_TESTS "Build the Akonadi unit tests." TRUE)
+ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
+@@ -27,10 +27,6 @@ if(NOT DEFINED DATABASE_BACKEND)
+   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
+ endif()
+ 
+-if(AKONADI_BUILD_TESTS)
+-  enable_testing()
+-endif()
+-
+ ############### CMake Macros ###############
+ 
+ include(InstallSettings)
+--- libs/CMakeLists.txt
++++ libs/CMakeLists.txt
+@@ -36,5 +36,7 @@ install(FILES
+   DESTINATION ${INCLUDE_INSTALL_DIR}/akonadi/private
+ )
+ 
+-add_subdirectory(tests)
++if(AKONADI_BUILD_TESTS)
++  add_subdirectory(tests)
++endif()
+ 
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index e4829f3..275938d 100644
+--- server/CMakeLists.txt
++++ server/CMakeLists.txt
+@@ -64,7 +64,10 @@ endmacro()
+ add_subdirectory(akonadictl)
+ add_subdirectory(control)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++
++if(AKONADI_BUILD_TESTS)
++  add_subdirectory(tests)
++endif()
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}")
+ if(MYSQLD_EXECUTABLE)
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 95096cf880f3..5cdf23569225 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -21,7 +21,7 @@ lib/cmake/Akonadi/AkonadiTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
 lib/libakonadiprotocolinternals.so
 lib/libakonadiprotocolinternals.so.1
-lib/libakonadiprotocolinternals.so.1.12.1
+lib/libakonadiprotocolinternals.so.1.13.0
 libdata/pkgconfig/akonadi.pc
 share/config/akonadi/mysql-global-mobile.conf
 share/config/akonadi/mysql-global.conf
@@ -41,10 +41,4 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
 share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
 share/dbus-1/services/org.freedesktop.Akonadi.Control.service
 share/mime/packages/akonadi-mime.xml
-@dirrm share/config/akonadi
-@dirrm lib/cmake/Akonadi
-@dirrmtry lib/cmake
-@dirrmtry include/akonadi/private
-@dirrmtry include/akonadi
-%%SQLITE%%@cwd %%QT_PREFIX%%
-%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
+%%SQLITE%%%%QT_PREFIX%%/%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 920bf13c0c00..4dae451a7391 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -7,11 +7,10 @@
 # deskutils/kdepim4
 # devel/kdevplatform
 # finance/skrooge
-# misk/kdehier4
 #
 
 PORTNAME=	grantlee
-DISTVERSION=	0.4.0
+DISTVERSION=	0.5.1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.${PORTNAME}.org/ \
 		http://www.loegria.net/${PORTNAME}/
diff --git a/devel/grantlee/distinfo b/devel/grantlee/distinfo
index ce5cb02b0a41..f406f1511c25 100644
--- a/devel/grantlee/distinfo
+++ b/devel/grantlee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grantlee-0.4.0.tar.gz) = 13a2d8121392404bb3be4ed470b211bc098cd98da795ef7bf41517d2fb640d3f
-SIZE (grantlee-0.4.0.tar.gz) = 1171445
+SHA256 (grantlee-0.5.1.tar.gz) = 191809bf4c9b7ef877af0fd29345061c2372edfb4506aa7d5df5c71a570fa0ac
+SIZE (grantlee-0.5.1.tar.gz) = 1172769
diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile
index fa7aac405d92..6228d974b2ef 100644
--- a/devel/libkgapi/Makefile
+++ b/devel/libkgapi/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libkgapi
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/libkgapi/${PORTVERSION}/src
@@ -16,11 +15,13 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 USES=		cmake:outsource tar:bzip2
-USE_KDE4=	automoc4 kdelibs kdeprefix kdehier pimlibs
+USE_KDE4=	automoc4 kdelibs kdeprefix pimlibs
 USE_LDCONFIG=	yes
 USE_QT4=	corelib network webkit xml \
 		qmake_build moc_build rcc_build uic_build
 
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+
 pre-configure:
 	${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_INSTALL_DIR}/libdata/' \
 		${WRKSRC}/libkgapi*/CMakeLists.txt
diff --git a/devel/libkgapi/distinfo b/devel/libkgapi/distinfo
index 835bfa564721..614b7af3960f 100644
--- a/devel/libkgapi/distinfo
+++ b/devel/libkgapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/libkgapi-2.0.1.tar.bz2) = 00e01a9544143a3fce009206c98a95e31a9925cda7e64ae4879029d57272c3f9
-SIZE (KDE/libkgapi-2.0.1.tar.bz2) = 112614
+SHA256 (KDE/libkgapi-2.2.0.tar.bz2) = c02965b639c2496d489d4f1865e35473db6f1b5e9e84fb079988d33db629c2b4
+SIZE (KDE/libkgapi-2.2.0.tar.bz2) = 127026
diff --git a/devel/libkgapi/pkg-plist b/devel/libkgapi/pkg-plist
index df0157004566..d1e2df9dc058 100644
--- a/devel/libkgapi/pkg-plist
+++ b/devel/libkgapi/pkg-plist
@@ -2,6 +2,25 @@ include/LibKGAPI2/Account
 include/LibKGAPI2/AccountInfo/AccountInfo
 include/LibKGAPI2/AccountInfo/AccountInfoFetchJob
 include/LibKGAPI2/AuthJob
+include/LibKGAPI2/Blogger/Blog
+include/LibKGAPI2/Blogger/BlogFetchJob
+include/LibKGAPI2/Blogger/Comment
+include/LibKGAPI2/Blogger/CommentApproveJob
+include/LibKGAPI2/Blogger/CommentDeleteContentJob
+include/LibKGAPI2/Blogger/CommentDeleteJob
+include/LibKGAPI2/Blogger/CommentFetchJob
+include/LibKGAPI2/Blogger/Page
+include/LibKGAPI2/Blogger/PageCreateJob
+include/LibKGAPI2/Blogger/PageDeleteJob
+include/LibKGAPI2/Blogger/PageFetchJob
+include/LibKGAPI2/Blogger/PageModifyJob
+include/LibKGAPI2/Blogger/Post
+include/LibKGAPI2/Blogger/PostCreateJob
+include/LibKGAPI2/Blogger/PostDeleteJob
+include/LibKGAPI2/Blogger/PostFetchJob
+include/LibKGAPI2/Blogger/PostModifyJob
+include/LibKGAPI2/Blogger/PostPublishJob
+include/LibKGAPI2/Blogger/PostSearchJob
 include/LibKGAPI2/Calendar/Calendar
 include/LibKGAPI2/Calendar/CalendarCreateJob
 include/LibKGAPI2/Calendar/CalendarDeleteJob
@@ -27,6 +46,43 @@ include/LibKGAPI2/Contacts/ContactsGroupFetchJob
 include/LibKGAPI2/Contacts/ContactsGroupModifyJob
 include/LibKGAPI2/CreateJob
 include/LibKGAPI2/DeleteJob
+include/LibKGAPI2/Drive/About
+include/LibKGAPI2/Drive/AboutFetchJob
+include/LibKGAPI2/Drive/App
+include/LibKGAPI2/Drive/Change
+include/LibKGAPI2/Drive/ChangeFetchJob
+include/LibKGAPI2/Drive/ChildReference
+include/LibKGAPI2/Drive/ChildReferenceCreateJob
+include/LibKGAPI2/Drive/ChildReferenceDeleteJob
+include/LibKGAPI2/Drive/ChildReferenceFetchJob
+include/LibKGAPI2/Drive/DriveService
+include/LibKGAPI2/Drive/File
+include/LibKGAPI2/Drive/FileAbstractDataJob
+include/LibKGAPI2/Drive/FileAbstractModifyJob
+include/LibKGAPI2/Drive/FileAbstractUploadJob
+include/LibKGAPI2/Drive/FileCopyJob
+include/LibKGAPI2/Drive/FileCreateJob
+include/LibKGAPI2/Drive/FileDeleteJob
+include/LibKGAPI2/Drive/FileFetchContentJob
+include/LibKGAPI2/Drive/FileFetchJob
+include/LibKGAPI2/Drive/FileModifyJob
+include/LibKGAPI2/Drive/FileTouchJob
+include/LibKGAPI2/Drive/FileTrashJob
+include/LibKGAPI2/Drive/FileUntrashJob
+include/LibKGAPI2/Drive/ParentReference
+include/LibKGAPI2/Drive/ParentReferenceCreateJob
+include/LibKGAPI2/Drive/ParentReferenceDeleteJob
+include/LibKGAPI2/Drive/ParentReferenceFetchJob
+include/LibKGAPI2/Drive/Permission
+include/LibKGAPI2/Drive/PermissionCreateJob
+include/LibKGAPI2/Drive/PermissionDeleteJob
+include/LibKGAPI2/Drive/PermissionFetchJob
+include/LibKGAPI2/Drive/PermissionModifyJob
+include/LibKGAPI2/Drive/Revision
+include/LibKGAPI2/Drive/RevisionDeleteJob
+include/LibKGAPI2/Drive/RevisionFetchJob
+include/LibKGAPI2/Drive/RevisionModifyJob
+include/LibKGAPI2/Drive/User
 include/LibKGAPI2/FetchJob
 include/LibKGAPI2/Job
 include/LibKGAPI2/Latitude/Location
@@ -53,40 +109,29 @@ include/LibKGAPI2/Tasks/TaskModifyJob
 include/LibKGAPI2/Tasks/TaskMoveJob
 include/LibKGAPI2/Types
 include/LibKGAPI2/Ui/AuthWidget
-include/libkgapi/accessmanager.h
-include/libkgapi/account.h
-include/libkgapi/auth.h
-include/libkgapi/common.h
-include/libkgapi/fetchlistjob.h
-include/libkgapi/libkgapi_export.h
-include/libkgapi/object.h
-include/libkgapi/objects/accountinfo.h
-include/libkgapi/objects/calendar.h
-include/libkgapi/objects/contact.h
-include/libkgapi/objects/contactsgroup.h
-include/libkgapi/objects/event.h
-include/libkgapi/objects/location.h
-include/libkgapi/objects/reminder.h
-include/libkgapi/objects/staticmapmarker.h
-include/libkgapi/objects/staticmappath.h
-include/libkgapi/objects/staticmapurl.h
-include/libkgapi/objects/task.h
-include/libkgapi/objects/tasklist.h
-include/libkgapi/reply.h
-include/libkgapi/request.h
-include/libkgapi/service.h
-include/libkgapi/services/accountinfo.h
-include/libkgapi/services/calendar.h
-include/libkgapi/services/contacts.h
-include/libkgapi/services/latitude.h
-include/libkgapi/services/staticmap.h
-include/libkgapi/services/tasks.h
-include/libkgapi/ui/accountscombo.h
-include/libkgapi/ui/authwidget.h
 include/libkgapi2/account.h
 include/libkgapi2/accountinfo/accountinfo.h
 include/libkgapi2/accountinfo/accountinfofetchjob.h
 include/libkgapi2/authjob.h
+include/libkgapi2/blogger/blog.h
+include/libkgapi2/blogger/blogfetchjob.h
+include/libkgapi2/blogger/comment.h
+include/libkgapi2/blogger/commentapprovejob.h
+include/libkgapi2/blogger/commentdeletecontentjob.h
+include/libkgapi2/blogger/commentdeletejob.h
+include/libkgapi2/blogger/commentfetchjob.h
+include/libkgapi2/blogger/page.h
+include/libkgapi2/blogger/pagecreatejob.h
+include/libkgapi2/blogger/pagedeletejob.h
+include/libkgapi2/blogger/pagefetchjob.h
+include/libkgapi2/blogger/pagemodifyjob.h
+include/libkgapi2/blogger/post.h
+include/libkgapi2/blogger/postcreatejob.h
+include/libkgapi2/blogger/postdeletejob.h
+include/libkgapi2/blogger/postfetchjob.h
+include/libkgapi2/blogger/postmodifyjob.h
+include/libkgapi2/blogger/postpublishjob.h
+include/libkgapi2/blogger/postsearchjob.h
 include/libkgapi2/calendar/calendar.h
 include/libkgapi2/calendar/calendarcreatejob.h
 include/libkgapi2/calendar/calendardeletejob.h
@@ -112,6 +157,43 @@ include/libkgapi2/contacts/contactsgroupfetchjob.h
 include/libkgapi2/contacts/contactsgroupmodifyjob.h
 include/libkgapi2/createjob.h
 include/libkgapi2/deletejob.h
+include/libkgapi2/drive/about.h
+include/libkgapi2/drive/aboutfetchjob.h
+include/libkgapi2/drive/app.h
+include/libkgapi2/drive/change.h
+include/libkgapi2/drive/changefetchjob.h
+include/libkgapi2/drive/childreference.h
+include/libkgapi2/drive/childreferencecreatejob.h
+include/libkgapi2/drive/childreferencedeletejob.h
+include/libkgapi2/drive/childreferencefetchjob.h
+include/libkgapi2/drive/driveservice.h
+include/libkgapi2/drive/file.h
+include/libkgapi2/drive/fileabstractdatajob.h
+include/libkgapi2/drive/fileabstractmodifyjob.h
+include/libkgapi2/drive/fileabstractuploadjob.h
+include/libkgapi2/drive/filecopyjob.h
+include/libkgapi2/drive/filecreatejob.h
+include/libkgapi2/drive/filedeletejob.h
+include/libkgapi2/drive/filefetchcontentjob.h
+include/libkgapi2/drive/filefetchjob.h
+include/libkgapi2/drive/filemodifyjob.h
+include/libkgapi2/drive/filetouchjob.h
+include/libkgapi2/drive/filetrashjob.h
+include/libkgapi2/drive/fileuntrashjob.h
+include/libkgapi2/drive/parentreference.h
+include/libkgapi2/drive/parentreferencecreatejob.h
+include/libkgapi2/drive/parentreferencedeletejob.h
+include/libkgapi2/drive/parentreferencefetchjob.h
+include/libkgapi2/drive/permission.h
+include/libkgapi2/drive/permissioncreatejob.h
+include/libkgapi2/drive/permissiondeletejob.h
+include/libkgapi2/drive/permissionfetchjob.h
+include/libkgapi2/drive/permissionmodifyjob.h
+include/libkgapi2/drive/revision.h
+include/libkgapi2/drive/revisiondeletejob.h
+include/libkgapi2/drive/revisionfetchjob.h
+include/libkgapi2/drive/revisionmodifyjob.h
+include/libkgapi2/drive/user.h
 include/libkgapi2/fetchjob.h
 include/libkgapi2/job.h
 include/libkgapi2/latitude/location.h
@@ -139,41 +221,10 @@ include/libkgapi2/tasks/taskmodifyjob.h
 include/libkgapi2/tasks/taskmovejob.h
 include/libkgapi2/types.h
 include/libkgapi2/ui/authwidget.h
-lib/cmake/LibKGAPI/LibKGAPIConfig.cmake
-lib/cmake/LibKGAPI/LibKGAPIConfigVersion.cmake
-lib/cmake/LibKGAPI/LibKGAPITargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/LibKGAPI/LibKGAPITargetsWithPrefix.cmake
 lib/cmake/LibKGAPI2/LibKGAPI2Config.cmake
 lib/cmake/LibKGAPI2/LibKGAPI2ConfigVersion.cmake
 lib/cmake/LibKGAPI2/LibKGAPI2TargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibKGAPI2/LibKGAPI2TargetsWithPrefix.cmake
-lib/libkgapi.so
-lib/libkgapi.so.1
-lib/libkgapi.so.2.0.1
 lib/libkgapi2.so
 lib/libkgapi2.so.2
-lib/libkgapi2.so.2.0.1
-libdata/pkgconfig/libkgapi.pc
-libdata/pkgconfig/libkgapi2.pc
-@dirrm lib/cmake/LibKGAPI2
-@dirrm lib/cmake/LibKGAPI
-@dirrm include/libkgapi2/ui
-@dirrm include/libkgapi2/tasks
-@dirrm include/libkgapi2/staticmaps
-@dirrm include/libkgapi2/latitude
-@dirrm include/libkgapi2/contacts
-@dirrm include/libkgapi2/calendar
-@dirrm include/libkgapi2/accountinfo
-@dirrm include/libkgapi2
-@dirrm include/libkgapi/ui
-@dirrm include/libkgapi/services
-@dirrm include/libkgapi/objects
-@dirrm include/libkgapi
-@dirrm include/LibKGAPI2/Ui
-@dirrm include/LibKGAPI2/Tasks
-@dirrm include/LibKGAPI2/StaticMaps
-@dirrm include/LibKGAPI2/Latitude
-@dirrm include/LibKGAPI2/Contacts
-@dirrm include/LibKGAPI2/Calendar
-@dirrm include/LibKGAPI2/AccountInfo
-@dirrm include/LibKGAPI2
+lib/libkgapi2.so.%%PORTVERSION%%
diff --git a/devel/libkolab/Makefile b/devel/libkolab/Makefile
index 45ed7860ae85..ae015ee1148a 100644
--- a/devel/libkolab/Makefile
+++ b/devel/libkolab/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libkolab
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.5.3
 CATEGORIES=	devel kde
 MASTER_SITES=	http://mirror.kolabsys.com/pub/releases/
 
diff --git a/devel/libkolab/distinfo b/devel/libkolab/distinfo
index c045032f83b1..58e615a519e3 100644
--- a/devel/libkolab/distinfo
+++ b/devel/libkolab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libkolab-0.5.2.tar.gz) = 6a1673f7f7f620c87cbfde2e7b5e981395ea5829e1599b65e7cc539f3a7428ca
-SIZE (libkolab-0.5.2.tar.gz) = 186423
+SHA256 (libkolab-0.5.3.tar.gz) = a90c4d892850e1795aec97f14c887f41463d0cad573926cdafd17f972e9d2726
+SIZE (libkolab-0.5.3.tar.gz) = 186440
diff --git a/devel/libkolab/pkg-plist b/devel/libkolab/pkg-plist
index 08e484687b3b..4f1eb6071cd5 100644
--- a/devel/libkolab/pkg-plist
+++ b/devel/libkolab/pkg-plist
@@ -16,6 +16,3 @@ lib/cmake/Libkolab/LibkolabTargets.cmake
 lib/libkolab.so
 lib/libkolab.so.0
 lib/libkolab.so.%%SHLIB_VER%%
-@dirrm lib/cmake/Libkolab
-@dirrmtry lib/cmake
-@dirrm include/kolab
diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
index 1ee08c61085a..20956f552f8c 100644
--- a/multimedia/phonon-designerplugin/Makefile
+++ b/multimedia/phonon-designerplugin/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-designerplugin
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 8f4d51170df7..c4b5e6dd4715 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.0
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-gstreamer
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -15,8 +14,8 @@ COMMENT=	GStreamer backend for Phonon
 
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
-USE_GSTREAMER=	yes
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_GSTREAMER1=	yes
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui opengl phonon \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11
@@ -26,7 +25,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GST_PLUGINS
 GST_PLUGINS_DESC=	Install GStreamer plugins
-GST_PLUGINS_RUN_DEPENDS=	gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all
+GST_PLUGINS_RUN_DEPENDS=	gstreamer1-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer1-plugins-all
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index 95326c743fa3..de667d287822 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-gstreamer-4.7.2.tar.xz) = 80b72a9092f540dd0a2abd2898328f3d5f9febfa073b0b1d44592a050a99d2b1
-SIZE (KDE/phonon-backend-gstreamer-4.7.2.tar.xz) = 75552
+SHA256 (KDE/phonon-backend-gstreamer-4.8.0.tar.xz) = f819cbd6296e1e19579e365902f7930ec8571e8cbb08718484091a795f70587e
+SIZE (KDE/phonon-backend-gstreamer-4.8.0.tar.xz) = 75608
diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist
index 7a2dd32998d8..38ca3188d241 100644
--- a/multimedia/phonon-gstreamer/pkg-plist
+++ b/multimedia/phonon-gstreamer/pkg-plist
@@ -6,9 +6,4 @@ share/icons/hicolor/48x48/apps/phonon-gstreamer.png
 share/icons/hicolor/64x64/apps/phonon-gstreamer.png
 share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
 share/kde4/services/phononbackends/gstreamer.desktop
-@dirrmtry share/kde4/services/phononbackends
-@dirrmtry lib/kde4/plugins/phonon_backend
-@cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
-@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR%%
+%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_gstreamer.so
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index c7206e30c5da..dd9d1b0966f7 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	multimedia kde
-MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-vlc
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -14,7 +13,7 @@ COMMENT=	VLC backend for Phonon
 
 LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
 
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib gui phonon \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake pkgconfig tar:xz
diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo
index 4490d6bcbc6b..9ad17d19421b 100644
--- a/multimedia/phonon-vlc/distinfo
+++ b/multimedia/phonon-vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-vlc-0.7.2.tar.xz) = 0a788360df2e3439efefacae70b73252c1e1d4a7ad08f4d93301d77a915d95a9
-SIZE (KDE/phonon-backend-vlc-0.7.2.tar.xz) = 58988
+SHA256 (KDE/phonon-backend-vlc-0.8.0.tar.xz) = e092185ba7798b65da0ee2707e4ebdb32d4d1858282f5bb96bce890336938a42
+SIZE (KDE/phonon-backend-vlc-0.8.0.tar.xz) = 59076
diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist
index 8ece7bb4a53b..eb8ba21ec9c3 100644
--- a/multimedia/phonon-vlc/pkg-plist
+++ b/multimedia/phonon-vlc/pkg-plist
@@ -1,8 +1,3 @@
 lib/kde4/plugins/phonon_backend/phonon_vlc.so
 share/kde4/services/phononbackends/vlc.desktop
-@dirrmtry share/kde4/services/phononbackends
-@dirrmtry lib/kde4/plugins/phonon_backend
-@cwd %%QT_PREFIX%%
-%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
-@dirrmtry %%QT_PLUGINDIR%%/phonon_backend
-@dirrmtry %%QT_PLUGINDIR%%
+%%QT_PREFIX%%/%%QT_PLUGINDIR%%/phonon_backend/libphonon_vlc.so
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 847e9be07428..93c3d33fca4d 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.2
-PORTREVISION=	1
+PORTVERSION=	4.8.1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -15,7 +14,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
 
-USE_KDE4=	kdehier kdeprefix automoc4
+USE_KDE4=	kdeprefix automoc4
 USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USES=		cmake tar:xz
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 901bf375120e..33de80ceb7f0 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-4.7.2.tar.xz) = 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be
-SIZE (KDE/phonon-4.7.2.tar.xz) = 330244
+SHA256 (KDE/phonon-4.8.1.tar.xz) = b6ca0126cd5330731875acc1cc0b60f8c9ed7ebc71e1d0210b74bf21658027d1
+SIZE (KDE/phonon-4.8.1.tar.xz) = 321652
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 4f23b7d3eab7..4b9ea72f5a2c 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -179,22 +179,10 @@ share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake
 %%DATADIR%%/buildsystem/PhononMacros.cmake
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
-@dirrm %%DATADIR%%/buildsystem
-@dirrm %%DATADIR%%
-@dirrm lib/cmake/phonon
-@dirrmtry lib/cmake
-@dirrm include/phonon/experimental
-@dirrm include/phonon
-@dirrm include/KDE/Phonon/Experimental
-@dirrm include/KDE/Phonon
-@cwd %%QT_PREFIX%%
-%%QT_INCDIR%%/Phonon
-%%QT_INCDIR%%/phonon
-%%QT_LIBDIR%%/libphonon.so
-%%QT_LIBDIR%%/libphonon.so.4
-%%QT_LIBDIR%%/libphononexperimental.so
-%%QT_LIBDIR%%/libphononexperimental.so.4
-share/qt4/mkspecs/modules/qt_phonon.pri
-@dirrmtry share/qt4/mkspecs/modules
-@dirrmtry %%QT_LIBDIR%%
-@dirrmtry %%QT_INCDIR%%
+%%QT_PREFIX%%/%%QT_INCDIR%%/Phonon
+%%QT_PREFIX%%/%%QT_INCDIR%%/phonon
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphonon.so.4
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so
+%%QT_PREFIX%%/%%QT_LIBDIR%%/libphononexperimental.so.4
+%%QT_PREFIX%%/%%QT_MKSPECDIR%%/modules/qt_phonon.pri