aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2014-02-18 14:23:03 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2014-02-18 14:23:03 +0000
commite9c34f4c34b0640b3613f03cd96e9f19730b2a07 (patch)
treeef2b2b24dfacf6def95c54d3379c421565b1fe2b /deskutils
parent4dc7ccc95d370549c7c9c7c9c253d64aa92881ae (diff)
downloadports-e9c34f4c34b0640b3613f03cd96e9f19730b2a07.tar.gz
ports-e9c34f4c34b0640b3613f03cd96e9f19730b2a07.zip
Notes
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/Makefile6
-rw-r--r--deskutils/kcharselect/distinfo4
-rw-r--r--deskutils/kdepim4-runtime/Makefile21
-rw-r--r--deskutils/kdepim4-runtime/distinfo4
-rw-r--r--deskutils/kdepim4-runtime/files/patch-CMakeLists.txt23
-rw-r--r--deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt12
-rw-r--r--deskutils/kdepim4-runtime/files/qt3to4headers.txt4
-rw-r--r--deskutils/kdepim4-runtime/pkg-plist75
-rw-r--r--deskutils/kdepim4/Makefile20
-rw-r--r--deskutils/kdepim4/distinfo4
-rw-r--r--deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h11
-rw-r--r--deskutils/kdepim4/pkg-plist308
-rw-r--r--deskutils/kdepimlibs4/Makefile7
-rw-r--r--deskutils/kdepimlibs4/distinfo4
-rw-r--r--deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake6
-rw-r--r--deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake15
-rw-r--r--deskutils/kdepimlibs4/pkg-plist183
-rw-r--r--deskutils/kdeplasma-addons/Makefile50
-rw-r--r--deskutils/kdeplasma-addons/distinfo4
-rw-r--r--deskutils/kdeplasma-addons/files/patch-CMakeLists.txt4
-rw-r--r--deskutils/kdeplasma-addons/files/qt3to4headers.txt46
-rw-r--r--deskutils/kdeplasma-addons/pkg-plist33
-rw-r--r--deskutils/kruler/Makefile6
-rw-r--r--deskutils/kruler/distinfo4
-rw-r--r--deskutils/superkaramba/Makefile8
-rw-r--r--deskutils/superkaramba/distinfo4
-rw-r--r--deskutils/superkaramba/pkg-plist4
27 files changed, 488 insertions, 382 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 84ad419b0ef0..3d3be0d8b3c3 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -4,19 +4,15 @@
PORTNAME= kcharselect
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Character selector for KDE
-CONFLICTS_INSTALL= kdeutils-4.[0-7].*
-
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs
USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 86a8d2f400e1..e65019d0c88c 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 2cc8c6685a5efc723e86cc42de19193f2ce2c6962d19189532f0e107e0af838b
-SIZE (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 86536
+SHA256 (KDE/4.12.2/kcharselect-4.12.2.tar.xz) = 444af977b84192aefd2789c54ae99898a9f077cdbc524b96af448f28fc8217d9
+SIZE (KDE/4.12.2/kcharselect-4.12.2.tar.xz) = 84716
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 5e10cbeb7dd1..a65624d670d7 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -3,25 +3,22 @@
PORTNAME= kdepim-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= deskutils kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= deskutils kde
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Libraries for KDE-PIM applications
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
- libkgapi.so:${PORTSDIR}/devel/libkgapi \
- libkolab.so:${PORTSDIR}/devel/libkolab
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+ libkgapi2.so:${PORTSDIR}/devel/libkgapi \
+ libkolab.so:${PORTSDIR}/devel/libkolab \
+ libkfbapi.so:${PORTSDIR}/net/libkfbapi
-CONFLICTS= akonadi-google-0.*
CONFLICTS_INSTALL= kdepim-runtime44-4.*
USE_XZ= yes
-USE_GNOME= libxml2
+USE_GNOME= libxml2 libxslt:build
USE_KDE4= kdehier kdelibs kdeprefix pimlibs nepomuk-core \
akonadi automoc4 ontologies soprano strigi
USES= cmake:outsource shared-mime-info
@@ -32,13 +29,11 @@ USE_LDCONFIG= yes
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
CMAKE_ARGS= -DKDEPIM_MOBILE_UI:BOOL=OFF
-NO_STAGE= yes
post-patch:
- ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
- ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
# Prevent updating MIME during build.
${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
${PATCH_WRKSRC}/CMakeLists.txt \
- ${PATCH_WRKSRC}/accountwizard/CMakeLists.txt
+ ${PATCH_WRKSRC}/accountwizard/CMakeLists.txt \
+ ${PATCH_WRKSRC}/resources/facebook/serializer/CMakeLists.txt
.include <bsd.port.mk>
diff --git a/deskutils/kdepim4-runtime/distinfo b/deskutils/kdepim4-runtime/distinfo
index 029fc47e85a7..81a114564873 100644
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc
-SIZE (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 1210604
+SHA256 (KDE/4.12.2/kdepim-runtime-4.12.2.tar.xz) = 787d46b960cfcbed5c74a0ba5aaaf21850da2fbacd949cee21bfd28069456a9c
+SIZE (KDE/4.12.2/kdepim-runtime-4.12.2.tar.xz) = 1191784
diff --git a/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
deleted file mode 100644
index bcaa618654a8..000000000000
--- a/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./CMakeLists.txt.orig 2012-04-29 20:39:36.039069000 +0000
-+++ ./CMakeLists.txt 2012-05-22 12:35:44.176575376 +0000
-@@ -154,7 +154,7 @@
-
- ############### Needed commands before building anything ###############
-
--include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
-+include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-
- ############### Generate akonadi-config.h ###############
-@@ -216,9 +216,9 @@
- add_subdirectory(kresources)
- endif (KDEPIMLIBS_KRESOURCES_LIBS)
- endif(NOT WINCE)
--if (QT_QTDECLARATIVE_FOUND)
-+if (KDEPIM_MOBILE_UI AND QT_QTDECLARATIVE_FOUND)
- add_subdirectory(qml)
--endif (QT_QTDECLARATIVE_FOUND)
-+endif (KDEPIM_MOBILE_UI AND QT_QTDECLARATIVE_FOUND)
-
- #if(OPENSYNC_FOUND)
- # add_subdirectory(opensync)
diff --git a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
deleted file mode 100644
index d40edbbf5975..000000000000
--- a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- xml/CMakeLists.txt.orig 2013-01-23 22:59:04.000000000 +0100
-+++ xml/CMakeLists.txt 2013-03-01 18:21:43.000000000 +0100
-@@ -4,6 +4,9 @@
- add_definitions( -DHAVE_LIBXML2 )
- endif ( LIBXML2_FOUND )
-
-+include_directories(${QT_QTCORE_INCLUDE_DIR})
-+include_directories(${QT_QTXML_INCLUDE_DIR})
-+
- add_subdirectory( tests )
-
- add_definitions( -DQT_NO_CAST_FROM_ASCII )
diff --git a/deskutils/kdepim4-runtime/files/qt3to4headers.txt b/deskutils/kdepim4-runtime/files/qt3to4headers.txt
deleted file mode 100644
index dfc6f7f16693..000000000000
--- a/deskutils/kdepim4-runtime/files/qt3to4headers.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-s/<qfile.h>/<QFile>/g
-s/<qimage.h>/<QImage>/g
-s/<qlabel.h>/<QLabel>/g
-s/<qobject.h>/<QObject>/g
diff --git a/deskutils/kdepim4-runtime/pkg-plist b/deskutils/kdepim4-runtime/pkg-plist
index 7a44876c2c6f..663e883248a5 100644
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@@ -1,7 +1,7 @@
bin/accountwizard
-bin/akonadi2xml
bin/akonadi_birthdays_resource
bin/akonadi_davgroupware_resource
+bin/akonadi_facebook_resource
bin/akonadi_googlecalendar_resource
bin/akonadi_googlecontacts_resource
bin/akonadi_icaldir_resource
@@ -15,14 +15,17 @@ 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
bin/akonadi_pop3_resource
bin/akonadi_vcarddir_resource
bin/akonaditray
+bin/gidmigrator
bin/kaddressbookmigrator
bin/kjotsmigrator
bin/kmail-migrator
@@ -34,7 +37,6 @@ lib/kde4/akonadi_contacts_resource.so
lib/kde4/akonadi_ical_resource.so
lib/kde4/akonadi_kalarm_dir_resource.so
lib/kde4/akonadi_kalarm_resource.so
-lib/kde4/akonadi_knut_resource.so
lib/kde4/akonadi_maildir_resource.so
lib/kde4/akonadi_mbox_resource.so
lib/kde4/akonadi_nepomuk_calendar_feeder.so
@@ -50,7 +52,35 @@ lib/kde4/akonadi_serializer_kcal.so
lib/kde4/akonadi_serializer_kcalcore.so
lib/kde4/akonadi_serializer_mail.so
lib/kde4/akonadi_serializer_microblog.so
+lib/kde4/akonadi_serializer_socialnotification.so
lib/kde4/akonadi_vcard_resource.so
+lib/kde4/imports/org/kde/BreadcrumbNavigationView.qml
+lib/kde4/imports/org/kde/Dialog.qml
+lib/kde4/imports/org/kde/Flap.qml
+lib/kde4/imports/org/kde/Flap2.qml
+lib/kde4/imports/org/kde/SlideoutPanel.qml
+lib/kde4/imports/org/kde/SlideoutPanelContainer.qml
+lib/kde4/imports/org/kde/akonadi/AkonadiBreadcrumbNavigationView.qml
+lib/kde4/imports/org/kde/akonadi/CollectionDelegate.qml
+lib/kde4/imports/org/kde/akonadi/border_dot.png
+lib/kde4/imports/org/kde/akonadi/check.png
+lib/kde4/imports/org/kde/akonadi/collectionview.qml
+lib/kde4/imports/org/kde/akonadi/qmldir
+lib/kde4/imports/org/kde/akonadi/sliderbackground.png
+lib/kde4/imports/org/kde/akonadi/transparentplus.png
+lib/kde4/imports/org/kde/dividing-line-horizontal.png
+lib/kde4/imports/org/kde/dividing-line.png
+lib/kde4/imports/org/kde/flap-collapsed-bottom.png
+lib/kde4/imports/org/kde/flap-collapsed-mid.png
+lib/kde4/imports/org/kde/flap-collapsed-top.png
+lib/kde4/imports/org/kde/flap-expanded-bottom.png
+lib/kde4/imports/org/kde/flap-expanded-mid.png
+lib/kde4/imports/org/kde/flap-expanded-top.png
+lib/kde4/imports/org/kde/libkdeqmlplugin.so
+lib/kde4/imports/org/kde/list-line-top.png
+lib/kde4/imports/org/kde/qmldir
+lib/kde4/imports/org/kde/scrollable-bottom.png
+lib/kde4/imports/org/kde/scrollable-top.png
lib/kde4/kabc_akonadi.so
lib/kde4/kcal_akonadi.so
lib/kde4/kcm_akonadi.so
@@ -58,26 +88,24 @@ lib/kde4/kcm_akonadi_resources.so
lib/kde4/kcm_akonadi_server.so
lib/kde4/kio_akonadi.so
lib/libakonadi-filestore.so
-lib/libakonadi-filestore.so.5
-lib/libakonadi-filestore.so.5.0.1
-lib/libakonadi-xml.so
-lib/libakonadi-xml.so.5
-lib/libakonadi-xml.so.5.0.1
+lib/libakonadi-filestore.so.4
+lib/libakonadi-filestore.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkdepim-copy.so
-lib/libkdepim-copy.so.5
-lib/libkdepim-copy.so.5.0.1
+lib/libkdepim-copy.so.4
+lib/libkdepim-copy.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkmindexreader.so
-lib/libkmindexreader.so.5
-lib/libkmindexreader.so.5.0.1
+lib/libkmindexreader.so.4
+lib/libkmindexreader.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmaildir.so
-lib/libmaildir.so.5
-lib/libmaildir.so.5.0.1
+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
share/akonadi/agents/contactsresource.desktop
share/akonadi/agents/davgroupwareresource.desktop
+share/akonadi/agents/facebookresource.desktop
share/akonadi/agents/googlecalendarresource.desktop
share/akonadi/agents/googlecontactsresource.desktop
share/akonadi/agents/icaldirresource.desktop
@@ -89,16 +117,17 @@ share/akonadi/agents/kalarmdirresource.desktop
share/akonadi/agents/kalarmresource.desktop
share/akonadi/agents/kcalresource.desktop
share/akonadi/agents/kdeaccountsresource.desktop
-share/akonadi/agents/knutresource.desktop
share/akonadi/agents/kolabproxyresource.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
share/akonadi/agents/openxchangeresource.desktop
@@ -131,7 +160,6 @@ share/apps/akonadi/accountwizard/pop3/pop3wizard.ui
share/apps/akonadi/accountwizard/tine20/tine20wizard.desktop
share/apps/akonadi/accountwizard/tine20/tine20wizard.es
share/apps/akonadi/accountwizard/tine20/tine20wizard.ui
-share/apps/akonadi/akonadi-xml.xsd
share/apps/akonadi/firstrun/defaultaddressbook
share/apps/akonadi/firstrun/defaultcalendar
share/apps/akonadi/firstrun/defaultnotebook
@@ -143,9 +171,11 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
-share/apps/akonadi_knut_resource/knut-template.xml
+share/apps/akonadi/plugins/serializer/akonadi_serializer_socialnotification.desktop
+share/apps/akonadi_facebook_resource/akonadi_facebook_resource.notifyrc
share/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
-share/apps/akonadi_nepomuk_feeder/akonadi_nepomuk_feeder.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
@@ -155,10 +185,14 @@ share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
share/icons/hicolor/128x128/apps/akonaditray.png
share/icons/hicolor/128x128/apps/ox.png
+share/icons/hicolor/16x16/apps/facebookresource.png
share/icons/hicolor/16x16/apps/ox.png
share/icons/hicolor/22x22/apps/akonaditray.png
+share/icons/hicolor/22x22/apps/facebookresource.png
share/icons/hicolor/32x32/apps/akonaditray.png
+share/icons/hicolor/32x32/apps/facebookresource.png
share/icons/hicolor/32x32/apps/ox.png
+share/icons/hicolor/48x48/apps/facebookresource.png
share/icons/hicolor/48x48/apps/ox.png
share/icons/hicolor/64x64/apps/akonaditray.png
share/icons/hicolor/64x64/apps/kolab.png
@@ -169,6 +203,7 @@ share/kde4/services/akonadi/davgroupware-providers/citadel.desktop
share/kde4/services/akonadi/davgroupware-providers/davical.desktop
share/kde4/services/akonadi/davgroupware-providers/egroupware.desktop
share/kde4/services/akonadi/davgroupware-providers/opengroupware.desktop
+share/kde4/services/akonadi/davgroupware-providers/owncloud-pre5.desktop
share/kde4/services/akonadi/davgroupware-providers/owncloud.desktop
share/kde4/services/akonadi/davgroupware-providers/scalix.desktop
share/kde4/services/akonadi/davgroupware-providers/sogo.desktop
@@ -188,6 +223,7 @@ 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
@@ -195,9 +231,9 @@ share/ontology/kde/aneo.trig
@dirrm share/kde4/services/akonadi/davgroupware-providers
@dirrmtry share/kde4/services/akonadi
@dirrm share/apps/nepomukpimindexerutility
-@dirrm share/apps/akonadi_nepomuk_feeder
+@dirrm share/apps/akonadi_newmailnotifier_agent
@dirrm share/apps/akonadi_maildispatcher_agent
-@dirrm share/apps/akonadi_knut_resource
+@dirrm share/apps/akonadi_facebook_resource
@dirrm share/apps/akonadi/plugins/serializer
@dirrm share/apps/akonadi/plugins
@dirrm share/apps/akonadi/firstrun
@@ -213,3 +249,4 @@ share/ontology/kde/aneo.trig
@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 96dfc38e2a86..6a0642c04bca 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,10 +3,8 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
-CATEGORIES= deskutils kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= deskutils kde
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
@@ -17,31 +15,29 @@ LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
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
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+ libclucene-core.so:${PORTSDIR}/textproc/clucene \
+ liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
RUN_DEPENDS= ${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime
CONFLICTS_INSTALL= kdepim44-4.*
USE_XZ= yes
-USE_GNOME= libxml2
-USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
+USE_GNOME= libxml2 libxslt:build
+USE_KDE4= kdehier kdelibs kdeprefix pimlibs kactivities \
akonadi automoc4 ontologies soprano strigi nepomuk-widgets
-USES= cmake:outsource iconv
+USES= cmake:outsource gmake iconv
USE_OPENLDAP= yes
USE_QT4= corelib dbus declarative designer_build gui network opengl \
script sql webkit \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xscrnsaver
CMAKE_ARGS+= -DKDEPIM_BUILD_MOBILE:BOOL=FALSE
-USE_GMAKE= yes
-NO_STAGE= yes
# Avoids Clang error:
# https://git.reviewboard.kde.org/r/108617
CXXFLAGS+= -Wno-error=return-type
USE_LDCONFIG= yes
MAKE_ENV= XDG_CONFIG_HOME=/dev/null
-MAN1= kabcclient.1
+PLIST_SUB= GRANTLEE_VER=0.4
.include <bsd.port.mk>
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index e3f980654793..39704f61869b 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 016f05cf28ed546199d4aec0683bb4022beb52cc1799162085337fb7b3fd4163
-SIZE (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 14442688
+SHA256 (KDE/4.12.2/kdepim-4.12.2.tar.xz) = 897c13fb65b3a8c182f67d67e0dba2b4e522de44648c3fe554eb380db699afab
+SIZE (KDE/4.12.2/kdepim-4.12.2.tar.xz) = 14133440
diff --git a/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h b/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
new file mode 100644
index 000000000000..3244820bf8bf
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-pimsettingexporter__mail__exportmailjob.h
@@ -0,0 +1,11 @@
+--- 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-plist b/deskutils/kdepim4/pkg-plist
index c4548416a52f..87b3a4d4d89b 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1,9 +1,14 @@
bin/akonadi_archivemail_agent
+bin/akonadi_folderarchive_agent
bin/akonadi_mailfilter_agent
+bin/akonadi_sendlater_agent
bin/akonadiconsole
bin/akregator
bin/akregatorstorageexporter
bin/blogilo
+bin/calendarjanitor
+bin/contactthemeeditor
+bin/headerthemeeditor
bin/ical2vcal
bin/importwizard
bin/kabc2mutt
@@ -32,6 +37,7 @@ bin/ksendemail
bin/ktimetracker
bin/ktnef
bin/kwatchgnupg
+bin/mboximporter
bin/pimsettingexporter
etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
@@ -44,6 +50,7 @@ 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
@@ -60,6 +67,7 @@ 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
@@ -95,109 +103,136 @@ lib/kde4/plasma_applet_akonotes_list.so
lib/kde4/plasma_applet_akonotes_note.so
lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
lib/kde4/plugins/designer/kdepimwidgets.so
+lib/kde4/plugins/designer/mailcommonwidgets.so
+lib/kde4/plugins/designer/pimcommonwidgets.so
+lib/kde4/plugins/grantlee/%%GRANTLEE_VER%%/grantlee_messageheaderfilters.so
lib/libakonadi_next.so
-lib/libakonadi_next.so.5
-lib/libakonadi_next.so.5.0.1
+lib/libakonadi_next.so.4
+lib/libakonadi_next.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakregatorinterfaces.so
-lib/libakregatorinterfaces.so.5
-lib/libakregatorinterfaces.so.5.0.1
-lib/libakregatorprivate.so.5
-lib/libakregatorprivate.so.5.0.1
+lib/libakregatorinterfaces.so.4
+lib/libakregatorinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakregatorprivate.so.4
+lib/libakregatorprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libcalendarsupport.so
-lib/libcalendarsupport.so.5
-lib/libcalendarsupport.so.5.0.1
+lib/libcalendarsupport.so.4
+lib/libcalendarsupport.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libcomposereditorng.so
+lib/libcomposereditorng.so.4
+lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libeventviews.so
-lib/libeventviews.so.5
-lib/libeventviews.so.5.0.1
+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/libgrantleetheme.so
+lib/libgrantleetheme.so.4
+lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrantleethemeeditor.so
+lib/libgrantleethemeeditor.so.4
+lib/libgrantleethemeeditor.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libincidenceeditorsng.so
-lib/libincidenceeditorsng.so.5
-lib/libincidenceeditorsng.so.5.0.1
+lib/libincidenceeditorsng.so.4
+lib/libincidenceeditorsng.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libincidenceeditorsngmobile.so
-lib/libincidenceeditorsngmobile.so.5
-lib/libincidenceeditorsngmobile.so.5.0.1
-lib/libkaddressbookprivate.so.5
-lib/libkaddressbookprivate.so.5.0.1
+lib/libincidenceeditorsngmobile.so.4
+lib/libincidenceeditorsngmobile.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookgrantlee.so.4
+lib/libkaddressbookgrantlee.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookprivate.so.4
+lib/libkaddressbookprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkcal_resourceblog.so
-lib/libkcal_resourceblog.so.5
-lib/libkcal_resourceblog.so.5.0.1
+lib/libkcal_resourceblog.so.4
+lib/libkcal_resourceblog.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkcal_resourceremote.so
-lib/libkcal_resourceremote.so.5
-lib/libkcal_resourceremote.so.5.0.1
+lib/libkcal_resourceremote.so.4
+lib/libkcal_resourceremote.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkdepim.so
-lib/libkdepim.so.5
-lib/libkdepim.so.5.0.1
+lib/libkdepim.so.4
+lib/libkdepim.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkdepimdbusinterfaces.so
-lib/libkdepimdbusinterfaces.so.5
-lib/libkdepimdbusinterfaces.so.5.0.1
+lib/libkdepimdbusinterfaces.so.4
+lib/libkdepimdbusinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkdgantt2.so
lib/libkdgantt2.so.0
lib/libkdgantt2.so.0.1.0
lib/libkleo.so
-lib/libkleo.so.5
-lib/libkleo.so.5.0.1
+lib/libkleo.so.4
+lib/libkleo.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkleopatraclientcore.so
lib/libkleopatraclientcore.so.0
lib/libkleopatraclientcore.so.0.3.0
lib/libkleopatraclientgui.so
lib/libkleopatraclientgui.so.0
lib/libkleopatraclientgui.so.0.3.0
-lib/libkmailprivate.so.5
-lib/libkmailprivate.so.5.0.1
+lib/libkmailprivate.so.4
+lib/libkmailprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkmanagesieve.so
-lib/libkmanagesieve.so.5
-lib/libkmanagesieve.so.5.0.1
+lib/libkmanagesieve.so.4
+lib/libkmanagesieve.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libknodecommon.so
-lib/libknodecommon.so.5
-lib/libknodecommon.so.5.0.1
-lib/libkontactprivate.so.5
-lib/libkontactprivate.so.5.0.1
+lib/libknodecommon.so.4
+lib/libknodecommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknotesprivate.so.4
+lib/libknotesprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkontactprivate.so.4
+lib/libkontactprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkorganizer_core.so
-lib/libkorganizer_core.so.5
-lib/libkorganizer_core.so.5.0.1
+lib/libkorganizer_core.so.4
+lib/libkorganizer_core.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkorganizer_interfaces.so
-lib/libkorganizer_interfaces.so.5
-lib/libkorganizer_interfaces.so.5.0.1
-lib/libkorganizerprivate.so.5
-lib/libkorganizerprivate.so.5.0.1
+lib/libkorganizer_interfaces.so.4
+lib/libkorganizer_interfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkorganizerprivate.so.4
+lib/libkorganizerprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkpgp.so
-lib/libkpgp.so.5
-lib/libkpgp.so.5.0.1
+lib/libkpgp.so.4
+lib/libkpgp.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libksieve.so
-lib/libksieve.so.5
-lib/libksieve.so.5.0.1
+lib/libksieve.so.4
+lib/libksieve.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libksieveui.so
-lib/libksieveui.so.5
-lib/libksieveui.so.5.0.1
+lib/libksieveui.so.4
+lib/libksieveui.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmailcommon.so
-lib/libmailcommon.so.5
-lib/libmailcommon.so.5.0.1
+lib/libmailcommon.so.4
+lib/libmailcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmailimporter.so
-lib/libmailimporter.so.5
-lib/libmailimporter.so.5.0.1
+lib/libmailimporter.so.4
+lib/libmailimporter.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmessagecomposer.so
-lib/libmessagecomposer.so.5
-lib/libmessagecomposer.so.5.0.1
+lib/libmessagecomposer.so.4
+lib/libmessagecomposer.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmessagecore.so
-lib/libmessagecore.so.5
-lib/libmessagecore.so.5.0.1
+lib/libmessagecore.so.4
+lib/libmessagecore.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmessagelist.so
-lib/libmessagelist.so.5
-lib/libmessagelist.so.5.0.1
+lib/libmessagelist.so.4
+lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmessageviewer.so
-lib/libmessageviewer.so.5
-lib/libmessageviewer.so.5.0.1
+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/libpimcommon.so
-lib/libpimcommon.so.5
-lib/libpimcommon.so.5.0.1
+lib/libpimcommon.so.4
+lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libsendlater.so
+lib/libsendlater.so.4
+lib/libsendlater.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libtemplateparser.so
-lib/libtemplateparser.so.5
-lib/libtemplateparser.so.5.0.1
-lib/strigi/strigiea_ctg.so
-lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_mail.so
-lib/strigi/strigiea_vcf.so
+lib/libtemplateparser.so.4
+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/mailfilteragent.desktop
+share/akonadi/agents/sendlateragent.desktop
share/applications/kde4/KMail2.desktop
share/applications/kde4/KNode.desktop
share/applications/kde4/Kjots.desktop
@@ -205,6 +240,8 @@ share/applications/kde4/Kontact.desktop
share/applications/kde4/akonadiconsole.desktop
share/applications/kde4/akregator.desktop
share/applications/kde4/blogilo.desktop
+share/applications/kde4/contactthemeeditor.desktop
+share/applications/kde4/headerthemeeditor.desktop
share/applications/kde4/importwizard.desktop
share/applications/kde4/kaddressbook.desktop
share/applications/kde4/kalarm.desktop
@@ -218,8 +255,11 @@ share/applications/kde4/korganizer-import.desktop
share/applications/kde4/korganizer.desktop
share/applications/kde4/ktimetracker.desktop
share/applications/kde4/ktnef.desktop
+share/applications/kde4/mboximporter.desktop
share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/apps/akonadi_folderarchive_agent/akonadi_folderarchive_agent.notifyrc
share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
share/apps/akonadiconsole/akonadiconsoleui.rc
share/apps/akregator/about/akregator.css
share/apps/akregator/about/main.html
@@ -232,14 +272,20 @@ share/apps/akregator/pageviewer.rc
share/apps/akregator/pics/kmmsgnew.png
share/apps/akregator/pics/kmmsgunseen.png
share/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
-share/apps/blogilo/TextEditorInitialHtml
share/apps/blogilo/blogiloui.rc
+share/apps/composereditor/composereditorinitialhtml
+share/apps/contactthemeeditor/contactthemeeditorui.rc
share/apps/desktoptheme/default/widgets/stickynote.svgz
+share/apps/headerthemeeditor/headerthemeeditorui.rc
share/apps/kaddressbook/kaddressbookui.rc
share/apps/kaddressbook/printing/compact-style.png
share/apps/kaddressbook/printing/detailed-style.png
share/apps/kaddressbook/printing/mike-style.png
share/apps/kaddressbook/printing/ringbinder-style.png
+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/viewertemplates/default/contact.html
share/apps/kaddressbook/viewertemplates/default/contact_embedded.html
share/apps/kaddressbook/viewertemplates/default/contact_row.html
@@ -247,6 +293,7 @@ share/apps/kaddressbook/viewertemplates/default/contactgroup.html
share/apps/kaddressbook/viewertemplates/default/contactgroup_additionalfieldrow.html
share/apps/kaddressbook/viewertemplates/default/contactgroup_embedded.html
share/apps/kaddressbook/viewertemplates/default/contactgroup_memberrow.html
+share/apps/kaddressbook/viewertemplates/default/theme.desktop
share/apps/kalarm/icons/oxygen/16x16/actions/document-new-from-template.png
share/apps/kalarm/icons/oxygen/16x16/actions/new-audio-alarm.png
share/apps/kalarm/icons/oxygen/16x16/actions/new-command-alarm.png
@@ -257,6 +304,7 @@ share/apps/kalarm/icons/oxygen/22x22/actions/kalarm.png
share/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png
share/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png
share/apps/kalarm/kalarmui.rc
+share/apps/kconf_update/grantleetheme.upd
share/apps/kconf_update/kalarm-1.2.1-general.pl
share/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -364,6 +412,11 @@ 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/big-title/theme.desktop
+share/apps/knotes/print/themes/big-title/theme.html
+share/apps/knotes/print/themes/default/theme.desktop
+share/apps/knotes/print/themes/default/theme.html
share/apps/kontact/about/kontact.css
share/apps/kontact/about/main.html
share/apps/kontact/about/top-left-kontact.png
@@ -473,10 +526,18 @@ share/apps/messagelist/pics/mail-thread-watch.png
share/apps/messagelist/pics/mail-vertical-separator-line.png
share/apps/messageviewer/about/main_mobile.html
share/apps/messageviewer/about/messageviewer_mobile.css
+share/apps/messageviewer/longurlServices.json
+share/apps/messageviewer/messageviewer.notifyrc
share/apps/messageviewer/plugins/bodypartformatter/application_ms-tnef.desktop
share/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
share/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
share/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
+share/apps/messageviewer/themes/example/header.desktop
+share/apps/messageviewer/themes/example/header.html
+share/apps/messageviewer/themes/example/header_row.html
+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/autostart/kalarm.autostart.desktop
share/autostart/korgac.desktop
@@ -491,10 +552,13 @@ share/config.kcfg/knotesglobalconfig.kcfg
share/config.kcfg/kontact.kcfg
share/config.kcfg/korganizer.kcfg
share/config.kcfg/templatesconfiguration_kfg.kcfg
+share/config/kaddressbook_themes.knsrc
share/config/kmail.antispamrc
share/config/kmail.antivirusrc
share/config/korganizer.knsrc
+share/config/ksieve_script.knsrc
share/config/libkleopatrarc
+share/config/messageviewer_header_themes.knsrc
share/dbus-1/interfaces/org.kde.KNotes.xml
share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
share/dbus-1/interfaces/org.kde.addressbook.service.xml
@@ -509,6 +573,20 @@ share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
share/dbus-1/interfaces/org.kde.mailtransport.service.xml
share/dbus-1/system-services/org.kde.kalarmrtcwake.service
+share/doc/HTML/en/akonadi_archivemail_agent/add-archive-mail.png
+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_sendlater_agent/common
+share/doc/HTML/en/akonadi_sendlater_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_sendlater_agent/index.docbook
+share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-configure.png
+share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-dialog.png
share/doc/HTML/en/akregator/add-feed.png
share/doc/HTML/en/akregator/add-feed2.png
share/doc/HTML/en/akregator/add-folder.png
@@ -518,6 +596,7 @@ share/doc/HTML/en/akregator/appearance-tab.png
share/doc/HTML/en/akregator/archive-tab.png
share/doc/HTML/en/akregator/browser-tab.png
share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/feed.png
share/doc/HTML/en/akregator/general-tab.png
share/doc/HTML/en/akregator/index.cache.bz2
share/doc/HTML/en/akregator/index.docbook
@@ -529,7 +608,7 @@ share/doc/HTML/en/akregator/main-window3.png
share/doc/HTML/en/akregator/main-window4.png
share/doc/HTML/en/akregator/quick-filter.png
share/doc/HTML/en/akregator/rss.png
-share/doc/HTML/en/akregator/rss3.png
+share/doc/HTML/en/akregator/share-services-tab.png
share/doc/HTML/en/blogilo/add-blog-1.png
share/doc/HTML/en/blogilo/add-blog-2.png
share/doc/HTML/en/blogilo/common
@@ -541,6 +620,13 @@ 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/headerthemeeditor/common
+share/doc/HTML/en/headerthemeeditor/index.cache.bz2
+share/doc/HTML/en/headerthemeeditor/index.docbook
+share/doc/HTML/en/importwizard/common
+share/doc/HTML/en/importwizard/import-selection.png
+share/doc/HTML/en/importwizard/index.cache.bz2
+share/doc/HTML/en/importwizard/index.docbook
share/doc/HTML/en/kabcclient/common
share/doc/HTML/en/kabcclient/index.cache.bz2
share/doc/HTML/en/kabcclient/index.docbook
@@ -560,21 +646,47 @@ share/doc/HTML/en/kioslave/news/index.docbook
share/doc/HTML/en/kjots/common
share/doc/HTML/en/kjots/index.cache.bz2
share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/kjots/mainwindow.png
share/doc/HTML/en/kleopatra/common
share/doc/HTML/en/kleopatra/index.cache.bz2
share/doc/HTML/en/kleopatra/index.docbook
+share/doc/HTML/en/kmail/accountwizard.png
+share/doc/HTML/en/kmail/aggregationtheme.png
share/doc/HTML/en/kmail/common
share/doc/HTML/en/kmail/configure.docbook
+share/doc/HTML/en/kmail/configure.png
share/doc/HTML/en/kmail/credits-and-licenses.docbook
share/doc/HTML/en/kmail/faq.docbook
+share/doc/HTML/en/kmail/folder-example.png
+share/doc/HTML/en/kmail/folder-properties.png
share/doc/HTML/en/kmail/getting-started.docbook
-share/doc/HTML/en/kmail/importing.docbook
+share/doc/HTML/en/kmail/identitiesadvanced.png
+share/doc/HTML/en/kmail/identity.png
+share/doc/HTML/en/kmail/identitycryptography.png
+share/doc/HTML/en/kmail/identitygeneral.png
+share/doc/HTML/en/kmail/identitypicture.png
+share/doc/HTML/en/kmail/identitysignature.png
+share/doc/HTML/en/kmail/identitytemplate.png
share/doc/HTML/en/kmail/index.cache.bz2
share/doc/HTML/en/kmail/index.docbook
share/doc/HTML/en/kmail/intro.docbook
+share/doc/HTML/en/kmail/kmailwelcome.png
+share/doc/HTML/en/kmail/mail-mark-important.png
+share/doc/HTML/en/kmail/mail-mark-read.png
+share/doc/HTML/en/kmail/mail-mark-task.png
+share/doc/HTML/en/kmail/mail-mark-unread.png
+share/doc/HTML/en/kmail/mail-thread-ignored.png
+share/doc/HTML/en/kmail/mail-thread-watch.png
share/doc/HTML/en/kmail/menus.docbook
+share/doc/HTML/en/kmail/message.png
+share/doc/HTML/en/kmail/messagelisttheme.png
+share/doc/HTML/en/kmail/smile.png
share/doc/HTML/en/kmail/troubleshooting.docbook
share/doc/HTML/en/kmail/using-kmail.docbook
+share/doc/HTML/en/kmailcvt/common
+share/doc/HTML/en/kmailcvt/index.cache.bz2
+share/doc/HTML/en/kmailcvt/index.docbook
+share/doc/HTML/en/kmailcvt/kmailcvt.png
share/doc/HTML/en/knode/commands.docbook
share/doc/HTML/en/knode/common
share/doc/HTML/en/knode/credits.docbook
@@ -702,14 +814,21 @@ share/doc/HTML/en/ktimetracker/systray.png
share/doc/HTML/en/ktnef/common
share/doc/HTML/en/ktnef/index.cache.bz2
share/doc/HTML/en/ktnef/index.docbook
+share/doc/HTML/en/ktnef/mainwindow.png
+share/doc/HTML/en/ktnef/winmail_dat.png
share/doc/HTML/en/kwatchgnupg/common
share/doc/HTML/en/kwatchgnupg/index.cache.bz2
share/doc/HTML/en/kwatchgnupg/index.docbook
+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/icons/hicolor/128x128/actions/upload-media.png
share/icons/hicolor/128x128/apps/akonadiconsole.png
share/icons/hicolor/128x128/apps/akregator.png
share/icons/hicolor/128x128/apps/blogilo.png
share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/kalarm.png
share/icons/hicolor/128x128/apps/kjots.png
share/icons/hicolor/128x128/apps/kleopatra.png
share/icons/hicolor/128x128/apps/kmail.png
@@ -725,6 +844,10 @@ share/icons/hicolor/128x128/apps/ktimetracker.png
share/icons/hicolor/16x16/actions/format-text-blockquote.png
share/icons/hicolor/16x16/actions/format-text-code.png
share/icons/hicolor/16x16/actions/insert-more-mark.png
+share/icons/hicolor/16x16/actions/knotes_alarm.png
+share/icons/hicolor/16x16/actions/knotes_close.png
+share/icons/hicolor/16x16/actions/knotes_date.png
+share/icons/hicolor/16x16/actions/knotes_delete.png
share/icons/hicolor/16x16/actions/remove-link.png
share/icons/hicolor/16x16/actions/upload-media.png
share/icons/hicolor/16x16/apps/akonadiconsole.png
@@ -736,6 +859,7 @@ share/icons/hicolor/16x16/apps/kalarm.png
share/icons/hicolor/16x16/apps/kjots.png
share/icons/hicolor/16x16/apps/kleopatra.png
share/icons/hicolor/16x16/apps/kmail.png
+share/icons/hicolor/16x16/apps/kmailcvt.png
share/icons/hicolor/16x16/apps/knode.png
share/icons/hicolor/16x16/apps/knotes.png
share/icons/hicolor/16x16/apps/konsolekalendar.png
@@ -755,6 +879,7 @@ share/icons/hicolor/22x22/apps/akonadiconsole.png
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/kjots.png
share/icons/hicolor/22x22/apps/kleopatra.png
share/icons/hicolor/22x22/apps/kmail.png
@@ -779,6 +904,7 @@ share/icons/hicolor/32x32/apps/kalarm.png
share/icons/hicolor/32x32/apps/kjots.png
share/icons/hicolor/32x32/apps/kleopatra.png
share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/kmailcvt.png
share/icons/hicolor/32x32/apps/knode.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/konsolekalendar.png
@@ -796,6 +922,7 @@ share/icons/hicolor/48x48/apps/kalarm.png
share/icons/hicolor/48x48/apps/kjots.png
share/icons/hicolor/48x48/apps/kleopatra.png
share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/kmailcvt.png
share/icons/hicolor/48x48/apps/knode.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/konsolekalendar.png
@@ -810,6 +937,7 @@ share/icons/hicolor/64x64/apps/akonadiconsole.png
share/icons/hicolor/64x64/apps/akregator.png
share/icons/hicolor/64x64/apps/blogilo.png
share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/kalarm.png
share/icons/hicolor/64x64/apps/kjots.png
share/icons/hicolor/64x64/apps/kleopatra.png
share/icons/hicolor/64x64/apps/kmail.png
@@ -823,6 +951,7 @@ share/icons/hicolor/64x64/apps/korganizer.png
share/icons/hicolor/64x64/apps/ktimetracker.png
share/icons/hicolor/scalable/apps/akregator.svgz
share/icons/hicolor/scalable/apps/kaddressbook.svgz
+share/icons/hicolor/scalable/apps/kalarm.svgz
share/icons/hicolor/scalable/apps/kjots.svgz
share/icons/hicolor/scalable/apps/kleopatra.svgz
share/icons/hicolor/scalable/apps/kmail.svgz
@@ -837,35 +966,21 @@ share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
share/icons/locolor/16x16/actions/ktnef_extract_to.png
share/icons/locolor/16x16/apps/ktnef.png
share/icons/locolor/32x32/apps/ktnef.png
-share/icons/oxygen/128x128/apps/kalarm.png
share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/16x16/actions/edit-delete-page.png
-share/icons/oxygen/16x16/actions/knotes_alarm.png
-share/icons/oxygen/16x16/actions/knotes_close.png
-share/icons/oxygen/16x16/actions/knotes_date.png
-share/icons/oxygen/16x16/actions/knotes_delete.png
share/icons/oxygen/16x16/actions/smallclock.png
share/icons/oxygen/16x16/actions/upindicator.png
-share/icons/oxygen/16x16/apps/kalarm.png
-share/icons/oxygen/16x16/apps/kmailcvt.png
share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/22x22/actions/checkmark.png
share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/apps/kalarm.png
share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/256x256/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/apps/kalarm.png
-share/icons/oxygen/32x32/apps/kmailcvt.png
share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/apps/kalarm.png
-share/icons/oxygen/48x48/apps/kmailcvt.png
share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/512x512/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/64x64/apps/kalarm.png
share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-share/icons/oxygen/scalable/apps/kalarm.svgz
share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
share/kde4/services/ServiceMenus/kmail_addattachmentservicemenu.desktop
share/kde4/services/akonotes_list.desktop
@@ -880,12 +995,14 @@ 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/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
@@ -916,7 +1033,7 @@ share/kde4/services/knote_config_action.desktop
share/kde4/services/knote_config_display.desktop
share/kde4/services/knote_config_editor.desktop
share/kde4/services/knote_config_network.desktop
-share/kde4/services/knote_config_style.desktop
+share/kde4/services/knote_config_print.desktop
share/kde4/services/kontact/akregatorplugin.desktop
share/kde4/services/kontact/journalplugin.desktop
share/kde4/services/kontact/kaddressbookplugin.desktop
@@ -976,6 +1093,7 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@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
@@ -985,15 +1103,24 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@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
@@ -1048,6 +1175,10 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@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
@@ -1076,17 +1207,24 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@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/apps/akonadi/contact
@dirrmtry share/akonadi/agents
@dirrmtry share/akonadi
@dirrmtry lib/kde4/plugins/accessible
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 46bd6f0c4dcd..4817acc4ee35 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,10 +3,8 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 3
-CATEGORIES= deskutils kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= deskutils kde
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
@@ -31,7 +29,6 @@ USE_QT4= corelib dbus declarative designer_build gui network sql xml \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
-NO_STAGE= yes
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${PATCH_WRKSRC}/cmake/modules/*.cmake
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 7458b3d25173..577453fadfd1 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06
-SIZE (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = 2986664
+SHA256 (KDE/4.12.2/kdepimlibs-4.12.2.tar.xz) = e475a40f8e00ce57d7acead85a4e33040cc50dc43962c7ae1b030ddbc4ae47e2
+SIZE (KDE/4.12.2/kdepimlibs-4.12.2.tar.xz) = 2760192
diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
index 989288c8810a..949598b57654 100644
--- a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@@ -1,6 +1,6 @@
---- ./cmake/modules/FindLibical.cmake.orgi 2009-02-27 17:59:51.000000000 +0100
-+++ ./cmake/modules/FindLibical.cmake 2009-02-27 18:00:20.000000000 +0100
-@@ -52,7 +52,7 @@
+--- cmake/modules/FindLibical.cmake.orig 2013-08-10 13:38:51.103327753 +0000
++++ cmake/modules/FindLibical.cmake 2013-08-10 13:40:47.134325441 +0000
+@@ -49,7 +49,7 @@
if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
set(FIND_LIBICAL_VERSION_SOURCE
diff --git a/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake b/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
deleted file mode 100644
index 84c7422c0c52..000000000000
--- a/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./kcalcore/ConfigureChecks.cmake.orig 2010-12-03 15:38:57.478419881 +1000
-+++ ./kcalcore/ConfigureChecks.cmake 2010-12-03 15:59:50.369411055 +1000
-@@ -2,6 +2,11 @@
- include(CheckLibraryExists)
-
- check_include_files(uuid/uuid.h HAVE_UUID_UUID_H)
--check_library_exists(uuid uuid_generate_random "" HAVE_UUID_LIBRARY)
-+find_library(UUID_LIBRARY uuid)
-+set(UUID_LIBRARY_DIR "")
-+if(UUID_LIBRARY)
-+ get_filename_component(UUID_LIBRARY_DIR ${UUID_LIBRARY} PATH)
-+endif(UUID_LIBRARY)
-+check_library_exists(uuid uuid_generate_random "${UUID_LIBRARY_DIR}" HAVE_UUID_LIBRARY)
-
-
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index 72ad12ed78b3..4ca539bda5a1 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -1,3 +1,4 @@
+bin/akonadi2xml
include/KDE/Akonadi/AgentBase
include/KDE/Akonadi/AgentFactory
include/KDE/Akonadi/AgentFilterProxyModel
@@ -13,8 +14,21 @@ include/KDE/Akonadi/AgentTypeWidget
include/KDE/Akonadi/Attribute
include/KDE/Akonadi/AttributeFactory
include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/BlockAlarmsAttribute
+include/KDE/Akonadi/Calendar/CalendarBase
+include/KDE/Akonadi/Calendar/CalendarClipboard
+include/KDE/Akonadi/Calendar/CalendarSettings
+include/KDE/Akonadi/Calendar/ETMCalendar
+include/KDE/Akonadi/Calendar/FetchJobCalendar
+include/KDE/Akonadi/Calendar/FreeBusyManager
include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/History
+include/KDE/Akonadi/Calendar/ICalImporter
+include/KDE/Akonadi/Calendar/ITIPHandler
+include/KDE/Akonadi/Calendar/IncidenceChanger
+include/KDE/Akonadi/Calendar/PublishDialog
include/KDE/Akonadi/Calendar/StandardCalendarActionManager
+include/KDE/Akonadi/Calendar/TodoPurger
include/KDE/Akonadi/ChangeRecorder
include/KDE/Akonadi/Collection
include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@@ -100,10 +114,12 @@ include/KDE/Akonadi/KMime/MessageThreaderProxyModel
include/KDE/Akonadi/KMime/MessageThreadingAttribute
include/KDE/Akonadi/KMime/RemoveDuplicatesJob
include/KDE/Akonadi/KMime/SpecialMailCollections
+include/KDE/Akonadi/KMime/SpecialMailCollectionsDiscoveryJob
include/KDE/Akonadi/KMime/SpecialMailCollectionsRequestJob
include/KDE/Akonadi/LinkJob
include/KDE/Akonadi/MimeTypeChecker
include/KDE/Akonadi/Monitor
+include/KDE/Akonadi/Notes/NoteUtils
include/KDE/Akonadi/PreprocessorBase
include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
include/KDE/Akonadi/RecursiveItemFetchJob
@@ -249,6 +265,7 @@ include/KDE/KCalCore/Incidence
include/KDE/KCalCore/IncidenceBase
include/KDE/KCalCore/Journal
include/KDE/KCalCore/MemoryCalendar
+include/KDE/KCalCore/OccurrenceIterator
include/KDE/KCalCore/Period
include/KDE/KCalCore/Person
include/KDE/KCalCore/Recurrence
@@ -351,11 +368,15 @@ include/KDE/KPIMTextEdit/InsertImageDialog
include/KDE/KPIMTextEdit/InsertImageWidget
include/KDE/KPIMTextEdit/InsertTableDialog
include/KDE/KPIMTextEdit/InsertTableWidget
+include/KDE/KPIMTextEdit/SelectSpecialChar
+include/KDE/KPIMTextEdit/TableCellFormatDialog
include/KDE/KPIMTextEdit/TableFormatDialog
include/KDE/KPIMTextEdit/TextEdit
include/KDE/KPIMUtils/Email
include/KDE/KPIMUtils/KFileIO
include/KDE/KPIMUtils/LinkLocator
+include/KDE/KPIMUtils/ProgressIndicatorLabel
+include/KDE/KPIMUtils/ProgressIndicatorWidget
include/KDE/KPIMUtils/SpellingFilter
include/KDE/KResources/ConfigDialog
include/KDE/KResources/ConfigPage
@@ -440,8 +461,21 @@ include/akonadi/attributefactory.h
include/akonadi/cachepolicy.h
include/akonadi/cachepolicypage.h
include/akonadi/calendar/akonadi-calendar_export.h
+include/akonadi/calendar/blockalarmsattribute.h
+include/akonadi/calendar/calendarbase.h
+include/akonadi/calendar/calendarclipboard.h
+include/akonadi/calendar/calendarsettings.h
+include/akonadi/calendar/etmcalendar.h
+include/akonadi/calendar/fetchjobcalendar.h
+include/akonadi/calendar/freebusymanager.h
include/akonadi/calendar/freebusyproviderbase.h
+include/akonadi/calendar/history.h
+include/akonadi/calendar/icalimporter.h
+include/akonadi/calendar/incidencechanger.h
+include/akonadi/calendar/itiphandler.h
+include/akonadi/calendar/publishdialog.h
include/akonadi/calendar/standardcalendaractionmanager.h
+include/akonadi/calendar/todopurger.h
include/akonadi/changerecorder.h
include/akonadi/collection.h
include/akonadi/collectionattributessynchronizationjob.h
@@ -456,6 +490,7 @@ include/akonadi/collectionfilterproxymodel.h
include/akonadi/collectionmodel.h
include/akonadi/collectionmodifyjob.h
include/akonadi/collectionmovejob.h
+include/akonadi/collectionpathresolver_p.h
include/akonadi/collectionpropertiesdialog.h
include/akonadi/collectionpropertiespage.h
include/akonadi/collectionquotaattribute.h
@@ -487,6 +522,7 @@ include/akonadi/contact/contactviewerdialog.h
include/akonadi/contact/emailaddressselection.h
include/akonadi/contact/emailaddressselectiondialog.h
include/akonadi/contact/emailaddressselectionwidget.h
+include/akonadi/contact/improtocols.h
include/akonadi/contact/recentcontactscollectionrequestjob.h
include/akonadi/contact/standardcontactactionmanager.h
include/akonadi/contact/standardcontactformatter.h
@@ -508,6 +544,7 @@ include/akonadi/entitytreeviewstatesaver.h
include/akonadi/etmviewstatesaver.h
include/akonadi/exception.h
include/akonadi/favoritecollectionsmodel.h
+include/akonadi/gidextractorinterface.h
include/akonadi/indexpolicyattribute.h
include/akonadi/item.h
include/akonadi/itemcopyjob.h
@@ -541,6 +578,7 @@ include/akonadi/kmime/messagethreaderproxymodel.h
include/akonadi/kmime/messagethreadingattribute.h
include/akonadi/kmime/removeduplicatesjob.h
include/akonadi/kmime/specialmailcollections.h
+include/akonadi/kmime/specialmailcollectionsdiscoveryjob.h
include/akonadi/kmime/specialmailcollectionsrequestjob.h
include/akonadi/kmime/standardmailactionmanager.h
include/akonadi/linkjob.h
@@ -568,6 +606,7 @@ include/akonadi/socialutils/libakonadisocialutils_export.h
include/akonadi/socialutils/socialfeeditem.h
include/akonadi/socialutils/socialnetworkattributes.h
include/akonadi/specialcollections.h
+include/akonadi/specialcollectionsdiscoveryjob.h
include/akonadi/specialcollectionsrequestjob.h
include/akonadi/standardactionmanager.h
include/akonadi/statisticsproxymodel.h
@@ -579,6 +618,11 @@ include/akonadi/trashjob.h
include/akonadi/trashrestorejob.h
include/akonadi/trashsettings.h
include/akonadi/unlinkjob.h
+include/akonadi/xml/akonadi-xml_export.h
+include/akonadi/xml/xmldocument.h
+include/akonadi/xml/xmlreader.h
+include/akonadi/xml/xmlwritejob.h
+include/akonadi/xml/xmlwriter.h
include/gpgme++/assuanresult.h
include/gpgme++/configuration.h
include/gpgme++/context.h
@@ -753,6 +797,7 @@ include/kcalcore/incidencebase.h
include/kcalcore/journal.h
include/kcalcore/kcalcore_export.h
include/kcalcore/memorycalendar.h
+include/kcalcore/occurrenceiterator.h
include/kcalcore/period.h
include/kcalcore/person.h
include/kcalcore/recurrence.h
@@ -873,6 +918,8 @@ include/kpimtextedit/insertimagedialog.h
include/kpimtextedit/insertimagewidget.h
include/kpimtextedit/inserttabledialog.h
include/kpimtextedit/kpimtextedit_export.h
+include/kpimtextedit/selectspecialchar.h
+include/kpimtextedit/tablecellformatdialog.h
include/kpimtextedit/tableformatdialog.h
include/kpimtextedit/textedit.h
include/kpimtextedit/textutils.h
@@ -883,6 +930,8 @@ include/kpimutils/kpimutils_export.h
include/kpimutils/linklocator.h
include/kpimutils/networkaccesshelper.h
include/kpimutils/processes.h
+include/kpimutils/progressindicatorlabel.h
+include/kpimutils/progressindicatorwidget.h
include/kpimutils/spellingfilter.h
include/kpimutils/supertrait.h
include/kresources/configdialog.h
@@ -890,6 +939,7 @@ include/kresources/configpage.h
include/kresources/configwidget.h
include/kresources/factory.h
include/kresources/idmapper.h
+include/kresources/kcmkresources_export.h
include/kresources/kresources_export.h
include/kresources/manager.h
include/kresources/managerimpl.h
@@ -1022,31 +1072,35 @@ lib/kde4/kio_nntp.so
lib/kde4/kio_pop3.so
lib/kde4/kio_sieve.so
lib/kde4/kio_smtp.so
+lib/kde4/plugins/designer/akonadiwidgets.so
lib/kde4/plugins/designer/kholidayswidgets.so
lib/libakonadi-calendar.so
-lib/libakonadi-calendar.so.5
-lib/libakonadi-calendar.so.5.0.1
+lib/libakonadi-calendar.so.4
+lib/libakonadi-calendar.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-contact.so
-lib/libakonadi-contact.so.5
-lib/libakonadi-contact.so.5.0.1
+lib/libakonadi-contact.so.4
+lib/libakonadi-contact.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-kabc.so
-lib/libakonadi-kabc.so.5
-lib/libakonadi-kabc.so.5.0.1
+lib/libakonadi-kabc.so.4
+lib/libakonadi-kabc.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-kcal.so
-lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.1
+lib/libakonadi-kcal.so.4
+lib/libakonadi-kcal.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-kde.so
-lib/libakonadi-kde.so.5
-lib/libakonadi-kde.so.5.0.1
+lib/libakonadi-kde.so.4
+lib/libakonadi-kde.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-kmime.so
-lib/libakonadi-kmime.so.5
-lib/libakonadi-kmime.so.5.0.1
+lib/libakonadi-kmime.so.4
+lib/libakonadi-kmime.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-notes.so
-lib/libakonadi-notes.so.5
-lib/libakonadi-notes.so.5.0.1
+lib/libakonadi-notes.so.4
+lib/libakonadi-notes.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libakonadi-socialutils.so
-lib/libakonadi-socialutils.so.5
-lib/libakonadi-socialutils.so.5.0.1
+lib/libakonadi-socialutils.so.4
+lib/libakonadi-socialutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-xml.so
+lib/libakonadi-xml.so.4
+lib/libakonadi-xml.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libgpgme++-pthread.so
lib/libgpgme++-pthread.so.2
lib/libgpgme++-pthread.so.2.8.0
@@ -1054,75 +1108,76 @@ lib/libgpgme++.so
lib/libgpgme++.so.2
lib/libgpgme++.so.2.8.0
lib/libkabc.so
-lib/libkabc.so.5
-lib/libkabc.so.5.0.1
+lib/libkabc.so.4
+lib/libkabc.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkabc_file_core.so
-lib/libkabc_file_core.so.5
-lib/libkabc_file_core.so.5.0.1
+lib/libkabc_file_core.so.4
+lib/libkabc_file_core.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkalarmcal.so
lib/libkalarmcal.so.2
lib/libkalarmcal.so.2.7.0
lib/libkblog.so
-lib/libkblog.so.5
-lib/libkblog.so.5.0.1
+lib/libkblog.so.4
+lib/libkblog.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkcal.so
-lib/libkcal.so.5
-lib/libkcal.so.5.0.1
+lib/libkcal.so.4
+lib/libkcal.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkcalcore.so
-lib/libkcalcore.so.5
-lib/libkcalcore.so.5.0.1
+lib/libkcalcore.so.4
+lib/libkcalcore.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkcalutils.so
-lib/libkcalutils.so.5
-lib/libkcalutils.so.5.0.1
+lib/libkcalutils.so.4
+lib/libkcalutils.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkholidays.so
-lib/libkholidays.so.5
-lib/libkholidays.so.5.0.1
+lib/libkholidays.so.4
+lib/libkholidays.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkimap.so
-lib/libkimap.so.5
-lib/libkimap.so.5.0.1
+lib/libkimap.so.4
+lib/libkimap.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkldap.so
-lib/libkldap.so.5
-lib/libkldap.so.5.0.1
+lib/libkldap.so.4
+lib/libkldap.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkmbox.so
-lib/libkmbox.so.5
-lib/libkmbox.so.5.0.1
+lib/libkmbox.so.4
+lib/libkmbox.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkmime.so
-lib/libkmime.so.5
-lib/libkmime.so.5.0.1
+lib/libkmime.so.4
+lib/libkmime.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkontactinterface.so
-lib/libkontactinterface.so.5
-lib/libkontactinterface.so.5.0.1
+lib/libkontactinterface.so.4
+lib/libkontactinterface.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkpimidentities.so
-lib/libkpimidentities.so.5
-lib/libkpimidentities.so.5.0.1
+lib/libkpimidentities.so.4
+lib/libkpimidentities.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkpimtextedit.so
-lib/libkpimtextedit.so.5
-lib/libkpimtextedit.so.5.0.1
+lib/libkpimtextedit.so.4
+lib/libkpimtextedit.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkpimutils.so
-lib/libkpimutils.so.5
-lib/libkpimutils.so.5.0.1
+lib/libkpimutils.so.4
+lib/libkpimutils.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkresources.so
-lib/libkresources.so.5
-lib/libkresources.so.5.0.1
+lib/libkresources.so.4
+lib/libkresources.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libktnef.so
-lib/libktnef.so.5
-lib/libktnef.so.5.0.1
+lib/libktnef.so.4
+lib/libktnef.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libkxmlrpcclient.so
-lib/libkxmlrpcclient.so.5
-lib/libkxmlrpcclient.so.5.0.1
+lib/libkxmlrpcclient.so.4
+lib/libkxmlrpcclient.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmailtransport.so
-lib/libmailtransport.so.5
-lib/libmailtransport.so.5.0.1
+lib/libmailtransport.so.4
+lib/libmailtransport.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libmicroblog.so
-lib/libmicroblog.so.5
-lib/libmicroblog.so.5.0.1
+lib/libmicroblog.so.4
+lib/libmicroblog.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libqgpgme.so
lib/libqgpgme.so.1
lib/libqgpgme.so.1.0.1
lib/libsyndication.so
-lib/libsyndication.so.5
-lib/libsyndication.so.5.0.1
+lib/libsyndication.so.4
+lib/libsyndication.so.%%KDE4_GENERIC_LIB_VERSION%%
share/apps/akonadi-kde/kcfg2dbus.xsl
+share/apps/akonadi/akonadi-xml.xsd
share/apps/akonadi/contact/data/zone.tab
share/apps/akonadi/contact/icons/oxygen/16x16/apps/aim_protocol.png
share/apps/akonadi/contact/icons/oxygen/16x16/apps/gadu_protocol.png
@@ -1137,6 +1192,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/cmake/modules/AkonadiMacros.cmake
share/apps/cmake/modules/CheckTimezone.cmake
share/apps/cmake/modules/FindGpgme.cmake
share/apps/cmake/modules/FindLdap.cmake
@@ -1158,6 +1214,10 @@ share/apps/libkholidays/plan2/holiday_au-sa_en-gb
share/apps/libkholidays/plan2/holiday_au-tas_en-gb
share/apps/libkholidays/plan2/holiday_au-vic_en-gb
share/apps/libkholidays/plan2/holiday_au-wa_en-gb
+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_be_fr
share/apps/libkholidays/plan2/holiday_be_nl
share/apps/libkholidays/plan2/holiday_be_wa
@@ -1239,6 +1299,9 @@ share/apps/libkholidays/plan2/holiday_py_es
share/apps/libkholidays/plan2/holiday_re_fr
share/apps/libkholidays/plan2/holiday_ro_ro
share/apps/libkholidays/plan2/holiday_rs_sr
+share/apps/libkholidays/plan2/holiday_rs_sr@ijekavian
+share/apps/libkholidays/plan2/holiday_rs_sr@ijekavianlatin
+share/apps/libkholidays/plan2/holiday_rs_sr@latin
share/apps/libkholidays/plan2/holiday_ru_ru
share/apps/libkholidays/plan2/holiday_se_sv
share/apps/libkholidays/plan2/holiday_sg_en-gb
@@ -1322,10 +1385,8 @@ share/kde4/servicetypes/kaddressbookimprotocol.desktop
share/kde4/servicetypes/kontactplugin.desktop
share/kde4/servicetypes/kresources_manager.desktop
share/kde4/servicetypes/kresources_plugin.desktop
-share/mime/application/x-vnd.kde.contactgroup.xml
share/mime/packages/kdepimlibs-mime.xml
share/mime/packages/x-vnd.akonadi.socialfeeditem.xml
-share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@dirrm share/kde4/services/akonadi/contact
@dirrmtry share/kde4/services/akonadi
@dirrm share/doc/HTML/en/kioslave/smtp
@@ -1379,6 +1440,7 @@ share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@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
@@ -1407,6 +1469,7 @@ share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@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
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 168103c9bc5a..036c55b37660 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -2,10 +2,8 @@
PORTNAME= kdeplasma-addons
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= deskutils kde ipv6
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES= deskutils kde
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
@@ -16,7 +14,6 @@ LIB_DEPENDS= libqalculate.so:${PORTSDIR}/math/libqalculate \
libqca.so:${PORTSDIR}/devel/qca \
libqoauth.so:${PORTSDIR}/net/qoauth \
libqjson.so:${PORTSDIR}/devel/qjson
-
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].*
@@ -30,45 +27,24 @@ USE_QT4= corelib dbus declarative gui network script sql webkit \
USE_XORG= x11 xrender xtst
USE_LDCONFIG= yes
-OPTIONS_DEFINE= MARBLE SCIM # IBUS
+OPTIONS_DEFINE= MARBLE SCIM IBUS
OPTIONS_DEFAULT= MARBLE
+OPTIONS_SUB= yes
MARBLE_DESC= Support for desktop globe wallpaper
-IBUS_DESC= Enable IBUS backend for input dialog
-SCIM_DESC= Enable SCIM backend for input dialog
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+MARBLE_USE= KDE4=marble
+MARBLE_CMAKE_OFF= -DWITH_Marble=off
-.if ${PORT_OPTIONS:MMARBLE}
-USE_KDE4+= marble
-PLIST_SUB+= MARBLE=""
-.else
-CMAKE_ARGS+= -DWITH_Marble:BOOL=FALSE
-PLIST_SUB+= MARBLE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIBUS}
-IGNORE= requires ibus version 1.4.2 or greater
-LIB_DEPENDS+= libibus-1.0.so:${PORTSDIR}/textproc/ibus
-PLIST_SUB+= IBUS=""
-.else
-CMAKE_ARGS+= -DBUILD_ibus=off
-PLIST_SUB+= IBUS="@comment "
-.endif
+IBUS_DESC= Enable IBUS backend for input dialog
+IBUS_LIB_DEPENDS= libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_CMAKE_OFF= -DBUILD_ibus=off
-.if ${PORT_OPTIONS:MSCIM}
-LIB_DEPENDS+= libscim-1.0.so:${PORTSDIR}/textproc/scim
-PLIST_SUB+= SCIM=""
-.else
-CMAKE_ARGS+= -DBUILD_scim=off
-PLIST_SUB+= SCIM="@comment "
-.endif
+SCIM_DESC= Enable SCIM backend for input dialog
+SCIM_LIB_DEPENDS= libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_CMAKE_OFF= -DBUILD_scim=off
post-patch:
- ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
- ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
- # Respect prefix, don't update MIME when installing.
+# Respect prefix, don't update MIME when installing.
${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
${WRKSRC}/applets/lancelot/parts/CMakeLists.txt
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 11397f633d3c..979ca0e024de 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = f76fac6b5c2c67c63efc9eea58b829f07f998405ab5e74f4a489b2475e5d4943
-SIZE (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = 1791872
+SHA256 (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1d547d1a203f3e025241e1a57b2cf0a2239b2ed08ffb72700c1b28d0ce86dab8
+SIZE (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1758332
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
index 230221c017d4..8d8f6daf183c 100644
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- ./CMakeLists.txt.orig 2011-05-21 07:37:49.000000000 +1100
-+++ ./CMakeLists.txt 2011-08-15 14:56:28.177306481 +1100
+--- CMakeLists.txt.orig 2013-08-14 12:32:08.088461763 +0000
++++ CMakeLists.txt 2013-08-14 12:33:12.856460461 +0000
@@ -36,17 +36,21 @@
endif (DEPEND_PACKAGE_Marble)
macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
diff --git a/deskutils/kdeplasma-addons/files/qt3to4headers.txt b/deskutils/kdeplasma-addons/files/qt3to4headers.txt
deleted file mode 100644
index 75f06c344ce0..000000000000
--- a/deskutils/kdeplasma-addons/files/qt3to4headers.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-s/<q3dragobject.h>/<Q3DragObject>/g
-s/<q3frame.h>/<Q3Frame>/g
-s/<q3groupbox.h>/<Q3GroupBox>/g
-s/<q3hgroupbox.h>/<Q3HGroupBox>/g
-s/<q3listview.h>/<Q3ListView>/g
-s/<q3popupmenu.h>/<Q3PopupMenu>/g
-s/<q3process.h>/<Q3Process>/g
-s/<q3progressdialog.h>/<Q3ProgressDialog>/g
-s/<q3strlist.h>/<Q3StrList>/g
-s/<q3textview.h>/<Q3TextView>/g
-s/<q3vbox.h>/<Q3VBox>/g
-s/<q3vgroupbox.h>/<Q3VGroupBox>/g
-s/<qapplication.h>/<QApplication>/g
-s/<qbuttongroup.h>/<QButtonGroup>/g
-s/<qcheckbox.h>/<QCheckBox>/g
-s/<qcolor.h>/<QColor>/g
-s/<qcombobox.h>/<QComboBox>/g
-s/<qcursor.h>/<QCursor>/g
-s/<qdesktopwidget.h>/<QDesktopWidget>/g
-s/<qdir.h>/<QDir>/g
-s/<qevent.h>/<QEvent>/g
-s/<qfile.h>/<QFile>/g
-s/<qfileinfo.h>/<QFileInfo>/g
-s/<qfont.h>/<QFont>/g
-s/<qfontmetrics.h>/<QFontMetrics>/g
-s/<qgroupbox.h>/<QGroupBox>/g
-s/<qimage.h>/<QImage>/g
-s/<qlabel.h>/<QLabel>/g
-s/<qlayout.h>/<QLayout>/g
-s/<qlineedit.h>/<QLineEdit>/g
-s/<qmatrix.h>/<QMatrix>/g
-s/<qobject.h>/<QObject>/g
-s/<qpainter.h>/<QPainter>/g
-s/<qpalette.h>/<QPalette>/g
-s/<qpixmap.h>/<QPixmap>/g
-s/<qpointer.h>/<QPointer>/g
-s/<qpushbutton.h>/<QPushButton>/g
-s/<qradiobutton.h>/<QRadioButton>/g
-s/<qregexp.h>/<QRegExp>/g
-s/<qspinbox.h>/<QSpinBox>/g
-s/<qstring.h>/<QString>/g
-s/<qtextcodec.h>/<QTextCodec>/g
-s/<qtextstream.h>/<QTextStream>/g
-s/<qtimer.h>/<QTimer>/g
-s/<qtooltip.h>/<QToolTip>/g
-s/<qwidget.h>/<QWidget>/g
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 126d29b18afb..42ab54255130 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -111,6 +111,7 @@ lib/kde4/krunner_konsolesessions.so
lib/kde4/krunner_kopete.so
lib/kde4/krunner_mediawiki.so
lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/krunner_translator.so
lib/kde4/krunner_youtube.so
%%IBUS%%lib/kde4/libexec/kimpanel-ibus-panel
%%SCIM%%lib/kde4/libexec/kimpanel-scim-panel
@@ -178,6 +179,7 @@ lib/kde4/plasma_packagestructure_comic.so
lib/kde4/plasma_potd_apodprovider.so
lib/kde4/plasma_potd_epodprovider.so
lib/kde4/plasma_potd_flickrprovider.so
+lib/kde4/plasma_potd_natgeoprovider.so
lib/kde4/plasma_potd_oseiprovider.so
lib/kde4/plasma_potd_wcpotdprovider.so
lib/kde4/plasma_runner_datetime.so
@@ -196,8 +198,8 @@ lib/liblancelot.so
lib/liblancelot.so.1.9.0
lib/liblancelot.so.2
lib/libplasma_groupingcontainment.so
-lib/libplasma_groupingcontainment.so.5
-lib/libplasma_groupingcontainment.so.5.0.1
+lib/libplasma_groupingcontainment.so.4
+lib/libplasma_groupingcontainment.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/libplasmacomicprovidercore.so
lib/libplasmacomicprovidercore.so.1
lib/libplasmacomicprovidercore.so.1.0.0
@@ -205,11 +207,11 @@ lib/libplasmapotdprovidercore.so
lib/libplasmapotdprovidercore.so.1
lib/libplasmapotdprovidercore.so.1.0.0
lib/libplasmaweather.so
-lib/libplasmaweather.so.5
-lib/libplasmaweather.so.5.0.1
+lib/libplasmaweather.so.4
+lib/libplasmaweather.so.%%KDE4_GENERIC_LIB_VERSION%%
lib/librtm.so
-lib/librtm.so.5
-lib/librtm.so.5.0.1
+lib/librtm.so.4
+lib/librtm.so.%%KDE4_GENERIC_LIB_VERSION%%
share/apps/bball/bball.svgz
share/apps/bball/bounce.ogg
share/apps/bball/football.svgz
@@ -362,7 +364,7 @@ share/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
share/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
share/apps/plasma/plasmoids/nowplaying/contents/code/service.js
share/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
-share/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying/nocover.svgz
share/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
share/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
share/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
@@ -452,7 +454,7 @@ share/icons/hicolor/128x128/apps/luna.png
share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
share/icons/hicolor/128x128/apps/previewer.png
share/icons/hicolor/128x128/apps/qalculate-applet.png
-share/icons/hicolor/16x16/actions/youtube.png
+share/icons/hicolor/16x16/actions/krunner_youtube.png
share/icons/hicolor/16x16/apps/bball.png
share/icons/hicolor/16x16/apps/eyes.png
share/icons/hicolor/16x16/apps/kdeobservatory.png
@@ -462,7 +464,7 @@ share/icons/hicolor/16x16/apps/lifegame.png
share/icons/hicolor/16x16/apps/luna.png
share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
share/icons/hicolor/16x16/apps/previewer.png
-share/icons/hicolor/22x22/actions/youtube.png
+share/icons/hicolor/22x22/actions/krunner_youtube.png
share/icons/hicolor/22x22/apps/eyes.png
share/icons/hicolor/22x22/apps/kdeobservatory.png
share/icons/hicolor/22x22/apps/lancelot-start.png
@@ -473,7 +475,7 @@ share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
share/icons/hicolor/22x22/apps/previewer.png
share/icons/hicolor/256x256/apps/eyes.png
share/icons/hicolor/256x256/apps/lifegame.png
-share/icons/hicolor/32x32/actions/youtube.png
+share/icons/hicolor/32x32/actions/krunner_youtube.png
share/icons/hicolor/32x32/apps/bball.png
share/icons/hicolor/32x32/apps/kdeobservatory.png
share/icons/hicolor/32x32/apps/lancelot-start.png
@@ -482,7 +484,7 @@ share/icons/hicolor/32x32/apps/lifegame.png
share/icons/hicolor/32x32/apps/luna.png
share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
share/icons/hicolor/32x32/apps/previewer.png
-share/icons/hicolor/48x48/actions/youtube.png
+share/icons/hicolor/48x48/actions/krunner_youtube.png
share/icons/hicolor/48x48/apps/bball.png
share/icons/hicolor/48x48/apps/kdeobservatory.png
share/icons/hicolor/48x48/apps/lancelot-start.png
@@ -492,7 +494,7 @@ share/icons/hicolor/48x48/apps/luna.png
share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
share/icons/hicolor/48x48/apps/previewer.png
share/icons/hicolor/48x48/apps/qalculate-applet.png
-share/icons/hicolor/64x64/actions/youtube.png
+share/icons/hicolor/64x64/actions/krunner_youtube.png
share/icons/hicolor/64x64/apps/bball.png
share/icons/hicolor/64x64/apps/eyes.png
share/icons/hicolor/64x64/apps/kdeobservatory.png
@@ -502,7 +504,7 @@ share/icons/hicolor/64x64/apps/lifegame.png
share/icons/hicolor/64x64/apps/luna.png
share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
share/icons/hicolor/64x64/apps/previewer.png
-share/icons/hicolor/scalable/actions/youtube.svgz
+share/icons/hicolor/scalable/actions/krunner_youtube.svgz
share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
share/icons/hicolor/scalable/apps/bball.svgz
share/icons/hicolor/scalable/apps/eyes.svgz
@@ -520,6 +522,7 @@ share/kde4/services/katesessions.desktop
share/kde4/services/konquerorsessions.desktop
share/kde4/services/konsolesessions.desktop
share/kde4/services/lancelot.desktop
+share/kde4/services/natgeoprovider.desktop
share/kde4/services/oseiprovider.desktop
share/kde4/services/plasma-applet-bball.desktop
share/kde4/services/plasma-applet-binaryclock.desktop
@@ -597,6 +600,7 @@ share/kde4/services/plasma-runner-kopete.desktop
share/kde4/services/plasma-runner-spellchecker.desktop
share/kde4/services/plasma-runner-spellchecker_config.desktop
share/kde4/services/plasma-runner-techbase.desktop
+share/kde4/services/plasma-runner-translator.desktop
share/kde4/services/plasma-runner-wikipedia.desktop
share/kde4/services/plasma-runner-wikitravel.desktop
share/kde4/services/plasma-runner-youtube.desktop
@@ -628,7 +632,8 @@ share/mime/packages/lancelotpart-mime.xml
@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/images
+@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
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index fa7ebb159c04..56825c2e866e 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@@ -3,20 +3,16 @@
PORTNAME= kruler
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 screen ruler
-CONFLICTS= kdegraphics-4.[0-6].*
-
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USES= cmake:outsource
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XORG= x11
USE_XZ= yes
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo
index a386d6150518..a9a3d2e32def 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kruler-4.10.5.tar.xz) = 9d1833803d94f10ffcd18a72e89c66a6a588e6fa4f1e6cae5d051c8826f09e3f
-SIZE (KDE/4.10.5/kruler-4.10.5.tar.xz) = 134516
+SHA256 (KDE/4.12.2/kruler-4.12.2.tar.xz) = ea0f95149ca1bc21eb16b0aeeb80676d18a05964888c153ad9e5b1635e18ffe0
+SIZE (KDE/4.12.2/kruler-4.12.2.tar.xz) = 128560
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index 8b4af6788516..4679908c0a8e 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -3,21 +3,17 @@
PORTNAME= superkaramba
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= deskutils kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Widget framework for KDE
-CONFLICTS= kdeutils-4.[0-7].*
-
USE_XZ= yes
-USE_PYTHON= yes
+USE_PYTHON= 2
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
USES= cmake:outsource
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/deskutils/superkaramba/distinfo b/deskutils/superkaramba/distinfo
index dccbe3cfb3f1..2d59a6f9d585 100644
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = a21f1dce36f35aea4d9f64578da75459048986ea83a76e87afd03c658a41ab6f
-SIZE (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = 391704
+SHA256 (KDE/4.12.2/superkaramba-4.12.2.tar.xz) = 3695fbdabd4c2dcf33e0f6d04a0cca6cb9d58a2e81b3744b3c9f7ca77e41fdd8
+SIZE (KDE/4.12.2/superkaramba-4.12.2.tar.xz) = 383964
diff --git a/deskutils/superkaramba/pkg-plist b/deskutils/superkaramba/pkg-plist
index 123b5a09009c..34cb465c013f 100644
--- a/deskutils/superkaramba/pkg-plist
+++ b/deskutils/superkaramba/pkg-plist
@@ -2,8 +2,8 @@ bin/superkaramba
lib/kde4/plasma_package_superkaramba.so
lib/kde4/plasma_scriptengine_superkaramba.so
lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
+lib/libsuperkaramba.so.4
+lib/libsuperkaramba.so.%%KDE4_GENERIC_LIB_VERSION%%
share/applications/kde4/superkaramba.desktop
share/apps/superkaramba/superkarambaui.rc
share/config/superkaramba.knsrc