summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2014-11-13 19:19:06 +0000
committermarkd <markd@pkgsrc.org>2014-11-13 19:19:06 +0000
commite486e6cd2651bd49568c85720099f7535bcf5083 (patch)
tree83f7122d5a014569a87b5529ab7dece89be51cc0 /misc
parent94189b4ae5021626678059d23f799ec2e4743b15 (diff)
downloadpkgsrc-e486e6cd2651bd49568c85720099f7535bcf5083.tar.gz
Update to KDE SC 4.14.3
Diffstat (limited to 'misc')
-rw-r--r--misc/kaccessible/Makefile3
-rw-r--r--misc/kaccessible/distinfo8
-rw-r--r--misc/kalzium/Makefile7
-rw-r--r--misc/kalzium/PLIST3
-rw-r--r--misc/kalzium/distinfo8
-rw-r--r--misc/kbruch/Makefile3
-rw-r--r--misc/kbruch/PLIST3
-rw-r--r--misc/kbruch/distinfo8
-rw-r--r--misc/kcharselect/Makefile3
-rw-r--r--misc/kcharselect/distinfo8
-rw-r--r--misc/kde-wallpapers4/Makefile3
-rw-r--r--misc/kde-wallpapers4/distinfo8
-rw-r--r--misc/kdeartwork4/Makefile5
-rw-r--r--misc/kdeartwork4/PLIST4
-rw-r--r--misc/kdeartwork4/distinfo8
-rw-r--r--misc/kdepim-runtime4/Makefile13
-rw-r--r--misc/kdepim-runtime4/PLIST167
-rw-r--r--misc/kdepim-runtime4/distinfo8
-rw-r--r--misc/kdepim4/Makefile26
-rw-r--r--misc/kdepim4/PLIST780
-rw-r--r--misc/kdepim4/patches/patch-aa259
-rw-r--r--misc/kdepim4/patches/patch-ab22
-rw-r--r--misc/kdepim4/patches/patch-ac13
-rw-r--r--misc/kdepim4/patches/patch-ae15
-rw-r--r--misc/kdepim4/patches/patch-af38
-rw-r--r--misc/kdepim4/patches/patch-ag154
-rw-r--r--misc/kdepim4/patches/patch-ah26
-rw-r--r--misc/kdepim4/patches/patch-ai25
-rw-r--r--misc/kdepim4/patches/patch-aj122
-rw-r--r--misc/kdepim4/patches/patch-ak16
-rw-r--r--misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt12
-rw-r--r--misc/kdepim4/patches/patch-al60
-rw-r--r--misc/kdepim4/patches/patch-am36
-rw-r--r--misc/kdepim4/patches/patch-an338
-rw-r--r--misc/kdepim4/patches/patch-ao40
-rw-r--r--misc/kdepim4/patches/patch-ap39
-rw-r--r--misc/kdepim4/patches/patch-kalarm_CMakeLists.txt12
-rw-r--r--misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp35
-rw-r--r--misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp16
-rw-r--r--misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp20
-rw-r--r--misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp37
-rw-r--r--misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h22
-rw-r--r--misc/kdepim4/patches/patch-kmail_imapaccountbase.h20
-rw-r--r--misc/kdepim4/patches/patch-kmail_networkaccount.h20
-rw-r--r--misc/kdepim4/patches/patch-knode_CMakeLists.txt12
-rw-r--r--misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt13
-rw-r--r--misc/kdepim4/patches/patch-korganizer_CMakeLists.txt12
-rw-r--r--misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h13
-rw-r--r--misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h16
-rw-r--r--misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt12
-rw-r--r--misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt12
-rw-r--r--misc/kdepimlibs4/Makefile5
-rw-r--r--misc/kdepimlibs4/PLIST58
-rw-r--r--misc/kdepimlibs4/distinfo14
-rw-r--r--misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt12
-rw-r--r--misc/kdepimlibs4/patches/patch-kcalutils_CMakeLists.txt12
-rw-r--r--misc/kdepimlibs4/patches/patch-kldap_ber.cpp46
-rw-r--r--misc/kdepimlibs4/patches/patch-kldap_ber.h25
-rw-r--r--misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt12
-rw-r--r--misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt12
-rw-r--r--misc/kdeplasma-addons4/Makefile6
-rw-r--r--misc/kdeplasma-addons4/PLIST6
-rw-r--r--misc/kdeplasma-addons4/distinfo8
-rw-r--r--misc/kgeography/Makefile3
-rw-r--r--misc/kgeography/distinfo8
-rw-r--r--misc/kig/Makefile3
-rw-r--r--misc/kig/PLIST4
-rw-r--r--misc/kig/distinfo9
-rw-r--r--misc/kig/patches/patch-CMakeLists.txt15
-rw-r--r--misc/kiten/Makefile3
-rw-r--r--misc/kiten/PLIST3
-rw-r--r--misc/kiten/distinfo8
-rw-r--r--misc/klettres/Makefile3
-rw-r--r--misc/klettres/PLIST4
-rw-r--r--misc/klettres/distinfo8
-rw-r--r--misc/kmag/Makefile3
-rw-r--r--misc/kmag/PLIST8
-rw-r--r--misc/kmag/distinfo8
-rw-r--r--misc/kmousetool/Makefile3
-rw-r--r--misc/kmousetool/distinfo8
-rw-r--r--misc/kmouth/Makefile3
-rw-r--r--misc/kmouth/distinfo8
-rw-r--r--misc/kremotecontrol/Makefile3
-rw-r--r--misc/kremotecontrol/distinfo8
-rw-r--r--misc/kstars/Makefile8
-rw-r--r--misc/kstars/PLIST3
-rw-r--r--misc/kstars/distinfo9
-rw-r--r--misc/kstars/patches/patch-kstars_skyobjects_starobject.cpp13
-rw-r--r--misc/kteatime/Makefile3
-rw-r--r--misc/kteatime/distinfo8
-rw-r--r--misc/ktouch/Makefile3
-rw-r--r--misc/ktouch/PLIST27
-rw-r--r--misc/ktouch/distinfo8
-rw-r--r--misc/kturtle/Makefile3
-rw-r--r--misc/kturtle/PLIST3
-rw-r--r--misc/kturtle/distinfo8
-rw-r--r--misc/ktux/Makefile3
-rw-r--r--misc/ktux/distinfo8
-rw-r--r--misc/kwordquiz/Makefile3
-rw-r--r--misc/kwordquiz/PLIST3
-rw-r--r--misc/kwordquiz/distinfo8
-rw-r--r--misc/libkdeedu/Makefile3
-rw-r--r--misc/libkdeedu/distinfo8
-rw-r--r--misc/marble/Makefile3
-rw-r--r--misc/marble/PLIST107
-rw-r--r--misc/marble/distinfo11
-rw-r--r--misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h15
-rw-r--r--misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp10
-rw-r--r--misc/parley/Makefile3
-rw-r--r--misc/parley/PLIST16
-rw-r--r--misc/parley/distinfo8
-rw-r--r--misc/rocs/Makefile3
-rw-r--r--misc/rocs/distinfo8
-rw-r--r--misc/step/Makefile4
-rw-r--r--misc/step/PLIST3
-rw-r--r--misc/step/distinfo8
-rw-r--r--misc/superkaramba/Makefile3
-rw-r--r--misc/superkaramba/distinfo8
-rw-r--r--misc/sweeper/Makefile3
-rw-r--r--misc/sweeper/distinfo8
120 files changed, 1044 insertions, 2211 deletions
diff --git a/misc/kaccessible/Makefile b/misc/kaccessible/Makefile
index af6102460b0..9ba8f48e406 100644
--- a/misc/kaccessible/Makefile
+++ b/misc/kaccessible/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= kaccessible-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Provides accessibility services like focus tracking for KDE
diff --git a/misc/kaccessible/distinfo b/misc/kaccessible/distinfo
index 88e374df825..da2a4b8a155 100644
--- a/misc/kaccessible/distinfo
+++ b/misc/kaccessible/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (kaccessible-4.11.5.tar.xz) = f6aa4459ac28aa493c0048b72c9f21dc40dcc12e
-RMD160 (kaccessible-4.11.5.tar.xz) = 141450a9d6bd990ca9967faebb5d80ea9b1ae679
-Size (kaccessible-4.11.5.tar.xz) = 20528 bytes
+SHA1 (kaccessible-4.14.3.tar.xz) = 76a036db685b98c031d6f0e746f44f70c2cacfd5
+RMD160 (kaccessible-4.14.3.tar.xz) = 0e5c60007893a9842b4cebb7efe8e5a1ff23c1b6
+Size (kaccessible-4.14.3.tar.xz) = 20544 bytes
diff --git a/misc/kalzium/Makefile b/misc/kalzium/Makefile
index e2b54537c02..73956e6cf01 100644
--- a/misc/kalzium/Makefile
+++ b/misc/kalzium/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
DISTNAME= kalzium-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Periodic table of elements
@@ -10,8 +9,8 @@ COMMENT= Periodic table of elements
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
-.include "../../math/eigen2/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
+.include "../../math/eigen3/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/kalzium/PLIST b/misc/kalzium/PLIST
index 70bf763acf8..bec01de495e 100644
--- a/misc/kalzium/PLIST
+++ b/misc/kalzium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/07 12:35:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/13 19:19:08 markd Exp $
bin/kalzium
include/libkdeedu/chemicaldataobject.h
include/libkdeedu/element.h
@@ -21,6 +21,7 @@ lib/libscience.so
lib/libscience.so.4
lib/libscience.so.${PKGVERSION}
man/man1/kalzium.1
+share/appdata/kalzium.appdata.xml
share/applications/kde4/kalzium.desktop
share/applications/kde4/kalzium_cml.desktop
share/doc/kde/HTML/en/kalzium/common
diff --git a/misc/kalzium/distinfo b/misc/kalzium/distinfo
index 87e0b1a22d4..9421af5593f 100644
--- a/misc/kalzium/distinfo
+++ b/misc/kalzium/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (kalzium-4.11.5.tar.xz) = 6b0bef377390517c4d77d7701e32a2436102791a
-RMD160 (kalzium-4.11.5.tar.xz) = 64ffd339271afd15e939b32b676bc8dcc717c4de
-Size (kalzium-4.11.5.tar.xz) = 3946808 bytes
+SHA1 (kalzium-4.14.3.tar.xz) = 49abc32ed7260a59a17d7c29c9f919617a57f803
+RMD160 (kalzium-4.14.3.tar.xz) = 79c3d78183b71829835b8b623a44152ee84e85fe
+Size (kalzium-4.14.3.tar.xz) = 3944960 bytes
diff --git a/misc/kbruch/Makefile b/misc/kbruch/Makefile
index ce44298c2c4..7e4a3d5f580 100644
--- a/misc/kbruch/Makefile
+++ b/misc/kbruch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= kbruch-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE exercise fractions
diff --git a/misc/kbruch/PLIST b/misc/kbruch/PLIST
index a749ddddcd1..3f346127e46 100644
--- a/misc/kbruch/PLIST
+++ b/misc/kbruch/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:46:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/13 19:19:07 markd Exp $
bin/kbruch
man/man1/kbruch.1
+share/appdata/kbruch.appdata.xml
share/applications/kde4/kbruch.desktop
share/doc/kde/HTML/en/kbruch/checked.png
share/doc/kde/HTML/en/kbruch/common
diff --git a/misc/kbruch/distinfo b/misc/kbruch/distinfo
index c63003186b9..1d3dbb5d2b2 100644
--- a/misc/kbruch/distinfo
+++ b/misc/kbruch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/13 19:19:07 markd Exp $
-SHA1 (kbruch-4.11.5.tar.xz) = 36e25d3c5ccaa6668a2e7bba2f35fc6d6f82acae
-RMD160 (kbruch-4.11.5.tar.xz) = 0d52b5a9c6de383a2cbac9df8b2c97a7798b17eb
-Size (kbruch-4.11.5.tar.xz) = 897176 bytes
+SHA1 (kbruch-4.14.3.tar.xz) = d19a96ea1fb190fafb947d1217479ae56336163d
+RMD160 (kbruch-4.14.3.tar.xz) = e9d738e56352533d4b55e8a65bfc2a69b8b3fb1e
+Size (kbruch-4.14.3.tar.xz) = 902924 bytes
diff --git a/misc/kcharselect/Makefile b/misc/kcharselect/Makefile
index 95c51b355dd..d3a9a3edfb9 100644
--- a/misc/kcharselect/Makefile
+++ b/misc/kcharselect/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:36 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:08 markd Exp $
DISTNAME= kcharselect-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE character selector
diff --git a/misc/kcharselect/distinfo b/misc/kcharselect/distinfo
index f89f5c8b44e..76cdd990153 100644
--- a/misc/kcharselect/distinfo
+++ b/misc/kcharselect/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (kcharselect-4.11.5.tar.xz) = e22cf8be6f34e177b39da5766f267d4c8e6f7d78
-RMD160 (kcharselect-4.11.5.tar.xz) = 9ed666fe5818bb74d973b976e08a88670c5a472e
-Size (kcharselect-4.11.5.tar.xz) = 84540 bytes
+SHA1 (kcharselect-4.14.3.tar.xz) = 738483687b5d4651a1b9a7a2d8cd41ca25c2ef88
+RMD160 (kcharselect-4.14.3.tar.xz) = 3efe2a9edcdaff06829247db46cbf3445710bf32
+Size (kcharselect-4.14.3.tar.xz) = 84708 bytes
diff --git a/misc/kde-wallpapers4/Makefile b/misc/kde-wallpapers4/Makefile
index 54558d82c30..068ace76395 100644
--- a/misc/kde-wallpapers4/Makefile
+++ b/misc/kde-wallpapers4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= kde-wallpapers-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Wallpapers for the KDE integrated X11 desktop
diff --git a/misc/kde-wallpapers4/distinfo b/misc/kde-wallpapers4/distinfo
index 7967bc7540e..d2dc9e7f9b3 100644
--- a/misc/kde-wallpapers4/distinfo
+++ b/misc/kde-wallpapers4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (kde-wallpapers-4.11.5.tar.xz) = 84a89848a9140eea2fdefc1b38d21346a2273b98
-RMD160 (kde-wallpapers-4.11.5.tar.xz) = a04928651e39cf074aa8965e9e96f2277d930eda
-Size (kde-wallpapers-4.11.5.tar.xz) = 90385020 bytes
+SHA1 (kde-wallpapers-4.14.3.tar.xz) = 3e8181d510e384c1ff328c888d78c6eb8453f20e
+RMD160 (kde-wallpapers-4.14.3.tar.xz) = 8b9b64ffbfb6327678d7f4690806cd6146835a06
+Size (kde-wallpapers-4.14.3.tar.xz) = 90372808 bytes
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index ebd627e9695..2f0e0597500 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.47 2014/11/13 19:19:06 markd Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
@@ -18,7 +17,7 @@ BUILDLINK_API_DEPENDS.xscreensaver+= xscreensaver>=5.10
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../graphics/libkexiv2/buildlink3.mk"
-.include "../../math/eigen2/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/kde-runtime4/buildlink3.mk"
.include "../../x11/kde-workspace4/buildlink3.mk"
diff --git a/misc/kdeartwork4/PLIST b/misc/kdeartwork4/PLIST
index 25105bf134d..d25c998e9eb 100644
--- a/misc/kdeartwork4/PLIST
+++ b/misc/kdeartwork4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/11/07 12:35:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/13 19:19:06 markd Exp $
bin/kbanner.kss
bin/kblob.kss
bin/kclock.kss
@@ -6627,5 +6627,3 @@ share/kde4/services/ScreenSavers/xmatrix.desktop
share/kde4/services/ScreenSavers/xrayswarm.desktop
share/kde4/services/ScreenSavers/xspirograph.desktop
share/kde4/services/ScreenSavers/zoom.desktop
-share/sounds/KDE_Logout_new.wav
-share/sounds/KDE_Startup_new.wav
diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo
index 5afd7d1c207..797e6ef533c 100644
--- a/misc/kdeartwork4/distinfo
+++ b/misc/kdeartwork4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.22 2014/11/13 19:19:06 markd Exp $
-SHA1 (kdeartwork-4.11.5.tar.xz) = e0f7bb387f7ff2fd95d63d9a13dde1d1b5e382e4
-RMD160 (kdeartwork-4.11.5.tar.xz) = 8a470b07a646beaa62c09275e53d4927ef4e158e
-Size (kdeartwork-4.11.5.tar.xz) = 142256144 bytes
+SHA1 (kdeartwork-4.14.3.tar.xz) = 78697ddce0fc5b8bbfe6659110a5ba147e3b2fe6
+RMD160 (kdeartwork-4.14.3.tar.xz) = 4f7272623ed18867648f4d7aa6ec7564d63e8dd2
+Size (kdeartwork-4.14.3.tar.xz) = 140848704 bytes
SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509
diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index 51e8afcff72..d103c51c06a 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,23 +1,18 @@
-# $NetBSD: Makefile,v 1.56 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.57 2014/11/13 19:19:09 markd Exp $
-#DISTNAME= kdepim-runtime-${_KDE_VERSION}
-DISTNAME= kdepim-runtime-4.4.11.1
+DISTNAME= kdepim-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-MASTER_SITES= ${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
-PKGREVISION= 31
CATEGORIES= misc
COMMENT= Runtime requirements for the KDE PIM tools
-EXTRACT_SUFX= .tar.bz2
.include "../../meta-pkgs/kde4/Makefile.kde4"
-# tar: Invalid header, starting valid header search.
-EXTRACT_USING= gtar
-
# BUILD_MAKE_FLAGS+= VERBOSE=1
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../devel/libkgapi/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/kdepim-runtime4/PLIST b/misc/kdepim-runtime4/PLIST
index 606d03553f1..4bd8bd054ca 100644
--- a/misc/kdepim-runtime4/PLIST
+++ b/misc/kdepim-runtime4/PLIST
@@ -1,99 +1,204 @@
-@comment $NetBSD: PLIST,v 1.9 2014/02/01 02:20:49 markd Exp $
-bin/akonadi2xml
+@comment $NetBSD: PLIST,v 1.10 2014/11/13 19:19:09 markd Exp $
+bin/accountwizard
bin/akonadi_birthdays_resource
-bin/akonadi_contacts_resource
-bin/akonadi_ical_resource
+bin/akonadi_davgroupware_resource
+bin/akonadi_googlecalendar_resource
+bin/akonadi_googlecontacts_resource
+bin/akonadi_icaldir_resource
bin/akonadi_imap_resource
+bin/akonadi_invitations_agent
bin/akonadi_kabc_resource
bin/akonadi_kcal_resource
-bin/akonadi_knut_resource
-bin/akonadi_kolabproxy_resource
+bin/akonadi_kdeaccounts_resource
bin/akonadi_localbookmarks_resource
-bin/akonadi_maildir_resource
bin/akonadi_maildispatcher_agent
bin/akonadi_mailtransport_dummy_resource
-bin/akonadi_mbox_resource
-bin/akonadi_microblog_resource
-bin/akonadi_nepomuk_calendar_feeder
-bin/akonadi_nepomuk_contact_feeder
-bin/akonadi_nepomuktag_resource
+bin/akonadi_migration_agent
+bin/akonadi_mixedmaildir_resource
+bin/akonadi_newmailnotifier_agent
bin/akonadi_nntp_resource
-bin/akonadi_notes_resource
+bin/akonadi_openxchange_resource
bin/akonadi_pop3_resource
-bin/akonadi_vcard_resource
bin/akonadi_vcarddir_resource
bin/akonaditray
+bin/gidmigrator
bin/kaddressbookmigrator
+bin/kjotsmigrator
bin/kmail-migrator
+bin/knotes-migrator
bin/kres-migrator
+lib/kde4/accountwizard_plugin.so
+lib/kde4/akonadi_akonotes_resource.so
+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_maildir_resource.so
+lib/kde4/akonadi_mbox_resource.so
+lib/kde4/akonadi_notes_resource.so
lib/kde4/akonadi_serializer_addressee.so
lib/kde4/akonadi_serializer_bookmark.so
lib/kde4/akonadi_serializer_contactgroup.so
+lib/kde4/akonadi_serializer_kalarm.so
lib/kde4/akonadi_serializer_kcal.so
lib/kde4/akonadi_serializer_kcalcore.so
lib/kde4/akonadi_serializer_mail.so
lib/kde4/akonadi_serializer_microblog.so
+lib/kde4/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
lib/kde4/kcm_akonadi_resources.so
lib/kde4/kcm_akonadi_server.so
lib/kde4/kio_akonadi.so
-lib/libakonadi-xml.so
-lib/libakonadi-xml.so.4
-lib/libakonadi-xml.so.4.11.5
+lib/libakonadi-filestore.so
+lib/libakonadi-filestore.so.4
+lib/libakonadi-filestore.so.${PKGVERSION}
+lib/libfolderarchivesettings.so
+lib/libfolderarchivesettings.so.4
+lib/libfolderarchivesettings.so.${PKGVERSION}
lib/libkdepim-copy.so
lib/libkdepim-copy.so.4
-lib/libkdepim-copy.so.4.11.5
+lib/libkdepim-copy.so.${PKGVERSION}
+lib/libkmindexreader.so
+lib/libkmindexreader.so.4
+lib/libkmindexreader.so.${PKGVERSION}
lib/libmaildir.so
lib/libmaildir.so.4
-lib/libmaildir.so.4.11.5
-lib/libmbox.so
-lib/libmbox.so.4
-lib/libmbox.so.4.11.5
+lib/libmaildir.so.${PKGVERSION}
+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/googlecalendarresource.desktop
+share/akonadi/agents/googlecontactsresource.desktop
+share/akonadi/agents/icaldirresource.desktop
share/akonadi/agents/icalresource.desktop
share/akonadi/agents/imapresource.desktop
+share/akonadi/agents/invitationsagent.desktop
share/akonadi/agents/kabcresource.desktop
+share/akonadi/agents/kalarmdirresource.desktop
+share/akonadi/agents/kalarmresource.desktop
share/akonadi/agents/kcalresource.desktop
-share/akonadi/agents/knutresource.desktop
-share/akonadi/agents/kolabproxyresource.desktop
+share/akonadi/agents/kdeaccountsresource.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/nepomukcalendarfeeder.desktop
-share/akonadi/agents/nepomukcontactfeeder.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
share/akonadi/agents/pop3resource.desktop
share/akonadi/agents/vcarddirresource.desktop
share/akonadi/agents/vcardresource.desktop
+share/applications/kde4/accountwizard.desktop
share/applications/kde4/akonaditray.desktop
share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
-share/icons/hicolor/64x64/apps/kolab.png
-share/kde/apps/akonadi/akonadi-xml.xsd
+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/ox.png
+share/icons/hicolor/22x22/apps/akonaditray.png
+share/icons/hicolor/32x32/apps/akonaditray.png
+share/icons/hicolor/32x32/apps/ox.png
+share/icons/hicolor/48x48/apps/ox.png
+share/icons/hicolor/64x64/apps/akonaditray.png
+share/icons/hicolor/64x64/apps/ox.png
+share/icons/hicolor/scalable/apps/akonaditray.svgz
+share/kde/apps/akonadi/accountwizard/contacts/contactswizard.desktop
+share/kde/apps/akonadi/accountwizard/contacts/contactswizard.es
+share/kde/apps/akonadi/accountwizard/contacts/contactswizard.ui
+share/kde/apps/akonadi/accountwizard/ical/icalwizard.desktop
+share/kde/apps/akonadi/accountwizard/ical/icalwizard.es
+share/kde/apps/akonadi/accountwizard/ical/icalwizard.ui
+share/kde/apps/akonadi/accountwizard/imap/imapwizard.desktop
+share/kde/apps/akonadi/accountwizard/imap/imapwizard.es
+share/kde/apps/akonadi/accountwizard/imap/imapwizard.ui
+share/kde/apps/akonadi/accountwizard/mailbox/mailboxwizard.desktop
+share/kde/apps/akonadi/accountwizard/mailbox/mailboxwizard.es
+share/kde/apps/akonadi/accountwizard/mailbox/mailboxwizard.ui
+share/kde/apps/akonadi/accountwizard/maildir/maildirwizard.desktop
+share/kde/apps/akonadi/accountwizard/maildir/maildirwizard.es
+share/kde/apps/akonadi/accountwizard/maildir/maildirwizard.ui
+share/kde/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
+share/kde/apps/akonadi/accountwizard/pop3/pop3wizard.es
+share/kde/apps/akonadi/accountwizard/pop3/pop3wizard.ui
+share/kde/apps/akonadi/accountwizard/tine20/tine20wizard.desktop
+share/kde/apps/akonadi/accountwizard/tine20/tine20wizard.es
+share/kde/apps/akonadi/accountwizard/tine20/tine20wizard.ui
+share/kde/apps/akonadi/accountwizard/vcard/vcardwizard.desktop
+share/kde/apps/akonadi/accountwizard/vcard/vcardwizard.es
+share/kde/apps/akonadi/accountwizard/vcard/vcardwizard.ui
+share/kde/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.desktop
+share/kde/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.es
+share/kde/apps/akonadi/accountwizard/vcarddir/vcarddirwizard.ui
share/kde/apps/akonadi/firstrun/defaultaddressbook
share/kde/apps/akonadi/firstrun/defaultcalendar
+share/kde/apps/akonadi/firstrun/defaultnotebook
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
+share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_kalarm.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
-share/kde/apps/akonadi_knut_resource/knut-template.xml
+share/kde/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
+share/kde/apps/akonadi_newmailnotifier_agent/akonadi_newmailnotifier_agent.notifyrc
+share/kde/apps/kconf_update/newmailnotifier.upd
share/kde/autostart/kaddressbookmigrator.desktop
+share/kde/config/accountwizard.knsrc
share/kde/config/kmail-migratorrc
share/kde/config/kres-migratorrc
share/kde4/services/akonadi.protocol
+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
+share/kde4/services/akonadi/davgroupware-providers/yahoo.desktop
+share/kde4/services/akonadi/davgroupware-providers/zarafa.desktop
+share/kde4/services/akonadi/davgroupware-providers/zimbra.desktop
share/kde4/services/kcm_akonadi.desktop
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/servicetypes/davgroupwareprovider.desktop
+share/mime/packages/accountwizard-mime.xml
share/mime/packages/kdepim-mime.xml
diff --git a/misc/kdepim-runtime4/distinfo b/misc/kdepim-runtime4/distinfo
index 15cd72670fd..1172ae3a0aa 100644
--- a/misc/kdepim-runtime4/distinfo
+++ b/misc/kdepim-runtime4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2012/03/19 21:01:28 markd Exp $
+$NetBSD: distinfo,v 1.14 2014/11/13 19:19:09 markd Exp $
-SHA1 (kdepim-runtime-4.4.11.1.tar.bz2) = e3105eb99ab0de47c617f8491774b2e3ee4cdd4a
-RMD160 (kdepim-runtime-4.4.11.1.tar.bz2) = dbc1120ab3f70c0073f6e9f389edba89bf80bee6
-Size (kdepim-runtime-4.4.11.1.tar.bz2) = 619924 bytes
+SHA1 (kdepim-runtime-4.14.3.tar.xz) = 377e8c3d91c8f3348cd4f6598c242c5f308486d1
+RMD160 (kdepim-runtime-4.14.3.tar.xz) = 242cef1f55bc2621c86009b515a12904d73fdb90
+Size (kdepim-runtime-4.14.3.tar.xz) = 1168856 bytes
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 21a7e0be067..6d592f1bb0b 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.69 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.70 2014/11/13 19:19:08 markd Exp $
-#DISTNAME= kdepim-${_KDE_VERSION}
-DISTNAME= kdepim-4.4.11.1
+DISTNAME= kdepim-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-MASTER_SITES= ${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
-PKGREVISION= 38
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
-EXTRACT_SUFX= .tar.bz2
.include "../../meta-pkgs/kde4/Makefile.kde4"
+USE_TOOLS+= gmake
+
# BUILD_MAKE_FLAGS+= VERBOSE=1
-CMAKE_ARGS+=-DMAL_BASE:STRING=${BUILDLINK_PREFIX.libmal}
+CMAKE_ARGS+=-DKDEPIM_BUILD_MOBILE=OFF
CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
ktimetracker/test/booktime-badduration.sh \
@@ -27,6 +25,7 @@ CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
REPLACE_BASH+= kmail/kconf_update/kmail-*.sh
REPLACE_PERL+= \
+ agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
kalarm/kalarm-1.2.1-general.pl \
kalarm/kalarm-1.9.5-defaults.pl \
kalarm/kalarm-2.0.2-general.pl \
@@ -49,7 +48,9 @@ REPLACE_PERL+= \
kmail/kconf_update/upgrade-signature.pl \
kmail/kconf_update/upgrade-transport.pl \
kresources/kolab/upgrade-resourcetype.pl \
- libkpgp/kpgp-3.1-upgrade-address-data.pl
+ libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
+
+PLIST_SUBST+= KDE_VERSION=${_KDE_VERSION}
SUBST_CLASSES+= perlfix
SUBST_STAGE.perlfix= pre-configure
@@ -61,15 +62,16 @@ BUILDLINK_DEPMETHOD.qt4-tools=full
.include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../comms/libmal/buildlink3.mk"
-.include "../../comms/libopensync/buildlink3.mk"
-.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/grantlee/buildlink3.mk"
+.include "../../devel/libkgapi/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../security/libassuan2/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
+.include "../../sysutils/baloo/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/kde-runtime4/buildlink3.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index 5870f52d8ea..d02688ec6b9 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,11 +1,18 @@
-@comment $NetBSD: PLIST,v 1.12 2014/02/01 02:20:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/11/13 19:19:08 markd Exp $
+bin/akonadi_archivemail_agent
+bin/akonadi_followupreminder_agent
+bin/akonadi_mailfilter_agent
+bin/akonadi_notes_agent
+bin/akonadi_sendlater_agent
bin/akonadiconsole
bin/akregator
bin/akregatorstorageexporter
bin/blogilo
-bin/groupwarewizard
-bin/groupwisewizard
+bin/calendarjanitor
+bin/contactthemeeditor
+bin/headerthemeeditor
bin/ical2vcal
+bin/importwizard
bin/kabc2mutt
bin/kabcclient
bin/kaddressbook
@@ -13,6 +20,7 @@ bin/kalarm
bin/kalarmautostart
bin/karm
bin/kgpgconf
+bin/kincidenceeditor
bin/kjots
bin/kleopatra
bin/kmail
@@ -23,38 +31,31 @@ bin/kmail_sav.sh
bin/kmailcvt
bin/knode
bin/knotes
-bin/kolabwizard
bin/konsolekalendar
bin/kontact
bin/korgac
bin/korganizer
bin/ksendemail
bin/ktimetracker
+bin/ktnef
bin/kwatchgnupg
-bin/sloxwizard
+bin/mboximporter
+bin/pimsettingexporter
+bin/sieveeditor
+bin/storageservicemanager
lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
lib/kde4/akregator_config_advanced.so
lib/kde4/akregator_config_appearance.so
lib/kde4/akregator_config_archive.so
lib/kde4/akregator_config_browser.so
lib/kde4/akregator_config_general.so
+lib/kde4/akregator_config_sharemicroblog.so
lib/kde4/akregator_mk4storage_plugin.so
+lib/kde4/akregator_sharemicroblog_plugin.so
lib/kde4/akregatorpart.so
-lib/kde4/kabc_groupdav.so
-lib/kde4/kabc_groupwise.so
-lib/kde4/kabc_kolab.so
-lib/kde4/kabc_slox.so
lib/kde4/kaddressbookpart.so
-lib/kde4/kalarm_local.so
-lib/kde4/kalarm_localdir.so
-lib/kde4/kalarm_remote.so
lib/kde4/kcal_blog.so
-lib/kde4/kcal_groupdav.so
-lib/kde4/kcal_groupwise.so
-lib/kde4/kcal_kabc.so
-lib/kde4/kcal_kolab.so
lib/kde4/kcal_remote.so
-lib/kde4/kcal_slox.so
lib/kde4/kcm_apptsummary.so
lib/kde4/kcm_kjots.so
lib/kde4/kcm_kleopatra.so
@@ -62,22 +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_sdsummary.so
lib/kde4/kcm_todosummary.so
-lib/kde4/kio_groupwise.so
lib/kde4/kjotspart.so
-lib/kde4/kmail_bodypartformatter_application_octetstream.so
-lib/kde4/kmail_bodypartformatter_text_calendar.so
-lib/kde4/kmail_bodypartformatter_text_vcard.so
-lib/kde4/kmail_bodypartformatter_text_xdiff.so
lib/kde4/kmailpart.so
lib/kde4/knodepart.so
-lib/kde4/knotes_kolab.so
-lib/kde4/knotes_local.so
lib/kde4/kontact_akregatorplugin.so
lib/kde4/kontact_journalplugin.so
lib/kde4/kontact_kaddressbookplugin.so
@@ -86,149 +83,166 @@ lib/kde4/kontact_kmailplugin.so
lib/kde4/kontact_knodeplugin.so
lib/kde4/kontact_knotesplugin.so
lib/kde4/kontact_korganizerplugin.so
-lib/kde4/kontact_ktimetrackerplugin.so
+lib/kde4/kontact_specialdatesplugin.so
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/kpartsdesignerplugin.so
lib/kde4/ktexteditorkabcbridge.so
lib/kde4/ktimetrackerpart.so
+lib/kde4/libexec/kalarm_helper
+lib/kde4/messageviewer_bodypartformatter_application_mstnef.so
+lib/kde4/messageviewer_bodypartformatter_text_calendar.so
+lib/kde4/messageviewer_bodypartformatter_text_vcard.so
+lib/kde4/messageviewer_bodypartformatter_text_xdiff.so
+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/libakonadi-kcal_next.so
-lib/libakonadi-kcal_next.so.4
-lib/libakonadi-kcal_next.so.4.11.5
+lib/kde4/plugins/designer/mailcommonwidgets.so
+lib/kde4/plugins/designer/pimcommonwidgets.so
+lib/kde4/plugins/grantlee/0.5/grantlee_messageheaderfilters.so
lib/libakonadi_next.so
lib/libakonadi_next.so.4
-lib/libakonadi_next.so.4.11.5
+lib/libakonadi_next.so.${PKGVERSION}
lib/libakregatorinterfaces.so
lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.4.11.5
+lib/libakregatorinterfaces.so.${PKGVERSION}
lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.4.11.5
-lib/libgwsoap.so
-lib/libgwsoap.so.4
-lib/libgwsoap.so.4.11.5
-lib/libkabc_groupdav.so
-lib/libkabc_groupdav.so.4
-lib/libkabc_groupdav.so.4.11.5
-lib/libkabc_slox.so
-lib/libkabc_slox.so.4
-lib/libkabc_slox.so.4.11.5
-lib/libkabcgroupwise.so
-lib/libkabcgroupwise.so.4
-lib/libkabcgroupwise.so.4.11.5
-lib/libkabckolab.so
-lib/libkabckolab.so.4
-lib/libkabckolab.so.4.11.5
+lib/libakregatorprivate.so.${PKGVERSION}
+lib/libcalendarsupport.so
+lib/libcalendarsupport.so.4
+lib/libcalendarsupport.so.${PKGVERSION}
+lib/libcomposereditorng.so
+lib/libcomposereditorng.so.4
+lib/libcomposereditorng.so.${PKGVERSION}
+lib/libeventviews.so
+lib/libeventviews.so.4
+lib/libeventviews.so.${PKGVERSION}
+lib/libfollowupreminder.so
+lib/libfollowupreminder.so.4
+lib/libfollowupreminder.so.${PKGVERSION}
+lib/libgrantleetheme.so
+lib/libgrantleetheme.so.4
+lib/libgrantleetheme.so.${PKGVERSION}
+lib/libgrantleethemeeditor.so
+lib/libgrantleethemeeditor.so.4
+lib/libgrantleethemeeditor.so.${PKGVERSION}
+lib/libincidenceeditorsng.so
+lib/libincidenceeditorsng.so.4
+lib/libincidenceeditorsng.so.${PKGVERSION}
+lib/libincidenceeditorsngmobile.so
+lib/libincidenceeditorsngmobile.so.4
+lib/libincidenceeditorsngmobile.so.${PKGVERSION}
+lib/libkaddressbookgrantlee.so.4
+lib/libkaddressbookgrantlee.so.${PKGVERSION}
lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.4.11.5
-lib/libkalarm_calendar.so
-lib/libkalarm_calendar.so.4
-lib/libkalarm_calendar.so.4.11.5
-lib/libkalarm_resources.so
-lib/libkalarm_resources.so.4
-lib/libkalarm_resources.so.4.11.5
-lib/libkcal_groupdav.so
-lib/libkcal_groupdav.so.4
-lib/libkcal_groupdav.so.4.11.5
+lib/libkaddressbookprivate.so.${PKGVERSION}
lib/libkcal_resourceblog.so
lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.4.11.5
+lib/libkcal_resourceblog.so.${PKGVERSION}
lib/libkcal_resourceremote.so
lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.4.11.5
-lib/libkcal_slox.so
-lib/libkcal_slox.so.4
-lib/libkcal_slox.so.4.11.5
-lib/libkcalgroupwise.so
-lib/libkcalgroupwise.so.4
-lib/libkcalgroupwise.so.4.11.5
-lib/libkcalkolab.so
-lib/libkcalkolab.so.4
-lib/libkcalkolab.so.4.11.5
+lib/libkcal_resourceremote.so.${PKGVERSION}
lib/libkdepim.so
lib/libkdepim.so.4
-lib/libkdepim.so.4.11.5
-lib/libkgroupwarebase.so
-lib/libkgroupwarebase.so.4
-lib/libkgroupwarebase.so.4.11.5
-lib/libkgroupwaredav.so
-lib/libkgroupwaredav.so.4
-lib/libkgroupwaredav.so.4.11.5
+lib/libkdepim.so.${PKGVERSION}
+lib/libkdepimdbusinterfaces.so
+lib/libkdepimdbusinterfaces.so.4
+lib/libkdepimdbusinterfaces.so.${PKGVERSION}
+lib/libkdgantt2.so
+lib/libkdgantt2.so.0
+lib/libkdgantt2.so.0.1.0
lib/libkleo.so
lib/libkleo.so.4
-lib/libkleo.so.4.11.5
+lib/libkleo.so.${PKGVERSION}
lib/libkleopatraclientcore.so
lib/libkleopatraclientcore.so.0
-lib/libkleopatraclientcore.so.0.2.1
+lib/libkleopatraclientcore.so.0.3.0
lib/libkleopatraclientgui.so
lib/libkleopatraclientgui.so.0
-lib/libkleopatraclientgui.so.0.2.1
+lib/libkleopatraclientgui.so.0.3.0
lib/libkmailprivate.so.4
-lib/libkmailprivate.so.4.11.5
+lib/libkmailprivate.so.${PKGVERSION}
+lib/libkmanagesieve.so
+lib/libkmanagesieve.so.4
+lib/libkmanagesieve.so.${PKGVERSION}
lib/libknodecommon.so
lib/libknodecommon.so.4
-lib/libknodecommon.so.4.11.5
-lib/libknoteskolab.so
-lib/libknoteskolab.so.4
-lib/libknoteskolab.so.4.11.5
+lib/libknodecommon.so.${PKGVERSION}
+lib/libknotesprivate.so.4
+lib/libknotesprivate.so.${PKGVERSION}
lib/libkontactprivate.so.4
-lib/libkontactprivate.so.4.11.5
-lib/libkorg_stdprinting.so
-lib/libkorg_stdprinting.so.4
-lib/libkorg_stdprinting.so.4.11.5
-lib/libkorganizer_calendar.so
-lib/libkorganizer_calendar.so.4
-lib/libkorganizer_calendar.so.4.11.5
+lib/libkontactprivate.so.${PKGVERSION}
lib/libkorganizer_core.so
lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.4.11.5
-lib/libkorganizer_eventviewer.so
-lib/libkorganizer_eventviewer.so.4
-lib/libkorganizer_eventviewer.so.4.11.5
+lib/libkorganizer_core.so.${PKGVERSION}
lib/libkorganizer_interfaces.so
lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.4.11.5
+lib/libkorganizer_interfaces.so.${PKGVERSION}
lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.4.11.5
+lib/libkorganizerprivate.so.${PKGVERSION}
lib/libkpgp.so
lib/libkpgp.so.4
-lib/libkpgp.so.4.11.5
+lib/libkpgp.so.${PKGVERSION}
lib/libksieve.so
lib/libksieve.so.4
-lib/libksieve.so.4.11.5
-lib/libkslox.so
-lib/libkslox.so.4
-lib/libkslox.so.4.11.5
+lib/libksieve.so.${PKGVERSION}
+lib/libksieveui.so
+lib/libksieveui.so.4
+lib/libksieveui.so.${PKGVERSION}
+lib/libmailcommon.so
+lib/libmailcommon.so.4
+lib/libmailcommon.so.${PKGVERSION}
+lib/libmailimporter.so
+lib/libmailimporter.so.4
+lib/libmailimporter.so.${PKGVERSION}
+lib/libmessagecomposer.so
+lib/libmessagecomposer.so.4
+lib/libmessagecomposer.so.${PKGVERSION}
lib/libmessagecore.so
lib/libmessagecore.so.4
-lib/libmessagecore.so.4.11.5
+lib/libmessagecore.so.${PKGVERSION}
lib/libmessagelist.so
lib/libmessagelist.so.4
-lib/libmessagelist.so.4.11.5
+lib/libmessagelist.so.${PKGVERSION}
lib/libmessageviewer.so
-lib/libmessageviewer.so.0
-lib/libmessageviewer.so.0.1.0
-lib/libmimelib.so
-lib/libmimelib.so.4
-lib/libmimelib.so.4.11.5
-lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_vcf.so
+lib/libmessageviewer.so.4
+lib/libmessageviewer.so.${PKGVERSION}
+lib/libnoteshared.so
+lib/libnoteshared.so.4
+lib/libnoteshared.so.${PKGVERSION}
+lib/libpimcommon.so
+lib/libpimcommon.so.4
+lib/libpimcommon.so.${PKGVERSION}
+lib/libsendlater.so
+lib/libsendlater.so.4
+lib/libsendlater.so.${PKGVERSION}
+lib/libtemplateparser.so
+lib/libtemplateparser.so.4
+lib/libtemplateparser.so.${PKGVERSION}
man/man1/kabcclient.1
-share/applications/kde4/KMail.desktop
+share/PolicyKit/policy/org.kde.kalarmrtcwake.policy
+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
share/applications/kde4/Kjots.desktop
share/applications/kde4/Kontact.desktop
share/applications/kde4/akonadiconsole.desktop
share/applications/kde4/akregator.desktop
share/applications/kde4/blogilo.desktop
-share/applications/kde4/groupwarewizard.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
@@ -240,6 +254,11 @@ share/applications/kde4/kontact-admin.desktop
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/applications/kde4/pimsettingexporter.desktop
+share/applications/kde4/sieveeditor.desktop
+share/applications/kde4/storageservicemanager.desktop
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
@@ -247,13 +266,29 @@ share/dbus-1/interfaces/org.kde.akregator.part.xml
share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
share/dbus-1/interfaces/org.kde.kmail.kmail.xml
share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
-share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml
share/dbus-1/interfaces/org.kde.knode.xml
share/dbus-1/interfaces/org.kde.kontact.KNotes.xml
share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
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/kde/HTML/en/akonadi_archivemail_agent/add-archive-mail.png
+share/doc/kde/HTML/en/akonadi_archivemail_agent/common
+share/doc/kde/HTML/en/akonadi_archivemail_agent/configure-archive-mail-agent.png
+share/doc/kde/HTML/en/akonadi_archivemail_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_archivemail_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/common
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_followupreminder_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_notes_agent/common
+share/doc/kde/HTML/en/akonadi_notes_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_notes_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_sendlater_agent/common
+share/doc/kde/HTML/en/akonadi_sendlater_agent/index.cache.bz2
+share/doc/kde/HTML/en/akonadi_sendlater_agent/index.docbook
+share/doc/kde/HTML/en/akonadi_sendlater_agent/sendlateragent-configure.png
+share/doc/kde/HTML/en/akonadi_sendlater_agent/sendlateragent-dialog.png
share/doc/kde/HTML/en/akregator/add-feed.png
share/doc/kde/HTML/en/akregator/add-feed2.png
share/doc/kde/HTML/en/akregator/add-folder.png
@@ -263,6 +298,7 @@ share/doc/kde/HTML/en/akregator/appearance-tab.png
share/doc/kde/HTML/en/akregator/archive-tab.png
share/doc/kde/HTML/en/akregator/browser-tab.png
share/doc/kde/HTML/en/akregator/common
+share/doc/kde/HTML/en/akregator/feed.png
share/doc/kde/HTML/en/akregator/general-tab.png
share/doc/kde/HTML/en/akregator/index.cache.bz2
share/doc/kde/HTML/en/akregator/index.docbook
@@ -274,7 +310,7 @@ share/doc/kde/HTML/en/akregator/main-window3.png
share/doc/kde/HTML/en/akregator/main-window4.png
share/doc/kde/HTML/en/akregator/quick-filter.png
share/doc/kde/HTML/en/akregator/rss.png
-share/doc/kde/HTML/en/akregator/rss3.png
+share/doc/kde/HTML/en/akregator/share-services-tab.png
share/doc/kde/HTML/en/blogilo/add-blog-1.png
share/doc/kde/HTML/en/blogilo/add-blog-2.png
share/doc/kde/HTML/en/blogilo/common
@@ -286,6 +322,16 @@ share/doc/kde/HTML/en/blogilo/toolbox-1.png
share/doc/kde/HTML/en/blogilo/toolbox-2.png
share/doc/kde/HTML/en/blogilo/toolbox-3.png
share/doc/kde/HTML/en/blogilo/toolbox-4.png
+share/doc/kde/HTML/en/contactthemeeditor/common
+share/doc/kde/HTML/en/contactthemeeditor/index.cache.bz2
+share/doc/kde/HTML/en/contactthemeeditor/index.docbook
+share/doc/kde/HTML/en/headerthemeeditor/common
+share/doc/kde/HTML/en/headerthemeeditor/index.cache.bz2
+share/doc/kde/HTML/en/headerthemeeditor/index.docbook
+share/doc/kde/HTML/en/importwizard/common
+share/doc/kde/HTML/en/importwizard/import-selection.png
+share/doc/kde/HTML/en/importwizard/index.cache.bz2
+share/doc/kde/HTML/en/importwizard/index.docbook
share/doc/kde/HTML/en/kabcclient/common
share/doc/kde/HTML/en/kabcclient/index.cache.bz2
share/doc/kde/HTML/en/kabcclient/index.docbook
@@ -305,20 +351,49 @@ share/doc/kde/HTML/en/kioslave/news/index.docbook
share/doc/kde/HTML/en/kjots/common
share/doc/kde/HTML/en/kjots/index.cache.bz2
share/doc/kde/HTML/en/kjots/index.docbook
+share/doc/kde/HTML/en/kjots/mainwindow.png
share/doc/kde/HTML/en/kleopatra/common
share/doc/kde/HTML/en/kleopatra/index.cache.bz2
share/doc/kde/HTML/en/kleopatra/index.docbook
+share/doc/kde/HTML/en/kmail/accountwizard.png
+share/doc/kde/HTML/en/kmail/aggregationtheme.png
share/doc/kde/HTML/en/kmail/common
share/doc/kde/HTML/en/kmail/configure.docbook
+share/doc/kde/HTML/en/kmail/configure.png
share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook
share/doc/kde/HTML/en/kmail/faq.docbook
+share/doc/kde/HTML/en/kmail/folder-example.png
+share/doc/kde/HTML/en/kmail/folder-properties.png
+share/doc/kde/HTML/en/kmail/folderarchiveagent.png
share/doc/kde/HTML/en/kmail/getting-started.docbook
-share/doc/kde/HTML/en/kmail/importing.docbook
+share/doc/kde/HTML/en/kmail/identitiesadvanced.png
+share/doc/kde/HTML/en/kmail/identity.png
+share/doc/kde/HTML/en/kmail/identitycryptography.png
+share/doc/kde/HTML/en/kmail/identitygeneral.png
+share/doc/kde/HTML/en/kmail/identitypicture.png
+share/doc/kde/HTML/en/kmail/identitysignature.png
+share/doc/kde/HTML/en/kmail/identitytemplate.png
share/doc/kde/HTML/en/kmail/index.cache.bz2
share/doc/kde/HTML/en/kmail/index.docbook
share/doc/kde/HTML/en/kmail/intro.docbook
+share/doc/kde/HTML/en/kmail/kmailwelcome.png
+share/doc/kde/HTML/en/kmail/layout.png
+share/doc/kde/HTML/en/kmail/mail-mark-important.png
+share/doc/kde/HTML/en/kmail/mail-mark-read.png
+share/doc/kde/HTML/en/kmail/mail-mark-task.png
+share/doc/kde/HTML/en/kmail/mail-mark-unread.png
+share/doc/kde/HTML/en/kmail/mail-thread-ignored.png
+share/doc/kde/HTML/en/kmail/mail-thread-watch.png
share/doc/kde/HTML/en/kmail/menus.docbook
+share/doc/kde/HTML/en/kmail/message.png
+share/doc/kde/HTML/en/kmail/messagelisttheme.png
+share/doc/kde/HTML/en/kmail/smile.png
+share/doc/kde/HTML/en/kmail/troubleshooting.docbook
share/doc/kde/HTML/en/kmail/using-kmail.docbook
+share/doc/kde/HTML/en/kmailcvt/common
+share/doc/kde/HTML/en/kmailcvt/index.cache.bz2
+share/doc/kde/HTML/en/kmailcvt/index.docbook
+share/doc/kde/HTML/en/kmailcvt/kmailcvt.png
share/doc/kde/HTML/en/knode/commands.docbook
share/doc/kde/HTML/en/knode/common
share/doc/kde/HTML/en/knode/credits.docbook
@@ -373,12 +448,9 @@ share/doc/kde/HTML/en/kontact-admin/index.cache.bz2
share/doc/kde/HTML/en/kontact-admin/index.docbook
share/doc/kde/HTML/en/kontact/calendar-sidebar-icon.png
share/doc/kde/HTML/en/kontact/common
-share/doc/kde/HTML/en/kontact/configuration-components.png
share/doc/kde/HTML/en/kontact/configuration-main.png
-share/doc/kde/HTML/en/kontact/configuration-select-components.png
+share/doc/kde/HTML/en/kontact/configuration-shortcuts.png
share/doc/kde/HTML/en/kontact/configuration-starting-component.png
-share/doc/kde/HTML/en/kontact/configuration-summary-view-kpilot.png
-share/doc/kde/HTML/en/kontact/configuration-summary-view.png
share/doc/kde/HTML/en/kontact/index.cache.bz2
share/doc/kde/HTML/en/kontact/index.docbook
share/doc/kde/HTML/en/kontact/kaddressbook-sidebar-icon.png
@@ -386,72 +458,59 @@ share/doc/kde/HTML/en/kontact/main-view.png
share/doc/kde/HTML/en/kontact/menu-bar-kmail.png
share/doc/kde/HTML/en/kontact/menu-bar-korganizer.png
share/doc/kde/HTML/en/kontact/menu-bar-summary.png
+share/doc/kde/HTML/en/kontact/navigator-bar-kontact.png
share/doc/kde/HTML/en/kontact/new-menu.png
share/doc/kde/HTML/en/kontact/settings-menu-kmail.png
share/doc/kde/HTML/en/kontact/side-pane.png
+share/doc/kde/HTML/en/kontact/summary-selection.png
share/doc/kde/HTML/en/kontact/summary-view-calendar.png
-share/doc/kde/HTML/en/kontact/summary-view-contacts.png
-share/doc/kde/HTML/en/kontact/summary-view-kpilot.png
share/doc/kde/HTML/en/kontact/summary-view-mail.png
-share/doc/kde/HTML/en/kontact/summary-view-newsticker.png
share/doc/kde/HTML/en/kontact/summary-view-notes.png
share/doc/kde/HTML/en/kontact/summary-view-repositioning.png
+share/doc/kde/HTML/en/kontact/summary-view-special-dates.png
share/doc/kde/HTML/en/kontact/summary-view-todos.png
-share/doc/kde/HTML/en/kontact/summary-view-weather.png
share/doc/kde/HTML/en/kontact/summary-view.png
share/doc/kde/HTML/en/kontact/todo-list-sidebar-icon.png
+share/doc/kde/HTML/en/korganizer/application-exit.png
+share/doc/kde/HTML/en/korganizer/appointment-new.png
share/doc/kde/HTML/en/korganizer/common
+share/doc/kde/HTML/en/korganizer/document-open.png
+share/doc/kde/HTML/en/korganizer/document-print-preview.png
+share/doc/kde/HTML/en/korganizer/document-print.png
+share/doc/kde/HTML/en/korganizer/edit-copy.png
+share/doc/kde/HTML/en/korganizer/edit-cut.png
+share/doc/kde/HTML/en/korganizer/edit-delete.png
+share/doc/kde/HTML/en/korganizer/edit-find.png
+share/doc/kde/HTML/en/korganizer/edit-paste.png
+share/doc/kde/HTML/en/korganizer/edit-redo.png
+share/doc/kde/HTML/en/korganizer/edit-undo.png
share/doc/kde/HTML/en/korganizer/event-attachments.png
share/doc/kde/HTML/en/korganizer/event-attendees.png
-share/doc/kde/HTML/en/korganizer/event-freebusy.png
share/doc/kde/HTML/en/korganizer/event-general.png
share/doc/kde/HTML/en/korganizer/event-recurrence.png
+share/doc/kde/HTML/en/korganizer/go-jump-today.png
+share/doc/kde/HTML/en/korganizer/go-next.png
+share/doc/kde/HTML/en/korganizer/go-previous.png
share/doc/kde/HTML/en/korganizer/groupevent.png
-share/doc/kde/HTML/en/korganizer/i_actions_newevent.png
-share/doc/kde/HTML/en/korganizer/i_actions_newtodo.png
-share/doc/kde/HTML/en/korganizer/i_copy.png
-share/doc/kde/HTML/en/korganizer/i_cut.png
-share/doc/kde/HTML/en/korganizer/i_edit_delete.png
-share/doc/kde/HTML/en/korganizer/i_edit_find.png
-share/doc/kde/HTML/en/korganizer/i_edit_redo.png
-share/doc/kde/HTML/en/korganizer/i_edit_undo.png
-share/doc/kde/HTML/en/korganizer/i_file_close.png
-share/doc/kde/HTML/en/korganizer/i_file_new.png
-share/doc/kde/HTML/en/korganizer/i_file_open.png
-share/doc/kde/HTML/en/korganizer/i_file_print.png
-share/doc/kde/HTML/en/korganizer/i_file_quit.png
-share/doc/kde/HTML/en/korganizer/i_file_revert.png
-share/doc/kde/HTML/en/korganizer/i_file_save.png
-share/doc/kde/HTML/en/korganizer/i_file_saveas.png
-share/doc/kde/HTML/en/korganizer/i_go_backward.png
-share/doc/kde/HTML/en/korganizer/i_go_forward.png
-share/doc/kde/HTML/en/korganizer/i_go_to_today.png
-share/doc/kde/HTML/en/korganizer/i_paste.png
-share/doc/kde/HTML/en/korganizer/i_settings_prefs.png
-share/doc/kde/HTML/en/korganizer/i_view_day.png
-share/doc/kde/HTML/en/korganizer/i_view_journal.png
-share/doc/kde/HTML/en/korganizer/i_view_list.png
-share/doc/kde/HTML/en/korganizer/i_view_month.png
-share/doc/kde/HTML/en/korganizer/i_view_todo_list.png
-share/doc/kde/HTML/en/korganizer/i_view_week.png
-share/doc/kde/HTML/en/korganizer/i_view_whatsnext.png
-share/doc/kde/HTML/en/korganizer/i_view_work_week.png
-share/doc/kde/HTML/en/korganizer/i_view_xdays.png
share/doc/kde/HTML/en/korganizer/index.cache.bz2
share/doc/kde/HTML/en/korganizer/index.docbook
share/doc/kde/HTML/en/korganizer/korganizer-resource.png
-share/doc/kde/HTML/en/korganizer/o2v_importing1.png
-share/doc/kde/HTML/en/korganizer/o2v_importing2.png
-share/doc/kde/HTML/en/korganizer/o2v_importing3.png
-share/doc/kde/HTML/en/korganizer/o2v_main.png
-share/doc/kde/HTML/en/korganizer/o2v_progress.png
-share/doc/kde/HTML/en/korganizer/o2v_save.png
-share/doc/kde/HTML/en/korganizer/o2v_warning.png
+share/doc/kde/HTML/en/korganizer/list-add.png
share/doc/kde/HTML/en/korganizer/organizer.png
-share/doc/kde/HTML/en/korganizer/outlook-to-vcalendar.docbook
-share/doc/kde/HTML/en/korganizer/plugins-chapter.docbook
share/doc/kde/HTML/en/korganizer/remotefile-resource.png
share/doc/kde/HTML/en/korganizer/todo-general.png
+share/doc/kde/HTML/en/korganizer/view-calendar-agenda.png
+share/doc/kde/HTML/en/korganizer/view-calendar-day.png
+share/doc/kde/HTML/en/korganizer/view-calendar-journal.png
+share/doc/kde/HTML/en/korganizer/view-calendar-list.png
+share/doc/kde/HTML/en/korganizer/view-calendar-month.png
+share/doc/kde/HTML/en/korganizer/view-calendar-tasks.png
+share/doc/kde/HTML/en/korganizer/view-calendar-timeline.png
+share/doc/kde/HTML/en/korganizer/view-calendar-upcoming-days.png
+share/doc/kde/HTML/en/korganizer/view-calendar-upcoming-events.png
+share/doc/kde/HTML/en/korganizer/view-calendar-week.png
+share/doc/kde/HTML/en/korganizer/view-calendar-workweek.png
+share/doc/kde/HTML/en/korganizer/view-task-add.png
share/doc/kde/HTML/en/ktimetracker/common
share/doc/kde/HTML/en/ktimetracker/csvexport.png
share/doc/kde/HTML/en/ktimetracker/idle-detect.png
@@ -459,125 +518,194 @@ share/doc/kde/HTML/en/ktimetracker/index.cache.bz2
share/doc/kde/HTML/en/ktimetracker/index.docbook
share/doc/kde/HTML/en/ktimetracker/ktimetracker.png
share/doc/kde/HTML/en/ktimetracker/systray.png
+share/doc/kde/HTML/en/ktnef/common
+share/doc/kde/HTML/en/ktnef/index.cache.bz2
+share/doc/kde/HTML/en/ktnef/index.docbook
+share/doc/kde/HTML/en/ktnef/mainwindow.png
+share/doc/kde/HTML/en/ktnef/winmail_dat.png
share/doc/kde/HTML/en/kwatchgnupg/common
share/doc/kde/HTML/en/kwatchgnupg/index.cache.bz2
share/doc/kde/HTML/en/kwatchgnupg/index.docbook
+share/doc/kde/HTML/en/pimsettingexporter/common
+share/doc/kde/HTML/en/pimsettingexporter/index.cache.bz2
+share/doc/kde/HTML/en/pimsettingexporter/index.docbook
+share/doc/kde/HTML/en/pimsettingexporter/pimsettingexporter.png
+share/doc/kde/HTML/en/sieveeditor/common
+share/doc/kde/HTML/en/sieveeditor/index.cache.bz2
+share/doc/kde/HTML/en/sieveeditor/index.docbook
+share/examples/kde4-dbus/org.kde.kalarmrtcwake.conf
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
share/icons/hicolor/128x128/apps/knode.png
-share/icons/hicolor/128x128/apps/knode2.png
share/icons/hicolor/128x128/apps/knotes.png
+share/icons/hicolor/128x128/apps/konsolekalendar.png
+share/icons/hicolor/128x128/apps/kontact-import-wizard.png
share/icons/hicolor/128x128/apps/kontact.png
+share/icons/hicolor/128x128/apps/korg-journal.png
+share/icons/hicolor/128x128/apps/korg-todo.png
share/icons/hicolor/128x128/apps/korganizer.png
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
share/icons/hicolor/16x16/apps/akregator.png
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
+share/icons/hicolor/16x16/apps/kmailcvt.png
share/icons/hicolor/16x16/apps/knode.png
-share/icons/hicolor/16x16/apps/knode2.png
share/icons/hicolor/16x16/apps/knotes.png
+share/icons/hicolor/16x16/apps/konsolekalendar.png
share/icons/hicolor/16x16/apps/kontact.png
+share/icons/hicolor/16x16/apps/korg-journal.png
+share/icons/hicolor/16x16/apps/korg-todo.png
share/icons/hicolor/16x16/apps/korganizer.png
share/icons/hicolor/16x16/apps/ktimetracker.png
share/icons/hicolor/22x22/actions/format-text-blockquote.png
share/icons/hicolor/22x22/actions/format-text-code.png
share/icons/hicolor/22x22/actions/insert-more-mark.png
+share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
+share/icons/hicolor/22x22/actions/ktnef_extract_to.png
share/icons/hicolor/22x22/actions/remove-link.png
share/icons/hicolor/22x22/actions/upload-media.png
+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/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
+share/icons/hicolor/22x22/apps/knode.png
share/icons/hicolor/22x22/apps/knotes.png
+share/icons/hicolor/22x22/apps/konsolekalendar.png
share/icons/hicolor/22x22/apps/kontact.png
+share/icons/hicolor/22x22/apps/korg-journal.png
+share/icons/hicolor/22x22/apps/korg-todo.png
share/icons/hicolor/22x22/apps/korganizer.png
share/icons/hicolor/22x22/apps/ktimetracker.png
+share/icons/hicolor/256x256/apps/akonadiconsole.png
+share/icons/hicolor/256x256/apps/akregator.png
+share/icons/hicolor/256x256/apps/kleopatra.png
+share/icons/hicolor/256x256/apps/kontact-import-wizard.png
share/icons/hicolor/32x32/actions/upload-media.png
+share/icons/hicolor/32x32/apps/akonadiconsole.png
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
+share/icons/hicolor/32x32/apps/kmailcvt.png
share/icons/hicolor/32x32/apps/knode.png
-share/icons/hicolor/32x32/apps/knode2.png
share/icons/hicolor/32x32/apps/knotes.png
+share/icons/hicolor/32x32/apps/konsolekalendar.png
share/icons/hicolor/32x32/apps/kontact.png
+share/icons/hicolor/32x32/apps/korg-journal.png
+share/icons/hicolor/32x32/apps/korg-todo.png
share/icons/hicolor/32x32/apps/korganizer.png
share/icons/hicolor/32x32/apps/ktimetracker.png
share/icons/hicolor/48x48/actions/upload-media.png
+share/icons/hicolor/48x48/apps/akonadiconsole.png
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
+share/icons/hicolor/48x48/apps/kmailcvt.png
share/icons/hicolor/48x48/apps/knode.png
-share/icons/hicolor/48x48/apps/knode2.png
share/icons/hicolor/48x48/apps/knotes.png
+share/icons/hicolor/48x48/apps/konsolekalendar.png
share/icons/hicolor/48x48/apps/kontact.png
+share/icons/hicolor/48x48/apps/korg-journal.png
+share/icons/hicolor/48x48/apps/korg-todo.png
share/icons/hicolor/48x48/apps/korganizer.png
share/icons/hicolor/48x48/apps/ktimetracker.png
+share/icons/hicolor/48x48/apps/ktnef.png
share/icons/hicolor/64x64/actions/upload-media.png
+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
share/icons/hicolor/64x64/apps/knode.png
-share/icons/hicolor/64x64/apps/knode2.png
share/icons/hicolor/64x64/apps/knotes.png
+share/icons/hicolor/64x64/apps/kontact-import-wizard.png
share/icons/hicolor/64x64/apps/kontact.png
+share/icons/hicolor/64x64/apps/korg-journal.png
+share/icons/hicolor/64x64/apps/korg-todo.png
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
+share/icons/hicolor/scalable/apps/knode.svgz
+share/icons/hicolor/scalable/apps/knotes.svgz
+share/icons/hicolor/scalable/apps/kontact-import-wizard.svgz
+share/icons/hicolor/scalable/apps/kontact.svgz
+share/icons/hicolor/scalable/apps/korg-journal.svgz
+share/icons/hicolor/scalable/apps/korg-todo.svgz
share/icons/hicolor/scalable/apps/korganizer.svgz
-share/icons/oxygen/128x128/apps/kalarm.png
-share/icons/oxygen/128x128/apps/kleopatra.png
+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/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/16x16/actions/edit-delete-page.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/kleopatra.png
-share/icons/oxygen/16x16/apps/kmailcvt.png
share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/actions/button_fewer.png
-share/icons/oxygen/22x22/actions/button_more.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/apps/kleopatra.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/kleopatra.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/kleopatra.png
-share/icons/oxygen/48x48/apps/kmailcvt.png
share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/64x64/apps/kalarm.png
-share/icons/oxygen/64x64/apps/kleopatra.png
+share/icons/oxygen/512x512/mimetypes/x-mail-distribution-list.png
share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-share/icons/oxygen/scalable/apps/kalarm.svgz
-share/icons/oxygen/scalable/apps/kleopatra.svgz
share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
+share/kde/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/kde/apps/akonadi_followupreminder_agent/akonadi_followupreminder_agent.notifyrc
+share/kde/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/kde/apps/akonadi_notes_agent/akonadi_notes_agent.notifyrc
+share/kde/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
share/kde/apps/akonadiconsole/akonadiconsoleui.rc
share/kde/apps/akregator/about/akregator.css
share/kde/apps/akregator/about/main.html
@@ -589,21 +717,42 @@ share/kde/apps/akregator/articleviewer.rc
share/kde/apps/akregator/pageviewer.rc
share/kde/apps/akregator/pics/kmmsgnew.png
share/kde/apps/akregator/pics/kmmsgunseen.png
+share/kde/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
share/kde/apps/blogilo/blogiloui.rc
+share/kde/apps/composereditor/composereditorinitialhtml
+share/kde/apps/contactthemeeditor/contactthemeeditorui.rc
+share/kde/apps/desktoptheme/default/widgets/stickynote.svgz
+share/kde/apps/headerthemeeditor/headerthemeeditorui.rc
share/kde/apps/kaddressbook/kaddressbookui.rc
+share/kde/apps/kaddressbook/printing/compact-style.png
share/kde/apps/kaddressbook/printing/detailed-style.png
share/kde/apps/kaddressbook/printing/mike-style.png
share/kde/apps/kaddressbook/printing/ringbinder-style.png
+share/kde/apps/kaddressbook/printing/themes/big-theme-example/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/big-theme-example/theme.html
+share/kde/apps/kaddressbook/printing/themes/default/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/default/theme.html
+share/kde/apps/kaddressbook/printing/themes/full/theme.desktop
+share/kde/apps/kaddressbook/printing/themes/full/theme.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact_embedded.html
+share/kde/apps/kaddressbook/viewertemplates/default/contact_row.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_additionalfieldrow.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_embedded.html
+share/kde/apps/kaddressbook/viewertemplates/default/contactgroup_memberrow.html
+share/kde/apps/kaddressbook/viewertemplates/default/theme.desktop
share/kde/apps/kalarm/icons/oxygen/16x16/actions/document-new-from-template.png
share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-audio-alarm.png
share/kde/apps/kalarm/icons/oxygen/16x16/actions/new-command-alarm.png
share/kde/apps/kalarm/icons/oxygen/22x22/actions/document-new-from-template.png
share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm-disabled.png
+share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm-partdisabled.png
share/kde/apps/kalarm/icons/oxygen/22x22/actions/kalarm.png
share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png
share/kde/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png
-share/kde/apps/kalarm/icons/oxygen/22x22/emblems/partdisabled.png
share/kde/apps/kalarm/kalarmui.rc
+share/kde/apps/kconf_update/grantleetheme.upd
share/kde/apps/kconf_update/kalarm-1.2.1-general.pl
share/kde/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/kde/apps/kconf_update/kalarm-2.0.2-general.pl
@@ -628,11 +777,13 @@ share/kde/apps/kconf_update/kmail-4.0-misc.pl
share/kde/apps/kconf_update/kmail-pgpidentity.pl
share/kde/apps/kconf_update/kmail-upd-identities.pl
share/kde/apps/kconf_update/kmail.upd
-share/kde/apps/kconf_update/kolab-resource.upd
+share/kde/apps/kconf_update/knode.upd
share/kde/apps/kconf_update/korganizer.upd
share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
share/kde/apps/kconf_update/kpgp.upd
-share/kde/apps/kconf_update/upgrade-resourcetype.pl
+share/kde/apps/kconf_update/mailfilteragent.upd
+share/kde/apps/kconf_update/migrate-kmail-filters.pl
+share/kde/apps/kconf_update/noteglobalsettings.upd
share/kde/apps/kconf_update/upgrade-signature.pl
share/kde/apps/kconf_update/upgrade-transport.pl
share/kde/apps/kdepimwidgets/pics/addresseelineedit.png
@@ -641,6 +792,19 @@ share/kde/apps/kdepimwidgets/pics/kdateedit.png
share/kde/apps/kdepimwidgets/pics/ktimeedit.png
share/kde/apps/kjots/kjotspartui.rc
share/kde/apps/kjots/kjotsui.rc
+share/kde/apps/kjots/themes/default/book_toc_list.html
+share/kde/apps/kjots/themes/default/booktemplate.html
+share/kde/apps/kjots/themes/default/pagetemplate.html
+share/kde/apps/kjots/themes/default/template.html
+share/kde/apps/kjots/themes/other/booktemplate.html
+share/kde/apps/kjots/themes/other/pagetemplate.html
+share/kde/apps/kjots/themes/other/template.html
+share/kde/apps/kjots/themes/plain_text/book_template.txt
+share/kde/apps/kjots/themes/plain_text/page_template.txt
+share/kde/apps/kjots/themes/plain_text/template.txt
+share/kde/apps/kjots/themes/xml_output/booktemplate.xml
+share/kde/apps/kjots/themes/xml_output/pagetemplate.xml
+share/kde/apps/kjots/themes/xml_output/template.xml
share/kde/apps/kleopatra/kleopatra.rc
share/kde/apps/kleopatra/pics/gpg4win-compact.png
share/kde/apps/kleopatra/pics/gpg4win.png
@@ -648,52 +812,24 @@ share/kde/apps/kleopatra/pics/kleopatra_splashscreen.png
share/kde/apps/kleopatra/pics/kleopatra_splashscreen.svgz
share/kde/apps/kleopatra/pics/kleopatra_wizard.png
share/kde/apps/kleopatra/pics/kleopatra_wizard.svgz
-share/kde/apps/kmail/about/kmail.css
-share/kde/apps/kmail/about/main.html
-share/kde/apps/kmail/about/top-left-kmail.png
-share/kde/apps/kmail/kmail.notifyrc
-share/kde/apps/kmail/kmail_part.rc
-share/kde/apps/kmail/kmcomposerui.rc
-share/kde/apps/kmail/kmmainwin.rc
-share/kde/apps/kmail/kmreadermainwin.rc
-share/kde/apps/kmail/pics/enterprise_bottom.png
-share/kde/apps/kmail/pics/enterprise_bottom_left.png
-share/kde/apps/kmail/pics/enterprise_bottom_right.png
-share/kde/apps/kmail/pics/enterprise_icon.png
-share/kde/apps/kmail/pics/enterprise_left.png
-share/kde/apps/kmail/pics/enterprise_right.png
-share/kde/apps/kmail/pics/enterprise_s_left.png
-share/kde/apps/kmail/pics/enterprise_s_right.png
-share/kde/apps/kmail/pics/enterprise_sbar.png
-share/kde/apps/kmail/pics/enterprise_sp_right.png
-share/kde/apps/kmail/pics/enterprise_sw.png
-share/kde/apps/kmail/pics/enterprise_top.png
-share/kde/apps/kmail/pics/enterprise_top_left.png
-share/kde/apps/kmail/pics/enterprise_top_right.png
-share/kde/apps/kmail/pics/enterprise_w.png
-share/kde/apps/kmail/pics/key.png
-share/kde/apps/kmail/pics/key_bad.png
-share/kde/apps/kmail/pics/key_ok.png
-share/kde/apps/kmail/pics/key_unknown.png
-share/kde/apps/kmail/pics/kmwizard.png
-share/kde/apps/kmail/pics/mail-deleted.png
-share/kde/apps/kmail/pics/mail-encrypted-full.png
-share/kde/apps/kmail/pics/mail-encrypted-part.png
-share/kde/apps/kmail/pics/mail-encrypted.png
-share/kde/apps/kmail/pics/mail-horizontal-space.png
-share/kde/apps/kmail/pics/mail-thread-ignored.png
-share/kde/apps/kmail/pics/mail-thread-watch.png
-share/kde/apps/kmail/pics/mail-vertical-separator-line.png
-share/kde/apps/kmail/pics/pgp-keys.png
-share/kde/apps/kmail/pics/quicklistClosed.png
-share/kde/apps/kmail/pics/quicklistOpened.png
-share/kde/apps/kmail/pics/quotecollapse.png
-share/kde/apps/kmail/pics/quoteexpand.png
-share/kde/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
-share/kde/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop
-share/kde/apps/kmail/tips
+share/kde/apps/kmail2/about/kmail.css
+share/kde/apps/kmail2/about/main.html
+share/kde/apps/kmail2/about/top-left-kmail.png
+share/kde/apps/kmail2/kmail2.notifyrc
+share/kde/apps/kmail2/kmail_part.rc
+share/kde/apps/kmail2/kmcomposerui.rc
+share/kde/apps/kmail2/kmmainwin.rc
+share/kde/apps/kmail2/kmreadermainwin.rc
+share/kde/apps/kmail2/pics/key.png
+share/kde/apps/kmail2/pics/key_bad.png
+share/kde/apps/kmail2/pics/key_ok.png
+share/kde/apps/kmail2/pics/key_unknown.png
+share/kde/apps/kmail2/pics/kmwizard.png
+share/kde/apps/kmail2/pics/mail-deleted.png
+share/kde/apps/kmail2/pics/mail-thread-ignored.png
+share/kde/apps/kmail2/pics/mail-thread-watch.png
+share/kde/apps/kmail2/pics/pgp-keys.png
+share/kde/apps/kmail2/tips
share/kde/apps/kmailcvt/pics/step1.png
share/kde/apps/knode/filters/1.fltr
share/kde/apps/knode/filters/2.fltr
@@ -722,18 +858,15 @@ share/kde/apps/knode/pics/mail.png
share/kde/apps/knode/pics/newsubs.png
share/kde/apps/knode/pics/posting.png
share/kde/apps/knode/pics/snderr.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png
-share/kde/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
share/kde/apps/knotes/knotes_part.rc
share/kde/apps/knotes/knotesappui.rc
share/kde/apps/knotes/knotesui.rc
-share/kde/apps/konsolekalendar/pics/hi128-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi16-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi22-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi32-apps-konsolekalendar.png
-share/kde/apps/konsolekalendar/pics/hi48-apps-konsolekalendar.png
+share/kde/apps/knotes/print/themes/background-color/theme.desktop
+share/kde/apps/knotes/print/themes/background-color/theme.html
+share/kde/apps/knotes/print/themes/big-title/theme.desktop
+share/kde/apps/knotes/print/themes/big-title/theme.html
+share/kde/apps/knotes/print/themes/default/theme.desktop
+share/kde/apps/knotes/print/themes/default/theme.html
share/kde/apps/kontact/about/kontact.css
share/kde/apps/kontact/about/main.html
share/kde/apps/kontact/about/top-left-kontact.png
@@ -745,10 +878,16 @@ share/kde/apps/kontact/ksettingsdialog/kmail.setdlg
share/kde/apps/kontact/ksettingsdialog/knode.setdlg
share/kde/apps/kontact/ksettingsdialog/knotes.setdlg
share/kde/apps/kontact/ksettingsdialog/korganizer.setdlg
-share/kde/apps/kontact/ksettingsdialog/ktimetracker.setdlg
+share/kde/apps/kontact/ksettingsdialog/specialdates.setdlg
share/kde/apps/kontact/ksettingsdialog/summary.setdlg
share/kde/apps/kontactsummary/kontactsummary_part.rc
-share/kde/apps/korgac/icons/hicolor/22x22/actions/korgac.png
+share/kde/apps/korgac/icons/hicolor/128x128/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/16x16/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/22x22/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/256x256/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/32x32/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/64x64/apps/korgac.png
+share/kde/apps/korgac/icons/hicolor/scalable/apps/korgac.svgz
share/kde/apps/korganizer/korganizer_part.rc
share/kde/apps/korganizer/korganizerui.rc
share/kde/apps/korganizer/sounds/alert.wav
@@ -757,13 +896,13 @@ share/kde/apps/korganizer/sounds/lightmag.wav
share/kde/apps/korganizer/sounds/onscreen.wav
share/kde/apps/korganizer/sounds/spinout.wav
share/kde/apps/korganizer/tips
-share/kde/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
-share/kde/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
+share/kde/apps/ktimetracker/icons/hicolor/128x128/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/16x16/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/22x22/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/32x32/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/48x48/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/64x64/actions/subtask-new-ktimetracker.png
+share/kde/apps/ktimetracker/icons/hicolor/scalable/actions/subtask-new-ktimetracker.svgz
share/kde/apps/ktimetracker/ktimetrackerui.rc
share/kde/apps/ktimetracker/pics/active-icon-0.xpm
share/kde/apps/ktimetracker/pics/active-icon-1.xpm
@@ -787,32 +926,10 @@ share/kde/apps/ktimetracker/pics/watch-4.xpm
share/kde/apps/ktimetracker/pics/watch-5.xpm
share/kde/apps/ktimetracker/pics/watch-6.xpm
share/kde/apps/ktimetracker/pics/watch-7.xpm
+share/kde/apps/ktnef/ktnefui.rc
share/kde/apps/kwatchgnupg/kwatchgnupgui.rc
share/kde/apps/kwatchgnupg/pics/kwatchgnupg.png
share/kde/apps/kwatchgnupg/pics/kwatchgnupg2.png
-share/kde/apps/libkdepim/about/bar-bottom-left.png
-share/kde/apps/libkdepim/about/bar-bottom-middle.png
-share/kde/apps/libkdepim/about/bar-bottom-right.png
-share/kde/apps/libkdepim/about/bar-middle-left.png
-share/kde/apps/libkdepim/about/bar-middle-right.png
-share/kde/apps/libkdepim/about/bar-top-left.png
-share/kde/apps/libkdepim/about/bar-top-middle.png
-share/kde/apps/libkdepim/about/bar-top-right.png
-share/kde/apps/libkdepim/about/bottom-left.png
-share/kde/apps/libkdepim/about/bottom-middle.png
-share/kde/apps/libkdepim/about/bottom-right.png
-share/kde/apps/libkdepim/about/box-bottom-left.png
-share/kde/apps/libkdepim/about/box-bottom-middle.png
-share/kde/apps/libkdepim/about/box-bottom-right.png
-share/kde/apps/libkdepim/about/box-middle-left.png
-share/kde/apps/libkdepim/about/box-middle-right.png
-share/kde/apps/libkdepim/about/box-top-left.png
-share/kde/apps/libkdepim/about/box-top-middle.png
-share/kde/apps/libkdepim/about/box-top-right.png
-share/kde/apps/libkdepim/about/kde_infopage.css
-share/kde/apps/libkdepim/about/kde_infopage_rtl.css
-share/kde/apps/libkdepim/about/top-left.png
-share/kde/apps/libkdepim/about/top-middle.png
share/kde/apps/libkleopatra/pics/chiasmus_chi.png
share/kde/apps/libkleopatra/pics/hi16-app-gpg.png
share/kde/apps/libkleopatra/pics/hi16-app-gpgsm.png
@@ -825,48 +942,105 @@ share/kde/apps/libkleopatra/pics/key_bad.png
share/kde/apps/libkleopatra/pics/key_ok.png
share/kde/apps/libkleopatra/pics/key_unknown.png
share/kde/apps/libkleopatra/pics/smartcard.xpm
+share/kde/apps/libmessageviewer/pics/enterprise_bottom.png
+share/kde/apps/libmessageviewer/pics/enterprise_bottom_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_bottom_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_icon.png
+share/kde/apps/libmessageviewer/pics/enterprise_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_s_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_s_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_sbar.png
+share/kde/apps/libmessageviewer/pics/enterprise_sp_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_sw.png
+share/kde/apps/libmessageviewer/pics/enterprise_top.png
+share/kde/apps/libmessageviewer/pics/enterprise_top_left.png
+share/kde/apps/libmessageviewer/pics/enterprise_top_right.png
+share/kde/apps/libmessageviewer/pics/enterprise_w.png
+share/kde/apps/libmessageviewer/pics/mobile_bg.png
+share/kde/apps/libmessageviewer/pics/mobile_status_actionitem.png
+share/kde/apps/libmessageviewer/pics/mobile_status_attachment.png
+share/kde/apps/libmessageviewer/pics/mobile_status_encrypted.png
+share/kde/apps/libmessageviewer/pics/mobile_status_forwarded.png
+share/kde/apps/libmessageviewer/pics/mobile_status_important.png
+share/kde/apps/libmessageviewer/pics/mobile_status_replied.png
+share/kde/apps/libmessageviewer/pics/mobile_status_signed.png
+share/kde/apps/libmessageviewer/pics/quicklistClosed.png
+share/kde/apps/libmessageviewer/pics/quicklistOpened.png
+share/kde/apps/libmessageviewer/pics/quotecollapse.png
+share/kde/apps/libmessageviewer/pics/quoteexpand.png
+share/kde/apps/messagelist/pics/mail-deleted.png
+share/kde/apps/messagelist/pics/mail-horizontal-space.png
+share/kde/apps/messagelist/pics/mail-thread-ignored.png
+share/kde/apps/messagelist/pics/mail-thread-watch.png
+share/kde/apps/messagelist/pics/mail-vertical-separator-line.png
+share/kde/apps/messageviewer/about/main_mobile.html
+share/kde/apps/messageviewer/about/messageviewer_mobile.css
+share/kde/apps/messageviewer/longurlServices.json
+share/kde/apps/messageviewer/messageviewer.notifyrc
+share/kde/apps/messageviewer/plugins/bodypartformatter/application_ms-tnef.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
+share/kde/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
+share/kde/apps/messageviewer/themes/example/header.desktop
+share/kde/apps/messageviewer/themes/example/header.html
+share/kde/apps/messageviewer/themes/example/header_row.html
+share/kde/apps/messageviewer/themes/example_fancy/header.desktop
+share/kde/apps/messageviewer/themes/example_fancy/header.html
+share/kde/apps/pimsettingexporter/backup-structure.txt
+share/kde/apps/pimsettingexporter/pimsettingexporter.rc
+share/kde/apps/sieve/scripts/copy/template.desktop
+share/kde/apps/sieve/scripts/copy/template.txt
+share/kde/apps/sieveeditor/sieveeditorui.rc
+share/kde/apps/storageservicemanager/storageservicemanager.notifyrc
+share/kde/apps/storageservicemanager/storageservicemanagerui.rc
share/kde/autostart/kalarm.autostart.desktop
share/kde/autostart/korgac.desktop
share/kde/config.kcfg/akregator.kcfg
share/kde/config.kcfg/blogilo.kcfg
-share/kde/config.kcfg/custommimeheader.kcfg
share/kde/config.kcfg/customtemplates_kfg.kcfg
-share/kde/config.kcfg/groupwise.kcfg
share/kde/config.kcfg/kalarmconfig.kcfg
share/kde/config.kcfg/kjots.kcfg
share/kde/config.kcfg/kmail.kcfg
-share/kde/config.kcfg/knoteconfig.kcfg
share/kde/config.kcfg/knotesglobalconfig.kcfg
-share/kde/config.kcfg/kolab.kcfg
share/kde/config.kcfg/kontact.kcfg
share/kde/config.kcfg/korganizer.kcfg
-share/kde/config.kcfg/slox.kcfg
share/kde/config.kcfg/templatesconfiguration_kfg.kcfg
+share/kde/config/kaddressbook_themes.knsrc
share/kde/config/kmail.antispamrc
share/kde/config/kmail.antivirusrc
+share/kde/config/knotes_printing_theme.knsrc
share/kde/config/korganizer.knsrc
+share/kde/config/ksieve_script.knsrc
share/kde/config/libkleopatrarc
+share/kde/config/messageviewer_header_themes.knsrc
+share/kde4/services/ServiceMenus/kmail_addattachmentservicemenu.desktop
+share/kde4/services/akonotes_list.desktop
+share/kde4/services/akonotes_note.desktop
share/kde4/services/akregator_config_advanced.desktop
share/kde4/services/akregator_config_appearance.desktop
share/kde4/services/akregator_config_archive.desktop
share/kde4/services/akregator_config_browser.desktop
share/kde4/services/akregator_config_general.desktop
+share/kde4/services/akregator_config_sharemicroblog.desktop
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/groupwise.protocol
-share/kde4/services/groupwises.protocol
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/kcmsdsummary.desktop
share/kde4/services/kcmtodosummary.desktop
share/kde4/services/kjots_config_misc.desktop
share/kde4/services/kjotspart.desktop
share/kde4/services/kleopatra_config_appear.desktop
+share/kde4/services/kleopatra_config_cryptooperations.desktop
share/kde4/services/kleopatra_config_dirserv.desktop
-share/kde4/services/kleopatra_config_dnorder.desktop
share/kde4/services/kleopatra_config_gnupgsystem.desktop
share/kde4/services/kleopatra_config_smimevalidation.desktop
share/kde4/services/kleopatra_decryptverifyfiles.desktop
@@ -879,7 +1053,6 @@ share/kde4/services/kmail_config_composer.desktop
share/kde4/services/kmail_config_identity.desktop
share/kde4/services/kmail_config_misc.desktop
share/kde4/services/kmail_config_security.desktop
-share/kde4/services/knewsservice.protocol
share/kde4/services/knode_config_accounts.desktop
share/kde4/services/knode_config_appearance.desktop
share/kde4/services/knode_config_cleanup.desktop
@@ -888,10 +1061,12 @@ 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_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
@@ -900,16 +1075,14 @@ share/kde4/services/kontact/kmailplugin.desktop
share/kde4/services/kontact/knodeplugin.desktop
share/kde4/services/kontact/knotesplugin.desktop
share/kde4/services/kontact/korganizerplugin.desktop
-share/kde4/services/kontact/ktimetracker_plugin.desktop
+share/kde4/services/kontact/specialdatesplugin.desktop
share/kde4/services/kontact/summaryplugin.desktop
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
@@ -919,28 +1092,8 @@ share/kde4/services/korganizer_configplugins.desktop
share/kde4/services/korganizer_configtime.desktop
share/kde4/services/korganizer_configviews.desktop
share/kde4/services/korganizer_part.desktop
-share/kde4/services/kresources/alarms/local.desktop
-share/kde4/services/kresources/alarms/localdir.desktop
-share/kde4/services/kresources/alarms/remote.desktop
-share/kde4/services/kresources/kabc/kabc_groupdav.desktop
-share/kde4/services/kresources/kabc/kabc_groupwise.desktop
-share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
-share/kde4/services/kresources/kabc/kabc_ox.desktop
-share/kde4/services/kresources/kabc/kabc_slox.desktop
-share/kde4/services/kresources/kabc/kolab.desktop
-share/kde4/services/kresources/kalarm_manager.desktop
share/kde4/services/kresources/kcal/blog.desktop
-share/kde4/services/kresources/kcal/kabc.desktop
-share/kde4/services/kresources/kcal/kcal_groupdav.desktop
-share/kde4/services/kresources/kcal/kcal_groupwise.desktop
-share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
-share/kde4/services/kresources/kcal/kcal_ox.desktop
-share/kde4/services/kresources/kcal/kcal_slox.desktop
-share/kde4/services/kresources/kcal/kolab.desktop
share/kde4/services/kresources/kcal/remote.desktop
-share/kde4/services/kresources/knotes/kolabresource.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
@@ -950,7 +1103,4 @@ share/kde4/servicetypes/akregator_plugin.desktop
share/kde4/servicetypes/calendardecoration.desktop
share/kde4/servicetypes/calendarplugin.desktop
share/kde4/servicetypes/dbuscalendar.desktop
-share/kde4/servicetypes/dbusimap.desktop
share/kde4/servicetypes/dbusmail.desktop
-share/kde4/servicetypes/korganizerpart.desktop
-share/kde4/servicetypes/korgprintplugin.desktop
diff --git a/misc/kdepim4/patches/patch-aa b/misc/kdepim4/patches/patch-aa
deleted file mode 100644
index 9becda7d428..00000000000
--- a/misc/kdepim4/patches/patch-aa
+++ /dev/null
@@ -1,259 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- cmake/modules/FindAssuan2.cmake.orig 2010-08-31 18:25:54.000000000 +0000
-+++ cmake/modules/FindAssuan2.cmake
-@@ -0,0 +1,251 @@
-+# - Try to find the assuan v2 library
-+
-+# Variables set:
-+# ASSUAN2_{INCLUDES,FOUND,LIBRARIES} will be set for each of the above
-+
-+# do away with crappy condition repetition on else/endfoo
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved ${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} )
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
-+
-+#if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own
-+macro( macro_bool_to_bool FOUND_VAR )
-+ foreach( _current_VAR ${ARGN} )
-+ if ( ${FOUND_VAR} )
-+ set( ${_current_VAR} TRUE )
-+ else()
-+ set( ${_current_VAR} FALSE )
-+ endif()
-+ endforeach()
-+endmacro()
-+
-+include (MacroEnsureVersion)
-+
-+message( STATUS "In FindAssuan2.cmake" )
-+
-+if ( WIN32 )
-+
-+ # On Windows, we don't have a libassuan-config script, so we need to
-+ # look for the stuff ourselves:
-+
-+ # in cmake, AND and OR have the same precedence, there's no
-+ # subexpressions, and expressions are evaluated short-circuit'ed
-+ # IOW: CMake if() suxx.
-+ set( _seem_to_have_cached_assuan2 false )
-+ if ( ASSUAN2_INCLUDES )
-+ if ( ASSUAN2_VANILLA_LIBRARIES )#OR ASSUAN2_QT_LIBRARIES OR ASSUAN2_GLIB_LIBRARIES )
-+ set( _seem_to_have_cached_assuan2 true )
-+ endif()
-+ endif()
-+
-+ if ( _seem_to_have_cached_assuan2 )
-+
-+ macro_bool_to_bool( ASSUAN2_VANILLA_LIBRARIES ASSUAN2_VANILLA_FOUND )
-+ # this would have been preferred:
-+ #set( ASSUAN2_*_FOUND macro_bool_to_bool(ASSUAN2_*_LIBRARIES) )
-+
-+ if ( ASSUAN2_VANILLA_FOUND ) #OR ASSUAN2_GLIB_FOUND OR ASSUAN2_QT_FOUND )
-+ set( ASSUAN2_FOUND true )
-+ else()
-+ set( ASSUAN2_FOUND false )
-+ endif()
-+
-+ else()
-+
-+ set( ASSUAN2_FOUND false )
-+ set( ASSUAN2_VANILLA_FOUND false )
-+ #set( ASSUAN2_GLIB_FOUND false )
-+ #set( ASSUAN2_QT_FOUND false )
-+
-+ find_path( ASSUAN2_INCLUDES assuan.h
-+ ${CMAKE_INCLUDE_PATH}
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ )
-+
-+ find_library( _assuan2_library NAMES assuan assuan0 assuan2 libassuan libassuan0 libassuan2
-+ PATHS
-+ ${CMAKE_LIBRARY_PATH}
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ )
-+
-+ find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0
-+ PATHS
-+ ${CMAKE_LIBRARY_PATH}
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ )
-+
-+ set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} )
-+
-+ if ( _assuan2_library AND _gpg_error_library )
-+ set( ASSUAN2_LIBRARIES ${_assuan2_library} ${_gpg_error_library} ws2_32 )
-+ set( ASSUAN2_FOUND true )
-+ endif()
-+
-+ endif()
-+
-+ macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 )
-+
-+else() # not WIN32
-+
-+ # On *nix, we have the libassuan-config script which can tell us all we
-+ # need to know:
-+
-+ # see WIN32 case for an explanation of what this does:
-+ set( _seem_to_have_cached_assuan2 false )
-+ if ( ASSUAN2_INCLUDES AND ASSUAN2_LIBRARIES )
-+ set( _seem_to_have_cached_assuan2 true )
-+ endif()
-+
-+ if ( _seem_to_have_cached_assuan2 )
-+
-+ set( ASSUAN2_FOUND true )
-+
-+ else()
-+
-+ set( ASSUAN2_FOUND false )
-+
-+ find_program( _ASSUAN2CONFIG_EXECUTABLE NAMES libassuan-config )
-+
-+ # if libassuan-config has been found
-+ if ( _ASSUAN2CONFIG_EXECUTABLE )
-+
-+ message( STATUS "Found libassuan-config at ${_ASSUAN2CONFIG_EXECUTABLE}" )
-+
-+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE ASSUAN2_VERSION )
-+
-+ set( _ASSUAN2_MIN_VERSION "2.0.0" )
-+ macro_ensure_version( ${_ASSUAN2_MIN_VERSION} ${ASSUAN2_VERSION} _ASSUAN2_INSTALLED_VERSION_OK )
-+
-+ if ( NOT _ASSUAN2_INSTALLED_VERSION_OK )
-+
-+ message( STATUS "The installed version of assuan is too old: ${ASSUAN2_VERSION} (required: >= ${_ASSUAN2_MIN_VERSION})" )
-+
-+ else()
-+
-+ message( STATUS "Found assuan v${ASSUAN2_VERSION}" )
-+
-+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _assuan2_config_libs RETURN_VALUE _ret )
-+ if ( _ret )
-+ set( _assuan2_config_libs )
-+ endif()
-+
-+ # append -lgpg-error to the list of libraries, if necessary
-+ if ( _assuan2_config_libs AND NOT _assuan2_config_libs MATCHES "lgpg-error" )
-+ set( _assuan2_config_libs "${_assuan2_config_libs} -lgpg-error" )
-+ endif()
-+
-+ if ( _assuan2_config_libs )
-+
-+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _ASSUAN2_CFLAGS )
-+
-+ if ( _ASSUAN2_CFLAGS )
-+ string( REGEX REPLACE "(\r?\n)+$" " " _ASSUAN2_CFLAGS "${_ASSUAN2_CFLAGS}" )
-+ string( REGEX REPLACE " *-I" ";" ASSUAN2_INCLUDES "${_ASSUAN2_CFLAGS}" )
-+ endif()
-+
-+ if ( _assuan2_config_libs )
-+
-+ set( _assuan2_library_dirs )
-+ set( _assuan2_library_names )
-+
-+ string( REGEX REPLACE " +" ";" _assuan2_config_libs "${_assuan2_config_libs}" )
-+
-+ foreach( _flag ${_assuan2_config_libs} )
-+ if ( "${_flag}" MATCHES "^-L" )
-+ string( REGEX REPLACE "^-L" "" _dir "${_flag}" )
-+ file( TO_CMAKE_PATH "${_dir}" _dir )
-+ set( _assuan2_library_dirs ${_assuan2_library_dirs} "${_dir}" )
-+ elseif( "${_flag}" MATCHES "^-l" )
-+ string( REGEX REPLACE "^-l" "" _name "${_flag}" )
-+ set( _assuan2_library_names ${_assuan2_library_names} "${_name}" )
-+ endif()
-+ endforeach()
-+
-+ set( ASSUAN2_FOUND true )
-+
-+ foreach( _name ${_assuan2_library_names} )
-+ set( _assuan2_${_name}_lib )
-+
-+ # if -L options were given, look only there
-+ if ( _assuan2_library_dirs )
-+ find_library( _assuan2_${_name}_lib NAMES ${_name} PATHS ${_assuan2_library_dirs} NO_DEFAULT_PATH )
-+ endif()
-+
-+ # if not found there, look in system directories
-+ if ( NOT _assuan2_${_name}_lib )
-+ find_library( _assuan2_${_name}_lib NAMES ${_name} )
-+ endif()
-+
-+ # if still not found, then the whole flavour isn't found
-+ if ( NOT _assuan2_${_name}_lib )
-+ if ( ASSUAN2_FOUND )
-+ set( ASSUAN2_FOUND false )
-+ set( _not_found_reason "dependant library ${_name} wasn't found" )
-+ endif()
-+ endif()
-+
-+ set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} "${_assuan2_${_name}_lib}" )
-+ endforeach()
-+
-+ #check_c_library_exists_explicit( assuan assuan_check_version "${_ASSUAN2_CFLAGS}" "${ASSUAN2_LIBRARIES}" ASSUAN2_FOUND )
-+ if ( ASSUAN2_FOUND )
-+ message( STATUS " Checking whether assuan is usable...yes" )
-+ else()
-+ message( STATUS " Checking whether assuan is usable...no" )
-+ message( STATUS " (${_not_found_reason})" )
-+ endif()
-+ endif()
-+
-+ # ensure that they are cached
-+ set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} )
-+ set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} )
-+
-+ endif()
-+
-+ endif()
-+
-+ endif()
-+
-+ endif()
-+
-+ macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 )
-+
-+endif() # WIN32 | Unix
-+
-+
-+if ( NOT Assuan2_FIND_QUIETLY )
-+
-+ if ( ASSUAN2_FOUND )
-+ message( STATUS "Usable assuan found." )
-+ message( STATUS " Includes: ${ASSUAN2_INCLUDES}" )
-+ message( STATUS " Libraries: ${ASSUAN2_LIBRARIES}" )
-+ else()
-+ message( STATUS "No usable assuan found." )
-+ endif()
-+
-+ macro_bool_to_bool( Assuan2_FIND_REQUIRED _req )
-+
-+ if ( WIN32 )
-+ set( _assuan2_homepage "http://www.gpg4win.org" )
-+ else()
-+ set( _assuan2_homepage "http://www.gnupg.org/related_software/libassuan" )
-+ endif()
-+
-+ macro_log_feature(
-+ ASSUAN2_FOUND
-+ "assuan2"
-+ "Assuan v2 IPC library"
-+ ${_assuan2_homepage}
-+ ${_req}
-+ "${_ASSUAN2_MIN_VERSION} or greater"
-+ "Needed for Kleopatra to act as the GnuPG UI Server"
-+ )
-+
-+else()
-+
-+ if ( Assuan2_FIND_REQUIRED AND NOT ASSUAN2_FOUND )
-+ message( FATAL_ERROR "" )
-+ endif()
-+
-+endif()
-+
-+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved )
diff --git a/misc/kdepim4/patches/patch-ab b/misc/kdepim4/patches/patch-ab
deleted file mode 100644
index a435bbf8856..00000000000
--- a/misc/kdepim4/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
---- kmail/kconf_update/kmail.upd.orig 2007-08-29 21:55:21.000000000 +1200
-+++ kmail/kconf_update/kmail.upd
-@@ -67,7 +67,7 @@ Id=3.2-update-loop-on-goto-unread-settin
- File=kmailrc
- Group=Behaviour
- Key=LoopOnGotoUnread
--Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash
-+Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,sh
- # due to a bug the first identity always had UOID 0, assign another UOID
- Id=3.1.4-dont-use-UOID-0-for-any-identity
- File=kmailrc
-@@ -81,7 +81,7 @@ Id=3.2-misc
- # against being run multiple times.
- ######################################################################
- File=kmailrc
--Script=kmail-3.2-misc.sh,bash
-+Script=kmail-3.2-misc.sh,sh
- #
- # reuse this section to add trivial stuff!
- #
diff --git a/misc/kdepim4/patches/patch-ac b/misc/kdepim4/patches/patch-ac
deleted file mode 100644
index 15f285fd506..00000000000
--- a/misc/kdepim4/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
---- kresources/groupwise/soap/stdsoap2.h.orig 2008-10-18 00:01:10.000000000 +1300
-+++ kresources/groupwise/soap/stdsoap2.h
-@@ -251,7 +251,7 @@ A commercial use license is available fr
- # define HAVE_LOCALTIME_R
- # define HAVE_WCTOMB
- # define HAVE_MBTOWC
--# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__)
-+# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
- # define HAVE_STRRCHR
- # define HAVE_STRTOD
- # define HAVE_SSCANF
diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae
deleted file mode 100644
index 4ef7f609911..00000000000
--- a/misc/kdepim4/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2010/08/31 12:17:44 markd Exp $
-
-fix build with boost-libs 1.44
-
---- kleopatra/crypto/gui/newresultpage.cpp.orig 2010-08-31 11:37:56.000000000 +0000
-+++ kleopatra/crypto/gui/newresultpage.cpp
-@@ -52,6 +52,8 @@
- #include <QVBoxLayout>
- #include <QTimer>
-
-+#include <boost/mem_fn.hpp>
-+
- #include <cassert>
-
- static const int ProgressBarHideDelay = 2000; // 2 secs
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
deleted file mode 100644
index 1d466d34c39..00000000000
--- a/misc/kdepim4/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.5 2012/03/19 21:01:28 markd Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/CMakeLists.txt.orig 2009-11-02 12:02:09.000000000 +0000
-+++ kleopatra/CMakeLists.txt
-@@ -2,7 +2,7 @@ project(kleopatra)
-
- include(MacroOptionalAddSubdirectory)
-
--set( kleopatra_version 2.0.12 )
-+set( kleopatra_version 2.1.0 )
- set( kleopatra_release FALSE )
-
- if (NOT kleopatra_release)
-@@ -28,7 +28,7 @@ include_directories(
- ${QGPGME_INCLUDES}
- ${GPGME_INCLUDES} )
- if (USABLE_ASSUAN_FOUND)
-- include_directories(${ASSUAN_INCLUDES})
-+ include_directories(${ASSUAN2_INCLUDES})
- endif(USABLE_ASSUAN_FOUND)
- add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
- remove_definitions ( -DQT_NO_STL )
-@@ -84,11 +84,7 @@ if ( USABLE_ASSUAN_FOUND )
- selftest/uiservercheck.cpp
- )
-
-- if ( WIN32 )
-- set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
-- else ( WIN32 )
-- set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
-- endif( WIN32 )
-+ set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
-
- if ( HAVE_GPG_ERR_SOURCE_KLEO )
- add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )
diff --git a/misc/kdepim4/patches/patch-ag b/misc/kdepim4/patches/patch-ag
deleted file mode 100644
index 13d69acf371..00000000000
--- a/misc/kdepim4/patches/patch-ag
+++ /dev/null
@@ -1,154 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/ConfigureChecks.cmake.orig 2008-05-15 18:37:21.000000000 +0000
-+++ kleopatra/ConfigureChecks.cmake
-@@ -1,21 +1,18 @@
- # assuan configure checks
- include(CheckFunctionExists)
-
--macro_optional_find_package(Assuan)
-+macro_optional_find_package(Assuan2)
-
- set( USABLE_ASSUAN_FOUND false )
-
--if ( ASSUAN_FOUND )
-+if ( ASSUAN2_FOUND )
-
-- set( CMAKE_REQUIRED_INCLUDES ${ASSUAN_INCLUDES} )
-+ set( CMAKE_REQUIRED_INCLUDES ${ASSUAN2_INCLUDES} )
-
-- if ( WIN32 AND ASSUAN_VANILLA_FOUND )
-- set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_VANILLA_LIBRARIES} )
-+ if ( ASSUAN2_FOUND )
-+ set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN2_LIBRARIES} )
- set( USABLE_ASSUAN_FOUND true )
-- elseif( NOT WIN32 AND ASSUAN_PTHREAD_FOUND )
-- set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_PTHREAD_LIBRARIES} )
-- set( USABLE_ASSUAN_FOUND true )
-- endif( WIN32 AND ASSUAN_VANILLA_FOUND )
-+ endif( ASSUAN2_FOUND )
-
- # TODO: this workaround will be removed as soon as we find better solution
- if(MINGW)
-@@ -24,7 +21,7 @@ if ( ASSUAN_FOUND )
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc)
- endif(MINGW)
-
--endif( ASSUAN_FOUND )
-+endif( ASSUAN2_FOUND )
-
- if ( USABLE_ASSUAN_FOUND )
- # check if assuan.h can be compiled standalone (it couldn't, on
-@@ -48,40 +45,6 @@ endif( USABLE_ASSUAN_FOUND )
-
- if ( USABLE_ASSUAN_FOUND )
-
-- # check if assuan has assuan_fd_t
-- check_cxx_source_compiles("
-- #include <assuan.h>
-- int main() {
-- assuan_fd_t fd = ASSUAN_INVALID_FD;
-- return fd ? 1 : 0 ;
-- }
-- "
-- HAVE_ASSUAN_FD_T )
--
-- if ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
-- set( USABLE_ASSUAN_FOUND false )
-- endif ( WIN32 AND NOT HAVE_ASSUAN_FD_T )
--
-- # check if assuan has assuan_inquire_ext, old style
-- check_function_exists( "assuan_inquire_ext" HAVE_ASSUAN_INQUIRE_EXT )
--
-- if ( NOT HAVE_ASSUAN_INQUIRE_EXT )
-- set( USABLE_ASSUAN_FOUND false )
-- endif( NOT HAVE_ASSUAN_INQUIRE_EXT )
--
-- # check if assuan has new-style assuan_inquire_ext:
-- check_cxx_source_compiles("
-- #include <assuan.h>
-- static int handler( void *, int, unsigned char*, size_t ) { return 0; }
-- int main() {
-- assuan_context_t ctx = 0;
-- const size_t maxSize = 0U;
-- assuan_error_t err = assuan_inquire_ext( ctx, \"FOO\", maxSize, handler, (void*)0 );
-- return err ? 1 : 0 ;
-- }
-- "
-- HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT )
--
- # check if gpg-error already has GPG_ERR_SOURCE_KLEO
- check_cxx_source_compiles("
- #include <gpg-error.h>
-@@ -90,21 +53,6 @@ if ( USABLE_ASSUAN_FOUND )
- "
- HAVE_GPG_ERR_SOURCE_KLEO )
-
-- # check if assuan has assuan_sock_get_nonce (via assuan_sock_nonce_t)
-- # function_exists runs into linking errors - libassuan is static,
-- # and assuan_sock_get_nonce drags in stuff that needs linking
-- # against winsock2.
-- check_cxx_source_compiles("
-- #include <assuan.h>
-- static assuan_sock_nonce_t nonce;
-- int main() { return 0; }
-- "
-- HAVE_ASSUAN_SOCK_GET_NONCE )
--
-- if ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )
-- set( USABLE_ASSUAN_FOUND false )
-- endif ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE )
--
- endif ( USABLE_ASSUAN_FOUND )
-
- if ( USABLE_ASSUAN_FOUND )
-@@ -113,45 +61,14 @@ else ( USABLE_ASSUAN_FOUND )
- message( STATUS "NO usable assuan found for Kleopatra" )
- endif ( USABLE_ASSUAN_FOUND )
-
--#
--# Check that libassuan (which is built statically) can be linked into a DSO
--# (e.g. on amd64, this requires it to be compiled with -fPIC).
--#
--
--set ( ASSUAN_LINKABLE_TO_DSO false )
--
- OPTION( BUILD_libkleopatraclient "Build directory kleopatra/libkleopatraclient" ${USABLE_ASSUAN_FOUND} )
-
- if ( NOT USABLE_ASSUAN_FOUND )
- set( BUILD_libkleopatraclient false )
- endif ( NOT USABLE_ASSUAN_FOUND )
-
--if ( BUILD_libkleopatraclient )
--
-- message( STATUS "Checking whether libassuan can be linked against from DSO's" )
--
-- set ( YUP TRUE )
-- if ( YUP )
-- set ( ASSUAN_LINKABLE_TO_DSO true )
-- message( STATUS "--> Assuming that it can. If compilation of libkleopatraclient fails on AMD64, check that libassuan is compiled with -fPIC and try again. Otherwise, pass -DBUILD_libkleopatraclient=OFF." )
-- else ( YUP )
-- # TODO: make this one executed at configure time, so the check below works:
-- add_library( dso_with_assuan_check SHARED ${CMAKE_SOURCE_DIR}/kleopatra/dso_with_assuan_check.c )
--
-- set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dso_with_assuan_check )
-- check_cxx_source_compiles( "int main() { return 0; }" ASSUAN_LINKABLE_TO_DSO )
--
-- if ( ASSUAN_LINKABLE_TO_DSO )
-- message( STATUS "Usable assuan found for libkleopatraclient" )
-- else ( ASSUAN_LINKABLE_TO_DSO )
-- message( STATUS "NO usable assuan found for libkleopatraclient - if this is AMD64, check that libassuan is compiled with -fPIC" )
-- endif ( ASSUAN_LINKABLE_TO_DSO )
-- endif ( YUP )
--
--endif ( BUILD_libkleopatraclient )
--
- macro_bool_to_01( USABLE_ASSUAN_FOUND HAVE_USABLE_ASSUAN )
--macro_bool_to_01( ASSUAN_LINKABLE_TO_DSO HAVE_KLEOPATRACLIENT_LIBRARY )
-+macro_bool_to_01( USABLE_ASSUAN_FOUND HAVE_KLEOPATRACLIENT_LIBRARY )
-
- set(CMAKE_REQUIRED_INCLUDES)
- set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/misc/kdepim4/patches/patch-ah b/misc/kdepim4/patches/patch-ah
deleted file mode 100644
index ea86e238b16..00000000000
--- a/misc/kdepim4/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/config-kleopatra.h.cmake.orig 2008-07-29 11:51:01.000000000 +0000
-+++ kleopatra/config-kleopatra.h.cmake
-@@ -1,18 +1,6 @@
- /* Define to 1 if you have a recent enough libassuan */
- #cmakedefine HAVE_USABLE_ASSUAN 1
-
--/* Define to 1 if your libassuan has the assuan_fd_t type */
--#cmakedefine HAVE_ASSUAN_FD_T 1
--
--/* Define to 1 if your libassuan has the assuan_inquire_ext function */
--#cmakedefine HAVE_ASSUAN_INQUIRE_EXT 1
--
--/* Define to 1 if your assuan_inquire_ext puts the buffer arguments into the callback signature */
--#cmakedefine HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT 1
--
--/* Define to 1 if your libassuan has the assuan_sock_get_nonce function */
--#cmakedefine HAVE_ASSUAN_SOCK_GET_NONCE 1
--
- /* Define to 1 if you build libkleopatraclient */
- #cmakedefine HAVE_KLEOPATRACLIENT_LIBRARY 1
-
diff --git a/misc/kdepim4/patches/patch-ai b/misc/kdepim4/patches/patch-ai
deleted file mode 100644
index a22db93e489..00000000000
--- a/misc/kdepim4/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/CMakeLists.txt.orig 2010-01-19 23:22:25.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories( ${ASSUAN_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
-+include_directories( ${ASSUAN2_INCLUDES} ${CMAKE_SOURCE_DIR}/kleopatra )
-
- add_definitions( -D_ASSUAN_ONLY_GPG_ERRORS -DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII )
-
-@@ -27,9 +27,9 @@ set_target_properties( kleopatraclientco
-
-
- if ( WIN32 )
-- target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_VANILLA_LIBRARIES} ws2_32 )
-+ target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} ws2_32 )
- else ( WIN32 )
-- target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN_PTHREAD_LIBRARIES} )
-+ target_link_libraries( kleopatraclientcore ${QT_QTCORE_LIBRARY} ${ASSUAN2_LIBRARIES} )
- endif ( WIN32 )
-
- install(
diff --git a/misc/kdepim4/patches/patch-aj b/misc/kdepim4/patches/patch-aj
deleted file mode 100644
index 7c4118b8902..00000000000
--- a/misc/kdepim4/patches/patch-aj
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/command.cpp.orig 2008-11-19 10:18:55.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/command.cpp
-@@ -283,19 +283,19 @@ typedef shared_ptr< remove_pointer<assua
- namespace {
- struct AssuanClientContext : AssuanContextBase {
- AssuanClientContext() : AssuanContextBase() {}
-- explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_disconnect ) {}
-- void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_disconnect ); }
-+ explicit AssuanClientContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_release ) {}
-+ void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_release ); }
- };
- }
-
--static assuan_error_t
-+static gpg_error_t
- my_assuan_transact( const AssuanClientContext & ctx,
- const char *command,
-- assuan_error_t (*data_cb)( void *, const void *, size_t )=0,
-+ gpg_error_t (*data_cb)( void *, const void *, size_t )=0,
- void * data_cb_arg=0,
-- assuan_error_t (*inquire_cb)( void *, const char * )=0,
-+ gpg_error_t (*inquire_cb)( void *, const char * )=0,
- void * inquire_cb_arg=0,
-- assuan_error_t (*status_cb)( void *, const char * )=0,
-+ gpg_error_t (*status_cb)( void *, const char * )=0,
- void * status_cb_arg=0)
- {
- return assuan_transact( ctx.get(), command, data_cb, data_cb_arg, inquire_cb, inquire_cb_arg, status_cb, status_cb_arg );
-@@ -337,26 +337,26 @@ static QString start_uiserver() {
- return Command::tr("start_uiserver: not yet implemented");
- }
-
--static assuan_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
-+static gpg_error_t getinfo_pid_cb( void * opaque, const void * buffer, size_t length ) {
- qint64 & pid = *static_cast<qint64*>( opaque );
- pid = QByteArray( static_cast<const char*>( buffer ), length ).toLongLong();
- return 0;
- }
-
--static assuan_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
-+static gpg_error_t command_data_cb( void * opaque, const void * buffer, size_t length ) {
- QByteArray & ba = *static_cast<QByteArray*>( opaque );
- ba.append( QByteArray( static_cast<const char*>(buffer), length ) );
- return 0;
- }
-
--static assuan_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
-+static gpg_error_t send_option( const AssuanClientContext & ctx, const char * name, const QVariant & value ) {
- if ( value.isValid() )
- return my_assuan_transact( ctx, QString().sprintf( "OPTION %s=%s", name, value.toString().toUtf8().constData() ).toUtf8().constData() );
- else
- return my_assuan_transact( ctx, QString().sprintf( "OPTION %s", name ).toUtf8().constData() );
- }
-
--static assuan_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
-+static gpg_error_t send_file( const AssuanClientContext & ctx, const QString & file ) {
- return my_assuan_transact( ctx, QString().sprintf( "FILE %s", hexencode( QFile::encodeName( file ) ).constData() ).toUtf8().constData() );
- }
-
-@@ -373,21 +373,32 @@ void Command::Private::run() {
-
- out.canceled = false;
-
-- assuan_error_t err = 0;
--
-- assuan_context_t naked_ctx = 0;
-- AssuanClientContext ctx;
--
- if ( out.serverLocation.isEmpty() )
- out.serverLocation = default_socket_name();
-
-+ AssuanClientContext ctx;
-+ gpg_error_t err = 0;
-+
- const QString socketName = out.serverLocation;
- if ( socketName.isEmpty() ) {
- out.errorString = tr("Invalid socket name!");
- goto leave;
- }
-
-- err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
-+ {
-+ assuan_context_t naked_ctx = 0;
-+ err = assuan_new( &naked_ctx );
-+ if ( err ) {
-+ out.errorString = tr( "Could not allocate resources to connect to Kleopatra UI server at %1: %2" )
-+ .arg( socketName, to_error_string( err ) );
-+ goto leave;
-+ }
-+
-+ ctx.reset( naked_ctx );
-+ }
-+
-+
-+ err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
- if ( err ) {
- qDebug( "UI server not running, starting it" );
-
-@@ -400,7 +411,7 @@ void Command::Private::run() {
- // give it a bit of time to start up and try a couple of times
- for ( int i = 0 ; err && i < 20 ; ++i ) {
- msleep( 500 );
-- err = assuan_socket_connect( &naked_ctx, QFile::encodeName( socketName ).constData(), -1 );
-+ err = assuan_socket_connect( ctx.get(), QFile::encodeName( socketName ).constData(), -1, 0 );
- }
- }
-
-@@ -410,9 +421,6 @@ void Command::Private::run() {
- goto leave;
- }
-
-- ctx.reset( naked_ctx );
-- naked_ctx = 0;
--
- out.serverPid = -1;
- err = my_assuan_transact( ctx, "GETINFO pid", &getinfo_pid_cb, &out.serverPid );
- if ( err || out.serverPid <= 0 ) {
diff --git a/misc/kdepim4/patches/patch-ak b/misc/kdepim4/patches/patch-ak
deleted file mode 100644
index a99314d5e81..00000000000
--- a/misc/kdepim4/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/libkleopatraclient/core/initialization.cpp.orig 2008-07-08 09:56:21.000000000 +0000
-+++ kleopatra/libkleopatraclient/core/initialization.cpp
-@@ -29,7 +29,7 @@
- using namespace KLEOPATRACLIENT_NAMESPACE;
-
- Initialization::Initialization() {
-- assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+ assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
- }
-
- Initialization::~Initialization() {
diff --git a/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt b/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
deleted file mode 100644
index 69b954cf433..00000000000
--- a/misc/kdepim4/patches/patch-akregator_plugins_mk4storage_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-akregator_plugins_mk4storage_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- akregator/plugins/mk4storage/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ akregator/plugins/mk4storage/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories( ${CMAKE_SOURCE_DIR}/akregator/interfaces ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/akregator/plugins/mk4storage/metakit/include ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_BINARY_DIR}/akregator ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIR} )
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- set(libmetakitlocal_SRCS
- metakit/src/column.cpp
- metakit/src/custom.cpp
diff --git a/misc/kdepim4/patches/patch-al b/misc/kdepim4/patches/patch-al
deleted file mode 100644
index 6f0cea206b2..00000000000
--- a/misc/kdepim4/patches/patch-al
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/tests/test_uiserver.cpp.orig 2009-07-17 21:45:43.000000000 +0000
-+++ kleopatra/tests/test_uiserver.cpp
-@@ -89,17 +89,17 @@ static void usage( const std::string & m
- exit( 1 );
- }
-
--static assuan_error_t data( void * void_ctx, const void * buffer, size_t len ) {
-+static gpg_error_t data( void * void_ctx, const void * buffer, size_t len ) {
- (void)void_ctx; (void)buffer; (void)len;
- return 0; // ### implement me
- }
-
--static assuan_error_t status( void * void_ctx, const char * line ) {
-+static gpg_error_t status( void * void_ctx, const char * line ) {
- (void)void_ctx; (void)line;
- return 0;
- }
-
--static assuan_error_t inquire( void * void_ctx, const char * keyword ) {
-+static gpg_error_t inquire( void * void_ctx, const char * keyword ) {
- assuan_context_t ctx = (assuan_context_t)void_ctx;
- assert( ctx );
- const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
-@@ -121,7 +121,7 @@ int main( int argc, char * argv[] ) {
-
- const Kleo::WSAStarter _wsastarter;
-
-- assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+ assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
-
- if ( argc < 3 )
- usage(); // need socket and command, at least
-@@ -185,7 +185,12 @@ int main( int argc, char * argv[] ) {
-
- assuan_context_t ctx = 0;
-
-- if ( const gpg_error_t err = assuan_socket_connect_ext( &ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
-+ if ( const gpg_error_t err = assuan_new( &ctx ) ) {
-+ qDebug( "%s", Exception( err, "assuan_new" ).what() );
-+ return 1;
-+ }
-+
-+ if ( const gpg_error_t err = assuan_socket_connect( ctx, socket, -1, ASSUAN_CONNECT_FLAGS ) ) {
- qDebug( "%s", Exception( err, "assuan_socket_connect_ext" ).what() );
- return 1;
- }
-@@ -279,7 +284,7 @@ int main( int argc, char * argv[] ) {
- return 1;
- }
-
-- assuan_disconnect( ctx );
-+ assuan_release( ctx );
-
- return 0;
- }
diff --git a/misc/kdepim4/patches/patch-am b/misc/kdepim4/patches/patch-am
deleted file mode 100644
index 008197194d0..00000000000
--- a/misc/kdepim4/patches/patch-am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/assuancommand.h.orig 2009-11-13 10:58:28.000000000 +0000
-+++ kleopatra/uiserver/assuancommand.h
-@@ -39,6 +39,8 @@
- #include <gpgme++/global.h>
- #include <gpgme++/error.h>
-
-+#include <gpg-error.h>
-+
- #include <kmime/kmime_header_parsing.h>
-
- #include <qwindowdefs.h> // for WId
-@@ -329,16 +331,16 @@ namespace Kleo {
- virtual boost::shared_ptr<AssuanCommand> create() const = 0;
- virtual const char * name() const = 0;
-
-- typedef int(*_Handler)( assuan_context_s*, char *);
-+ typedef gpg_error_t(*_Handler)( assuan_context_s*, char *);
- virtual _Handler _handler() const = 0;
- protected:
-- static int _handle( assuan_context_s*, char *, const char * );
-+ static gpg_error_t _handle( assuan_context_s*, char *, const char * );
- };
-
- template <typename Command>
- class GenericAssuanCommandFactory : public AssuanCommandFactory {
- /* reimp */ AssuanCommandFactory::_Handler _handler() const { return &GenericAssuanCommandFactory::_handle; }
-- static int _handle( assuan_context_s* _ctx, char * _line ) {
-+ static gpg_error_t _handle( assuan_context_s* _ctx, char * _line ) {
- return AssuanCommandFactory::_handle( _ctx, _line, Command::staticName() );
- }
- /* reimp */ boost::shared_ptr<AssuanCommand> create() const { return make(); }
diff --git a/misc/kdepim4/patches/patch-an b/misc/kdepim4/patches/patch-an
deleted file mode 100644
index c9dbdba2b32..00000000000
--- a/misc/kdepim4/patches/patch-an
+++ /dev/null
@@ -1,338 +0,0 @@
-$NetBSD: patch-an,v 1.3 2013/06/13 14:29:37 joerg Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
-Work around moc inability to parse a boost macro
-
---- kleopatra/uiserver/assuanserverconnection.cpp.orig 2011-04-20 20:03:31.000000000 +0000
-+++ kleopatra/uiserver/assuanserverconnection.cpp
-@@ -77,11 +77,13 @@
-
- #include <kleo-assuan.h>
-
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits/remove_pointer.hpp>
- #include <boost/lexical_cast.hpp>
- #include <boost/bind.hpp>
- #include <boost/mem_fn.hpp>
- #include <boost/mpl/if.hpp>
-+#endif
-
- #include <vector>
- #include <map>
-@@ -91,10 +93,6 @@
-
- #include <errno.h>
-
--#ifdef __GNUC__
--# include <ext/algorithm> // for is_sorted
--#endif
--
- #ifdef Q_OS_WIN32
- # include <io.h>
- # include <process.h>
-@@ -116,13 +114,18 @@ static const unsigned int INIT_SOCKET_FL
- static const int FOR_READING = 0;
- static const unsigned int MAX_ACTIVE_FDS = 32;
-
-+static void my_assuan_release( assuan_context_t ctx ) {
-+ if ( ctx )
-+ assuan_release( ctx );
-+}
-+
- // shared_ptr for assuan_context_t w/ deleter enforced to assuan_deinit_server:
- typedef shared_ptr< remove_pointer<assuan_context_t>::type > AssuanContextBase;
- struct AssuanContext : AssuanContextBase {
- AssuanContext() : AssuanContextBase() {}
-- explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &assuan_deinit_server ) {}
-+ explicit AssuanContext( assuan_context_t ctx ) : AssuanContextBase( ctx, &my_assuan_release ) {}
-
-- void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &assuan_deinit_server ); }
-+ void reset( assuan_context_t ctx=0 ) { AssuanContextBase::reset( ctx, &my_assuan_release ); }
- };
-
- static inline gpg_error_t assuan_process_done_msg( assuan_context_t ctx, gpg_error_t err, const char * err_msg ) {
-@@ -240,7 +243,8 @@ Q_SIGNALS:
- public Q_SLOTS:
- void slotReadActivity( int ) {
- assert( ctx );
-- if ( const int err = assuan_process_next( ctx.get() ) ) {
-+ int done = false;
-+ if ( const int err = assuan_process_next( ctx.get(), &done ) || done ) {
- //if ( err == -1 || gpg_err_code(err) == GPG_ERR_EOF ) {
- topHalfDeletion();
- if ( nohupedCommands.empty() )
-@@ -296,15 +300,17 @@ private:
- }
-
- private:
-- static void reset_handler( assuan_context_t ctx_ ) {
-+ static gpg_error_t reset_handler( assuan_context_t ctx_, char * ) {
- assert( assuan_get_pointer( ctx_ ) );
-
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
- conn.reset();
-+
-+ return 0;
- }
-
-- static int option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
-+ static gpg_error_t option_handler( assuan_context_t ctx_, const char * key, const char * value ) {
- assert( assuan_get_pointer( ctx_ ) );
-
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-@@ -317,7 +323,7 @@ private:
- //return gpg_error( GPG_ERR_UNKNOWN_OPTION );
- }
-
-- static int session_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t session_handler( assuan_context_t ctx_, char * line ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -344,7 +350,7 @@ private:
- return assuan_process_done( ctx_, 0 );
- }
-
-- static int capabilities_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t capabilities_handler( assuan_context_t ctx_, char * line ) {
- if ( !QByteArray( line ).trimmed().isEmpty() ) {
- static const QString errorString = i18n("CAPABILITIES does not take arguments");
- return assuan_process_done_msg( ctx_, gpg_error( GPG_ERR_ASS_PARAMETER ), errorString );
-@@ -357,7 +363,7 @@ private:
- return assuan_process_done( ctx_, assuan_send_data( ctx_, capabilities, sizeof capabilities - 1 ) );
- }
-
-- static int getinfo_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t getinfo_handler( assuan_context_t ctx_, char * line ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -386,7 +392,7 @@ private:
- return assuan_process_done( ctx_, assuan_send_data( ctx_, ba.constData(), ba.size() ) );
- }
-
-- static int start_keymanager_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t start_keymanager_handler( assuan_context_t ctx_, char * line ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -400,7 +406,7 @@ private:
- return assuan_process_done( ctx_, 0 );
- }
-
-- static int start_confdialog_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t start_confdialog_handler( assuan_context_t ctx_, char * line ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -418,7 +424,7 @@ private:
-
- // format: TAG (FD|FD=\d+|FILE=...)
- template <bool in, typename T_memptr>
-- static int IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
-+ static gpg_error_t IO_handler( assuan_context_t ctx_, char * line_, T_memptr which ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -498,19 +504,19 @@ private:
-
- }
-
-- static int input_handler( assuan_context_t ctx, char * line ) {
-+ static gpg_error_t input_handler( assuan_context_t ctx, char * line ) {
- return IO_handler<true>( ctx, line, &Private::inputs );
- }
-
-- static int output_handler( assuan_context_t ctx, char * line ) {
-+ static gpg_error_t output_handler( assuan_context_t ctx, char * line ) {
- return IO_handler<false>( ctx, line, &Private::outputs );
- }
-
-- static int message_handler( assuan_context_t ctx, char * line ) {
-+ static gpg_error_t message_handler( assuan_context_t ctx, char * line ) {
- return IO_handler<true>( ctx, line, &Private::messages );
- }
-
-- static int file_handler( assuan_context_t ctx_, char * line ) {
-+ static gpg_error_t file_handler( assuan_context_t ctx_, char * line ) {
- assert( assuan_get_pointer( ctx_ ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx_ ) );
-
-@@ -572,7 +578,7 @@ private:
- }
-
- template <typename T_memptr, typename T_memptr2>
-- static int recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
-+ static gpg_error_t recipient_sender_handler( T_memptr mp, T_memptr2 info, assuan_context_t ctx, char * line, bool sender=false ) {
- assert( assuan_get_pointer( ctx ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
-
-@@ -656,11 +662,11 @@ private:
- return assuan_process_done( ctx, 0 );
- }
-
-- static int recipient_handler( assuan_context_t ctx, char * line ) {
-+ static gpg_error_t recipient_handler( assuan_context_t ctx, char * line ) {
- return recipient_sender_handler( &Private::recipients, &Private::informativeRecipients, ctx, line );
- }
-
-- static int sender_handler( assuan_context_t ctx, char * line ) {
-+ static gpg_error_t sender_handler( assuan_context_t ctx, char * line ) {
- return recipient_sender_handler( &Private::senders, &Private::informativeSenders, ctx, line, true );
- }
-
-@@ -785,18 +791,18 @@ AssuanServerConnection::Private::Private
- sessionId( 0 ),
- factories( factories_ )
- {
--#ifdef __GNUC__
-- assert( __gnu_cxx::is_sorted( factories_.begin(), factories_.end(), _detail::ByName<std::less>() ) );
--#endif
--
- if ( fd == ASSUAN_INVALID_FD )
- throw Exception( gpg_error( GPG_ERR_INV_ARG ), "pre-assuan_init_socket_server_ext" );
-
-- assuan_context_t naked_ctx = 0;
-- if ( const gpg_error_t err = assuan_init_socket_server_ext( &naked_ctx, fd, INIT_SOCKET_FLAGS ) )
-+ {
-+ assuan_context_t naked_ctx = 0;
-+ if ( const gpg_error_t err = assuan_new( &naked_ctx ) )
-+ throw Exception( err, "assuan_new" );
-+ ctx.reset( naked_ctx );
-+ }
-+ if ( const gpg_error_t err = assuan_init_socket_server( ctx.get(), fd, INIT_SOCKET_FLAGS ) )
- throw Exception( err, "assuan_init_socket_server_ext" );
-
-- ctx.reset( naked_ctx ); naked_ctx = 0;
-
- // for callbacks, associate the context with this connection:
- assuan_set_pointer( ctx.get(), this );
-@@ -824,34 +830,34 @@ AssuanServerConnection::Private::Private
-
-
- // register our INPUT/OUTPUT/MESSGAE/FILE handlers:
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT", input_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "INPUT", input_handler, "" ) )
- throw Exception( err, "register \"INPUT\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE", message_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "MESSAGE", message_handler, "" ) )
- throw Exception( err, "register \"MESSAGE\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "OUTPUT", output_handler, "" ) )
- throw Exception( err, "register \"OUTPUT\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "FILE", file_handler, "" ) )
- throw Exception( err, "register \"FILE\" handler" );
-
-
- // register user-defined commands:
- Q_FOREACH( shared_ptr<AssuanCommandFactory> fac, factories )
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler() ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), fac->name(), fac->_handler(), "" ) )
- throw Exception( err, std::string( "register \"" ) + fac->name() + "\" handler" );
-
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "GETINFO", getinfo_handler, "" ) )
- throw Exception( err, "register \"GETINFO\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_KEYMANAGER", start_keymanager_handler, "" ) )
- throw Exception( err, "register \"START_KEYMANAGER\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "START_CONFDIALOG", start_confdialog_handler, "" ) )
- throw Exception( err, "register \"START_CONFDIALOG\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "RECIPIENT", recipient_handler, "" ) )
- throw Exception( err, "register \"RECIPIENT\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SENDER", sender_handler, "" ) )
- throw Exception( err, "register \"SENDER\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "SESSION", session_handler, "" ) )
- throw Exception( err, "register \"SESSION\" handler" );
-- if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler ) )
-+ if ( const gpg_error_t err = assuan_register_command( ctx.get(), "CAPABILITIES", capabilities_handler, "" ) )
- throw Exception( err, "register \"CAPABILITIES\" handler" );
-
- assuan_set_hello_line( ctx.get(), "GPG UI server (Kleopatra/" KLEOPATRA_VERSION_STRING ") ready to serve" );
-@@ -904,20 +910,14 @@ class InquiryHandler : public QObject {
- Q_OBJECT
- public:
-
--#ifdef HAVE_ASSUAN_INQUIRE_EXT
- explicit InquiryHandler( const char * keyword_, QObject * p=0 )
- : QObject( p ),
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
-- buffer( 0 ),
-- buflen( 0 ),
--# endif
- keyword( keyword_ )
- {
-
- }
-
--# ifdef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
-- static int handler( void * cb_data, int rc, unsigned char * buffer, size_t buflen )
-+ static gpg_error_t handler( void * cb_data, gpg_error_t rc, unsigned char * buffer, size_t buflen )
- {
- assert( cb_data );
- InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
-@@ -926,26 +926,9 @@ public:
- delete this_;
- return 0;
- }
--# else
-- static int handler( void * cb_data, int rc )
-- {
-- assert( cb_data );
-- InquiryHandler * this_ = static_cast<InquiryHandler*>(cb_data);
-- emit this_->signal( rc, QByteArray::fromRawData( reinterpret_cast<const char*>(this_->buffer), this_->buflen ), this_->keyword );
-- std::free( this_->buffer );
-- delete this_;
-- return 0;
-- }
--# endif
-
- private:
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
-- friend class ::Kleo::AssuanCommand;
-- unsigned char * buffer;
-- size_t buflen;
--# endif
- const char * keyword;
--#endif // HAVE_ASSUAN_INQUIRE_EXT
-
- Q_SIGNALS:
- void signal( int rc, const QByteArray & data, const QByteArray & keyword );
-@@ -1157,20 +1140,13 @@ int AssuanCommand::inquire( const char *
- if ( d->nohup )
- return makeError( GPG_ERR_INV_OP );
-
--#ifdef HAVE_ASSUAN_INQUIRE_EXT
- std::auto_ptr<InquiryHandler> ih( new InquiryHandler( keyword, receiver ) );
- receiver->connect( ih.get(), SIGNAL(signal(int,QByteArray,QByteArray)), slot );
- if ( const gpg_error_t err = assuan_inquire_ext( d->ctx.get(), keyword,
--# ifndef HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT
-- &ih->buffer, &ih->buflen,
--# endif
- maxSize, InquiryHandler::handler, ih.get() ) )
- return err;
- ih.release();
- return 0;
--#else
-- return makeError( GPG_ERR_NOT_SUPPORTED ); // libassuan too old
--#endif // HAVE_ASSUAN_INQUIRE_EXT
- }
-
- void AssuanCommand::done( const GpgME::Error& err, const QString & details ) {
-@@ -1262,7 +1238,7 @@ const std::vector<KMime::Types::Mailbox>
- return d->senders;
- }
-
--int AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
-+gpg_error_t AssuanCommandFactory::_handle( assuan_context_t ctx, char * line, const char * commandName ) {
- assert( assuan_get_pointer( ctx ) );
- AssuanServerConnection::Private & conn = *static_cast<AssuanServerConnection::Private*>( assuan_get_pointer( ctx ) );
-
diff --git a/misc/kdepim4/patches/patch-ao b/misc/kdepim4/patches/patch-ao
deleted file mode 100644
index d58b64b2dd2..00000000000
--- a/misc/kdepim4/patches/patch-ao
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/uiserver.cpp.orig 2009-03-10 12:25:10.000000000 +0000
-+++ kleopatra/uiserver/uiserver.cpp
-@@ -73,15 +73,15 @@ UiServer::Private::Private( UiServer * q
- actualSocketName(),
- cryptoCommandsEnabled( false )
- {
-- assuan_set_assuan_err_source( GPG_ERR_SOURCE_DEFAULT );
-+ assuan_set_gpg_err_source( GPG_ERR_SOURCE_DEFAULT );
- }
-
- bool UiServer::Private::isStaleAssuanSocket( const QString& fileName )
- {
- assuan_context_t ctx = 0;
-- const bool error = assuan_socket_connect_ext( &ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
-+ const bool error = assuan_new( &ctx ) || assuan_socket_connect( ctx, QFile::encodeName( fileName ).constData(), -1, 0 );
- if ( !error )
-- assuan_disconnect( ctx );
-+ assuan_release( ctx );
- return error;
- }
-
-@@ -166,13 +166,11 @@ void UiServer::Private::slotConnectionCl
- void UiServer::Private::incomingConnection( int fd ) {
- try {
- qDebug( "UiServer: client connect on fd %d", fd );
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
- if ( assuan_sock_check_nonce( (assuan_fd_t)fd, &nonce ) ) {
- qDebug( "UiServer: nonce check failed" );
- assuan_sock_close( (assuan_fd_t)fd );
- return;
- }
--#endif
- const shared_ptr<AssuanServerConnection> c( new AssuanServerConnection( (assuan_fd_t)fd, factories ) );
- connect( c.get(), SIGNAL(closed(Kleo::AssuanServerConnection*)),
- this, SLOT(slotConnectionClosed(Kleo::AssuanServerConnection*)) );
diff --git a/misc/kdepim4/patches/patch-ap b/misc/kdepim4/patches/patch-ap
deleted file mode 100644
index 6dc4772c9e8..00000000000
--- a/misc/kdepim4/patches/patch-ap
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/09/01 13:45:25 wiz Exp $
-
-libassuan2 support from
-http://websvn.kde.org/?view=revision&revision=1078528
-
---- kleopatra/uiserver/uiserver_unix.cpp.orig 2009-01-27 23:05:13.000000000 +0000
-+++ kleopatra/uiserver/uiserver_unix.cpp
-@@ -61,11 +61,7 @@ QString UiServer::Private::systemErrorSt
-
- void UiServer::Private::doMakeListeningSocket( const QByteArray & encodedFileName ) {
- // Create a Unix Domain Socket:
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
- const assuan_fd_t sock = assuan_sock_new( AF_UNIX, SOCK_STREAM, 0 );
--#else
-- const assuan_fd_t sock = ::socket( AF_UNIX, SOCK_STREAM, 0 );
--#endif
- if ( sock == ASSUAN_INVALID_FD )
- throw_<std::runtime_error>( i18n( "Could not create socket: %1", systemErrorString() ) );
-
-@@ -75,19 +71,13 @@ void UiServer::Private::doMakeListeningS
- std::memset( &sa, 0, sizeof(sa) );
- sa.sun_family = AF_UNIX;
- std::strncpy( sa.sun_path, encodedFileName.constData(), sizeof( sa.sun_path ) - 1 );
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
- if ( assuan_sock_bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
--#else
-- if ( ::bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) )
--#endif
- throw_<std::runtime_error>( i18n( "Could not bind to socket: %1", systemErrorString() ) );
-
- // ### TODO: permissions?
-
--#ifdef HAVE_ASSUAN_SOCK_GET_NONCE
- if ( assuan_sock_get_nonce( (struct sockaddr*)&sa, sizeof( sa ), &nonce ) )
- throw_<std::runtime_error>( i18n("Could not get socket nonce: %1", systemErrorString() ) );
--#endif
-
- // Listen
- if ( ::listen( sock, SOMAXCONN ) )
diff --git a/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt b/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
deleted file mode 100644
index 97cc8788760..00000000000
--- a/misc/kdepim4/patches/patch-kalarm_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kalarm_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- kalarm/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ kalarm/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kalarm)
-
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5950)
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp b/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
deleted file mode 100644
index 302ea4b9296..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_models_keylistmodel.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-kleopatra_models_keylistmodel.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/models/keylistmodel.cpp.orig 2013-06-12 20:30:56.000000000 +0000
-+++ kleopatra/models/keylistmodel.cpp
-@@ -67,10 +67,6 @@
- #include <iterator>
- #include <cassert>
-
--#ifdef __GNUC__
--#include <ext/algorithm> // for is_sorted
--#endif
--
- using namespace GpgME;
- using namespace Kleo;
-
-@@ -444,9 +440,6 @@ QModelIndex FlatKeyListModel::doMapFromK
- }
-
- QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-- assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
--#endif
- if ( keys.empty() )
- return QList<QModelIndex>();
-
-@@ -701,9 +694,6 @@ static std::vector<Key> topological_sort
- }
-
- QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
--#ifdef __GNUC__
-- assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
--#endif
- if ( keys.empty() )
- return QList<QModelIndex>();
-
diff --git a/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp b/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp
new file mode 100644
index 00000000000..6353ed871b4
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- kleopatra/newcertificatewizard/newcertificatewizard.cpp.orig 2014-11-06 08:45:47.000000000 +0000
++++ kleopatra/newcertificatewizard/newcertificatewizard.cpp
+@@ -78,7 +78,9 @@
+ #include <QUrl>
+ #include <QDesktopServices>
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+
+ #include <algorithm>
+
diff --git a/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp b/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp
new file mode 100644
index 00000000000..1267ab6bf76
--- /dev/null
+++ b/misc/kdepim4/patches/patch-kleopatra_smartcard_readerstatus.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-kleopatra_smartcard_readerstatus.cpp,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- kleopatra/smartcard/readerstatus.cpp.orig 2014-11-06 08:45:47.000000000 +0000
++++ kleopatra/smartcard/readerstatus.cpp
+@@ -58,11 +58,13 @@
+ #include <QThread>
+ #include <QPointer>
+
++#ifndef Q_MOC_RUN
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/case_conv.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/range.hpp>
++#endif
+ #include <boost/bind.hpp>
+
+ #include <vector>
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp b/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
deleted file mode 100644
index 94191127e16..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_utils_classify.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-kleopatra_utils_classify.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/utils/classify.cpp.orig 2013-06-12 20:27:57.000000000 +0000
-+++ kleopatra/utils/classify.cpp
-@@ -43,10 +43,6 @@
-
- #include <boost/range.hpp>
-
--#ifdef __GNUC__
--# include <ext/algorithm>
--#endif
--
- #include <functional>
-
- using namespace boost;
-@@ -149,10 +145,6 @@ unsigned int Kleo::classify( const QStri
- }
-
- unsigned int Kleo::classify( const QString & filename ) {
--#ifdef __GNUC__
-- assert( __gnu_cxx::is_sorted( begin( classifications ), end( classifications ), ByExtension<std::less>() ) );
--#endif
--
- const QFileInfo fi( filename );
-
- const _classification * const it = qBinaryFind( begin( classifications ), end( classifications ),
-@@ -175,10 +167,6 @@ unsigned int Kleo::classify( const QStri
- }
-
- unsigned int Kleo::classifyContent( const QByteArray & data ) {
--#ifdef __GNUC__
-- assert( __gnu_cxx::is_sorted( begin( content_classifications ), end( content_classifications ), ByContent<std::less>(100) ) );
--#endif
--
- static const char beginString[] = "-----BEGIN ";
- static const QByteArrayMatcher beginMatcher( beginString );
- int pos = beginMatcher.indexIn( data );
diff --git a/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h b/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
deleted file mode 100644
index 63594e9e52b..00000000000
--- a/misc/kdepim4/patches/patch-kleopatra_utils_stl__util.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-kleopatra_utils_stl__util.h,v 1.1 2013/06/13 14:29:37 joerg Exp $
-
---- kleopatra/utils/stl_util.h.orig 2013-06-12 20:35:45.000000000 +0000
-+++ kleopatra/utils/stl_util.h
-@@ -347,7 +347,7 @@ namespace kdtools {
- template <typename O, typename I, typename P>
- O copy_if( const I & i, P p ) {
- O o;
-- copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
-+ kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
- return o;
- }
-
-@@ -390,7 +390,7 @@ namespace kdtools {
-
- template <typename C, typename P>
- bool none_of( const C & c, P p ) {
-- return none_of( boost::begin( c ), boost::end( c ), p );
-+ return kdtools::none_of( boost::begin( c ), boost::end( c ), p );
- }
-
- template <typename C, typename B>
diff --git a/misc/kdepim4/patches/patch-kmail_imapaccountbase.h b/misc/kdepim4/patches/patch-kmail_imapaccountbase.h
deleted file mode 100644
index e9c311f9cd9..00000000000
--- a/misc/kdepim4/patches/patch-kmail_imapaccountbase.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-kmail_imapaccountbase.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- kmail/imapaccountbase.h.orig 2012-11-09 14:04:05.000000000 +0000
-+++ kmail/imapaccountbase.h
-@@ -37,7 +37,6 @@
- #include <QByteArray>
- #include "progressmanager.h"
-
--class AccountManager;
- class KMFolder;
- class KConfigGroup;
- class KMMessagePart;
-@@ -55,6 +54,7 @@ namespace KPIM {
- }
-
- namespace KMail {
-+ class AccountManager;
- struct ACLListEntry;
- class QuotaInfo;
- typedef QVector<KMail::ACLListEntry> ACLList;
diff --git a/misc/kdepim4/patches/patch-kmail_networkaccount.h b/misc/kdepim4/patches/patch-kmail_networkaccount.h
deleted file mode 100644
index 25fe8950f87..00000000000
--- a/misc/kdepim4/patches/patch-kmail_networkaccount.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-kmail_networkaccount.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- kmail/networkaccount.h.orig 2012-11-09 14:02:41.000000000 +0000
-+++ kmail/networkaccount.h
-@@ -33,7 +33,6 @@
-
- #include <QString>
-
--class AccountManager;
- class KConfig/*Base*/;
- class KUrl;
- namespace KIO {
-@@ -41,6 +40,7 @@ namespace KIO {
- }
-
- namespace KMail {
-+ class AccountManager;
-
- class NetworkAccount : public KMAccount {
- Q_OBJECT
diff --git a/misc/kdepim4/patches/patch-knode_CMakeLists.txt b/misc/kdepim4/patches/patch-knode_CMakeLists.txt
deleted file mode 100644
index 9a8f901858c..00000000000
--- a/misc/kdepim4/patches/patch-knode_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-knode_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- knode/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ knode/CMakeLists.txt
-@@ -9,6 +9,7 @@ include_directories( ${KDE4_INCLUDE_DIR}
-
- add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5003 )
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- ########### next target ###############
-
diff --git a/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt b/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt
deleted file mode 100644
index 729a40e834a..00000000000
--- a/misc/kdepim4/patches/patch-kontact_plugins_akregator_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kontact_plugins_akregator_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- kontact/plugins/akregator/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ kontact/plugins/akregator/CMakeLists.txt
-@@ -2,6 +2,8 @@
- include_directories(${CMAKE_SOURCE_DIR}/akregator/src)
- include_directories( ${Boost_INCLUDE_DIRS} )
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- ########### next target ###############
-
- set(kontact_akregator_PART_SRCS akregator_plugin.cpp)
diff --git a/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt b/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt
deleted file mode 100644
index 33d0a7928eb..00000000000
--- a/misc/kdepim4/patches/patch-korganizer_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-korganizer_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- korganizer/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ korganizer/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(korganizer)
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- #
- # The following macros can be defined to alter KOrganizer behavior.
- # (if desired, use add_definitions() to define them)
diff --git a/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h b/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h
deleted file mode 100644
index 7080fdd7a73..00000000000
--- a/misc/kdepim4/patches/patch-libkleo_backends_qgpgme_threadedjobmixin.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libkleo_backends_qgpgme_threadedjobmixin.h,v 1.1 2012/11/11 22:29:14 joerg Exp $
-
---- libkleo/backends/qgpgme/threadedjobmixin.h.orig 2012-11-09 13:05:24.000000000 +0000
-+++ libkleo/backends/qgpgme/threadedjobmixin.h
-@@ -143,7 +143,7 @@ namespace _detail {
-
- void lateInitialization() {
- assert( m_ctx );
-- connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
-+ this->connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
- m_ctx->setProgressProvider( this );
- }
-
diff --git a/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h b/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h
new file mode 100644
index 00000000000..e373da5521e
--- /dev/null
+++ b/misc/kdepim4/patches/patch-libkleo_kleo_stl_util.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libkleo_kleo_stl_util.h,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+Work around: Parse error at "BOOST_JOIN"
+
+--- libkleo/kleo/stl_util.h.orig 2014-11-12 07:57:34.000000000 +0000
++++ libkleo/kleo/stl_util.h
+@@ -22,7 +22,9 @@
+ #ifndef __KDTOOLSCORE_STL_UTIL_H__
+ #define __KDTOOLSCORE_STL_UTIL_H__
+
++#ifndef Q_MOC_RUN
+ #include <boost/range.hpp>
++#endif
+ #include <boost/iterator/filter_iterator.hpp>
+ #include <boost/iterator/transform_iterator.hpp>
+ #include <boost/call_traits.hpp>
diff --git a/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt b/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
deleted file mode 100644
index 43415ddbaf0..00000000000
--- a/misc/kdepim4/patches/patch-plugins_kaddressbook_editorpages_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugins_kaddressbook_editorpages_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- plugins/kaddressbook/editorpages/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ plugins/kaddressbook/editorpages/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories( ${CMAKE_SOURCE_DIR}/libkleo ${Boost_INCLUDE_DIR} )
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- ########### next target ###############
-
- set(cryptopageplugin_SRCS cryptopageplugin.cpp )
diff --git a/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt b/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt
deleted file mode 100644
index 1deb6367026..00000000000
--- a/misc/kdepim4/patches/patch-plugins_kmail_bodypartformatter_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-plugins_kmail_bodypartformatter_CMakeLists.txt,v 1.1 2012/03/19 21:01:28 markd Exp $
-
---- plugins/kmail/bodypartformatter/CMakeLists.txt.orig 2011-04-20 20:03:31.000000000 +0000
-+++ plugins/kmail/bodypartformatter/CMakeLists.txt
-@@ -1,6 +1,7 @@
-
- include_directories( ${CMAKE_SOURCE_DIR}/kmail ${CMAKE_SOURCE_DIR}/libkdepim ${CMAKE_SOURCE_DIR}/mimelib ${KDE4_INCLUDE_DIR} )
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- ########### next target ###############
-
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 61da6892e6d..94103cd0778 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.68 2014/11/13 19:19:06 markd Exp $
DISTNAME= kdepimlibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 6
CATEGORIES= misc
COMMENT= Support libraries for PIM for the KDE integrated X11 desktop
@@ -28,7 +27,7 @@ BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.8.51
.endif
.include "../../devel/qjson/buildlink3.mk"
.include "../../mail/akonadi/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
+#.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../time/libical/buildlink3.mk"
diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST
index f476b523161..fcc44024c0e 100644
--- a/misc/kdepimlibs4/PLIST
+++ b/misc/kdepimlibs4/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2013/11/07 12:35:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/11/13 19:19:06 markd Exp $
+bin/akonadi2xml
+bin/akonaditest
include/KDE/Akonadi/AgentBase
include/KDE/Akonadi/AgentFactory
include/KDE/Akonadi/AgentFilterProxyModel
@@ -12,6 +14,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
@@ -23,10 +26,12 @@ 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
@@ -76,6 +81,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
@@ -123,12 +129,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
@@ -373,6 +391,8 @@ 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
@@ -453,6 +473,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
@@ -466,10 +487,12 @@ 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
@@ -484,6 +507,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
@@ -515,6 +539,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
@@ -523,6 +548,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
@@ -536,6 +562,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
@@ -589,6 +616,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
@@ -601,6 +629,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
@@ -609,6 +648,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
@@ -916,6 +960,7 @@ 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
@@ -924,6 +969,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
@@ -1038,6 +1084,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
@@ -1082,6 +1129,9 @@ lib/libakonadi-notes.so.${PKGVERSION}
lib/libakonadi-socialutils.so
lib/libakonadi-socialutils.so.4
lib/libakonadi-socialutils.so.${PKGVERSION}
+lib/libakonadi-xml.so
+lib/libakonadi-xml.so.4
+lib/libakonadi-xml.so.${PKGVERSION}
lib/libgpgme++-pthread.so
lib/libgpgme++-pthread.so.2
lib/libgpgme++-pthread.so.2.8.0
@@ -1157,6 +1207,7 @@ lib/libqgpgme.so.1.0.1
lib/libsyndication.so
lib/libsyndication.so.4
lib/libsyndication.so.${PKGVERSION}
+share/akonadi/agents/knutresource.desktop
share/dbus-1/interfaces/org.kde.KResourcesManager.xml
share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
share/doc/kde/HTML/en/kcontrol/kresources/common
@@ -1184,6 +1235,7 @@ share/doc/kde/HTML/en/kioslave/smtp/common
share/doc/kde/HTML/en/kioslave/smtp/index.cache.bz2
share/doc/kde/HTML/en/kioslave/smtp/index.docbook
share/kde/apps/akonadi-kde/kcfg2dbus.xsl
+share/kde/apps/akonadi/akonadi-xml.xsd
share/kde/apps/akonadi/contact/data/zone.tab
share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/aim_protocol.png
share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/gadu_protocol.png
@@ -1198,6 +1250,8 @@ share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/sms_protocol.png
share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/yahoo_protocol.png
share/kde/apps/akonadi/contact/pics/world.jpg
share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_socialfeeditem.desktop
+share/kde/apps/akonadi_knut_resource/knut-template.xml
+share/kde/apps/cmake/modules/AkonadiMacros.cmake
share/kde/apps/cmake/modules/CheckTimezone.cmake
share/kde/apps/cmake/modules/FindGpgme.cmake
share/kde/apps/cmake/modules/FindLdap.cmake
@@ -1223,6 +1277,7 @@ share/kde/apps/libkholidays/plan2/holiday_ba-srp_sr
share/kde/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavian
share/kde/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavianlatin
share/kde/apps/libkholidays/plan2/holiday_ba-srp_sr@latin
+share/kde/apps/libkholidays/plan2/holiday_bb_en-gb
share/kde/apps/libkholidays/plan2/holiday_be_fr
share/kde/apps/libkholidays/plan2/holiday_be_nl
share/kde/apps/libkholidays/plan2/holiday_be_wa
@@ -1257,6 +1312,7 @@ share/kde/apps/libkholidays/plan2/holiday_gb-sct_en-gb
share/kde/apps/libkholidays/plan2/holiday_gf_fr
share/kde/apps/libkholidays/plan2/holiday_gp_fr
share/kde/apps/libkholidays/plan2/holiday_gr_el
+share/kde/apps/libkholidays/plan2/holiday_gr_el_nameday
share/kde/apps/libkholidays/plan2/holiday_gt_es
share/kde/apps/libkholidays/plan2/holiday_hk_en-gb
share/kde/apps/libkholidays/plan2/holiday_hk_zh-cn
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index 6260f567590..5ff41a6d290 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.29 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.30 2014/11/13 19:19:06 markd Exp $
-SHA1 (kdepimlibs-4.11.5.tar.xz) = 5a78dc61dac33a50f0817cf743ecb3b8f5f23591
-RMD160 (kdepimlibs-4.11.5.tar.xz) = e54a9d207630579b9df05be098ab33dea8f13189
-Size (kdepimlibs-4.11.5.tar.xz) = 2936404 bytes
+SHA1 (kdepimlibs-4.14.3.tar.xz) = bbfff3ea5775bfb0f1692828c679e549deaf4fb3
+RMD160 (kdepimlibs-4.14.3.tar.xz) = 95af39ad4848fe48efbd4e3be8b4b0767530ec60
+Size (kdepimlibs-4.14.3.tar.xz) = 2790888 bytes
SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
-SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
SHA1 (patch-kblog_CMakeLists.txt) = b03068672c39492ef4883125c65f7951c7cc8f01
-SHA1 (patch-kcalutils_CMakeLists.txt) = 5c212ab23d0b1006a43c765bc1d860be85da284a
SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f
-SHA1 (patch-kldap_ber.cpp) = 3656e006278db8fd4014f6e4a902f60703955871
-SHA1 (patch-kldap_ber.h) = c4edcaedb7169e261892b973627b3265f1efd3df
-SHA1 (patch-kmbox_CMakeLists.txt) = 924bd70a84c8af1c7d37501d4f718343a0aa7121
SHA1 (patch-kpimidentities_identity.cpp) = 5a7d7e0c8edb7d2855c0e18bb6e9c596efbfe615
-SHA1 (patch-kpimutils_CMakeLists.txt) = 540a866b7c9d9de35ed0613519320490d73258d8
SHA1 (patch-qgpgme_CMakeLists.txt) = 0860963f371a008f1d006dad58ea40329c358cfd
diff --git a/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt
deleted file mode 100644
index 46aa80d7eb8..00000000000
--- a/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kalarmcal_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
-
---- kalarmcal/CMakeLists.txt.orig 2011-11-04 14:32:31.000000000 +0000
-+++ kalarmcal/CMakeLists.txt
-@@ -6,6 +6,7 @@ set(LIB_VERSION 2.7.0)
- set(LIB_SOVERSION 2)
-
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5955)
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- ############### Build Options ###############
-
diff --git a/misc/kdepimlibs4/patches/patch-kcalutils_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kcalutils_CMakeLists.txt
deleted file mode 100644
index 55df5d3a90e..00000000000
--- a/misc/kdepimlibs4/patches/patch-kcalutils_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kcalutils_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
-
---- kcalutils/CMakeLists.txt.orig 2011-07-27 18:34:56.000000000 +0000
-+++ kcalutils/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kcalutils)
-
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5820)
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- if(KDE4_BUILD_TESTS)
- add_definitions(-DCOMPILING_TESTS)
diff --git a/misc/kdepimlibs4/patches/patch-kldap_ber.cpp b/misc/kdepimlibs4/patches/patch-kldap_ber.cpp
deleted file mode 100644
index bbb14cfe149..00000000000
--- a/misc/kdepimlibs4/patches/patch-kldap_ber.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-kldap_ber.cpp,v 1.2 2012/11/11 22:28:29 joerg Exp $
-
-Fix building with Clang.
-
---- kldap/ber.cpp.orig 2012-11-08 10:20:25.000000000 +0000
-+++ kldap/ber.cpp
-@@ -124,7 +124,7 @@ QByteArray Ber::flatten() const
- return ret;
- }
-
--int Ber::printf( const QString &format, ... )
-+int Ber::printf( const char *format, ... )
- {
- char fmt[2];
- va_list args;
-@@ -132,8 +132,8 @@ int Ber::printf( const QString &format,
- fmt[1] = '\0';
-
- int i = 0, ret = 0;
-- while ( i < format.length() ) {
-- fmt[0] = format[i].toLatin1();
-+ while ( format[i] ) {
-+ fmt[0] = format[i];
- i++;
- switch ( fmt[0] ) {
- case 'b':
-@@ -229,7 +229,7 @@ int Ber::printf( const QString &format,
- return ret;
- }
-
--int Ber::scanf( const QString &format, ... )
-+int Ber::scanf( const char *format, ... )
- {
- char fmt[2];
- va_list args;
-@@ -237,8 +237,8 @@ int Ber::scanf( const QString &format, .
- fmt[1] = '\0';
-
- int i = 0, ret = 0;
-- while ( i < format.length() ) {
-- fmt[0] = format[i].toLatin1();
-+ while ( format[i] ) {
-+ fmt[0] = format[i];
- i++;
- switch ( fmt[0] ) {
- case 'l':
diff --git a/misc/kdepimlibs4/patches/patch-kldap_ber.h b/misc/kdepimlibs4/patches/patch-kldap_ber.h
deleted file mode 100644
index 7a2ae810308..00000000000
--- a/misc/kdepimlibs4/patches/patch-kldap_ber.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-kldap_ber.h,v 1.1 2012/11/11 22:49:20 joerg Exp $
-
---- kldap/ber.h.orig 2012-11-08 10:20:45.000000000 +0000
-+++ kldap/ber.h
-@@ -57,7 +57,8 @@ class KLDAP_EXPORT Ber
-
- /**
- * Appends the data with the specified format to the Ber object.
-- * This function works like printf, except that it's appending the
-+ * This function works like
-+ printf, except that it's appending the
- * parameters, not replacing them. The allowed format characters and
- * the expected parameter types are:
- * <ul>
-@@ -114,8 +115,8 @@ class KLDAP_EXPORT Ber
- * </li>
- * </ul>
- */
-- int printf( const QString &format, ... );
-- int scanf( const QString &format, ... );
-+ int printf( const char *format, ... );
-+ int scanf( const char *format, ... );
- unsigned int peekTag( int &size );
- unsigned int skipTag( int &size );
-
diff --git a/misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt
deleted file mode 100644
index 13360c229ad..00000000000
--- a/misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kmbox_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
-
---- kmbox/CMakeLists.txt.orig 2011-07-27 18:34:56.000000000 +0000
-+++ kmbox/CMakeLists.txt
-@@ -1,5 +1,7 @@
- project(kmbox)
-
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-+
- set(kmbox_LIB_SRCS
- mboxentry.cpp
- mbox_p.cpp
diff --git a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
deleted file mode 100644
index 22a005cd119..00000000000
--- a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.2 2013/04/03 10:51:48 markd Exp $
-
---- kpimutils/CMakeLists.txt.orig 2013-03-01 06:58:43.000000000 +0000
-+++ kpimutils/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(kpimutils)
-
- add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5321)
-+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-
- add_subdirectory(tests)
-
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index aa6fd5dba18..3ed7c0ed0aa 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.62 2014/11/13 19:19:08 markd Exp $
DISTNAME= kdeplasma-addons-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 6
CATEGORIES= misc
COMMENT= Plasmoids
@@ -19,9 +18,10 @@ CMAKE_ARGS+= -D BUILD_ibus:BOOL=OFF
.include "../../graphics/libkexiv2/buildlink3.mk"
BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
.include "../../math/eigen2/buildlink3.mk"
+.include "../../math/qalculate/buildlink3.mk"
.include "../../misc/attica/buildlink3.mk"
.include "../../misc/marble/buildlink3.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
+#.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
.include "../../security/qoauth/buildlink3.mk"
diff --git a/misc/kdeplasma-addons4/PLIST b/misc/kdeplasma-addons4/PLIST
index 8da1a052343..d4dc11e3317 100644
--- a/misc/kdeplasma-addons4/PLIST
+++ b/misc/kdeplasma-addons4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/13 19:19:08 markd Exp $
bin/lancelot
include/KDE/Lancelot/ActionListModel
include/KDE/Lancelot/ActionListView
@@ -149,6 +149,7 @@ lib/kde4/plasma_applet_paste.so
lib/kde4/plasma_applet_pastebin.so
lib/kde4/plasma_applet_plasmaboard.so
lib/kde4/plasma_applet_previewer.so
+lib/kde4/plasma_applet_qalculate.so
lib/kde4/plasma_applet_rssnow.so
lib/kde4/plasma_applet_rtm.so
lib/kde4/plasma_applet_showdashboard.so
@@ -217,6 +218,7 @@ share/icons/hicolor/128x128/apps/lifegame.png
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/krunner_youtube.png
share/icons/hicolor/16x16/apps/bball.png
share/icons/hicolor/16x16/apps/eyes.png
@@ -252,6 +254,7 @@ share/icons/hicolor/48x48/apps/lifegame.png
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/krunner_youtube.png
share/icons/hicolor/64x64/apps/bball.png
share/icons/hicolor/64x64/apps/eyes.png
@@ -542,6 +545,7 @@ share/kde4/services/plasma-applet-opendesktop.desktop
share/kde4/services/plasma-applet-paste.desktop
share/kde4/services/plasma-applet-pastebin.desktop
share/kde4/services/plasma-applet-previewer.desktop
+share/kde4/services/plasma-applet-qalculate.desktop
share/kde4/services/plasma-applet-rememberthemilk.desktop
share/kde4/services/plasma-applet-rssnow.desktop
share/kde4/services/plasma-applet-showdashboard.desktop
diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo
index 216d2093882..e5ba84ef6c3 100644
--- a/misc/kdeplasma-addons4/distinfo
+++ b/misc/kdeplasma-addons4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.21 2014/11/13 19:19:08 markd Exp $
-SHA1 (kdeplasma-addons-4.11.5.tar.xz) = 6014a1a77921c69ec240d2dc7adcf2bf42f280b2
-RMD160 (kdeplasma-addons-4.11.5.tar.xz) = 35ffa3c15290f7ae56329547d5cfae105736654d
-Size (kdeplasma-addons-4.11.5.tar.xz) = 1759984 bytes
+SHA1 (kdeplasma-addons-4.14.3.tar.xz) = f71c6add1d62eaaa57a2f859679f522655ae0f73
+RMD160 (kdeplasma-addons-4.14.3.tar.xz) = 3d1ff5693ee881dd0eac0664bba655d0e95fb530
+Size (kdeplasma-addons-4.14.3.tar.xz) = 1791328 bytes
SHA1 (patch-ab) = eb477ddc938d7eb9205df386e6f2f17e88de392e
SHA1 (patch-libs_lancelot-datamodels_CMakeLists.txt) = 0f8000457dbfc2de02e451a7a76faff089a1635a
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index c512c23e102..c4b67e323ad 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/11/13 19:19:07 markd Exp $
DISTNAME= kgeography-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE geography trainer
diff --git a/misc/kgeography/distinfo b/misc/kgeography/distinfo
index 27774ac1182..5260cce4201 100644
--- a/misc/kgeography/distinfo
+++ b/misc/kgeography/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.11 2014/11/13 19:19:07 markd Exp $
-SHA1 (kgeography-4.11.5.tar.xz) = 59d24c200be19638ad38f3b4301484292c888ef1
-RMD160 (kgeography-4.11.5.tar.xz) = 704d2c6f7d79107a01caac2b66e0e151997971dc
-Size (kgeography-4.11.5.tar.xz) = 6714048 bytes
+SHA1 (kgeography-4.14.3.tar.xz) = 6465f290a058f1c41b1957a308de5b6f383b8bd2
+RMD160 (kgeography-4.14.3.tar.xz) = a6782f304668e53915108e1605d4e0b95c0ca719
+Size (kgeography-4.14.3.tar.xz) = 6707392 bytes
diff --git a/misc/kig/Makefile b/misc/kig/Makefile
index b3e5e684baf..5b029648b4a 100644
--- a/misc/kig/Makefile
+++ b/misc/kig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
DISTNAME= kig-${_KDE_VERSION}
-PKGREVISION= 6
CATEGORIES= misc
COMMENT= KDE interactive geometry
diff --git a/misc/kig/PLIST b/misc/kig/PLIST
index f6681c9930b..13dda8c46f4 100644
--- a/misc/kig/PLIST
+++ b/misc/kig/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:19:08 markd Exp $
bin/kig
bin/pykig.py
lib/kde4/kigpart.so
man/man1/kig.1
+share/appdata/kig.appdata.xml
share/applications/kde4/kig.desktop
share/doc/kde/HTML/en/kig/common
share/doc/kde/HTML/en/kig/constructed_a_point.png
@@ -42,7 +43,6 @@ share/kde/apps/kig/builtin-macros/circle_by_point_and_diameter.kigt
share/kde/apps/kig/builtin-macros/equitriangle.kigt
share/kde/apps/kig/builtin-macros/evolute.kigt
share/kde/apps/kig/builtin-macros/osculating_circle.kigt
-share/kde/apps/kig/builtin-macros/segment_axis.kigt
share/kde/apps/kig/builtin-macros/square.kigt
share/kde/apps/kig/builtin-macros/vector_difference.kigt
share/kde/apps/kig/icons/hicolor/16x16/actions/kig_xfig.png
diff --git a/misc/kig/distinfo b/misc/kig/distinfo
index 7cf5d2bd919..873e9fee192 100644
--- a/misc/kig/distinfo
+++ b/misc/kig/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:49 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (kig-4.11.5.tar.xz) = 720238e25095b0b820622e8fdf953f30c23bb251
-RMD160 (kig-4.11.5.tar.xz) = 3b74692dd31645cf0a21b68c2858d81ff3f732ad
-Size (kig-4.11.5.tar.xz) = 1505088 bytes
+SHA1 (kig-4.14.3.tar.xz) = 730a87d7a9b95199385076e7a281712bd278b88a
+RMD160 (kig-4.14.3.tar.xz) = eac3d01e3ed708f6919684e30b59aad4199e43a7
+Size (kig-4.14.3.tar.xz) = 1506492 bytes
+SHA1 (patch-CMakeLists.txt) = 3d0827de25a235368553300e37a35eb6d0eab598
diff --git a/misc/kig/patches/patch-CMakeLists.txt b/misc/kig/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..cdb28df3c86
--- /dev/null
+++ b/misc/kig/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2014/11/13 19:19:08 markd Exp $
+
+gcc<=4.5 doesn't like -std=c++11
+
+--- CMakeLists.txt.orig 2014-10-25 02:44:23.000000000 +0000
++++ CMakeLists.txt
+@@ -25,7 +25,7 @@ include(MacroBoolTo01)
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
++if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+
diff --git a/misc/kiten/Makefile b/misc/kiten/Makefile
index ba25175594e..9db7b07d724 100644
--- a/misc/kiten/Makefile
+++ b/misc/kiten/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= kiten-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE Japanese reference/learning tool
diff --git a/misc/kiten/PLIST b/misc/kiten/PLIST
index e8143a5a04b..c64a6a49fe6 100644
--- a/misc/kiten/PLIST
+++ b/misc/kiten/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:52:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/13 19:19:07 markd Exp $
bin/kiten
bin/kitengen
bin/kitenkanjibrowser
@@ -18,6 +18,7 @@ include/libkiten/libkitenexport.h
lib/libkiten.so
lib/libkiten.so.4
lib/libkiten.so.${PKGVERSION}
+share/appdata/kiten.appdata.xml
share/applications/kde4/kiten.desktop
share/applications/kde4/kitenkanjibrowser.desktop
share/applications/kde4/kitenradselect.desktop
diff --git a/misc/kiten/distinfo b/misc/kiten/distinfo
index efe6b0126b9..7c8b563d60c 100644
--- a/misc/kiten/distinfo
+++ b/misc/kiten/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (kiten-4.11.5.tar.xz) = 9fbe415304cf7176b33873045a625ee86cd0a897
-RMD160 (kiten-4.11.5.tar.xz) = 1aaefa1e4605240d5c1a903d968ee2793a4b6480
-Size (kiten-4.11.5.tar.xz) = 11734956 bytes
+SHA1 (kiten-4.14.3.tar.xz) = aa586a2202ec3df2cceabd539f7a7753b26f9cd7
+RMD160 (kiten-4.14.3.tar.xz) = 780810d7d6d3484e0d775fc6ee9bf8ae2a794287
+Size (kiten-4.14.3.tar.xz) = 11680148 bytes
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index 3acf90fd005..c60f647a9a5 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:07 markd Exp $
DISTNAME= klettres-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE app to teach the alphabet and read some syllables in languages
diff --git a/misc/klettres/PLIST b/misc/klettres/PLIST
index f341fa37a09..396e46ca0f8 100644
--- a/misc/klettres/PLIST
+++ b/misc/klettres/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:19:07 markd Exp $
bin/klettres
+share/appdata/klettres.appdata.xml
share/applications/kde4/klettres.desktop
share/doc/kde/HTML/en/klettres/common
share/doc/kde/HTML/en/klettres/index.cache.bz2
@@ -149,6 +150,7 @@ share/kde/apps/klettres/icons/hicolor/scalable/actions/klettres_grownup.svgz
share/kde/apps/klettres/icons/hicolor/scalable/actions/klettres_kids.svgz
share/kde/apps/klettres/klettresui.rc
share/kde/apps/klettres/nds.txt
+share/kde/apps/klettres/pics/aqua/klettres_aqua.svg
share/kde/apps/klettres/pics/desert/klettres_desert.svg
share/kde/apps/klettres/pics/kids/klettres_kids.svg
share/kde/apps/klettres/pics/klettres_desert.png
diff --git a/misc/klettres/distinfo b/misc/klettres/distinfo
index 3fed15fb47b..f067abc5cb1 100644
--- a/misc/klettres/distinfo
+++ b/misc/klettres/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (klettres-4.11.5.tar.xz) = 8fccbd21ccb51891885202a5e79b2b09d059ae36
-RMD160 (klettres-4.11.5.tar.xz) = 124515a2d38da7c9c76caea9f3649a4a066622d4
-Size (klettres-4.11.5.tar.xz) = 2669860 bytes
+SHA1 (klettres-4.14.3.tar.xz) = da001f8ada10f18a87f0c6be8c00b02d9b0106f5
+RMD160 (klettres-4.14.3.tar.xz) = ab2d7e91a14d34f698ed74d6019947a4a172b0c3
+Size (klettres-4.14.3.tar.xz) = 2814412 bytes
diff --git a/misc/kmag/Makefile b/misc/kmag/Makefile
index 2c3dcbd7e64..ad64dea3510 100644
--- a/misc/kmag/Makefile
+++ b/misc/kmag/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= kmag-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE screen magnifier
diff --git a/misc/kmag/PLIST b/misc/kmag/PLIST
index 4c57febd929..c869ece7fa5 100644
--- a/misc/kmag/PLIST
+++ b/misc/kmag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 06:53:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/13 19:19:06 markd Exp $
bin/kmag
man/man1/kmag.1
share/applications/kde4/kmag.desktop
@@ -7,9 +7,9 @@ share/doc/kde/HTML/en/kmag/index.cache.bz2
share/doc/kde/HTML/en/kmag/index.docbook
share/doc/kde/HTML/en/kmag/man-kmag.1.docbook
share/doc/kde/HTML/en/kmag/screenshot.png
-share/icons/hicolor/16x16/actions/followmouse.png
-share/icons/hicolor/16x16/actions/hidemouse.png
-share/icons/hicolor/16x16/actions/window.png
share/icons/hicolor/16x16/apps/kmag.png
share/icons/hicolor/32x32/apps/kmag.png
+share/kde/apps/kmag/icons/hicolor/16x16/actions/followmouse.png
+share/kde/apps/kmag/icons/hicolor/16x16/actions/hidemouse.png
+share/kde/apps/kmag/icons/hicolor/16x16/actions/window.png
share/kde/apps/kmag/kmagui.rc
diff --git a/misc/kmag/distinfo b/misc/kmag/distinfo
index 44b07ab6aee..28038bb6b26 100644
--- a/misc/kmag/distinfo
+++ b/misc/kmag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (kmag-4.11.5.tar.xz) = 24e64d6a9644845837c3820c5f399058386c8e6b
-RMD160 (kmag-4.11.5.tar.xz) = 267cdeca19ffd4a8b9b70893e9ad90472e71963e
-Size (kmag-4.11.5.tar.xz) = 86404 bytes
+SHA1 (kmag-4.14.3.tar.xz) = 2ec27ba8b380f6a3c8a14908ec1a913f99b8b70f
+RMD160 (kmag-4.14.3.tar.xz) = 019de8e6b15f24628fd9c32927cc43fe3c4cafcd
+Size (kmag-4.14.3.tar.xz) = 86264 bytes
diff --git a/misc/kmousetool/Makefile b/misc/kmousetool/Makefile
index fc753d62f87..039fe786e8d 100644
--- a/misc/kmousetool/Makefile
+++ b/misc/kmousetool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= kmousetool-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE mouse manipulation tool
diff --git a/misc/kmousetool/distinfo b/misc/kmousetool/distinfo
index 4372994e4af..16c846bcee5 100644
--- a/misc/kmousetool/distinfo
+++ b/misc/kmousetool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (kmousetool-4.11.5.tar.xz) = 335a645fdaed2e70878bf2d4d96fc13e7002da15
-RMD160 (kmousetool-4.11.5.tar.xz) = 9488c8b8a5018e4bcd742534c5c66d0690c90e93
-Size (kmousetool-4.11.5.tar.xz) = 35860 bytes
+SHA1 (kmousetool-4.14.3.tar.xz) = 5140076edd3cae4ef147d1b0fc9e39f87378ca6f
+RMD160 (kmousetool-4.14.3.tar.xz) = ad07ed164072f26ea0761880507266358109c4c6
+Size (kmousetool-4.14.3.tar.xz) = 35968 bytes
diff --git a/misc/kmouth/Makefile b/misc/kmouth/Makefile
index 1bf4f99313c..dfb3387f93a 100644
--- a/misc/kmouth/Makefile
+++ b/misc/kmouth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= kmouth-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE Speech Synthesizer frontend
diff --git a/misc/kmouth/distinfo b/misc/kmouth/distinfo
index 46540499f40..ecd0acd2800 100644
--- a/misc/kmouth/distinfo
+++ b/misc/kmouth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (kmouth-4.11.5.tar.xz) = 13767a140270108269c0862fd1ddac940a384b7b
-RMD160 (kmouth-4.11.5.tar.xz) = 9d118e383ebdefcaa18d90d7e87de6a27b678c0a
-Size (kmouth-4.11.5.tar.xz) = 308708 bytes
+SHA1 (kmouth-4.14.3.tar.xz) = 1a405f642a0d4b994525e65a6a08849e3f572e46
+RMD160 (kmouth-4.14.3.tar.xz) = 36add6fb0101e69208a5d7ce1bae728245eef221
+Size (kmouth-4.14.3.tar.xz) = 307840 bytes
diff --git a/misc/kremotecontrol/Makefile b/misc/kremotecontrol/Makefile
index 5428fe54929..5c8be892d5a 100644
--- a/misc/kremotecontrol/Makefile
+++ b/misc/kremotecontrol/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
DISTNAME= kremotecontrol-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE frontend for your remote controls
diff --git a/misc/kremotecontrol/distinfo b/misc/kremotecontrol/distinfo
index fbcb0e42866..10178e23b75 100644
--- a/misc/kremotecontrol/distinfo
+++ b/misc/kremotecontrol/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (kremotecontrol-4.11.5.tar.xz) = 55ee9e3d229139396aa31016e93d5308366d92ed
-RMD160 (kremotecontrol-4.11.5.tar.xz) = 886aafec2b76fe7eeb362001d62cb5d208f16462
-Size (kremotecontrol-4.11.5.tar.xz) = 1074076 bytes
+SHA1 (kremotecontrol-4.14.3.tar.xz) = bd7eaed3e808fe538c9dc5361b7cfcac76102ac8
+RMD160 (kremotecontrol-4.14.3.tar.xz) = f0b9e4c31e5e860a83b381b8fcff786ed0bf0607
+Size (kremotecontrol-4.14.3.tar.xz) = 1074704 bytes
diff --git a/misc/kstars/Makefile b/misc/kstars/Makefile
index b8ed4f6cb63..14db9203edf 100644
--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2014/11/07 19:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.37 2014/11/13 19:19:07 markd Exp $
DISTNAME= kstars-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE desktop planetarium
@@ -10,9 +9,10 @@ COMMENT= KDE desktop planetarium
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../devel/cfitsio/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
-.include "../../math/eigen2/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
+.include "../../math/eigen3/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/kstars/PLIST b/misc/kstars/PLIST
index 7cacce55298..4eb434bb97f 100644
--- a/misc/kstars/PLIST
+++ b/misc/kstars/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/13 19:19:07 markd Exp $
bin/kstars
lib/libhtmesh.a
+share/appdata/kstars.appdata.xml
share/applications/kde4/kstars.desktop
share/doc/kde/HTML/en/kstars/Add_Object_to_Session_plan.png
share/doc/kde/HTML/en/kstars/Another_way4.png
diff --git a/misc/kstars/distinfo b/misc/kstars/distinfo
index 256a05ded73..deda8d925b9 100644
--- a/misc/kstars/distinfo
+++ b/misc/kstars/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.11 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.12 2014/11/13 19:19:07 markd Exp $
-SHA1 (kstars-4.11.5.tar.xz) = f1bf1f5e861acac1b1ce1e69e513a8e21a63c6f5
-RMD160 (kstars-4.11.5.tar.xz) = 6333add2b3c8f43cdaf67b2c58827b09993f382f
-Size (kstars-4.11.5.tar.xz) = 12395260 bytes
+SHA1 (kstars-4.14.3.tar.xz) = 108b204308d464f03f3119b08d2e53c203615c05
+RMD160 (kstars-4.14.3.tar.xz) = 6e0ae12cc2b7c9277294c720ebab6502d3fffd29
+Size (kstars-4.14.3.tar.xz) = 12374500 bytes
SHA1 (patch-kstars_fitsviewer_fitsimage.cpp) = f18ceecfa2267d0957f7f5d3b6e609a2d861b375
SHA1 (patch-kstars_skyobjects_satellite.cpp) = a30cd6139fff8e5968d704b901dd2a059548d527
-SHA1 (patch-kstars_skyobjects_starobject.cpp) = 5d09d63fdc220d387b75bd75221eb48a0f9bd90a
SHA1 (patch-kstars_tools_altvstime.cpp) = 24b8d4c31216fd08353e29825c6213349cfa6287
SHA1 (patch-kstars_widgets_moonphasecalendarwidget.h) = c3c507447ea4586b2d1224e49cb4c44ba0a13918
diff --git a/misc/kstars/patches/patch-kstars_skyobjects_starobject.cpp b/misc/kstars/patches/patch-kstars_skyobjects_starobject.cpp
deleted file mode 100644
index 89fa83fff09..00000000000
--- a/misc/kstars/patches/patch-kstars_skyobjects_starobject.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kstars_skyobjects_starobject.cpp,v 1.1 2013/11/07 12:35:42 markd Exp $
-
---- kstars/skyobjects/starobject.cpp.orig 2013-08-28 17:03:16.000000000 +0000
-+++ kstars/skyobjects/starobject.cpp
-@@ -282,7 +282,7 @@ void StarObject::getIndexCoords( KSNumbe
-
- pmms = pmMagnitudeSquared();
-
-- if( isnan( pmms ) || pmms * num->julianMillenia() * num->julianMillenia() < 1. ) {
-+ if( std::isnan( pmms ) || pmms * num->julianMillenia() * num->julianMillenia() < 1. ) {
- // Ignore corrections
- *ra = ra0().Degrees();
- *dec = dec0().Degrees();
diff --git a/misc/kteatime/Makefile b/misc/kteatime/Makefile
index 8ff2bb9aff7..e518c3a3313 100644
--- a/misc/kteatime/Makefile
+++ b/misc/kteatime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/11/13 19:19:07 markd Exp $
DISTNAME= kteatime-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE Tea Cooker
diff --git a/misc/kteatime/distinfo b/misc/kteatime/distinfo
index e3afa0af5e7..68ac2496622 100644
--- a/misc/kteatime/distinfo
+++ b/misc/kteatime/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.3 2014/11/13 19:19:07 markd Exp $
-SHA1 (kteatime-4.11.5.tar.xz) = 32402382e31226ea95e9c95706ca695934ec6acd
-RMD160 (kteatime-4.11.5.tar.xz) = 5da76b6e52db3dfa5f0d32fff49786020a8f8864
-Size (kteatime-4.11.5.tar.xz) = 100424 bytes
+SHA1 (kteatime-4.14.3.tar.xz) = 712e7cad4692529dc8ce3aae18d533a64b1c4ead
+RMD160 (kteatime-4.14.3.tar.xz) = aac442d2bc0b2a48123ebf296176fb5e8b647ca4
+Size (kteatime-4.14.3.tar.xz) = 100472 bytes
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 2af75c6497d..63f9baed4b9 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= ktouch-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE touch typing tutor
diff --git a/misc/ktouch/PLIST b/misc/ktouch/PLIST
index f8ed4b445e6..fdc664f1a0a 100644
--- a/misc/ktouch/PLIST
+++ b/misc/ktouch/PLIST
@@ -1,13 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/13 19:19:07 markd Exp $
bin/ktouch
-lib/kde4/imports/org/kde/ktouch/graph/BarGraph.qml
-lib/kde4/imports/org/kde/ktouch/graph/Label.qml
-lib/kde4/imports/org/kde/ktouch/graph/LegendItem.qml
-lib/kde4/imports/org/kde/ktouch/graph/LineGraph.qml
-lib/kde4/imports/org/kde/ktouch/graph/LineLabel.qml
-lib/kde4/imports/org/kde/ktouch/graph/libgraphplugin.so
-lib/kde4/imports/org/kde/ktouch/graph/qmldir
man/man1/ktouch.1
+share/appdata/ktouch.appdata.xml
share/applications/kde4/ktouch.desktop
share/doc/kde/HTML/en/ktouch/Icon-arrow-down.png
share/doc/kde/HTML/en/ktouch/Icon-arrow-left.png
@@ -16,7 +10,9 @@ share/doc/kde/HTML/en/ktouch/Icon-arrow-up.png
share/doc/kde/HTML/en/ktouch/Icon-configure.png
share/doc/kde/HTML/en/ktouch/Icon-dialog-information.png
share/doc/kde/HTML/en/ktouch/Icon-document-new.png
+share/doc/kde/HTML/en/ktouch/Icon-document-open.png
share/doc/kde/HTML/en/ktouch/Icon-edit-delete.png
+share/doc/kde/HTML/en/ktouch/Icon-format-justify-fill.png
share/doc/kde/HTML/en/ktouch/Icon-go-home.png
share/doc/kde/HTML/en/ktouch/Icon-list-add.png
share/doc/kde/HTML/en/ktouch/Icon-list-remove.png
@@ -33,6 +29,8 @@ share/doc/kde/HTML/en/ktouch/create_course3.png
share/doc/kde/HTML/en/ktouch/create_layout1.png
share/doc/kde/HTML/en/ktouch/create_layout2.png
share/doc/kde/HTML/en/ktouch/create_layout3.png
+share/doc/kde/HTML/en/ktouch/custom-lessons-edit.png
+share/doc/kde/HTML/en/ktouch/custom-lessons.png
share/doc/kde/HTML/en/ktouch/home_screen.png
share/doc/kde/HTML/en/ktouch/index.cache.bz2
share/doc/kde/HTML/en/ktouch/index.docbook
@@ -74,12 +72,14 @@ share/kde/apps/ktouch/courses/es.dvorak.xml
share/kde/apps/ktouch/courses/es1.xml
share/kde/apps/ktouch/courses/es2.xml
share/kde/apps/ktouch/courses/es3.xml
+share/kde/apps/ktouch/courses/es4.xml
share/kde/apps/ktouch/courses/fi.xml
share/kde/apps/ktouch/courses/fr.bepo.xml
share/kde/apps/ktouch/courses/fr.dvarok.xml
share/kde/apps/ktouch/courses/fr.xml
share/kde/apps/ktouch/courses/gb.xml
share/kde/apps/ktouch/courses/gr.xml
+share/kde/apps/ktouch/courses/ir.xml
share/kde/apps/ktouch/courses/it.xml
share/kde/apps/ktouch/courses/lt.std.xml
share/kde/apps/ktouch/courses/nl1.xml
@@ -96,6 +96,7 @@ share/kde/apps/ktouch/courses/ua.xml
share/kde/apps/ktouch/courses/us.colemak.xml
share/kde/apps/ktouch/courses/us.dvorak1.xml
share/kde/apps/ktouch/courses/us.dvorak2.xml
+share/kde/apps/ktouch/courses/us.workman.xml
share/kde/apps/ktouch/courses/us.xml
share/kde/apps/ktouch/data.xml
share/kde/apps/ktouch/images/accuracymeter.svgz
@@ -130,9 +131,11 @@ share/kde/apps/ktouch/keyboardlayouts/hu.xml
share/kde/apps/ktouch/keyboardlayouts/il.xml
share/kde/apps/ktouch/keyboardlayouts/in.kan.xml
share/kde/apps/ktouch/keyboardlayouts/in.tam_unicode.xml
+share/kde/apps/ktouch/keyboardlayouts/ir.xml
share/kde/apps/ktouch/keyboardlayouts/it.xml
share/kde/apps/ktouch/keyboardlayouts/latam.xml
share/kde/apps/ktouch/keyboardlayouts/lt.std.xml
+share/kde/apps/ktouch/keyboardlayouts/nl.xml
share/kde/apps/ktouch/keyboardlayouts/no.xml
share/kde/apps/ktouch/keyboardlayouts/pt.xml
share/kde/apps/ktouch/keyboardlayouts/ru.legacy.xml
@@ -142,9 +145,11 @@ share/kde/apps/ktouch/keyboardlayouts/si.xml
share/kde/apps/ktouch/keyboardlayouts/sk.qwerty.xml
share/kde/apps/ktouch/keyboardlayouts/sk.xml
share/kde/apps/ktouch/keyboardlayouts/tr.f.xml
+share/kde/apps/ktouch/keyboardlayouts/tr.xml
share/kde/apps/ktouch/keyboardlayouts/ua.xml
share/kde/apps/ktouch/keyboardlayouts/us.colemak.xml
share/kde/apps/ktouch/keyboardlayouts/us.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/us.workman.xml
share/kde/apps/ktouch/keyboardlayouts/us.xml
share/kde/apps/ktouch/qml/AccuracyMeter.qml
share/kde/apps/ktouch/qml/Balloon.qml
@@ -152,20 +157,24 @@ share/kde/apps/ktouch/qml/CharactersPerMinuteMeter.qml
share/kde/apps/ktouch/qml/CourseDescriptionItem.qml
share/kde/apps/ktouch/qml/CoursePage.qml
share/kde/apps/ktouch/qml/CourseSelector.qml
+share/kde/apps/ktouch/qml/CustomLessonSelector.qml
+share/kde/apps/ktouch/qml/DetailedRadioButton.qml
share/kde/apps/ktouch/qml/ElapsedTimeMeter.qml
share/kde/apps/ktouch/qml/HomeScreen.qml
share/kde/apps/ktouch/qml/InfoItem.qml
share/kde/apps/ktouch/qml/InformationTable.qml
share/kde/apps/ktouch/qml/InitialProfileForm.qml
+share/kde/apps/ktouch/qml/InlineToolbar.qml
share/kde/apps/ktouch/qml/KeyItem.qml
share/kde/apps/ktouch/qml/KeyLabel.qml
share/kde/apps/ktouch/qml/Keyboard.qml
share/kde/apps/ktouch/qml/KeyboardLayoutEditor.qml
share/kde/apps/ktouch/qml/KeyboardUnavailableNotice.qml
-share/kde/apps/ktouch/qml/LearningProgressGraph.qml
+share/kde/apps/ktouch/qml/LearningProgressChart.qml
share/kde/apps/ktouch/qml/LessonLockedNotice.qml
share/kde/apps/ktouch/qml/LessonPreview.qml
share/kde/apps/ktouch/qml/LessonSelector.qml
+share/kde/apps/ktouch/qml/LessonSelectorBase.qml
share/kde/apps/ktouch/qml/ListItem.qml
share/kde/apps/ktouch/qml/MessageBox.qml
share/kde/apps/ktouch/qml/Meter.qml
diff --git a/misc/ktouch/distinfo b/misc/ktouch/distinfo
index 1ba5f218c13..6d86cb99b95 100644
--- a/misc/ktouch/distinfo
+++ b/misc/ktouch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (ktouch-4.11.5.tar.xz) = d66b0ddbce1b9645e9b20b8beb655f776c410530
-RMD160 (ktouch-4.11.5.tar.xz) = 358f9bb7df827d679822e0816dff4036e0e983af
-Size (ktouch-4.11.5.tar.xz) = 2611156 bytes
+SHA1 (ktouch-4.14.3.tar.xz) = 6d403a6d30c0398f8bf274699059bcbab851f278
+RMD160 (ktouch-4.14.3.tar.xz) = 565a420d0347905a193988eb592022df7f15d415
+Size (ktouch-4.14.3.tar.xz) = 2420844 bytes
diff --git a/misc/kturtle/Makefile b/misc/kturtle/Makefile
index 1b23e2b67aa..e035232e01d 100644
--- a/misc/kturtle/Makefile
+++ b/misc/kturtle/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= kturtle-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE educational programming environment
diff --git a/misc/kturtle/PLIST b/misc/kturtle/PLIST
index 07421938b6b..4c3c257944a 100644
--- a/misc/kturtle/PLIST
+++ b/misc/kturtle/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:33:34 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/13 19:19:07 markd Exp $
bin/kturtle
+share/appdata/kturtle.appdata.xml
share/applications/kde4/kturtle.desktop
share/doc/kde/HTML/en/kturtle/common
share/doc/kde/HTML/en/kturtle/getting-started.docbook
diff --git a/misc/kturtle/distinfo b/misc/kturtle/distinfo
index 7562e632c23..91a7fb9187d 100644
--- a/misc/kturtle/distinfo
+++ b/misc/kturtle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (kturtle-4.11.5.tar.xz) = 364c99b447d4b3471e871c95edec8de2468ad00d
-RMD160 (kturtle-4.11.5.tar.xz) = e16512569f550625e51fffdcf3971e3ce7d18cdb
-Size (kturtle-4.11.5.tar.xz) = 188672 bytes
+SHA1 (kturtle-4.14.3.tar.xz) = b022711c94d6a241e1e029f66c35e77ca5af8118
+RMD160 (kturtle-4.14.3.tar.xz) = e30fa38635925c2e2bb8a704f90e24a161639faa
+Size (kturtle-4.14.3.tar.xz) = 192100 bytes
diff --git a/misc/ktux/Makefile b/misc/ktux/Makefile
index 2b9c352afa9..2f045137da5 100644
--- a/misc/ktux/Makefile
+++ b/misc/ktux/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/11/13 19:19:07 markd Exp $
DISTNAME= ktux-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Tux Screen Saver
diff --git a/misc/ktux/distinfo b/misc/ktux/distinfo
index 647d67b5277..81426c08e34 100644
--- a/misc/ktux/distinfo
+++ b/misc/ktux/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.3 2014/11/13 19:19:07 markd Exp $
-SHA1 (ktux-4.11.5.tar.xz) = 5c1ae9fd639d2c4510b09545e7cae0aa26b0dadb
-RMD160 (ktux-4.11.5.tar.xz) = 8f050ccd86e2b7ff853ca6cabf4b5c1e2bfa50b7
-Size (ktux-4.11.5.tar.xz) = 108524 bytes
+SHA1 (ktux-4.14.3.tar.xz) = 13157abb78fc1a42362a992be0d2c2f61f805fc5
+RMD160 (ktux-4.14.3.tar.xz) = 12a9f111efbb6c05fea69d85cbb69c0ae3b8616f
+Size (ktux-4.14.3.tar.xz) = 108632 bytes
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 107e685a6e9..30565d012cf 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= kwordquiz-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE flash card trainer
diff --git a/misc/kwordquiz/PLIST b/misc/kwordquiz/PLIST
index 73d89ac47db..9ac770969ba 100644
--- a/misc/kwordquiz/PLIST
+++ b/misc/kwordquiz/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:19:07 markd Exp $
bin/kwordquiz
+share/appdata/kwordquiz.appdata.xml
share/applications/kde4/kwordquiz.desktop
share/doc/kde/HTML/en/kwordquiz/common
share/doc/kde/HTML/en/kwordquiz/index.cache.bz2
diff --git a/misc/kwordquiz/distinfo b/misc/kwordquiz/distinfo
index 2c9e403391d..de55a492322 100644
--- a/misc/kwordquiz/distinfo
+++ b/misc/kwordquiz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (kwordquiz-4.11.5.tar.xz) = b35347d84c951d59a87def8a73c70a1c5f8b7ebf
-RMD160 (kwordquiz-4.11.5.tar.xz) = 0b61a2f43ab390ae6ee4bf9ad2f81ccec2371dfc
-Size (kwordquiz-4.11.5.tar.xz) = 1197656 bytes
+SHA1 (kwordquiz-4.14.3.tar.xz) = b341ba88986619307163df28130faa485911bd09
+RMD160 (kwordquiz-4.14.3.tar.xz) = 335fea61831d1ff6040e8cfe75d8eab40a062421
+Size (kwordquiz-4.14.3.tar.xz) = 1198472 bytes
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index 55534f1bf3e..6db876f59da 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
DISTNAME= libkdeedu-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= Common library for KDE educational apps
diff --git a/misc/libkdeedu/distinfo b/misc/libkdeedu/distinfo
index f18e2610403..773373e9273 100644
--- a/misc/libkdeedu/distinfo
+++ b/misc/libkdeedu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:06 markd Exp $
-SHA1 (libkdeedu-4.11.5.tar.xz) = e6e77d1cca4edb09fa2886ad0041ea4fb3be1c63
-RMD160 (libkdeedu-4.11.5.tar.xz) = 24b3af8aaf062789a906cf67a53e80e0f342ee14
-Size (libkdeedu-4.11.5.tar.xz) = 209764 bytes
+SHA1 (libkdeedu-4.14.3.tar.xz) = 02bb448832d518bd920e08e8a87ae9fb2db7f20b
+RMD160 (libkdeedu-4.14.3.tar.xz) = c256555bd7cdb2c38259774e17e3506c8e1df099
+Size (libkdeedu-4.14.3.tar.xz) = 218432 bytes
diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index de92bf7c662..6bfd0e4af35 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.28 2014/11/13 19:19:06 markd Exp $
DISTNAME= marble-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE desktop globe
diff --git a/misc/marble/PLIST b/misc/marble/PLIST
index 4fc6f8dec07..e10271dc86d 100644
--- a/misc/marble/PLIST
+++ b/misc/marble/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/01 02:20:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/13 19:19:06 markd Exp $
bin/marble
+bin/marble-mobile
bin/marble-qt
bin/marble-touch
-bin/routing-instructions
-bin/tilecreator
+include/astro/astr2lib.h
+include/astro/astrolib.h
+include/astro/astrolib_export.h
+include/astro/attlib.h
+include/astro/eclsolar.h
+include/astro/planetarySats.h
+include/astro/solarsystem.h
include/marble/AbstractDataPlugin.h
include/marble/AbstractDataPluginItem.h
include/marble/AbstractDataPluginModel.h
@@ -17,12 +23,10 @@ include/marble/BillboardGraphicsItem.h
include/marble/BookmarkManager.h
include/marble/ClipPainter.h
include/marble/CurrentLocationWidget.h
-include/marble/CylindricalProjection.h
include/marble/DialogConfigurationInterface.h
include/marble/DownloadRegion.h
include/marble/DownloadRegionDialog.h
include/marble/ElevationModel.h
-include/marble/EquirectProjection.h
include/marble/FileViewWidget.h
include/marble/FrameGraphicsItem.h
include/marble/GeoDataAbstractView.h
@@ -42,6 +46,7 @@ include/marble/GeoDataItemIcon.h
include/marble/GeoDataLabelStyle.h
include/marble/GeoDataLatLonAltBox.h
include/marble/GeoDataLatLonBox.h
+include/marble/GeoDataLatLonQuad.h
include/marble/GeoDataLineString.h
include/marble/GeoDataLineStyle.h
include/marble/GeoDataLinearRing.h
@@ -56,6 +61,7 @@ include/marble/GeoDataPoint.h
include/marble/GeoDataPolyStyle.h
include/marble/GeoDataPolygon.h
include/marble/GeoDataRegion.h
+include/marble/GeoDataSnippet.h
include/marble/GeoDataStyle.h
include/marble/GeoDataStyleMap.h
include/marble/GeoDataStyleSelector.h
@@ -82,33 +88,38 @@ include/marble/MapWizard.h
include/marble/MarbleAboutDialog.h
include/marble/MarbleColors.h
include/marble/MarbleControlBox.h
+include/marble/MarbleDebug.h
include/marble/MarbleDirs.h
include/marble/MarbleGlobal.h
include/marble/MarbleGraphicsGridLayout.h
include/marble/MarbleGraphicsItem.h
+include/marble/MarbleInputHandler.h
+include/marble/MarbleLocale.h
include/marble/MarbleMap.h
include/marble/MarbleModel.h
include/marble/MarbleNavigator.h
-include/marble/MarbleRunnerManager.h
include/marble/MarbleWebView.h
include/marble/MarbleWidget.h
include/marble/MarbleWidgetInputHandler.h
-include/marble/MercatorProjection.h
+include/marble/MarbleWidgetPopupMenu.h
include/marble/NavigationWidget.h
include/marble/ParseRunnerPlugin.h
include/marble/ParsingRunner.h
+include/marble/ParsingRunnerManager.h
include/marble/Planet.h
-include/marble/PluginManager.h
-include/marble/PositionProviderPlugin.h
include/marble/PluginAboutDialog.h
include/marble/PluginInterface.h
+include/marble/PluginManager.h
+include/marble/PositionProviderPlugin.h
include/marble/PositionProviderPluginInterface.h
include/marble/PositionTracking.h
include/marble/QtMarbleConfigDialog.h
include/marble/Quaternion.h
include/marble/RenderPlugin.h
include/marble/RenderPluginInterface.h
+include/marble/RenderState.h
include/marble/ReverseGeocodingRunner.h
+include/marble/ReverseGeocodingRunnerManager.h
include/marble/ReverseGeocodingRunnerPlugin.h
include/marble/Route.h
include/marble/RouteRequest.h
@@ -117,13 +128,14 @@ include/marble/RoutingManager.h
include/marble/RoutingModel.h
include/marble/RoutingProfile.h
include/marble/RoutingRunner.h
+include/marble/RoutingRunnerManager.h
include/marble/RoutingRunnerPlugin.h
include/marble/RoutingWidget.h
include/marble/ScreenGraphicsItem.h
include/marble/SearchRunner.h
+include/marble/SearchRunnerManager.h
include/marble/SearchRunnerPlugin.h
include/marble/Serializable.h
-include/marble/SphericalProjection.h
include/marble/SunLocator.h
include/marble/TileCoordsPyramid.h
include/marble/TileCreator.h
@@ -131,21 +143,29 @@ include/marble/TileCreatorDialog.h
include/marble/TileId.h
include/marble/TileLevelRangeWidget.h
include/marble/TinyWebBrowser.h
+include/marble/TourPlayback.h
+include/marble/TourWidget.h
include/marble/ViewportParams.h
include/marble/WidgetGraphicsItem.h
include/marble/geodata_export.h
include/marble/global.h
include/marble/marble_export.h
lib/kde4/libmarble_part.so
+lib/kde4/marblethumbnail.so
lib/kde4/plasma_applet_worldclock.so
lib/kde4/plasma_runner_marble.so
+lib/kde4/plugins/designer/LatLonEditPlugin.so
+lib/kde4/plugins/designer/MarbleNavigatorPlugin.so
+lib/kde4/plugins/designer/MarbleWidgetPlugin.so
lib/kde4/plugins/marble/AnnotatePlugin.so
lib/kde4/plugins/marble/AprsPlugin.so
lib/kde4/plugins/marble/AtmospherePlugin.so
lib/kde4/plugins/marble/CachePlugin.so
lib/kde4/plugins/marble/CompassFloatItem.so
lib/kde4/plugins/marble/CrosshairsPlugin.so
+lib/kde4/plugins/marble/CycleStreetsPlugin.so
lib/kde4/plugins/marble/EarthquakePlugin.so
+lib/kde4/plugins/marble/EclipsesPlugin.so
lib/kde4/plugins/marble/ElevationProfileFloatItem.so
lib/kde4/plugins/marble/ElevationProfileMarker.so
lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
@@ -153,6 +173,7 @@ lib/kde4/plugins/marble/FoursquarePlugin.so
lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
lib/kde4/plugins/marble/GpsInfo.so
+lib/kde4/plugins/marble/GpsbabelPlugin.so
lib/kde4/plugins/marble/GpxPlugin.so
lib/kde4/plugins/marble/GraticulePlugin.so
lib/kde4/plugins/marble/HostipPlugin.so
@@ -193,34 +214,32 @@ lib/kde4/plugins/marble/SunPlugin.so
lib/kde4/plugins/marble/Weather.so
lib/kde4/plugins/marble/Wikipedia.so
lib/kde4/plugins/marble/YoursPlugin.so
+lib/libastro.so
+lib/libastro.so.0.17.20
+lib/libastro.so.1
lib/libmarblewidget.so
-lib/libmarblewidget.so.0.16.5
-lib/libmarblewidget.so.16
+lib/libmarblewidget.so.0.19.2
+lib/libmarblewidget.so.19
qt4/imports/org/kde/edu/marble/MarbleSettings.qml
qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
qt4/imports/org/kde/edu/marble/qmldir
-qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MarbleMenuLayout.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MarbleToolIcon.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/PlacemarkEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
-qt4/imports/org/kde/edu/marble/qtcomponents/qmldir
+share/appdata/marble.appdata.xml
+share/applications/kde4/marble-mobile.desktop
+share/applications/kde4/marble-qt.desktop
+share/applications/kde4/marble-touch.desktop
share/applications/kde4/marble.desktop
+share/applications/kde4/marble_geo.desktop
share/applications/kde4/marble_gpx.desktop
share/applications/kde4/marble_kml.desktop
share/applications/kde4/marble_osm.desktop
+share/applications/kde4/marble_worldwind.desktop
share/doc/kde/HTML/en/marble/common
share/doc/kde/HTML/en/marble/configure-cacheproxy.png
share/doc/kde/HTML/en/marble/configure-dateandtime.png
share/doc/kde/HTML/en/marble/configure-navigation.png
share/doc/kde/HTML/en/marble/configure-plugins.png
share/doc/kde/HTML/en/marble/configure-routing.png
+share/doc/kde/HTML/en/marble/configure-synchronization.png
share/doc/kde/HTML/en/marble/configure-view.png
share/doc/kde/HTML/en/marble/download-region-1.png
share/doc/kde/HTML/en/marble/download-region-2.png
@@ -251,9 +270,13 @@ share/kde/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
share/kde/apps/marble/data/audio/KDE-Sys-List-End.ogg
share/kde/apps/marble/data/bitmaps/airport.png
share/kde/apps/marble/data/bitmaps/annotation.png
+share/kde/apps/marble/data/bitmaps/antarctic_shelves.png
+share/kde/apps/marble/data/bitmaps/audio-x-generic.png
share/kde/apps/marble/data/bitmaps/bookmark.png
share/kde/apps/marble/data/bitmaps/border_1.png
share/kde/apps/marble/data/bitmaps/border_2.png
+share/kde/apps/marble/data/bitmaps/border_disputed.png
+share/kde/apps/marble/data/bitmaps/border_maritime.png
share/kde/apps/marble/data/bitmaps/city_1_orange.png
share/kde/apps/marble/data/bitmaps/city_1_red.png
share/kde/apps/marble/data/bitmaps/city_1_white.png
@@ -281,9 +304,11 @@ share/kde/apps/marble/data/bitmaps/cursor_tc.png
share/kde/apps/marble/data/bitmaps/cursor_tl.png
share/kde/apps/marble/data/bitmaps/cursor_tr.png
share/kde/apps/marble/data/bitmaps/default_location.png
+share/kde/apps/marble/data/bitmaps/document-edit.png
share/kde/apps/marble/data/bitmaps/earth_apollo.jpg
share/kde/apps/marble/data/bitmaps/flag.png
share/kde/apps/marble/data/bitmaps/folder.png
+share/kde/apps/marble/data/bitmaps/glacier.png
share/kde/apps/marble/data/bitmaps/highway_footway.png
share/kde/apps/marble/data/bitmaps/highway_motorway.png
share/kde/apps/marble/data/bitmaps/highway_path.png
@@ -294,13 +319,17 @@ share/kde/apps/marble/data/bitmaps/highway_track.png
share/kde/apps/marble/data/bitmaps/highway_trunk.png
share/kde/apps/marble/data/bitmaps/highway_unclassified.png
share/kde/apps/marble/data/bitmaps/lake.png
+share/kde/apps/marble/data/bitmaps/lake_historic.png
share/kde/apps/marble/data/bitmaps/manned_landing.png
+share/kde/apps/marble/data/bitmaps/media-playback-pause.png
share/kde/apps/marble/data/bitmaps/mountain_1.png
share/kde/apps/marble/data/bitmaps/nation.png
share/kde/apps/marble/data/bitmaps/observatory.png
share/kde/apps/marble/data/bitmaps/ocean.png
share/kde/apps/marble/data/bitmaps/osm.png
share/kde/apps/marble/data/bitmaps/other.png
+share/kde/apps/marble/data/bitmaps/playa.png
+share/kde/apps/marble/data/bitmaps/player-time.png
share/kde/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png
share/kde/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png
share/kde/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png
@@ -397,6 +426,7 @@ share/kde/apps/marble/data/bitmaps/turn-slight-left.png
share/kde/apps/marble/data/bitmaps/turn-slight-right.png
share/kde/apps/marble/data/bitmaps/unmanned_hard_landing.png
share/kde/apps/marble/data/bitmaps/unmanned_soft_landing.png
+share/kde/apps/marble/data/bitmaps/urban_area.png
share/kde/apps/marble/data/bitmaps/valley.png
share/kde/apps/marble/data/bitmaps/volcano_1.png
share/kde/apps/marble/data/bitmaps/waypoint.png
@@ -740,6 +770,8 @@ share/kde/apps/marble/data/maps/earth/openstreetmap/openstreetmap-preview.png
share/kde/apps/marble/data/maps/earth/openstreetmap/openstreetmap.dgml
share/kde/apps/marble/data/maps/earth/plain/plain-preview.png
share/kde/apps/marble/data/maps/earth/plain/plain.dgml
+share/kde/apps/marble/data/maps/earth/political/political-preview.png
+share/kde/apps/marble/data/maps/earth/political/political.dgml
share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec-preview.png
share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec.dgml
share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec.jpg
@@ -941,6 +973,7 @@ share/kde/apps/marble/data/maps/moon/clementine/clementine-preview.png
share/kde/apps/marble/data/maps/moon/clementine/clementine.dgml
share/kde/apps/marble/data/maps/moon/clementine/clementine.jpg
share/kde/apps/marble/data/maps/moon/clementine/legend.html
+share/kde/apps/marble/data/maps/moon/clementine/tour.kml
share/kde/apps/marble/data/mwdbii/DATELINE.PNT
share/kde/apps/marble/data/mwdbii/PCOAST.PNT
share/kde/apps/marble/data/mwdbii/PDIFFBORDER.PNT
@@ -950,12 +983,24 @@ share/kde/apps/marble/data/mwdbii/PLAKE.PNT
share/kde/apps/marble/data/mwdbii/PLAKEISLAND.PNT
share/kde/apps/marble/data/mwdbii/PUSA48.DIFF.PNT
share/kde/apps/marble/data/mwdbii/RIVER.PNT
-share/kde/apps/marble/data/naturalearth/50m-urban-area.pn2
-share/kde/apps/marble/data/naturalearth/50m_glaciated_areas.pn2
-share/kde/apps/marble/data/naturalearth/50m_lakes.pn2
-share/kde/apps/marble/data/naturalearth/50m_land.pn2
share/kde/apps/marble/data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2
share/kde/apps/marble/data/naturalearth/ne_10m_rivers_lake_centerlines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_boundary_lines_land.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_countries.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_pacific_groupings.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_1_states_provinces_lines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_antarctic_ice_shelves_lines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_antarctic_ice_shelves_polys.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_coastline.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_glaciated_areas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_lakes.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_lakes_historic.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_land.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_playas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_rivers_lake_centerlines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_urban_areas.pn2
share/kde/apps/marble/data/placemarks/baseplacemarks.cache
share/kde/apps/marble/data/placemarks/boundaryplacemarks.cache
share/kde/apps/marble/data/placemarks/cityplacemarks.cache
@@ -968,11 +1013,13 @@ share/kde/apps/marble/data/seacolors.leg
share/kde/apps/marble/data/stars/constellations.dat
share/kde/apps/marble/data/stars/deepsky.png
share/kde/apps/marble/data/stars/dso.dat
+share/kde/apps/marble/data/stars/names.csv
share/kde/apps/marble/data/stars/stars.dat
share/kde/apps/marble/data/svg/application-x-marble-gray.png
share/kde/apps/marble/data/svg/application-x-marble.png
share/kde/apps/marble/data/svg/application-x-marble.svg
share/kde/apps/marble/data/svg/coordinate.svg
+share/kde/apps/marble/data/svg/glow.png
share/kde/apps/marble/data/svg/lunarmap.svg
share/kde/apps/marble/data/svg/marble-logo-32dpi.png
share/kde/apps/marble/data/svg/marble-logo-72dpi.png
@@ -981,6 +1028,7 @@ share/kde/apps/marble/data/svg/marble-logo-inverted-72dpi.png
share/kde/apps/marble/data/svg/marble-logo.png
share/kde/apps/marble/data/svg/marble-logo.svg
share/kde/apps/marble/data/svg/marsmap.svg
+share/kde/apps/marble/data/svg/moon.png
share/kde/apps/marble/data/svg/sun.png
share/kde/apps/marble/data/svg/sunshine.png
share/kde/apps/marble/data/svg/track_turtle.svg
@@ -1022,6 +1070,9 @@ share/kde4/services/marble_part.desktop
share/kde4/services/marble_part_gpx.desktop
share/kde4/services/marble_part_kml.desktop
share/kde4/services/marble_part_osm.desktop
+share/kde4/services/marble_thumbnail_gpx.desktop
+share/kde4/services/marble_thumbnail_kml.desktop
+share/kde4/services/marble_thumbnail_osm.desktop
share/kde4/services/plasma-applet-kworldclock.desktop
share/kde4/services/plasma-runner-marble.desktop
share/mime/packages/geo.xml
diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index d2465814c6f..9dad6a8ad24 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/13 19:19:06 markd Exp $
-SHA1 (marble-4.11.5.tar.xz) = b1aeaab423b553e6e18298fd76ec7bee843dcdb4
-RMD160 (marble-4.11.5.tar.xz) = 38a08a7e7b1b5bd016aedd930c392aa47d116627
-Size (marble-4.11.5.tar.xz) = 18950820 bytes
-SHA1 (patch-src_plugins_render_satellites_mex_astrolib.h) = acc3477ca16f20f02c3fcdbb8285d9e9a3ec1706
-SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 0c12eb09d4bd7601236bde2e586000afd2fef18d
+SHA1 (marble-4.14.3.tar.xz) = e2b039e61bdf828e30dd078c5bd5b55df0f5ef2b
+RMD160 (marble-4.14.3.tar.xz) = 13f10ab9fc4d0e963eb258854102172ade68bc91
+Size (marble-4.14.3.tar.xz) = 19709200 bytes
+SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0
diff --git a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h b/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
deleted file mode 100644
index a3356d8627e..00000000000
--- a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_render_satellites_mex_astrolib.h,v 1.1 2013/06/24 06:52:52 jperkin Exp $
-
-Avoid 'sun' clash.
-
---- src/plugins/render/satellites/mex/astrolib.h.orig 2013-05-03 04:38:26.036168912 +0000
-+++ src/plugins/render/satellites/mex/astrolib.h
-@@ -13,6 +13,8 @@
-
- #include "attlib.h"
-
-+#undef sun
-+
- double ddd (int d, int m, double s); // deg, min, sec -> decimal degrees
- void dms (double dd, int &d, int &m, double &s); // dec deg -> deg, min, sec
- double mjd (int day, int month, int year, double hour); // modified Julian date
diff --git a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
index 6d72e7c52d2..2d9a503d2b7 100644
--- a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
+++ b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.1 2013/06/24 06:52:52 jperkin Exp $
+$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.2 2014/11/13 19:19:06 markd Exp $
Avoid 'sun' clash.
---- src/plugins/render/stars/StarsPlugin.cpp.orig 2013-05-03 04:38:26.039168883 +0000
+--- src/plugins/render/stars/StarsPlugin.cpp.orig 2014-10-23 21:53:08.000000000 +0000
+++ src/plugins/render/stars/StarsPlugin.cpp
-@@ -23,6 +23,8 @@
- #include "SunLocator.h"
- #include "ViewportParams.h"
+@@ -34,6 +34,8 @@
+
+ #include "src/lib/astro/solarsystem.h"
+#undef sun
+
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 9b4b8f368d8..55cbae7102c 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
DISTNAME= parley-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE vocabulary trainer
diff --git a/misc/parley/PLIST b/misc/parley/PLIST
index a4031934a2d..6555ce79098 100644
--- a/misc/parley/PLIST
+++ b/misc/parley/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2013/11/07 12:35:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:19:07 markd Exp $
bin/parley
lib/kde4/plasma_applet_parley.so
lib/kde4/plasma_engine_parley.so
+share/appdata/parley.appdata.xml
share/applications/kde4/parley.desktop
share/doc/kde/HTML/en/parley/Configure_blocking.png
share/doc/kde/HTML/en/parley/Configure_practice.png
@@ -63,6 +64,7 @@ share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_003.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_004.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_005.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_006.png
+share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_006b.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_007.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_008.png
share/doc/kde/HTML/en/parley/Parley_trainer_eng-deu_0-9-4_009.png
@@ -85,8 +87,8 @@ share/icons/hicolor/scalable/apps/parley-parley.svgz
share/icons/hicolor/scalable/apps/parley-simple.svgz
share/icons/hicolor/scalable/apps/parley.svgz
share/kde/apps/desktoptheme/default/widgets/parley_plasma_card.svg
+share/kde/apps/parley/dashboardui.rc
share/kde/apps/parley/editorui.rc
-share/kde/apps/parley/icons/oxygen/16x16/actions/advanced-setup.png
share/kde/apps/parley/icons/oxygen/16x16/actions/cards-block.png
share/kde/apps/parley/icons/oxygen/16x16/actions/edit-clear.png
share/kde/apps/parley/icons/oxygen/16x16/actions/edit-entry.png
@@ -101,7 +103,7 @@ share/kde/apps/parley/icons/oxygen/16x16/actions/practice-start.png
share/kde/apps/parley/icons/oxygen/16x16/actions/practice-stop.png
share/kde/apps/parley/icons/oxygen/16x16/actions/remove-duplicates.png
share/kde/apps/parley/icons/oxygen/16x16/actions/set-language.png
-share/kde/apps/parley/icons/oxygen/22x22/actions/advanced-setup.png
+share/kde/apps/parley/icons/oxygen/16x16/actions/specific-setup.png
share/kde/apps/parley/icons/oxygen/22x22/actions/cards-block.png
share/kde/apps/parley/icons/oxygen/22x22/actions/edit-clear.png
share/kde/apps/parley/icons/oxygen/22x22/actions/edit-entry.png
@@ -116,7 +118,7 @@ share/kde/apps/parley/icons/oxygen/22x22/actions/practice-start.png
share/kde/apps/parley/icons/oxygen/22x22/actions/practice-stop.png
share/kde/apps/parley/icons/oxygen/22x22/actions/remove-duplicates.png
share/kde/apps/parley/icons/oxygen/22x22/actions/set-language.png
-share/kde/apps/parley/icons/oxygen/32x32/actions/advanced-setup.png
+share/kde/apps/parley/icons/oxygen/22x22/actions/specific-setup.png
share/kde/apps/parley/icons/oxygen/32x32/actions/cards-block.png
share/kde/apps/parley/icons/oxygen/32x32/actions/edit-clear.png
share/kde/apps/parley/icons/oxygen/32x32/actions/edit-entry.png
@@ -131,7 +133,7 @@ share/kde/apps/parley/icons/oxygen/32x32/actions/practice-start.png
share/kde/apps/parley/icons/oxygen/32x32/actions/practice-stop.png
share/kde/apps/parley/icons/oxygen/32x32/actions/remove-duplicates.png
share/kde/apps/parley/icons/oxygen/32x32/actions/set-language.png
-share/kde/apps/parley/icons/oxygen/48x48/actions/advanced-setup.png
+share/kde/apps/parley/icons/oxygen/32x32/actions/specific-setup.png
share/kde/apps/parley/icons/oxygen/48x48/actions/cards-block.png
share/kde/apps/parley/icons/oxygen/48x48/actions/edit-clear.png
share/kde/apps/parley/icons/oxygen/48x48/actions/edit-entry.png
@@ -147,7 +149,7 @@ share/kde/apps/parley/icons/oxygen/48x48/actions/practice-start.png
share/kde/apps/parley/icons/oxygen/48x48/actions/practice-stop.png
share/kde/apps/parley/icons/oxygen/48x48/actions/remove-duplicates.png
share/kde/apps/parley/icons/oxygen/48x48/actions/set-language.png
-share/kde/apps/parley/icons/oxygen/scalable/actions/advanced-setup.svgz
+share/kde/apps/parley/icons/oxygen/48x48/actions/specific-setup.png
share/kde/apps/parley/icons/oxygen/scalable/actions/cards-block.svgz
share/kde/apps/parley/icons/oxygen/scalable/actions/edit-clear.svgz
share/kde/apps/parley/icons/oxygen/scalable/actions/edit-entry.svgz
@@ -160,6 +162,7 @@ share/kde/apps/parley/icons/oxygen/scalable/actions/practice-setup.svgz
share/kde/apps/parley/icons/oxygen/scalable/actions/practice-start.svgz
share/kde/apps/parley/icons/oxygen/scalable/actions/remove-duplicates.svgz
share/kde/apps/parley/icons/oxygen/scalable/actions/set-language.svgz
+share/kde/apps/parley/icons/oxygen/scalable/actions/specific-setup.svgz
share/kde/apps/parley/parleyui.rc
share/kde/apps/parley/plugins/example.desktop
share/kde/apps/parley/plugins/example.py
@@ -200,7 +203,6 @@ share/kde/apps/parley/themes/theme_reference.desktop
share/kde/apps/parley/themes/theme_reference.svgz
share/kde/apps/parley/themes/theme_reference_preview.jpg
share/kde/apps/parley/tips
-share/kde/apps/parley/welcomescreenui.rc
share/kde/apps/parley/xslt/flashcards.xsl
share/kde/apps/parley/xslt/table.xsl
share/kde/config.kcfg/documentsettings.kcfg
diff --git a/misc/parley/distinfo b/misc/parley/distinfo
index fc08f54446f..ad6e29e1fa8 100644
--- a/misc/parley/distinfo
+++ b/misc/parley/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:07 markd Exp $
-SHA1 (parley-4.11.5.tar.xz) = 47ff00463099a793c4106f733c495ec4da140bad
-RMD160 (parley-4.11.5.tar.xz) = 0caf34b1ebe44c72888f6021cbe0ef3a1f394657
-Size (parley-4.11.5.tar.xz) = 7953936 bytes
+SHA1 (parley-4.14.3.tar.xz) = 73e22f3a3e08e4298df6e7c3be966c88e2bca797
+RMD160 (parley-4.14.3.tar.xz) = 79b672ca1e6665f2f7d2cb5103f6bfce8342c642
+Size (parley-4.14.3.tar.xz) = 8203748 bytes
diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile
index 9ee367fc922..4674469743a 100644
--- a/misc/rocs/Makefile
+++ b/misc/rocs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.34 2014/11/13 19:19:07 markd Exp $
DISTNAME= rocs-${_KDE_VERSION}
-PKGREVISION= 6
CATEGORIES= misc
COMMENT= KDE graph theory IDE
diff --git a/misc/rocs/distinfo b/misc/rocs/distinfo
index bbebaa1604f..4ef5f4103cc 100644
--- a/misc/rocs/distinfo
+++ b/misc/rocs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.10 2014/11/13 19:19:07 markd Exp $
-SHA1 (rocs-4.11.5.tar.xz) = d4aab2792407fe4bae86baae06abcb752710977f
-RMD160 (rocs-4.11.5.tar.xz) = 12918607f05a043e63eefc6f8dcda775f35060ea
-Size (rocs-4.11.5.tar.xz) = 1144868 bytes
+SHA1 (rocs-4.14.3.tar.xz) = a6fac0cee375f8bdb8c9241bde4bf9dda0f38704
+RMD160 (rocs-4.14.3.tar.xz) = c148e7720239043b21d112ac32bfa47ca88accd0
+Size (rocs-4.14.3.tar.xz) = 1146328 bytes
SHA1 (patch-RocsCore_LoadSave_Plugins_CMakeLists.txt) = ae4d15f9aa8fc2f19715db544a15ddbc2f0d98fb
diff --git a/misc/step/Makefile b/misc/step/Makefile
index 3bfd9c140dd..3c89fa7039e 100644
--- a/misc/step/Makefile
+++ b/misc/step/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:08 markd Exp $
DISTNAME= step-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE interactive physical simulator
@@ -13,6 +12,7 @@ COMMENT= KDE interactive physical simulator
BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
.include "../../math/eigen2/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
+.include "../../math/qalculate/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/step/PLIST b/misc/step/PLIST
index 92c7afbce26..ef1a2ad8612 100644
--- a/misc/step/PLIST
+++ b/misc/step/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:27:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/13 19:19:08 markd Exp $
bin/step
+share/appdata/step.appdata.xml
share/applications/kde4/step.desktop
share/doc/kde/HTML/en/step/circular-motor.png
share/doc/kde/HTML/en/step/common
diff --git a/misc/step/distinfo b/misc/step/distinfo
index 2ece905a510..2b88d24517d 100644
--- a/misc/step/distinfo
+++ b/misc/step/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (step-4.11.5.tar.xz) = a3476750f4c5c8773b439ea86b4d232fcfc68b1b
-RMD160 (step-4.11.5.tar.xz) = a2e1551c167783c67133be6e2a0eceb2dd392894
-Size (step-4.11.5.tar.xz) = 362360 bytes
+SHA1 (step-4.14.3.tar.xz) = aedf7def1a453e85361b9b5d714ecc126900449d
+RMD160 (step-4.14.3.tar.xz) = b6ca1a9c589f1b19dc6a61dd4f875fb54a3793e3
+Size (step-4.14.3.tar.xz) = 378612 bytes
diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile
index df52f58f713..4948b5b7c8f 100644
--- a/misc/superkaramba/Makefile
+++ b/misc/superkaramba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.29 2014/11/13 19:19:08 markd Exp $
DISTNAME= superkaramba-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= misc
COMMENT= KDE desktop widgets
diff --git a/misc/superkaramba/distinfo b/misc/superkaramba/distinfo
index 3a2709d3b48..69e1535cff6 100644
--- a/misc/superkaramba/distinfo
+++ b/misc/superkaramba/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/13 19:19:08 markd Exp $
-SHA1 (superkaramba-4.11.5.tar.xz) = 17d55da3fe4cb30aa44ad876921665a529d90533
-RMD160 (superkaramba-4.11.5.tar.xz) = e33333e7d1baddc2dd78ab53340294f2d41d9387
-Size (superkaramba-4.11.5.tar.xz) = 383832 bytes
+SHA1 (superkaramba-4.14.3.tar.xz) = e7b1d6dda1f49e0c90d1c1706a8d0304bdb68d82
+RMD160 (superkaramba-4.14.3.tar.xz) = 9755d7aaa4e6a5595151a9820e15c6f7c5cdc7c0
+Size (superkaramba-4.14.3.tar.xz) = 381816 bytes
SHA1 (patch-src_sensors_mem.cpp) = b95cf1c87821e0f01828646d4a23d46fa0368a02
diff --git a/misc/sweeper/Makefile b/misc/sweeper/Makefile
index 2d5d1507fc6..b153e7c620e 100644
--- a/misc/sweeper/Makefile
+++ b/misc/sweeper/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/11/07 19:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:08 markd Exp $
DISTNAME= sweeper-${_KDE_VERSION}
-PKGREVISION= 5
CATEGORIES= sysutils
COMMENT= KDE system cleaner
diff --git a/misc/sweeper/distinfo b/misc/sweeper/distinfo
index 38b5939849d..917e57138da 100644
--- a/misc/sweeper/distinfo
+++ b/misc/sweeper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 19:19:08 markd Exp $
-SHA1 (sweeper-4.11.5.tar.xz) = d2be24a0e34d6c5d52598ef4032a6ea6a301da36
-RMD160 (sweeper-4.11.5.tar.xz) = 12103a2b987634ee6c972220ee38e05b5dd22481
-Size (sweeper-4.11.5.tar.xz) = 82260 bytes
+SHA1 (sweeper-4.14.3.tar.xz) = 62ddc2a7017d0655909a8ee01054873e84c670c9
+RMD160 (sweeper-4.14.3.tar.xz) = 7d8716699bde1cf9458a9767593d887af029d4da
+Size (sweeper-4.14.3.tar.xz) = 82336 bytes