aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2014-10-19 15:57:27 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2014-10-19 15:57:27 +0000
commit0ea52f99b465b681e2a4bf7c44a8f7093f40fc68 (patch)
tree7d99a8b7b1226b2da14c7c6d04800d30a417873e /deskutils
parent24055ead515d6e00a9aaf5c651358eb4e8f56300 (diff)
downloadports-0ea52f99b465b681e2a4bf7c44a8f7093f40fc68.tar.gz
ports-0ea52f99b465b681e2a4bf7c44a8f7093f40fc68.zip
Notes
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/Makefile3
-rw-r--r--deskutils/kcharselect/distinfo4
-rw-r--r--deskutils/kcharselect/pkg-plist1
-rw-r--r--deskutils/kdepim4-runtime/Makefile5
-rw-r--r--deskutils/kdepim4-runtime/distinfo4
-rw-r--r--deskutils/kdepim4-runtime/pkg-descr7
-rw-r--r--deskutils/kdepim4-runtime/pkg-plist56
-rw-r--r--deskutils/kdepim4/Makefile19
-rw-r--r--deskutils/kdepim4/distinfo4
-rw-r--r--deskutils/kdepim4/files/patch-blogilo__src__blogger.h11
-rw-r--r--deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp25
-rw-r--r--deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp29
-rw-r--r--deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp20
-rw-r--r--deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp29
-rw-r--r--deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h11
-rw-r--r--deskutils/kdepim4/pkg-descr18
-rw-r--r--deskutils/kdepim4/pkg-plist236
-rw-r--r--deskutils/kdepimlibs4/Makefile10
-rw-r--r--deskutils/kdepimlibs4/distinfo4
-rw-r--r--deskutils/kdepimlibs4/pkg-descr12
-rw-r--r--deskutils/kdepimlibs4/pkg-plist122
-rw-r--r--deskutils/kdeplasma-addons/Makefile3
-rw-r--r--deskutils/kdeplasma-addons/distinfo4
-rw-r--r--deskutils/kdeplasma-addons/pkg-descr2
-rw-r--r--deskutils/kdeplasma-addons/pkg-plist75
-rw-r--r--deskutils/kruler/Makefile3
-rw-r--r--deskutils/kruler/distinfo4
-rw-r--r--deskutils/kruler/pkg-plist3
-rw-r--r--deskutils/superkaramba/Makefile3
-rw-r--r--deskutils/superkaramba/distinfo4
-rw-r--r--deskutils/superkaramba/pkg-plist1
31 files changed, 163 insertions, 569 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 5284eb17aa05..5ad2da2e79b3 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,7 +3,6 @@
PORTNAME= kcharselect
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -11,7 +10,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Character selector for KDE
-USE_KDE4= kdeprefix kdehier automoc4 kdelibs
+USE_KDE4= kdeprefix automoc4 kdelibs
USES= cmake:outsource tar:xz
USE_QT4= qmake_build moc_build rcc_build uic_build
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index a1bca741f35e..41dff8ab378a 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kcharselect-4.12.5.tar.xz) = 2851b67e116c646156456a069db00f662c977e0dd8113f8d7d45ab92119e67ee
-SIZE (KDE/4.12.5/kcharselect-4.12.5.tar.xz) = 84704
+SHA256 (KDE/4.14.2/kcharselect-4.14.2.tar.xz) = 528d6eef1cd4ea17ddc53292d9381a5b64ec680265afcc5f3505b94fbdb2a114
+SIZE (KDE/4.14.2/kcharselect-4.14.2.tar.xz) = 84704
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 7c4d65588b3f..65d8229cce6d 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -5,4 +5,3 @@ share/doc/HTML/en/kcharselect/common
share/doc/HTML/en/kcharselect/index.cache.bz2
share/doc/HTML/en/kcharselect/index.docbook
share/doc/HTML/en/kcharselect/kcharselect.png
-@dirrm share/doc/HTML/en/kcharselect
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 0b214829a341..d01a11657ea9 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -3,13 +3,12 @@
PORTNAME= kdepim-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
-COMMENT= Libraries for KDE-PIM applications
+COMMENT= KDE PIM tools and services
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libkgapi2.so:${PORTSDIR}/devel/libkgapi \
@@ -19,7 +18,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
CONFLICTS_INSTALL= kdepim-runtime44-4.*
USE_GNOME= libxml2 libxslt:build
-USE_KDE4= kdehier kdelibs kdeprefix pimlibs nepomuk-core \
+USE_KDE4= kdelibs kdeprefix pimlibs nepomuk-core \
akonadi automoc4 ontologies soprano strigi
USES= cmake:outsource shared-mime-info tar:xz
USE_QT4= corelib dbus declarative designer_build gui network qtestlib \
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index 59bfe46ac383..b092bea7fbd9 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdepim-runtime-4.12.5.tar.xz) = 33ecebd946550bbf0a4427e3fb18b27d3eea5940067cea76444bd74d9f38d51c
-SIZE (KDE/4.12.5/kdepim-runtime-4.12.5.tar.xz) = 1192900
+SHA256 (KDE/4.14.2/kdepim-runtime-4.14.2.tar.xz) = a9d44e19e73d9985e94714c55e1fadef48ac260f5b387b336b2f23268ce553ca
+SIZE (KDE/4.14.2/kdepim-runtime-4.14.2.tar.xz) = 1167908
diff --git a/deskutils/kdepim4-runtime/pkg-descr b/deskutils/kdepim4-runtime/pkg-descr
index 8485fc9d7142..c745f37671a1 100644
--- a/deskutils/kdepim4-runtime/pkg-descr
+++ b/deskutils/kdepim4-runtime/pkg-descr
@@ -1,8 +1,3 @@
-KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
-
-These kde4 ports intend to provide early access to KDE4 for FreeBSD
-developers, porters and beta testers. Use at your own risk!
-
-This package provides PIM runtime libs for KDE4.
+Tools and services that extends the functionality of KDE PIM.
WWW: http://www.kde.org/
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 28b6638b7ec3..b2c4f2e2ba61 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -10,15 +10,13 @@ bin/akonadi_invitations_agent
bin/akonadi_kabc_resource
bin/akonadi_kcal_resource
bin/akonadi_kdeaccounts_resource
+bin/akonadi_kolab_resource
bin/akonadi_kolabproxy_resource
bin/akonadi_localbookmarks_resource
bin/akonadi_maildispatcher_agent
bin/akonadi_mailtransport_dummy_resource
-bin/akonadi_microblog_resource
bin/akonadi_migration_agent
bin/akonadi_mixedmaildir_resource
-bin/akonadi_nepomuk_feeder
-bin/akonadi_nepomuktag_resource
bin/akonadi_newmailnotifier_agent
bin/akonadi_nntp_resource
bin/akonadi_openxchange_resource
@@ -29,8 +27,8 @@ bin/gidmigrator
bin/kaddressbookmigrator
bin/kjotsmigrator
bin/kmail-migrator
+bin/knotes-migrator
bin/kres-migrator
-bin/nepomukpimindexerutility
lib/kde4/accountwizard_plugin.so
lib/kde4/akonadi_akonotes_resource.so
lib/kde4/akonadi_contacts_resource.so
@@ -39,10 +37,6 @@ lib/kde4/akonadi_kalarm_dir_resource.so
lib/kde4/akonadi_kalarm_resource.so
lib/kde4/akonadi_maildir_resource.so
lib/kde4/akonadi_mbox_resource.so
-lib/kde4/akonadi_nepomuk_calendar_feeder.so
-lib/kde4/akonadi_nepomuk_contact_feeder.so
-lib/kde4/akonadi_nepomuk_email_feeder.so
-lib/kde4/akonadi_nepomuk_note_feeder.so
lib/kde4/akonadi_notes_resource.so
lib/kde4/akonadi_serializer_addressee.so
lib/kde4/akonadi_serializer_bookmark.so
@@ -90,6 +84,9 @@ lib/kde4/kio_akonadi.so
lib/libakonadi-filestore.so
lib/libakonadi-filestore.so.4
lib/libakonadi-filestore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfolderarchivesettings.so
+lib/libfolderarchivesettings.so.4
+lib/libfolderarchivesettings.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkdepim-copy.so
lib/libkdepim-copy.so.4
lib/libkdepim-copy.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -99,7 +96,6 @@ lib/libkmindexreader.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmaildir.so
lib/libmaildir.so.4
lib/libmaildir.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libnepomukfeederpluginlib.a
share/akonadi/agents/akonadinepomukfeederagent.desktop
share/akonadi/agents/akonotesresource.desktop
share/akonadi/agents/birthdaysresource.desktop
@@ -118,15 +114,14 @@ share/akonadi/agents/kalarmresource.desktop
share/akonadi/agents/kcalresource.desktop
share/akonadi/agents/kdeaccountsresource.desktop
share/akonadi/agents/kolabproxyresource.desktop
+share/akonadi/agents/kolabresource.desktop
share/akonadi/agents/localbookmarksresource.desktop
share/akonadi/agents/maildirresource.desktop
share/akonadi/agents/maildispatcheragent.desktop
share/akonadi/agents/mboxresource.desktop
-share/akonadi/agents/microblog.desktop
share/akonadi/agents/migrationagent.desktop
share/akonadi/agents/mixedmaildirresource.desktop
share/akonadi/agents/mtdummyresource.desktop
-share/akonadi/agents/nepomuktagresource.desktop
share/akonadi/agents/newmailnotifieragent.desktop
share/akonadi/agents/nntpresource.desktop
share/akonadi/agents/notesresource.desktop
@@ -160,6 +155,12 @@ 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/accountwizard/vcard/vcardwizard.desktop
+share/apps/akonadi/accountwizard/vcard/vcardwizard.es
+share/apps/akonadi/accountwizard/vcard/vcardwizard.ui
+share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.desktop
+share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.es
+share/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.ui
share/apps/akonadi/firstrun/defaultaddressbook
share/apps/akonadi/firstrun/defaultcalendar
share/apps/akonadi/firstrun/defaultnotebook
@@ -173,10 +174,10 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_socialnotification.desktop
share/apps/akonadi_facebook_resource/akonadi_facebook_resource.notifyrc
+share/apps/akonadi_kolabproxy_resource/akonadi_kolabproxy_resource.notifyrc
share/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
share/apps/akonadi_newmailnotifier_agent/akonadi_newmailnotifier_agent.notifyrc
share/apps/kconf_update/newmailnotifier.upd
-share/apps/nepomukpimindexerutility/nepomukpimindexerutility.rc
share/autostart/kaddressbookmigrator.desktop
share/config/accountwizard.knsrc
share/config/kmail-migratorrc
@@ -215,38 +216,7 @@ 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/kde4/services/nepomukcalendarfeeder.desktop
-share/kde4/services/nepomukcontactfeeder.desktop
-share/kde4/services/nepomukmailfeeder.desktop
-share/kde4/services/nepomuknotefeeder.desktop
-share/kde4/servicetypes/akonadinepomukfeeder.desktop
share/kde4/servicetypes/davgroupwareprovider.desktop
share/mime/packages/accountwizard-mime.xml
share/mime/packages/kdepim-mime.xml
share/mime/packages/x-vnd.akonadi.socialnotification.xml
-share/ontology/kde/aneo.ontology
-share/ontology/kde/aneo.trig
-@dirrmtry share/ontology/kde
-@dirrmtry share/ontology
-@dirrm share/kde4/services/akonadi/davgroupware-providers
-@dirrmtry share/kde4/services/akonadi
-@dirrm share/apps/nepomukpimindexerutility
-@dirrm share/apps/akonadi_newmailnotifier_agent
-@dirrm share/apps/akonadi_maildispatcher_agent
-@dirrm share/apps/akonadi_facebook_resource
-@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
-@dirrm share/apps/akonadi/accountwizard/kolab
-@dirrm share/apps/akonadi/accountwizard/imap
-@dirrm share/apps/akonadi/accountwizard/ical
-@dirrm share/apps/akonadi/accountwizard/contacts
-@dirrm share/apps/akonadi/accountwizard
-@dirrmtry share/apps/akonadi
-@dirrm share/akonadi/agents
-@dirrm share/akonadi
-@dirrm lib/kde4/imports/org/kde/akonadi
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 48c8e7814eb5..d9e1b9b76ebf 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,33 +3,31 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
-COMMENT= Libraries for KDE-PIM applications
+COMMENT= KDE PIM applications
LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
libassuan.so:${PORTSDIR}/security/libassuan \
libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
- libclucene-core.so:${PORTSDIR}/textproc/clucene \
- liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
+ libkgapi2.so:${PORTSDIR}/devel/libkgapi
RUN_DEPENDS= ${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime \
${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
CONFLICTS_INSTALL= kdepim44-4.*
USE_GNOME= libxml2 libxslt:build
-USE_KDE4= kdehier kdelibs kdeprefix pimlibs kactivities \
- akonadi automoc4 ontologies soprano strigi nepomuk-widgets
+USE_KDE4= kdelibs kdeprefix pimlibs kactivities \
+ akonadi automoc4 soprano nepomuk-widgets baloo
USES= cmake:outsource gmake iconv tar:xz
USE_OPENLDAP= yes
USE_QT4= corelib dbus declarative designer_build gui network opengl \
- script sql webkit \
+ qt3support script sql webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xscrnsaver
CMAKE_ARGS+= -DKDEPIM_BUILD_MOBILE:BOOL=FALSE
@@ -39,6 +37,11 @@ CXXFLAGS+= -Wno-error=return-type
USE_LDCONFIG= yes
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
-PLIST_SUB= GRANTLEE_VER=0.4
+PLIST_SUB= GRANTLEE_VER=0.5
+
+post-patch:
+# Remove BOM
+ ${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
+ ${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp
.include <bsd.port.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index b22080fd32e1..0915bd7d34aa 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdepim-4.12.5.tar.xz) = 5e26dc33b5d36eb305a24a834b153515990ea8a501498b63ee10103df94c6ff0
-SIZE (KDE/4.12.5/kdepim-4.12.5.tar.xz) = 14259060
+SHA256 (KDE/4.14.2/kdepim-4.14.2.tar.xz) = c5ad234c524537b4b29daa323c2fde424e3e4c910ce769db5789632d4b46906b
+SIZE (KDE/4.14.2/kdepim-4.14.2.tar.xz) = 14468416
diff --git a/deskutils/kdepim4/files/patch-blogilo__src__blogger.h b/deskutils/kdepim4/files/patch-blogilo__src__blogger.h
new file mode 100644
index 000000000000..5ee4abe895e5
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-blogilo__src__blogger.h
@@ -0,0 +1,11 @@
+--- blogilo/src/blogger.h.orig 2014-09-11 21:23:20 UTC
++++ blogilo/src/blogger.h
+@@ -93,7 +93,7 @@
+ signal emitted after previous authenticate() call.
+ @see authenticated(QMap\<QString,QString\>)
+ */
+- void authenticate(const QMap<QString, QString> &authData = QMap<QString, QString>());
++ void authenticate(const QMap<QString, QString> &authData = (QMap<QString, QString>()));
+
+ /**
+ Sets Google OAuth application API key.
diff --git a/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp b/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp
deleted file mode 100644
index 55716c1d3ac9..000000000000
--- a/deskutils/kdepim4/files/patch-grantleetheme__grantleethememanager.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 8c64e00460a173141d69624cb36fca19801405b4
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sun May 4 23:33:29 2014 +0300
-
- Stop needlessly calling KDirWatch::stopScan().
-
- Not only should the call be unnecessary, but it also causes an infinite
- loop when KDirWatch is set to use QFileSystemWatcher: the
- KDirWatch::stopScan()/addDir()/startScan() combination makes the slot
- where they're called end up being infinitely triggered.
-
- Discussed with dfaure.
-
- REVIEW: 117993
-
---- grantleetheme/grantleethememanager.cpp
-+++ grantleetheme/grantleethememanager.cpp
-@@ -95,7 +95,6 @@ public:
- void updateThemesPath()
- {
- if ( !themesDirectories.isEmpty() ) {
-- watch->stopScan();
- Q_FOREACH (const QString &directory, themesDirectories) {
- watch->removeDir( directory );
- }
diff --git a/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp b/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp
deleted file mode 100644
index a53c01bc1895..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__models__keylistmodel.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- kleopatra/models/keylistmodel.cpp
-+++ kleopatra/models/keylistmodel.cpp
-@@ -73,7 +73,7 @@
- #include <iterator>
- #include <cassert>
-
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- #include <ext/algorithm> // for is_sorted
- #endif
-
-@@ -460,7 +460,7 @@ QModelIndex FlatKeyListModel::doMapFromKey( const Key & key, int col ) const {
- }
-
- QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
- #endif
- if ( keys.empty() )
-@@ -717,7 +717,7 @@ static std::vector<Key> topological_sort( const std::vector<Key> & keys ) {
- }
-
- QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
- #endif
- if ( keys.empty() )
diff --git a/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp b/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
deleted file mode 100644
index 0a97de117e40..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__uiserver__assuanserverconnection.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kleopatra/uiserver/assuanserverconnection.cpp
-+++ kleopatra/uiserver/assuanserverconnection.cpp
-@@ -96,7 +96,7 @@
-
- #include <errno.h>
-
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- # include <ext/algorithm> // for is_sorted
- #endif
-
-@@ -827,7 +827,7 @@ AssuanServerConnection::Private::Private( assuan_fd_t fd_, const std::vector< sh
- sessionId( 0 ),
- factories( factories_ )
- {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
- #endif
-
diff --git a/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp b/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp
deleted file mode 100644
index a794cf62bb70..000000000000
--- a/deskutils/kdepim4/files/patch-kleopatra__utils__classify.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- kleopatra/utils/classify.cpp
-+++ kleopatra/utils/classify.cpp
-@@ -43,7 +43,7 @@
-
- #include <boost/range.hpp>
-
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- # include <ext/algorithm>
- #endif
-
-@@ -150,7 +150,7 @@ unsigned int Kleo::classify( const QStringList & fileNames ) {
- }
-
- unsigned int Kleo::classify( const QString & filename ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
- #endif
-
-@@ -179,7 +179,7 @@ unsigned int Kleo::classify( const QString & filename ) {
- }
-
- unsigned int Kleo::classifyContent( const QByteArray & data ) {
--#ifdef __GNUC__
-+#ifdef __GLIBCXX__
- assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
- #endif
-
diff --git a/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h b/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
deleted file mode 100644
index 3244820bf8bf..000000000000
--- a/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- pimsettingexporter/mail/exportmailjob.h.orig 2013-08-14 09:58:28.333460897 +0000
-+++ pimsettingexporter/mail/exportmailjob.h 2013-08-14 10:01:42.142460369 +0000
-@@ -18,6 +18,8 @@
- #ifndef ExportMailJob_H
- #define ExportMailJob_H
-
-+#include <time.h>
-+
- #include "abstractimportexportjob.h"
- #include <KSharedConfig>
- class KUrl;
diff --git a/deskutils/kdepim4/pkg-descr b/deskutils/kdepim4/pkg-descr
index a28514b796a4..5d13557c3d47 100644
--- a/deskutils/kdepim4/pkg-descr
+++ b/deskutils/kdepim4/pkg-descr
@@ -1,8 +1,16 @@
-KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
+KDE Personal Information Management suite.
-These kde4 ports intend to provide early access to KDE4 for FreeBSD
-developers, porters and beta testers. Use at your own risk!
-
-This package provides PIM applications for KDE4.
+blogio - The KDE blogging client
+kaddressbook - Keeps your addresses on file
+akregator - Feed reader
+kalarm - A personal alarm message, command and email scheduler
+kjots - A note taker
+kleopatra - KDE Key Manager
+kmail - Fully featured Email client
+knode - KDE News (Usenet) reader
+knotes - Popup notes
+kontact - Brings together all the KDE PIM applications under one roof
+korganizer - KDE Calendar and scheduling
+ktimetracker - time tracker
WWW: http://www.kde.org/
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 54683a717650..ed69ca5d8b78 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,6 +1,7 @@
bin/akonadi_archivemail_agent
-bin/akonadi_folderarchive_agent
+bin/akonadi_followupreminder_agent
bin/akonadi_mailfilter_agent
+bin/akonadi_notes_agent
bin/akonadi_sendlater_agent
bin/akonadiconsole
bin/akregator
@@ -39,6 +40,8 @@ bin/ktnef
bin/kwatchgnupg
bin/mboximporter
bin/pimsettingexporter
+bin/sieveeditor
+bin/storageservicemanager
etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
lib/kde4/akregator_config_advanced.so
@@ -50,7 +53,6 @@ lib/kde4/akregator_config_sharemicroblog.so
lib/kde4/akregator_mk4storage_plugin.so
lib/kde4/akregator_sharemicroblog_plugin.so
lib/kde4/akregatorpart.so
-lib/kde4/grammar_link.so
lib/kde4/kaddressbookpart.so
lib/kde4/kcal_blog.so
lib/kde4/kcal_remote.so
@@ -61,19 +63,18 @@ lib/kde4/kcm_kmail.so
lib/kde4/kcm_kmailsummary.so
lib/kde4/kcm_knode.so
lib/kde4/kcm_knote.so
+lib/kde4/kcm_knotessummary.so
lib/kde4/kcm_kontact.so
lib/kde4/kcm_kontactsummary.so
lib/kde4/kcm_korganizer.so
lib/kde4/kcm_kpimidentities.so
lib/kde4/kcm_ktimetracker.so
lib/kde4/kcm_ldap.so
-lib/kde4/kcm_pimactivity.so
lib/kde4/kcm_sdsummary.so
lib/kde4/kcm_todosummary.so
lib/kde4/kjotspart.so
lib/kde4/kmailpart.so
lib/kde4/knodepart.so
-lib/kde4/knotes_local.so
lib/kde4/kontact_akregatorplugin.so
lib/kde4/kontact_journalplugin.so
lib/kde4/kontact_kaddressbookplugin.so
@@ -87,10 +88,8 @@ lib/kde4/kontact_summaryplugin.so
lib/kde4/kontact_todoplugin.so
lib/kde4/korg_datenums.so
lib/kde4/korg_hebrew.so
-lib/kde4/korg_journalprint.so
lib/kde4/korg_picoftheday.so
lib/kde4/korg_thisdayinhistory.so
-lib/kde4/korg_yearprint.so
lib/kde4/korganizerpart.so
lib/kde4/ktexteditorkabcbridge.so
lib/kde4/ktimetrackerpart.so
@@ -123,12 +122,9 @@ lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libeventviews.so
lib/libeventviews.so.4
lib/libeventviews.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libfolderarchive.so
-lib/libfolderarchive.so.4
-lib/libfolderarchive.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libgrammar.so
-lib/libgrammar.so.4
-lib/libgrammar.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfollowupreminder.so
+lib/libfollowupreminder.so.4
+lib/libfollowupreminder.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libgrantleetheme.so
lib/libgrantleetheme.so.4
lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -216,9 +212,9 @@ lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmessageviewer.so
lib/libmessageviewer.so.4
lib/libmessageviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
-lib/libpimactivity.so
-lib/libpimactivity.so.4
-lib/libpimactivity.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnoteshared.so
+lib/libnoteshared.so.4
+lib/libnoteshared.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libpimcommon.so
lib/libpimcommon.so.4
lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -231,7 +227,9 @@ lib/libtemplateparser.so.%%KDE4_GENERIC_LIB_VERSION%%
man/man1/kabcclient.1.gz
share/akonadi/agents/archivemailagent.desktop
share/akonadi/agents/folderarchiveagent.desktop
+share/akonadi/agents/followupreminder.desktop
share/akonadi/agents/mailfilteragent.desktop
+share/akonadi/agents/notesagent.desktop
share/akonadi/agents/sendlateragent.desktop
share/applications/kde4/KMail2.desktop
share/applications/kde4/KNode.desktop
@@ -243,6 +241,7 @@ share/applications/kde4/blogilo.desktop
share/applications/kde4/contactthemeeditor.desktop
share/applications/kde4/headerthemeeditor.desktop
share/applications/kde4/importwizard.desktop
+share/applications/kde4/kaddressbook-importer.desktop
share/applications/kde4/kaddressbook.desktop
share/applications/kde4/kalarm.desktop
share/applications/kde4/kleopatra.desktop
@@ -256,9 +255,13 @@ share/applications/kde4/korganizer.desktop
share/applications/kde4/ktimetracker.desktop
share/applications/kde4/ktnef.desktop
share/applications/kde4/mboximporter.desktop
+share/applications/kde4/pimsettingexporter.desktop
+share/applications/kde4/sieveeditor.desktop
+share/applications/kde4/storageservicemanager.desktop
share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
-share/apps/akonadi_folderarchive_agent/akonadi_folderarchive_agent.notifyrc
+share/apps/akonadi_followupreminder_agent/akonadi_followupreminder_agent.notifyrc
share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/apps/akonadi_notes_agent/akonadi_notes_agent.notifyrc
share/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
share/apps/akonadiconsole/akonadiconsoleui.rc
share/apps/akregator/about/akregator.css
@@ -286,6 +289,8 @@ share/apps/kaddressbook/printing/themes/big-theme-example/theme.desktop
share/apps/kaddressbook/printing/themes/big-theme-example/theme.html
share/apps/kaddressbook/printing/themes/default/theme.desktop
share/apps/kaddressbook/printing/themes/default/theme.html
+share/apps/kaddressbook/printing/themes/full/theme.desktop
+share/apps/kaddressbook/printing/themes/full/theme.html
share/apps/kaddressbook/viewertemplates/default/contact.html
share/apps/kaddressbook/viewertemplates/default/contact_embedded.html
share/apps/kaddressbook/viewertemplates/default/contact_row.html
@@ -335,6 +340,7 @@ share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
share/apps/kconf_update/kpgp.upd
share/apps/kconf_update/mailfilteragent.upd
share/apps/kconf_update/migrate-kmail-filters.pl
+share/apps/kconf_update/noteglobalsettings.upd
share/apps/kconf_update/upgrade-signature.pl
share/apps/kconf_update/upgrade-transport.pl
share/apps/kdepimwidgets/pics/addresseelineedit.png
@@ -412,7 +418,8 @@ share/apps/knode/pics/snderr.png
share/apps/knotes/knotes_part.rc
share/apps/knotes/knotesappui.rc
share/apps/knotes/knotesui.rc
-share/apps/knotes/print/themes/TODO
+share/apps/knotes/print/themes/background-color/theme.desktop
+share/apps/knotes/print/themes/background-color/theme.html
share/apps/knotes/print/themes/big-title/theme.desktop
share/apps/knotes/print/themes/big-title/theme.html
share/apps/knotes/print/themes/default/theme.desktop
@@ -539,6 +546,11 @@ share/apps/messageviewer/themes/example_fancy/header.desktop
share/apps/messageviewer/themes/example_fancy/header.html
share/apps/pimsettingexporter/backup-structure.txt
share/apps/pimsettingexporter/pimsettingexporter.rc
+share/apps/sieve/scripts/copy/template.desktop
+share/apps/sieve/scripts/copy/template.txt
+share/apps/sieveeditor/sieveeditorui.rc
+share/apps/storageservicemanager/storageservicemanager.notifyrc
+share/apps/storageservicemanager/storageservicemanagerui.rc
share/autostart/kalarm.autostart.desktop
share/autostart/korgac.desktop
share/config.kcfg/akregator.kcfg
@@ -547,7 +559,6 @@ share/config.kcfg/customtemplates_kfg.kcfg
share/config.kcfg/kalarmconfig.kcfg
share/config.kcfg/kjots.kcfg
share/config.kcfg/kmail.kcfg
-share/config.kcfg/knoteconfig.kcfg
share/config.kcfg/knotesglobalconfig.kcfg
share/config.kcfg/kontact.kcfg
share/config.kcfg/korganizer.kcfg
@@ -555,6 +566,7 @@ share/config.kcfg/templatesconfiguration_kfg.kcfg
share/config/kaddressbook_themes.knsrc
share/config/kmail.antispamrc
share/config/kmail.antivirusrc
+share/config/knotes_printing_theme.knsrc
share/config/korganizer.knsrc
share/config/ksieve_script.knsrc
share/config/libkleopatrarc
@@ -578,10 +590,12 @@ share/doc/HTML/en/akonadi_archivemail_agent/common
share/doc/HTML/en/akonadi_archivemail_agent/configure-archive-mail-agent.png
share/doc/HTML/en/akonadi_archivemail_agent/index.cache.bz2
share/doc/HTML/en/akonadi_archivemail_agent/index.docbook
-share/doc/HTML/en/akonadi_folderarchive_agent/common
-share/doc/HTML/en/akonadi_folderarchive_agent/folderarchiveagent.png
-share/doc/HTML/en/akonadi_folderarchive_agent/index.cache.bz2
-share/doc/HTML/en/akonadi_folderarchive_agent/index.docbook
+share/doc/HTML/en/akonadi_followupreminder_agent/common
+share/doc/HTML/en/akonadi_followupreminder_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_followupreminder_agent/index.docbook
+share/doc/HTML/en/akonadi_notes_agent/common
+share/doc/HTML/en/akonadi_notes_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_notes_agent/index.docbook
share/doc/HTML/en/akonadi_sendlater_agent/common
share/doc/HTML/en/akonadi_sendlater_agent/index.cache.bz2
share/doc/HTML/en/akonadi_sendlater_agent/index.docbook
@@ -620,6 +634,9 @@ share/doc/HTML/en/blogilo/toolbox-1.png
share/doc/HTML/en/blogilo/toolbox-2.png
share/doc/HTML/en/blogilo/toolbox-3.png
share/doc/HTML/en/blogilo/toolbox-4.png
+share/doc/HTML/en/contactthemeeditor/common
+share/doc/HTML/en/contactthemeeditor/index.cache.bz2
+share/doc/HTML/en/contactthemeeditor/index.docbook
share/doc/HTML/en/headerthemeeditor/common
share/doc/HTML/en/headerthemeeditor/index.cache.bz2
share/doc/HTML/en/headerthemeeditor/index.docbook
@@ -825,6 +842,9 @@ share/doc/HTML/en/pimsettingexporter/common
share/doc/HTML/en/pimsettingexporter/index.cache.bz2
share/doc/HTML/en/pimsettingexporter/index.docbook
share/doc/HTML/en/pimsettingexporter/pimsettingexporter.png
+share/doc/HTML/en/sieveeditor/common
+share/doc/HTML/en/sieveeditor/index.cache.bz2
+share/doc/HTML/en/sieveeditor/index.docbook
share/icons/hicolor/128x128/actions/upload-media.png
share/icons/hicolor/128x128/apps/akonadiconsole.png
share/icons/hicolor/128x128/apps/akregator.png
@@ -858,6 +878,8 @@ share/icons/hicolor/16x16/apps/akregator_empty.png
share/icons/hicolor/16x16/apps/blogilo.png
share/icons/hicolor/16x16/apps/kaddressbook.png
share/icons/hicolor/16x16/apps/kalarm.png
+share/icons/hicolor/16x16/apps/kdepim-dropbox.png
+share/icons/hicolor/16x16/apps/kdepim-googledrive.png
share/icons/hicolor/16x16/apps/kjots.png
share/icons/hicolor/16x16/apps/kleopatra.png
share/icons/hicolor/16x16/apps/kmail.png
@@ -882,6 +904,8 @@ share/icons/hicolor/22x22/apps/akregator.png
share/icons/hicolor/22x22/apps/blogilo.png
share/icons/hicolor/22x22/apps/kaddressbook.png
share/icons/hicolor/22x22/apps/kalarm.png
+share/icons/hicolor/22x22/apps/kdepim-dropbox.png
+share/icons/hicolor/22x22/apps/kdepim-googledrive.png
share/icons/hicolor/22x22/apps/kjots.png
share/icons/hicolor/22x22/apps/kleopatra.png
share/icons/hicolor/22x22/apps/kmail.png
@@ -903,6 +927,8 @@ share/icons/hicolor/32x32/apps/akregator.png
share/icons/hicolor/32x32/apps/blogilo.png
share/icons/hicolor/32x32/apps/kaddressbook.png
share/icons/hicolor/32x32/apps/kalarm.png
+share/icons/hicolor/32x32/apps/kdepim-dropbox.png
+share/icons/hicolor/32x32/apps/kdepim-googledrive.png
share/icons/hicolor/32x32/apps/kjots.png
share/icons/hicolor/32x32/apps/kleopatra.png
share/icons/hicolor/32x32/apps/kmail.png
@@ -921,6 +947,8 @@ share/icons/hicolor/48x48/apps/akregator.png
share/icons/hicolor/48x48/apps/blogilo.png
share/icons/hicolor/48x48/apps/kaddressbook.png
share/icons/hicolor/48x48/apps/kalarm.png
+share/icons/hicolor/48x48/apps/kdepim-dropbox.png
+share/icons/hicolor/48x48/apps/kdepim-googledrive.png
share/icons/hicolor/48x48/apps/kjots.png
share/icons/hicolor/48x48/apps/kleopatra.png
share/icons/hicolor/48x48/apps/kmail.png
@@ -997,14 +1025,13 @@ share/kde4/services/akregator_mk4storage_plugin.desktop
share/kde4/services/akregator_part.desktop
share/kde4/services/akregator_sharemicroblog_plugin.desktop
share/kde4/services/feed.protocol
-share/kde4/services/grammar_link.desktop
share/kde4/services/kaddressbookpart.desktop
share/kde4/services/kcm_kpimidentities.desktop
share/kde4/services/kcmapptsummary.desktop
share/kde4/services/kcmkmailsummary.desktop
+share/kde4/services/kcmknotessummary.desktop
share/kde4/services/kcmkontactsummary.desktop
share/kde4/services/kcmldap.desktop
-share/kde4/services/kcmpimactivity.desktop
share/kde4/services/kcmsdsummary.desktop
share/kde4/services/kcmtodosummary.desktop
share/kde4/services/kjots_config_misc.desktop
@@ -1032,8 +1059,10 @@ share/kde4/services/knode_config_post_news.desktop
share/kde4/services/knode_config_privacy.desktop
share/kde4/services/knode_config_read_news.desktop
share/kde4/services/knote_config_action.desktop
+share/kde4/services/knote_config_collection.desktop
share/kde4/services/knote_config_display.desktop
share/kde4/services/knote_config_editor.desktop
+share/kde4/services/knote_config_misc.desktop
share/kde4/services/knote_config_network.desktop
share/kde4/services/knote_config_print.desktop
share/kde4/services/kontact/akregatorplugin.desktop
@@ -1050,10 +1079,8 @@ share/kde4/services/kontact/todoplugin.desktop
share/kde4/services/kontactconfig.desktop
share/kde4/services/korganizer/datenums.desktop
share/kde4/services/korganizer/hebrew.desktop
-share/kde4/services/korganizer/journalprint.desktop
share/kde4/services/korganizer/picoftheday.desktop
share/kde4/services/korganizer/thisdayinhistory.desktop
-share/kde4/services/korganizer/yearprint.desktop
share/kde4/services/korganizer_configcolorsandfonts.desktop
share/kde4/services/korganizer_configdesignerfields.desktop
share/kde4/services/korganizer_configfreebusy.desktop
@@ -1065,8 +1092,6 @@ share/kde4/services/korganizer_configviews.desktop
share/kde4/services/korganizer_part.desktop
share/kde4/services/kresources/kcal/blog.desktop
share/kde4/services/kresources/kcal/remote.desktop
-share/kde4/services/kresources/knotes/local.desktop
-share/kde4/services/kresources/knotes_manager.desktop
share/kde4/services/ktimetracker_config_behavior.desktop
share/kde4/services/ktimetracker_config_display.desktop
share/kde4/services/ktimetracker_config_storage.desktop
@@ -1077,159 +1102,4 @@ share/kde4/servicetypes/calendardecoration.desktop
share/kde4/servicetypes/calendarplugin.desktop
share/kde4/servicetypes/dbuscalendar.desktop
share/kde4/servicetypes/dbusmail.desktop
-share/kde4/servicetypes/korganizerpart.desktop
-share/kde4/servicetypes/korgprintplugin.desktop
-share/ontology/kde/messagetag.ontology
-share/ontology/kde/messagetag.trig
share/polkit-1/actions/org.kde.kalarmrtcwake.policy
-@dirrmtry share/ontology/kde
-@dirrmtry share/ontology
-@dirrm share/kde4/services/kresources/knotes
-@dirrm share/kde4/services/korganizer
-@dirrm share/kde4/services/kontact
-@dirrmtry share/icons/oxygen/512x512/mimetypes
-@dirrmtry share/icons/oxygen/512x512
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16/actions
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
-@dirrm share/doc/HTML/en/pimsettingexporter
-@dirrm share/doc/HTML/en/kwatchgnupg
-@dirrm share/doc/HTML/en/ktnef
-@dirrm share/doc/HTML/en/ktimetracker
-@dirrm share/doc/HTML/en/korganizer
-@dirrm share/doc/HTML/en/kontact-admin
-@dirrm share/doc/HTML/en/kontact
-@dirrm share/doc/HTML/en/konsolekalendar
-@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/knode
-@dirrm share/doc/HTML/en/kmailcvt
-@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kleopatra
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kioslave/news
-@dirrm share/doc/HTML/en/kalarm
-@dirrm share/doc/HTML/en/kabcclient
-@dirrm share/doc/HTML/en/importwizard
-@dirrm share/doc/HTML/en/headerthemeeditor
-@dirrm share/doc/HTML/en/blogilo
-@dirrm share/doc/HTML/en/akregator
-@dirrm share/doc/HTML/en/akonadi_sendlater_agent
-@dirrm share/doc/HTML/en/akonadi_folderarchive_agent
-@dirrm share/doc/HTML/en/akonadi_archivemail_agent
-@dirrm share/apps/pimsettingexporter
-@dirrm share/apps/messageviewer/themes/example_fancy
-@dirrm share/apps/messageviewer/themes/example
-@dirrm share/apps/messageviewer/themes
-@dirrm share/apps/messageviewer/plugins/bodypartformatter
-@dirrm share/apps/messageviewer/plugins
-@dirrm share/apps/messageviewer/about
-@dirrm share/apps/messageviewer
-@dirrm share/apps/messagelist/pics
-@dirrm share/apps/messagelist
-@dirrm share/apps/libmessageviewer/pics
-@dirrm share/apps/libmessageviewer
-@dirrm share/apps/libkleopatra/pics
-@dirrm share/apps/libkleopatra
-@dirrm share/apps/kwatchgnupg/pics
-@dirrm share/apps/kwatchgnupg
-@dirrm share/apps/ktnef
-@dirrm share/apps/ktimetracker/pics
-@dirrm share/apps/ktimetracker/icons/hicolor/scalable/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/scalable
-@dirrm share/apps/ktimetracker/icons/hicolor/64x64/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/64x64
-@dirrm share/apps/ktimetracker/icons/hicolor/48x48/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/48x48
-@dirrm share/apps/ktimetracker/icons/hicolor/32x32/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/32x32
-@dirrm share/apps/ktimetracker/icons/hicolor/22x22/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/22x22
-@dirrm share/apps/ktimetracker/icons/hicolor/16x16/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/16x16
-@dirrm share/apps/ktimetracker/icons/hicolor/128x128/actions
-@dirrm share/apps/ktimetracker/icons/hicolor/128x128
-@dirrm share/apps/ktimetracker/icons/hicolor
-@dirrm share/apps/ktimetracker/icons
-@dirrm share/apps/ktimetracker
-@dirrm share/apps/korganizer/sounds
-@dirrm share/apps/korganizer
-@dirrm share/apps/korgac/icons/hicolor/scalable/apps
-@dirrm share/apps/korgac/icons/hicolor/scalable
-@dirrm share/apps/korgac/icons/hicolor/64x64/apps
-@dirrm share/apps/korgac/icons/hicolor/64x64
-@dirrm share/apps/korgac/icons/hicolor/32x32/apps
-@dirrm share/apps/korgac/icons/hicolor/32x32
-@dirrm share/apps/korgac/icons/hicolor/256x256/apps
-@dirrm share/apps/korgac/icons/hicolor/256x256
-@dirrm share/apps/korgac/icons/hicolor/22x22/apps
-@dirrm share/apps/korgac/icons/hicolor/22x22
-@dirrm share/apps/korgac/icons/hicolor/16x16/apps
-@dirrm share/apps/korgac/icons/hicolor/16x16
-@dirrm share/apps/korgac/icons/hicolor/128x128/apps
-@dirrm share/apps/korgac/icons/hicolor/128x128
-@dirrm share/apps/korgac/icons/hicolor
-@dirrm share/apps/korgac/icons
-@dirrm share/apps/korgac
-@dirrm share/apps/kontactsummary
-@dirrm share/apps/kontact/ksettingsdialog
-@dirrm share/apps/kontact/about
-@dirrm share/apps/kontact
-@dirrm share/apps/knotes/print/themes/default
-@dirrm share/apps/knotes/print/themes/big-title
-@dirrm share/apps/knotes/print/themes
-@dirrm share/apps/knotes/print
-@dirrm share/apps/knotes
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
-@dirrm share/apps/kmailcvt/pics
-@dirrm share/apps/kmailcvt
-@dirrm share/apps/kmail2/pics
-@dirrm share/apps/kmail2/about
-@dirrm share/apps/kmail2
-@dirrm share/apps/kleopatra/pics
-@dirrm share/apps/kleopatra
-@dirrm share/apps/kjots/themes/xml_output
-@dirrm share/apps/kjots/themes/plain_text
-@dirrm share/apps/kjots/themes/other
-@dirrm share/apps/kjots/themes/default
-@dirrm share/apps/kjots/themes
-@dirrm share/apps/kjots
-@dirrm share/apps/kdepimwidgets/pics
-@dirrm share/apps/kdepimwidgets
-@dirrm share/apps/kalarm/icons/oxygen/22x22/actions
-@dirrm share/apps/kalarm/icons/oxygen/22x22
-@dirrm share/apps/kalarm/icons/oxygen/16x16/actions
-@dirrm share/apps/kalarm/icons/oxygen/16x16
-@dirrm share/apps/kalarm/icons/oxygen
-@dirrm share/apps/kalarm/icons
-@dirrm share/apps/kalarm
-@dirrm share/apps/kaddressbook/viewertemplates/default
-@dirrm share/apps/kaddressbook/viewertemplates
-@dirrm share/apps/kaddressbook/printing/themes/default
-@dirrm share/apps/kaddressbook/printing/themes/big-theme-example
-@dirrm share/apps/kaddressbook/printing/themes
-@dirrm share/apps/kaddressbook/printing
-@dirrm share/apps/kaddressbook
-@dirrm share/apps/headerthemeeditor
-@dirrm share/apps/contactthemeeditor
-@dirrm share/apps/composereditor
-@dirrm share/apps/blogilo
-@dirrm share/apps/akregator_sharemicroblog_plugin
-@dirrmtry share/apps/akregator/pics
-@dirrm share/apps/akregator/about
-@dirrmtry share/apps/akregator
-@dirrmtry share/apps/akonadiconsole
-@dirrm share/apps/akonadi_sendlater_agent
-@dirrm share/apps/akonadi_mailfilter_agent
-@dirrm share/apps/akonadi_folderarchive_agent
-@dirrm share/apps/akonadi_archivemail_agent
-@dirrmtry share/akonadi/agents
-@dirrmtry share/akonadi
-@dirrmtry lib/kde4/plugins/accessible
-@dirrmtry lib/akonadi/contact/editorpageplugins
-@dirrmtry lib/akonadi/contact
-@dirrmtry lib/akonadi
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index c1a88fed6e68..017a6f8d8816 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,14 +3,14 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
-COMMENT= Libraries for KDE-PIM applications
+COMMENT= KDE PIM Libraries
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
libboost_thread.so:${PORTSDIR}/devel/boost-libs \
@@ -19,10 +19,8 @@ LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
libprison.so:${PORTSDIR}/graphics/prison \
libqjson.so:${PORTSDIR}/devel/qjson
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-
-USE_KDE4= kdelibs akonadi kdeprefix kdehier \
- automoc4 nepomuk-core ontologies soprano
+USE_KDE4= kdelibs akonadi kdeprefix \
+ automoc4 ontologies soprano
USES= cmake:outsource shared-mime-info tar:xz
USE_OPENLDAP= yes
USE_QT4= corelib dbus declarative designer_build gui network sql xml \
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 68253f08adfe..54c44d25053a 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdepimlibs-4.12.5.tar.xz) = c6749903bcf46df07e419c02c42c6a8a32f29778de190a83c7f3ad0b7b335f22
-SIZE (KDE/4.12.5/kdepimlibs-4.12.5.tar.xz) = 2763532
+SHA256 (KDE/4.14.2/kdepimlibs-4.14.2.tar.xz) = d35b6343ffadbfaa561bed3d16fd0a449303c7f4c86366b5428d34a5df7db79d
+SIZE (KDE/4.14.2/kdepimlibs-4.14.2.tar.xz) = 2788976
diff --git a/deskutils/kdepimlibs4/pkg-descr b/deskutils/kdepimlibs4/pkg-descr
index 7cd2cfe6afdd..604be5ec0ec6 100644
--- a/deskutils/kdepimlibs4/pkg-descr
+++ b/deskutils/kdepimlibs4/pkg-descr
@@ -1,11 +1,3 @@
-This module includes libraries that are central to the development and
-execution of a KDE-PIM application.
+A set of libraries from the KDE Personal Information Management project.
-The KDE-PIM project aims to bring together those who wish to help design,
-implement, test, etc. anything that's to do with personal information
-management.
-
-This rather broad scope encompasses mail clients, addressbooks, usenet news,
-scheduling and even sticky notes.
-
-WWW: http://www.kde.org/
+WWW: http://www.kde.org/
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index 4ca539bda5a1..99bc0d7f11d7 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -1,4 +1,5 @@
bin/akonadi2xml
+bin/akonaditest
include/KDE/Akonadi/AgentBase
include/KDE/Akonadi/AgentFactory
include/KDE/Akonadi/AgentFilterProxyModel
@@ -12,6 +13,7 @@ include/KDE/Akonadi/AgentTypeDialog
include/KDE/Akonadi/AgentTypeModel
include/KDE/Akonadi/AgentTypeWidget
include/KDE/Akonadi/Attribute
+include/KDE/Akonadi/AttributeEntity
include/KDE/Akonadi/AttributeFactory
include/KDE/Akonadi/CachePolicy
include/KDE/Akonadi/Calendar/BlockAlarmsAttribute
@@ -78,6 +80,7 @@ include/KDE/Akonadi/Control
include/KDE/Akonadi/DBusConnectionPool
include/KDE/Akonadi/ETMViewStateSaver
include/KDE/Akonadi/Entity
+include/KDE/Akonadi/EntityAnnotationsAttribute
include/KDE/Akonadi/EntityDisplayAttribute
include/KDE/Akonadi/EntityHiddenAttribute
include/KDE/Akonadi/EntityListView
@@ -125,12 +128,24 @@ include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
include/KDE/Akonadi/RecursiveItemFetchJob
include/KDE/Akonadi/ResourceBase
include/KDE/Akonadi/SearchCreateJob
+include/KDE/Akonadi/SearchQuery
include/KDE/Akonadi/ServerManager
include/KDE/Akonadi/Session
include/KDE/Akonadi/SocialUtils/ImageProvider
include/KDE/Akonadi/SocialUtils/SocialFeedItem
include/KDE/Akonadi/SocialUtils/SocialNetworkAttributes
include/KDE/Akonadi/StandardActionManager
+include/KDE/Akonadi/Tag
+include/KDE/Akonadi/TagAttribute
+include/KDE/Akonadi/TagCreateJob
+include/KDE/Akonadi/TagDeleteJob
+include/KDE/Akonadi/TagFetchJob
+include/KDE/Akonadi/TagFetchScope
+include/KDE/Akonadi/TagManagementDialog
+include/KDE/Akonadi/TagModel
+include/KDE/Akonadi/TagModifyJob
+include/KDE/Akonadi/TagSelectionDialog
+include/KDE/Akonadi/TagWidget
include/KDE/Akonadi/TransactionBeginJob
include/KDE/Akonadi/TransactionCommitJob
include/KDE/Akonadi/TransactionRollbackJob
@@ -457,6 +472,7 @@ include/akonadi/agenttypemodel.h
include/akonadi/agenttypewidget.h
include/akonadi/akonadi_export.h
include/akonadi/attribute.h
+include/akonadi/attributeentity.h
include/akonadi/attributefactory.h
include/akonadi/cachepolicy.h
include/akonadi/cachepolicypage.h
@@ -531,6 +547,7 @@ include/akonadi/control.h
include/akonadi/dbusconnectionpool.h
include/akonadi/differencesalgorithminterface.h
include/akonadi/entity.h
+include/akonadi/entityannotationsattribute.h
include/akonadi/entitydeletedattribute.h
include/akonadi/entitydisplayattribute.h
include/akonadi/entityhiddenattribute.h
@@ -598,6 +615,7 @@ include/akonadi/resourcebasesettings.h
include/akonadi/resourcesettings.h
include/akonadi/resourcesynchronizationjob.h
include/akonadi/searchcreatejob.h
+include/akonadi/searchquery.h
include/akonadi/selectionproxymodel.h
include/akonadi/servermanager.h
include/akonadi/session.h
@@ -610,6 +628,17 @@ include/akonadi/specialcollectionsdiscoveryjob.h
include/akonadi/specialcollectionsrequestjob.h
include/akonadi/standardactionmanager.h
include/akonadi/statisticsproxymodel.h
+include/akonadi/tag.h
+include/akonadi/tagattribute.h
+include/akonadi/tagcreatejob.h
+include/akonadi/tagdeletejob.h
+include/akonadi/tagfetchjob.h
+include/akonadi/tagfetchscope.h
+include/akonadi/tagmanagementdialog.h
+include/akonadi/tagmodel.h
+include/akonadi/tagmodifyjob.h
+include/akonadi/tagselectiondialog.h
+include/akonadi/tagwidget.h
include/akonadi/transactionjobs.h
include/akonadi/transactionsequence.h
include/akonadi/transportresourcebase.h
@@ -1054,6 +1083,7 @@ lib/cmake/KdepimLibs/KdepimLibsConfig.cmake
lib/cmake/KdepimLibs/KdepimLibsConfigVersion.cmake
lib/gpgmepp/GpgmeppConfig.cmake
lib/gpgmepp/GpgmeppLibraryDepends.cmake
+lib/kde4/akonadi_knut_resource.so
lib/kde4/akonadi_serializer_socialfeeditem.so
lib/kde4/kabc_directory.so
lib/kde4/kabc_file.so
@@ -1176,6 +1206,7 @@ lib/libqgpgme.so.1.0.1
lib/libsyndication.so
lib/libsyndication.so.4
lib/libsyndication.so.%%KDE4_GENERIC_LIB_VERSION%%
+share/akonadi/agents/knutresource.desktop
share/apps/akonadi-kde/kcfg2dbus.xsl
share/apps/akonadi/akonadi-xml.xsd
share/apps/akonadi/contact/data/zone.tab
@@ -1192,6 +1223,7 @@ share/apps/akonadi/contact/icons/oxygen/16x16/apps/sms_protocol.png
share/apps/akonadi/contact/icons/oxygen/16x16/apps/yahoo_protocol.png
share/apps/akonadi/contact/pics/world.jpg
share/apps/akonadi/plugins/serializer/akonadi_serializer_socialfeeditem.desktop
+share/apps/akonadi_knut_resource/knut-template.xml
share/apps/cmake/modules/AkonadiMacros.cmake
share/apps/cmake/modules/CheckTimezone.cmake
share/apps/cmake/modules/FindGpgme.cmake
@@ -1218,6 +1250,7 @@ share/apps/libkholidays/plan2/holiday_ba-srp_sr
share/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavian
share/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavianlatin
share/apps/libkholidays/plan2/holiday_ba-srp_sr@latin
+share/apps/libkholidays/plan2/holiday_bb_en-gb
share/apps/libkholidays/plan2/holiday_be_fr
share/apps/libkholidays/plan2/holiday_be_nl
share/apps/libkholidays/plan2/holiday_be_wa
@@ -1252,6 +1285,7 @@ share/apps/libkholidays/plan2/holiday_gb-sct_en-gb
share/apps/libkholidays/plan2/holiday_gf_fr
share/apps/libkholidays/plan2/holiday_gp_fr
share/apps/libkholidays/plan2/holiday_gr_el
+share/apps/libkholidays/plan2/holiday_gr_el_nameday
share/apps/libkholidays/plan2/holiday_gt_es
share/apps/libkholidays/plan2/holiday_hk_en-gb
share/apps/libkholidays/plan2/holiday_hk_zh-cn
@@ -1387,91 +1421,3 @@ share/kde4/servicetypes/kresources_manager.desktop
share/kde4/servicetypes/kresources_plugin.desktop
share/mime/packages/kdepimlibs-mime.xml
share/mime/packages/x-vnd.akonadi.socialfeeditem.xml
-@dirrm share/kde4/services/akonadi/contact
-@dirrmtry share/kde4/services/akonadi
-@dirrm share/doc/HTML/en/kioslave/smtp
-@dirrm share/doc/HTML/en/kioslave/sieve
-@dirrm share/doc/HTML/en/kioslave/pop3
-@dirrm share/doc/HTML/en/kioslave/nntp
-@dirrm share/doc/HTML/en/kioslave/mbox
-@dirrm share/doc/HTML/en/kioslave/ldap
-@dirrm share/doc/HTML/en/kioslave/imap
-@dirrm share/doc/HTML/en/kcontrol/kresources
-@dirrm share/apps/libkholidays/plan2
-@dirrm share/apps/libkholidays
-@dirrm share/apps/akonadi/plugins/serializer
-@dirrm share/apps/akonadi/plugins
-@dirrm share/apps/akonadi/contact/pics
-@dirrm share/apps/akonadi/contact/icons/oxygen/16x16/apps
-@dirrm share/apps/akonadi/contact/icons/oxygen/16x16
-@dirrm share/apps/akonadi/contact/icons/oxygen
-@dirrm share/apps/akonadi/contact/icons
-@dirrm share/apps/akonadi/contact/data
-@dirrm share/apps/akonadi/contact
-@dirrm share/apps/akonadi-kde
-@dirrmtry share/apps/akonadi
-@dirrm lib/gpgmepp
-@dirrm lib/cmake/KdepimLibs
-@dirrmtry lib/cmake
-@dirrm include/syndication/rss2
-@dirrm include/syndication/rdf
-@dirrm include/syndication/atom
-@dirrm include/syndication
-@dirrm include/qgpgme
-@dirrm include/microblog
-@dirrm include/mailtransport
-@dirrm include/kxmlrpcclient
-@dirrm include/ktnef
-@dirrm include/kresources
-@dirrm include/kpimutils
-@dirrm include/kpimtextedit
-@dirrm include/kpimidentities
-@dirrm include/kontactinterface
-@dirrm include/kmime
-@dirrm include/kmbox
-@dirrm include/kldap
-@dirrm include/kimap
-@dirrm include/kholidays
-@dirrm include/kcalutils
-@dirrm include/kcalcore
-@dirrm include/kcal
-@dirrm include/kblog
-@dirrm include/kalarmcal
-@dirrm include/kabc
-@dirrm include/gpgme++/interfaces
-@dirrm include/gpgme++
-@dirrm include/akonadi/xml
-@dirrmtry include/akonadi/socialutils
-@dirrmtry include/akonadi/private
-@dirrm include/akonadi/notes
-@dirrm include/akonadi/kmime
-@dirrm include/akonadi/kcal
-@dirrm include/akonadi/kabc
-@dirrm include/akonadi/contact
-@dirrm include/akonadi/calendar
-@dirrmtry include/akonadi
-@dirrm include/KDE/Syndication
-@dirrm include/KDE/Mailtransport
-@dirrm include/KDE/KontactInterface
-@dirrm include/KDE/KTNEF
-@dirrm include/KDE/KResources
-@dirrm include/KDE/KPIMUtils
-@dirrm include/KDE/KPIMTextEdit
-@dirrm include/KDE/KPIMIdentities
-@dirrm include/KDE/KMime
-@dirrm include/KDE/KLDAP
-@dirrm include/KDE/KIMAP
-@dirrm include/KDE/KHolidays
-@dirrm include/KDE/KCalUtils
-@dirrm include/KDE/KCalCore
-@dirrm include/KDE/KCal
-@dirrm include/KDE/KBlog
-@dirrm include/KDE/KAlarmCal
-@dirrm include/KDE/KABC
-@dirrm include/KDE/Akonadi/SocialUtils
-@dirrm include/KDE/Akonadi/Notes
-@dirrm include/KDE/Akonadi/KMime
-@dirrm include/KDE/Akonadi/KCal
-@dirrm include/KDE/Akonadi/Contact
-@dirrm include/KDE/Akonadi/Calendar
-@dirrm include/KDE/Akonadi
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 57e12e739588..578e76ac6dd6 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -19,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].*
-USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 pimlibs workspace \
+USE_KDE4= kdelibs kdeprefix libkexiv2 pimlibs workspace \
akonadi attica automoc4 qimageblitz soprano
USES= cmake:outsource pkgconfig shared-mime-info tar:xz
USE_QT4= corelib dbus declarative gui network script sql webkit \
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 974310944019..84fe1fb0596d 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdeplasma-addons-4.12.5.tar.xz) = ee6f5ee9fe51db08d96beb1754ab6ce64f455e3e91c77cfe25f55eef35e3d511
-SIZE (KDE/4.12.5/kdeplasma-addons-4.12.5.tar.xz) = 1758720
+SHA256 (KDE/4.14.2/kdeplasma-addons-4.14.2.tar.xz) = 85656b9c4a709629563d14ca2371e7544f38366c3e54af4c8ddaaf9d500d201b
+SIZE (KDE/4.14.2/kdeplasma-addons-4.14.2.tar.xz) = 1791152
diff --git a/deskutils/kdeplasma-addons/pkg-descr b/deskutils/kdeplasma-addons/pkg-descr
index a3cb9ca52f81..0e170aeae19b 100644
--- a/deskutils/kdeplasma-addons/pkg-descr
+++ b/deskutils/kdeplasma-addons/pkg-descr
@@ -1,3 +1,3 @@
This port provides additional plasmoids for KDE
-WWW: http://www.kde.org/
+WWW: http://www.kde.org/
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 42ab54255130..7424c2c9d081 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -616,78 +616,3 @@ share/kde4/services/wcpotdprovider.desktop
share/kde4/servicetypes/plasma_comicprovider.desktop
share/kde4/servicetypes/plasma_potdprovider.desktop
share/mime/packages/lancelotpart-mime.xml
-@dirrm share/apps/rssnow
-@dirrm share/apps/plasmaboard
-@dirrm share/apps/plasma_wallpaper_pattern/patterns
-@dirrm share/apps/plasma_wallpaper_pattern
-@dirrm share/apps/plasma_pastebin
-@dirrm share/apps/plasma/wallpapers/org.kde.hunyango/contents/ui
-@dirrm share/apps/plasma/wallpapers/org.kde.hunyango/contents
-@dirrm share/apps/plasma/wallpapers/org.kde.hunyango
-@dirrm share/apps/plasma/wallpapers/org.kde.haenau/contents/ui
-@dirrm share/apps/plasma/wallpapers/org.kde.haenau/contents
-@dirrm share/apps/plasma/wallpapers/org.kde.haenau
-@dirrm share/apps/plasma/wallpapers/org.kde.animals/contents/ui
-@dirrm share/apps/plasma/wallpapers/org.kde.animals/contents
-@dirrm share/apps/plasma/wallpapers/org.kde.animals
-@dirrm share/apps/plasma/wallpapers
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/ui
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/config
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/code
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents
-@dirrm share/apps/plasma/plasmoids/nowplaying
-@dirrm share/apps/plasma/plasmoids/konsoleprofiles/contents/ui
-@dirrm share/apps/plasma/plasmoids/konsoleprofiles/contents
-@dirrm share/apps/plasma/plasmoids/konsoleprofiles
-@dirrm share/apps/plasma/plasmoids/konqprofiles/contents/ui
-@dirrm share/apps/plasma/plasmoids/konqprofiles/contents
-@dirrm share/apps/plasma/plasmoids/konqprofiles
-@dirrm share/apps/plasma/plasmoids/calculator/contents/ui
-@dirrm share/apps/plasma/plasmoids/calculator/contents
-@dirrm share/apps/plasma/plasmoids/calculator
-@dirrm share/apps/plasma/packages/org.kde.weather/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.weather/contents
-@dirrm share/apps/plasma/packages/org.kde.weather
-@dirrm share/apps/plasma/packages/org.kde.lcdweather/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.lcdweather/contents
-@dirrm share/apps/plasma/packages/org.kde.lcdweather
-@dirrm share/apps/plasma/packages/org.kde.comic/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.comic/contents
-@dirrm share/apps/plasma/packages/org.kde.comic
-@dirrm share/apps/plasma-applet-opendesktop-activities
-@dirrm share/apps/plasma-applet-opendesktop
-@dirrm share/apps/plasma-applet-frame
-@dirrm share/apps/lancelot
-@dirrm share/apps/kdeplasma-addons
-@dirrm share/apps/desktoptheme/slim-glow/lancelot
-@dirrmtry share/apps/desktoptheme/slim-glow
-@dirrm share/apps/desktoptheme/oxygen/lancelot
-@dirrmtry share/apps/desktoptheme/oxygen
-@dirrm share/apps/desktoptheme/default/weatherstation
-@dirrm share/apps/desktoptheme/default/weather
-@dirrm share/apps/desktoptheme/default/stylesheets
-@dirrm share/apps/desktoptheme/default/rssnow
-@dirrm share/apps/desktoptheme/default/lancelot
-@dirrm share/apps/desktoptheme/default/icontasks
-@dirrm share/apps/desktoptheme/default/fifteenPuzzle
-@dirrm share/apps/desktoptheme/default/bubblemon
-@dirrm share/apps/desktoptheme/Tibanna/lancelot
-@dirrmtry share/apps/desktoptheme/Tibanna
-@dirrm share/apps/desktoptheme/Produkt/lancelot
-@dirrmtry share/apps/desktoptheme/Produkt
-@dirrm share/apps/desktoptheme/Aya/lancelot
-@dirrmtry share/apps/desktoptheme/Aya
-@dirrm share/apps/desktoptheme/Androbit/lancelot
-@dirrmtry share/apps/desktoptheme/Androbit
-@dirrmtry share/apps/cmake/modules
-@dirrmtry share/apps/cmake
-@dirrm share/apps/bball
-@dirrm include/lancelot/widgets
-@dirrm include/lancelot/models
-@dirrm include/lancelot/layouts
-@dirrm include/lancelot-datamodels
-@dirrm include/lancelot
-@dirrm include/KDE/Lancelot/Models
-@dirrm include/KDE/Lancelot
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index 70125ce625f4..cf150934a429 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kruler
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen ruler
-USE_KDE4= kdehier kdelibs kdeprefix automoc4
+USE_KDE4= kdelibs kdeprefix automoc4
USES= cmake:outsource tar:xz
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XORG= x11
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo
index 7acee678a254..e0dac37534d4 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kruler-4.12.5.tar.xz) = 5c0c4d5f36e8a525a20ce8d6f48ffce48a5860b972c65f844324f8d1bb7bb42b
-SIZE (KDE/4.12.5/kruler-4.12.5.tar.xz) = 128572
+SHA256 (KDE/4.14.2/kruler-4.14.2.tar.xz) = 3fe4022a743feba8b34d6d966a4e6459804cf293f54f79d1e5c84be84b0a5f69
+SIZE (KDE/4.14.2/kruler-4.14.2.tar.xz) = 128572
diff --git a/deskutils/kruler/pkg-plist b/deskutils/kruler/pkg-plist
index 3030a00abd09..4202edb1d336 100644
--- a/deskutils/kruler/pkg-plist
+++ b/deskutils/kruler/pkg-plist
@@ -22,6 +22,3 @@ share/icons/hicolor/32x32/apps/kruler.png
share/icons/hicolor/48x48/apps/kruler.png
share/icons/hicolor/64x64/apps/kruler.png
share/icons/hicolor/scalable/apps/kruler.svgz
-@dirrm share/doc/HTML/en/kruler
-@dirrm share/apps/kruler/sounds
-@dirrm share/apps/kruler
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 8ad7a7506908..7f2d5cc896ea 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -2,7 +2,6 @@
PORTNAME= superkaramba
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Widget framework for KDE
-USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
+USE_KDE4= kdelibs kdeprefix automoc4 qimageblitz
USES= cmake:outsource python:2 tar:xz
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba/distinfo
index 9fecbf7fd848..6839272a152f 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/superkaramba-4.12.5.tar.xz) = f6c96798d6ae8e824858ea9385ff2568e3e35ff20dea7bfa2801e77d781c99a9
-SIZE (KDE/4.12.5/superkaramba-4.12.5.tar.xz) = 383936
+SHA256 (KDE/4.14.2/superkaramba-4.14.2.tar.xz) = b0c7abb69c82af30d75df069698c23c56acf699a7a58e6444516ddb1dd0d018d
+SIZE (KDE/4.14.2/superkaramba-4.14.2.tar.xz) = 381812
diff --git a/deskutils/superkaramba/pkg-plist b/deskutils/superkaramba/pkg-plist
index 34cb465c013f..9044a88ee13d 100644
--- a/deskutils/superkaramba/pkg-plist
+++ b/deskutils/superkaramba/pkg-plist
@@ -17,4 +17,3 @@ share/icons/hicolor/64x64/apps/superkaramba.png
share/icons/hicolor/scalable/apps/superkaramba.svgz
share/kde4/services/plasma-package-superkaramba.desktop
share/kde4/services/plasma-scriptengine-superkaramba.desktop
-@dirrm share/apps/superkaramba