7 files changed, 28 insertions, 53 deletions

diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 8173f959386e..1dda583b2f88 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -12,12 +11,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
 		ical:${PORTSDIR}/devel/libical \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		prison.0:${PORTSDIR}/graphics/prison
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		prison:${PORTSDIR}/graphics/prison
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index cd50227531c4..19feaac1e28d 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepimlibs-4.8.4.tar.xz) = 6b81b00255ca15d86b5c5a91487fdcde1d8753ff803d8ddab4910d1e603b11f3
-SIZE (KDE/kdepimlibs-4.8.4.tar.xz) = 2858756
+SHA256 (KDE/kdepimlibs-4.9.5.tar.xz) = f6ea96baf452895699160b24e7bb67f6a263d1d687abf479415c3b71ac488136
+SIZE (KDE/kdepimlibs-4.9.5.tar.xz) = 2720068
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
deleted file mode 100644
index a5bcbed0a1ea..000000000000
--- a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./CMakeLists.txt.orig	2011-07-20 08:36:16.000000000 +1100
-+++ ./CMakeLists.txt	2011-08-09 00:34:17.959934057 +1100
-@@ -81,7 +81,7 @@
- if (NOT KDEPIM_ONLY_KLEO)
-   #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
-   set(Akonadi_MIN_VERSION "1.5.52")
--  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE)
-+  find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET)
-   macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "")
- 
-   find_package(Sasl2)
diff --git a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
index 699a90253521..546628a30d0d 100644
--- a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
+++ b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
@@ -6,7 +6,7 @@
        find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
 -                   HINTS ${GPGME_LIBRARY_DIR})
 +                   HINTS ${GPGME_LIBRARY_DIR} %%KDE4_PREFIX%%/lib)
-    endif ( WIN32 )
+    endif()
  
     find_library(QGPGME_LIBRARY qgpgme
 -                HINTS ${GPGME_LIBRARY_DIR})
