Update kdepim4 to 4.14.10

minor updates.

3 files changed, 54 insertions, 51 deletions

diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 755cf42e5f1..4e4bb783332 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.73 2015/06/12 10:50:33 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2016/01/10 19:33:43 markd Exp $
 
-DISTNAME=	kdepim-${_KDE_VERSION}
+DISTNAME=	kdepim-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
+MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.04.3/src/}
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
@@ -51,12 +51,10 @@ REPLACE_PERL+= \
 	kresources/kolab/upgrade-resourcetype.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
 SUBST_MESSAGE.perlfix=	Fix perl path in cmake script
-SUBST_FILES.perlfix=	korganizer/ical2vcal.cmake
+SUBST_FILES.perlfix=	korganizer/data/ical2vcal.cmake
 SUBST_SED.perlfix=	-e 's:@PERL@:${PERL5}:g'
 
 BUILDLINK_DEPMETHOD.qt4-tools=full
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index d02688ec6b9..3e6af83fc6e 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2014/11/13 19:19:08 markd Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/01/10 19:33:43 markd Exp $
 bin/akonadi_archivemail_agent
 bin/akonadi_followupreminder_agent
 bin/akonadi_mailfilter_agent
@@ -107,58 +107,61 @@ 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.${PKGVERSION}
+lib/libakonadi_next.so.${KDELIBSVER}
 lib/libakregatorinterfaces.so
 lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.${PKGVERSION}
+lib/libakregatorinterfaces.so.${KDELIBSVER}
 lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.${PKGVERSION}
+lib/libakregatorprivate.so.${KDELIBSVER}
 lib/libcalendarsupport.so
 lib/libcalendarsupport.so.4
-lib/libcalendarsupport.so.${PKGVERSION}
+lib/libcalendarsupport.so.${KDELIBSVER}
+lib/libcalendarsupportcollectionpage.so
+lib/libcalendarsupportcollectionpage.so.4
+lib/libcalendarsupportcollectionpage.so.${KDELIBSVER}
 lib/libcomposereditorng.so
 lib/libcomposereditorng.so.4
-lib/libcomposereditorng.so.${PKGVERSION}
+lib/libcomposereditorng.so.${KDELIBSVER}
 lib/libeventviews.so
 lib/libeventviews.so.4
-lib/libeventviews.so.${PKGVERSION}
+lib/libeventviews.so.${KDELIBSVER}
 lib/libfollowupreminder.so
 lib/libfollowupreminder.so.4
-lib/libfollowupreminder.so.${PKGVERSION}
+lib/libfollowupreminder.so.${KDELIBSVER}
 lib/libgrantleetheme.so
 lib/libgrantleetheme.so.4
-lib/libgrantleetheme.so.${PKGVERSION}
+lib/libgrantleetheme.so.${KDELIBSVER}
 lib/libgrantleethemeeditor.so
 lib/libgrantleethemeeditor.so.4
-lib/libgrantleethemeeditor.so.${PKGVERSION}
+lib/libgrantleethemeeditor.so.${KDELIBSVER}
 lib/libincidenceeditorsng.so
 lib/libincidenceeditorsng.so.4
-lib/libincidenceeditorsng.so.${PKGVERSION}
+lib/libincidenceeditorsng.so.${KDELIBSVER}
 lib/libincidenceeditorsngmobile.so
 lib/libincidenceeditorsngmobile.so.4
-lib/libincidenceeditorsngmobile.so.${PKGVERSION}
+lib/libincidenceeditorsngmobile.so.${KDELIBSVER}
 lib/libkaddressbookgrantlee.so.4
-lib/libkaddressbookgrantlee.so.${PKGVERSION}
+lib/libkaddressbookgrantlee.so.${KDELIBSVER}
 lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.${PKGVERSION}
+lib/libkaddressbookprivate.so.${KDELIBSVER}
 lib/libkcal_resourceblog.so
 lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.${PKGVERSION}
+lib/libkcal_resourceblog.so.${KDELIBSVER}
 lib/libkcal_resourceremote.so
 lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.${PKGVERSION}
+lib/libkcal_resourceremote.so.${KDELIBSVER}
 lib/libkdepim.so
 lib/libkdepim.so.4
-lib/libkdepim.so.${PKGVERSION}
+lib/libkdepim.so.${KDELIBSVER}
 lib/libkdepimdbusinterfaces.so
 lib/libkdepimdbusinterfaces.so.4
-lib/libkdepimdbusinterfaces.so.${PKGVERSION}
+lib/libkdepimdbusinterfaces.so.${KDELIBSVER}
 lib/libkdgantt2.so
 lib/libkdgantt2.so.0
 lib/libkdgantt2.so.0.1.0
 lib/libkleo.so
 lib/libkleo.so.4
-lib/libkleo.so.${PKGVERSION}
+lib/libkleo.so.${KDELIBSVER}
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
 lib/libkleopatraclientcore.so.0.3.0
@@ -166,64 +169,66 @@ lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
 lib/libkleopatraclientgui.so.0.3.0
 lib/libkmailprivate.so.4
-lib/libkmailprivate.so.${PKGVERSION}
+lib/libkmailprivate.so.${KDELIBSVER}
 lib/libkmanagesieve.so
 lib/libkmanagesieve.so.4