diff --git a/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp b/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp
deleted file mode 100644
index 8dc3bc4e9d86..000000000000
--- a/deskutils/kdepimlibs4/files/patch-kcal__vcalformat.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- kcal/vcalformat.cpp.orig	2012-11-23 17:05:03.000000000 +0800
-+++ kcal/vcalformat.cpp	2012-11-23 17:05:32.000000000 +0800
-@@ -1029,8 +1029,7 @@
-   if ( ( vo = isAPropertyOf( vevent, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
- 
-     // first, read the type of the recurrence
-     int typelen = 1;
diff --git a/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp b/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp
deleted file mode 100644
index 227415512b2d..000000000000
--- a/deskutils/kdepimlibs4/files/patch-kcalcore__vcalformat.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- kcalcore/vcalformat.cpp.orig	2012-11-23 17:03:35.000000000 +0800
-+++ kcalcore/vcalformat.cpp	2012-11-23 17:04:14.000000000 +0800
-@@ -1190,8 +1190,7 @@
-   if ( ( vo = isAPropertyOf( vtodo, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
-     // first, read the type of the recurrence
-     int typelen = 1;
-     uint type = Recurrence::rNone;
-@@ -1674,8 +1673,7 @@
-   if ( ( vo = isAPropertyOf( vevent, VCRRuleProp ) ) != 0 ) {
-     QString tmpStr = ( s = fakeCString( vObjectUStringZValue( vo ) ) );
-     deleteStr( s );
--    tmpStr.simplified();
--    tmpStr = tmpStr.toUpper();
-+    tmpStr = tmpStr.simplified().toUpper();
-     // first, read the type of the recurrence
-     int typelen = 1;
-     uint type = Recurrence::rNone;
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index eb8c25cd9aab..ea78857808d7 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -1,4 +1,5 @@
 include/KDE/Akonadi/AgentBase
+include/KDE/Akonadi/AgentFactory
 include/KDE/Akonadi/AgentFilterProxyModel
 include/KDE/Akonadi/AgentInstance
 include/KDE/Akonadi/AgentInstanceCreateJob
@@ -12,6 +13,8 @@ include/KDE/Akonadi/AgentTypeWidget
 include/KDE/Akonadi/Attribute
 include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/StandardCalendarActionManager
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
 include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@@ -25,6 +28,7 @@ include/KDE/Akonadi/CollectionFetchScope
 include/KDE/Akonadi/CollectionFilterProxyModel
 include/KDE/Akonadi/CollectionModel
 include/KDE/Akonadi/CollectionModifyJob
+include/KDE/Akonadi/CollectionMoveJob
 include/KDE/Akonadi/CollectionPropertiesDialog
 include/KDE/Akonadi/CollectionPropertiesPage
 include/KDE/Akonadi/CollectionRequester
@@ -60,8 +64,11 @@ include/KDE/Akonadi/Control
 include/KDE/Akonadi/ETMViewStateSaver
 include/KDE/Akonadi/Entity
 include/KDE/Akonadi/EntityDisplayAttribute
+include/KDE/Akonadi/EntityHiddenAttribute
 include/KDE/Akonadi/EntityListView
 include/KDE/Akonadi/EntityMimeTypeFilterModel
+include/KDE/Akonadi/EntityOrderProxyModel
+include/KDE/Akonadi/EntityRightsFilterModel
 include/KDE/Akonadi/EntityTreeModel
 include/KDE/Akonadi/EntityTreeView
 include/KDE/Akonadi/Exception
@@ -83,8 +90,11 @@ include/KDE/Akonadi/Job
 include/KDE/Akonadi/KCal/FreeBusyProviderBase
 include/KDE/Akonadi/KCal/IncidenceMimeTypeVisitor
 include/KDE/Akonadi/KMime/AddressAttribute
+include/KDE/Akonadi/KMime/MessageFlags
 include/KDE/Akonadi/KMime/MessageFolderAttribute
 include/KDE/Akonadi/KMime/MessageModel
+include/KDE/Akonadi/KMime/MessageParts
+include/KDE/Akonadi/KMime/MessageStatus
 include/KDE/Akonadi/KMime/MessageThreaderProxyModel
 include/KDE/Akonadi/KMime/MessageThreadingAttribute
 include/KDE/Akonadi/KMime/SpecialMailCollections
@@ -93,6 +103,8 @@ include/KDE/Akonadi/LinkJob
 include/KDE/Akonadi/MimeTypeChecker
 include/KDE/Akonadi/Monitor
 include/KDE/Akonadi/PreprocessorBase
+include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
+include/KDE/Akonadi/RecursiveItemFetchJob
 include/KDE/Akonadi/ResourceBase
 include/KDE/Akonadi/SearchCreateJob
 include/KDE/Akonadi/ServerManager
@@ -343,6 +355,7 @@ include/KDE/KResources/Resource
 include/KDE/KResources/SelectDialog
 include/KDE/KTNEF/Formatter
 include/KDE/KTNEF/KTNEFAttach
+include/KDE/KTNEF/KTNEFDefs
 include/KDE/KTNEF/KTNEFMessage
 include/KDE/KTNEF/KTNEFParser
 include/KDE/KTNEF/KTNEFProperty
@@ -1131,6 +1144,8 @@ share/apps/libkholidays/plan2/holiday_cz_cs
 share/apps/libkholidays/plan2/holiday_de-by_de
 share/apps/libkholidays/plan2/holiday_de_de
 share/apps/libkholidays/plan2/holiday_dk_da
+share/apps/libkholidays/plan2/holiday_dz_ar
+share/apps/libkholidays/plan2/holiday_dz_fr
 share/apps/libkholidays/plan2/holiday_ee_et
 share/apps/libkholidays/plan2/holiday_eg_ar
 share/apps/libkholidays/plan2/holiday_es-ct_ca
@@ -1164,6 +1179,8 @@ share/apps/libkholidays/plan2/holiday_jm_en-gb
 share/apps/libkholidays/plan2/holiday_jp_en-us
 share/apps/libkholidays/plan2/holiday_jp_ja
 share/apps/libkholidays/plan2/holiday_kr_ko
+share/apps/libkholidays/plan2/holiday_kz_kk
+share/apps/libkholidays/plan2/holiday_kz_ru
 share/apps/libkholidays/plan2/holiday_lt_lt
 share/apps/libkholidays/plan2/holiday_lu_fr
 share/apps/libkholidays/plan2/holiday_lu_lb
@@ -1175,12 +1192,15 @@ share/apps/libkholidays/plan2/holiday_nc_fr
 share/apps/libkholidays/plan2/holiday_nl_nl
 share/apps/libkholidays/plan2/holiday_no_nb
 share/apps/libkholidays/plan2/holiday_nz_en-gb
+share/apps/libkholidays/plan2/holiday_pa_en
+share/apps/libkholidays/plan2/holiday_pa_es
 share/apps/libkholidays/plan2/holiday_pf_fr
 share/apps/libkholidays/plan2/holiday_pl_pl
 share/apps/libkholidays/plan2/holiday_pt_pt
 share/apps/libkholidays/plan2/holiday_py_es
 share/apps/libkholidays/plan2/holiday_re_fr
 share/apps/libkholidays/plan2/holiday_ro_ro
+share/apps/libkholidays/plan2/holiday_rs_sr
 share/apps/libkholidays/plan2/holiday_ru_ru
 share/apps/libkholidays/plan2/holiday_se_sv
 share/apps/libkholidays/plan2/holiday_sg_en-gb
@@ -1236,7 +1256,7 @@ share/kde4/services/akonadi/contact/skypeprotocol.desktop
 share/kde4/services/akonadi/contact/smsprotocol.desktop
 share/kde4/services/akonadi/contact/yahooprotocol.desktop
 share/kde4/services/akonadicontact_actions.desktop
-share/kde4/services/imap4.protocol
+share/kde4/services/imap.protocol
 share/kde4/services/imaps.protocol
 share/kde4/services/kcm_mailtransport.desktop
 share/kde4/services/kresources.desktop
@@ -1343,6 +1363,7 @@ share/mime/packages/kdepimlibs-mime.xml
 @dirrm include/KDE/Akonadi/KMime
 @dirrm include/KDE/Akonadi/KCal
 @dirrm include/KDE/Akonadi/Contact
+@dirrm include/KDE/Akonadi/Calendar
 @dirrm include/KDE/Akonadi
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true