-lib/libkmanagesieve.so.${PKGVERSION}
+lib/libkmanagesieve.so.${KDELIBSVER}
 lib/libknodecommon.so
 lib/libknodecommon.so.4
-lib/libknodecommon.so.${PKGVERSION}
+lib/libknodecommon.so.${KDELIBSVER}
 lib/libknotesprivate.so.4
-lib/libknotesprivate.so.${PKGVERSION}
+lib/libknotesprivate.so.${KDELIBSVER}
 lib/libkontactprivate.so.4
-lib/libkontactprivate.so.${PKGVERSION}
+lib/libkontactprivate.so.${KDELIBSVER}
 lib/libkorganizer_core.so
 lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.${PKGVERSION}
+lib/libkorganizer_core.so.${KDELIBSVER}
 lib/libkorganizer_interfaces.so
 lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.${PKGVERSION}
+lib/libkorganizer_interfaces.so.${KDELIBSVER}
 lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.${PKGVERSION}
+lib/libkorganizerprivate.so.${KDELIBSVER}
 lib/libkpgp.so
 lib/libkpgp.so.4
-lib/libkpgp.so.${PKGVERSION}
+lib/libkpgp.so.${KDELIBSVER}
 lib/libksieve.so
 lib/libksieve.so.4
-lib/libksieve.so.${PKGVERSION}
+lib/libksieve.so.${KDELIBSVER}
 lib/libksieveui.so
 lib/libksieveui.so.4
-lib/libksieveui.so.${PKGVERSION}
+lib/libksieveui.so.${KDELIBSVER}
 lib/libmailcommon.so
 lib/libmailcommon.so.4
-lib/libmailcommon.so.${PKGVERSION}
+lib/libmailcommon.so.${KDELIBSVER}
 lib/libmailimporter.so
 lib/libmailimporter.so.4
-lib/libmailimporter.so.${PKGVERSION}
+lib/libmailimporter.so.${KDELIBSVER}
 lib/libmessagecomposer.so
 lib/libmessagecomposer.so.4
-lib/libmessagecomposer.so.${PKGVERSION}
+lib/libmessagecomposer.so.${KDELIBSVER}
 lib/libmessagecore.so
 lib/libmessagecore.so.4
-lib/libmessagecore.so.${PKGVERSION}
+lib/libmessagecore.so.${KDELIBSVER}
 lib/libmessagelist.so
 lib/libmessagelist.so.4
-lib/libmessagelist.so.${PKGVERSION}
+lib/libmessagelist.so.${KDELIBSVER}
 lib/libmessageviewer.so
 lib/libmessageviewer.so.4
-lib/libmessageviewer.so.${PKGVERSION}
+lib/libmessageviewer.so.${KDELIBSVER}
 lib/libnoteshared.so
 lib/libnoteshared.so.4
-lib/libnoteshared.so.${PKGVERSION}
+lib/libnoteshared.so.${KDELIBSVER}
 lib/libpimcommon.so
 lib/libpimcommon.so.4
-lib/libpimcommon.so.${PKGVERSION}
+lib/libpimcommon.so.${KDELIBSVER}
+lib/libpimsettingexporterprivate.so.4
+lib/libpimsettingexporterprivate.so.${KDELIBSVER}
 lib/libsendlater.so
 lib/libsendlater.so.4
-lib/libsendlater.so.${PKGVERSION}
+lib/libsendlater.so.${KDELIBSVER}
 lib/libtemplateparser.so
 lib/libtemplateparser.so.4
-lib/libtemplateparser.so.${PKGVERSION}
+lib/libtemplateparser.so.${KDELIBSVER}
 man/man1/kabcclient.1
 share/PolicyKit/policy/org.kde.kalarmrtcwake.policy
 share/akonadi/agents/archivemailagent.desktop
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index 7c9c28a9a09..7b2d8efcb79 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2015/11/03 23:49:39 agc Exp $
+$NetBSD: distinfo,v 1.22 2016/01/10 19:33:43 markd Exp $
 
-SHA1 (kdepim-4.14.3.tar.xz) = da7ae7e595119a92f5f2399cbe60b0a6cb38817f
-RMD160 (kdepim-4.14.3.tar.xz) = 7dabf2be18cc9d3a0e42c9be855ebbe45dc54181
-SHA512 (kdepim-4.14.3.tar.xz) = e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7
-Size (kdepim-4.14.3.tar.xz) = 14483432 bytes
+SHA1 (kdepim-4.14.10.tar.xz) = 6f74763dda68dbb44394e807eab9204777bddf0a
+RMD160 (kdepim-4.14.10.tar.xz) = a9ba786e76ad0fe44bff5298a413aca514dbca82
+SHA512 (kdepim-4.14.10.tar.xz) = aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b
+Size (kdepim-4.14.10.tar.xz) = 14585020 bytes
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
 SHA1 (patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp) = 9769a802e6900f37d2720df35a5c9bc2beb0de79
 SHA1 (patch-kleopatra_smartcard_readerstatus.cpp) = a1e60b97f75f3490873df0dd53bed7d5302eba48