Update to KDE SC 4.8.0

9 files changed, 286 insertions, 62 deletions

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index a288ab5a36c..0b5d4ad5574 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2012/03/03 00:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2012/03/19 11:46:44 markd Exp $
 
 DISTNAME=	kdepimlibs-${_KDE_VERSION}
-PKGREVISION=	9
+PKGNAME=	${DISTNAME:S/-4/4-4/}
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
 
@@ -11,6 +11,8 @@ CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
 
 REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
 
+BUILDLINK_API_DEPENDS.akonadi+=  akonadi>=1.5.52
+
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../databases/openldap-client/buildlink3.mk"
diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST
index 9c122fffe52..ad481da76bd 100644
--- a/misc/kdepimlibs4/PLIST
+++ b/misc/kdepimlibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/10/25 20:55:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/19 11:46:44 markd Exp $
 include/KDE/Akonadi/AgentBase
 include/KDE/Akonadi/AgentFilterProxyModel
 include/KDE/Akonadi/AgentInstance
@@ -15,6 +15,7 @@ include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
+include/KDE/Akonadi/CollectionAttributesSynchronizationJob
 include/KDE/Akonadi/CollectionComboBox
 include/KDE/Akonadi/CollectionCopyJob
 include/KDE/Akonadi/CollectionCreateJob
@@ -33,6 +34,8 @@ include/KDE/Akonadi/CollectionStatisticsDelegate
 include/KDE/Akonadi/CollectionStatisticsJob
 include/KDE/Akonadi/CollectionStatisticsModel
 include/KDE/Akonadi/CollectionView
+include/KDE/Akonadi/Contact/AbstractContactFormatter
+include/KDE/Akonadi/Contact/AbstractContactGroupFormatter
 include/KDE/Akonadi/Contact/ContactDefaultActions
 include/KDE/Akonadi/Contact/ContactEditor
 include/KDE/Akonadi/Contact/ContactEditorDialog
@@ -45,8 +48,17 @@ include/KDE/Akonadi/Contact/ContactGroupViewerDialog
 include/KDE/Akonadi/Contact/ContactSearchJob
 include/KDE/Akonadi/Contact/ContactViewer
 include/KDE/Akonadi/Contact/ContactViewerDialog
+include/KDE/Akonadi/Contact/ContactsFilterProxyModel
+include/KDE/Akonadi/Contact/ContactsTreeModel
+include/KDE/Akonadi/Contact/EmailAddressSelection
+include/KDE/Akonadi/Contact/EmailAddressSelectionDialog
+include/KDE/Akonadi/Contact/EmailAddressSelectionWidget
 include/KDE/Akonadi/Contact/RecentContactsCollectionRequestJob
+include/KDE/Akonadi/Contact/StandardContactActionManager
+include/KDE/Akonadi/Contact/StandardContactFormatter
+include/KDE/Akonadi/Contact/StandardContactGroupFormatter
 include/KDE/Akonadi/Control
+include/KDE/Akonadi/ETMViewStateSaver
 include/KDE/Akonadi/Entity
 include/KDE/Akonadi/EntityDisplayAttribute
 include/KDE/Akonadi/EntityListView
@@ -69,6 +81,7 @@ include/KDE/Akonadi/ItemSerializerPlugin
 include/KDE/Akonadi/ItemSync
 include/KDE/Akonadi/ItemView
 include/KDE/Akonadi/Job
+include/KDE/Akonadi/KCal/FreeBusyProviderBase
 include/KDE/Akonadi/KCal/IncidenceMimeTypeVisitor
 include/KDE/Akonadi/KMime/AddressAttribute
 include/KDE/Akonadi/KMime/MessageFolderAttribute
@@ -78,6 +91,7 @@ include/KDE/Akonadi/KMime/MessageThreadingAttribute
 include/KDE/Akonadi/KMime/SpecialMailCollections
 include/KDE/Akonadi/KMime/SpecialMailCollectionsRequestJob
 include/KDE/Akonadi/LinkJob
+include/KDE/Akonadi/MimeTypeChecker
 include/KDE/Akonadi/Monitor
 include/KDE/Akonadi/PreprocessorBase
 include/KDE/Akonadi/ResourceBase
@@ -125,6 +139,15 @@ include/KDE/KABC/TimeZone
 include/KDE/KABC/VCardConverter
 include/KDE/KABC/VCardDrag
 include/KDE/KABC/VCardFormat
+include/KDE/KAlarmCal/AlarmText
+include/KDE/KAlarmCal/CollectionAttribute
+include/KDE/KAlarmCal/CompatibilityAttribute
+include/KDE/KAlarmCal/DateTime
+include/KDE/KAlarmCal/EventAttribute
+include/KDE/KAlarmCal/KAAlarm
+include/KDE/KAlarmCal/KAEvent
+include/KDE/KAlarmCal/KARecurrence
+include/KDE/KAlarmCal/Repetition
 include/KDE/KBlog/Blog
 include/KDE/KBlog/BlogComment
 include/KDE/KBlog/BlogMedia
@@ -187,7 +210,52 @@ include/KDE/KCal/SortableList
 include/KDE/KCal/Todo
 include/KDE/KCal/VCalDrag
 include/KDE/KCal/VCalFormat
+include/KDE/KCalCore/Alarm
+include/KDE/KCalCore/Attachment
+include/KDE/KCalCore/Attendee
+include/KDE/KCalCore/CalFilter
+include/KDE/KCalCore/CalFormat
+include/KDE/KCalCore/CalStorage
+include/KDE/KCalCore/Calendar
+include/KDE/KCalCore/Compat
+include/KDE/KCalCore/CustomProperties
+include/KDE/KCalCore/Duration
+include/KDE/KCalCore/Event
+include/KDE/KCalCore/Exception
+include/KDE/KCalCore/FileStorage
+include/KDE/KCalCore/FreeBusy
+include/KDE/KCalCore/FreeBusyCache
+include/KDE/KCalCore/FreeBusyPeriod
+include/KDE/KCalCore/FreeBusyUrlStore
+include/KDE/KCalCore/ICalFormat
+include/KDE/KCalCore/ICalTimeZones
+include/KDE/KCalCore/Incidence
+include/KDE/KCalCore/IncidenceBase
+include/KDE/KCalCore/Journal
+include/KDE/KCalCore/MemoryCalendar
+include/KDE/KCalCore/Period
+include/KDE/KCalCore/Person
+include/KDE/KCalCore/Recurrence
+include/KDE/KCalCore/RecurrenceRule
+include/KDE/KCalCore/ScheduleMessage
+include/KDE/KCalCore/SortableList
+include/KDE/KCalCore/Sorting
+include/KDE/KCalCore/Todo
+include/KDE/KCalCore/VCalFormat
+include/KDE/KCalCore/Visitor
+include/KDE/KCalUtils/DndFactory
+include/KDE/KCalUtils/HTMLExportSettings
+include/KDE/KCalUtils/HtmlExport
+include/KDE/KCalUtils/ICalDrag
+include/KDE/KCalUtils/IncidenceFormatter
+include/KDE/KCalUtils/RecurrenceActions
+include/KDE/KCalUtils/Scheduler
+include/KDE/KCalUtils/Stringify
+include/KDE/KCalUtils/VCalDrag
 include/KDE/KHolidays/AstroSeasons
+include/KDE/KHolidays/Holiday
+include/KDE/KHolidays/HolidayRegion
+include/KDE/KHolidays/HolidayRegionSelector
 include/KDE/KHolidays/Holidays
 include/KDE/KHolidays/LunarPhase
 include/KDE/KHolidays/Zodiac
@@ -286,17 +354,25 @@ include/KDE/KontactInterface/PimUniqueApplication
 include/KDE/KontactInterface/Plugin
 include/KDE/KontactInterface/Summary
 include/KDE/KontactInterface/UniqueAppHandler
+include/KDE/Mailtransport/DispatchModeAttribute
+include/KDE/Mailtransport/DispatcherInterface
+include/KDE/Mailtransport/ErrorAttribute
+include/KDE/Mailtransport/MessageQueueJob
 include/KDE/Mailtransport/PrecommandJob
 include/KDE/Mailtransport/SendmailJob
+include/KDE/Mailtransport/SentBehaviourAttribute
 include/KDE/Mailtransport/ServerTest
 include/KDE/Mailtransport/SmtpJob
+include/KDE/Mailtransport/Socket
 include/KDE/Mailtransport/Transport
+include/KDE/Mailtransport/TransportAttribute
 include/KDE/Mailtransport/TransportBase
 include/KDE/Mailtransport/TransportComboBox
 include/KDE/Mailtransport/TransportConfigDialog
 include/KDE/Mailtransport/TransportJob
 include/KDE/Mailtransport/TransportManagementWidget
 include/KDE/Mailtransport/TransportManager
+include/KDE/Mailtransport/TransportType
 include/KDE/Syndication/AbstractParser
 include/KDE/Syndication/Category
 include/KDE/Syndication/Constants
@@ -318,7 +394,10 @@ include/KDE/Syndication/SpecificItem
 include/KDE/Syndication/SpecificItemVisitor
 include/KDE/Syndication/Syndication
 include/KDE/Syndication/Tools
+include/akonadi/abstractdifferencesreporter.h
+include/akonadi/agentactionmanager.h
 include/akonadi/agentbase.h
+include/akonadi/agentfactory.h
 include/akonadi/agentfilterproxymodel.h
 include/akonadi/agentinstance.h
 include/akonadi/agentinstancecreatejob.h
@@ -334,8 +413,13 @@ include/akonadi/akonadi_export.h
 include/akonadi/attribute.h
 include/akonadi/attributefactory.h
 include/akonadi/cachepolicy.h
+include/akonadi/cachepolicypage.h
+include/akonadi/calendar/akonadi-calendar_export.h
+include/akonadi/calendar/freebusyproviderbase.h
+include/akonadi/calendar/standardcalendaractionmanager.h
 include/akonadi/changerecorder.h
 include/akonadi/collection.h
+include/akonadi/collectionattributessynchronizationjob.h
 include/akonadi/collectioncombobox.h
 include/akonadi/collectioncopyjob.h
 include/akonadi/collectioncreatejob.h
@@ -355,8 +439,10 @@ include/akonadi/collectionstatistics.h
 include/akonadi/collectionstatisticsdelegate.h
 include/akonadi/collectionstatisticsjob.h
 include/akonadi/collectionstatisticsmodel.h
+include/akonadi/collectionutils_p.h
 include/akonadi/collectionview.h
 include/akonadi/contact/abstractcontactformatter.h
+include/akonadi/contact/abstractcontactgroupformatter.h
 include/akonadi/contact/akonadi-contact_export.h
 include/akonadi/contact/contactdefaultactions.h
 include/akonadi/contact/contacteditor.h
@@ -377,18 +463,27 @@ include/akonadi/contact/emailaddressselection.h
 include/akonadi/contact/emailaddressselectiondialog.h
 include/akonadi/contact/emailaddressselectionwidget.h
 include/akonadi/contact/recentcontactscollectionrequestjob.h
+include/akonadi/contact/standardcontactactionmanager.h
 include/akonadi/contact/standardcontactformatter.h
+include/akonadi/contact/standardcontactgroupformatter.h
 include/akonadi/control.h
+include/akonadi/dbusconnectionpool.h
+include/akonadi/differencesalgorithminterface.h
 include/akonadi/entity.h
+include/akonadi/entitydeletedattribute.h
 include/akonadi/entitydisplayattribute.h
 include/akonadi/entityhiddenattribute.h
 include/akonadi/entitylistview.h
 include/akonadi/entitymimetypefiltermodel.h
+include/akonadi/entityorderproxymodel.h
+include/akonadi/entityrightsfiltermodel.h
 include/akonadi/entitytreemodel.h
 include/akonadi/entitytreeview.h
 include/akonadi/entitytreeviewstatesaver.h
+include/akonadi/etmviewstatesaver.h
 include/akonadi/exception.h
 include/akonadi/favoritecollectionsmodel.h
+include/akonadi/indexpolicyattribute.h
 include/akonadi/item.h
 include/akonadi/itemcopyjob.h
 include/akonadi/itemcreatejob.h
@@ -408,6 +503,7 @@ include/akonadi/job.h
 include/akonadi/kabc/akonadi-kabc_export.h
 include/akonadi/kabc/contactparts.h
 include/akonadi/kcal/akonadi-kcal_export.h
+include/akonadi/kcal/freebusyproviderbase.h
 include/akonadi/kcal/incidencemimetypevisitor.h
 include/akonadi/kmime/addressattribute.h
 include/akonadi/kmime/akonadi-kmime_export.h
@@ -415,19 +511,27 @@ include/akonadi/kmime/messageflags.h
 include/akonadi/kmime/messagefolderattribute.h
 include/akonadi/kmime/messagemodel.h
 include/akonadi/kmime/messageparts.h
+include/akonadi/kmime/messagestatus.h
 include/akonadi/kmime/messagethreaderproxymodel.h
 include/akonadi/kmime/messagethreadingattribute.h
 include/akonadi/kmime/specialmailcollections.h
 include/akonadi/kmime/specialmailcollectionsrequestjob.h
+include/akonadi/kmime/standardmailactionmanager.h
 include/akonadi/linkjob.h
 include/akonadi/mimetypechecker.h
 include/akonadi/monitor.h
+include/akonadi/notes/akonadi-notes_export.h
+include/akonadi/notes/noteutils.h
 include/akonadi/partfetcher.h
 include/akonadi/persistentsearchattribute.h
 include/akonadi/preprocessorbase.h
 include/akonadi/private/collectionpathresolver_p.h
 include/akonadi/qtest_akonadi.h
+include/akonadi/recursivecollectionfilterproxymodel.h
+include/akonadi/recursiveitemfetchjob.h
 include/akonadi/resourcebase.h
+include/akonadi/resourcebasesettings.h
+include/akonadi/resourcesettings.h
 include/akonadi/resourcesynchronizationjob.h
 include/akonadi/searchcreatejob.h
 include/akonadi/selectionproxymodel.h
@@ -440,8 +544,13 @@ include/akonadi/statisticsproxymodel.h
 include/akonadi/transactionjobs.h
 include/akonadi/transactionsequence.h
 include/akonadi/transportresourcebase.h
+include/akonadi/trashfilterproxymodel.h
+include/akonadi/trashjob.h
+include/akonadi/trashrestorejob.h
+include/akonadi/trashsettings.h
 include/akonadi/unlinkjob.h
 include/gpgme++/assuanresult.h
+include/gpgme++/configuration.h
 include/gpgme++/context.h
 include/gpgme++/data.h
 include/gpgme++/decryptionresult.h
@@ -513,6 +622,18 @@ include/kabc/vcarddrag.h
 include/kabc/vcardformat.h
 include/kabc/vcardline.h
 include/kabc/vcardparser.h
+include/kalarmcal/alarmtext.h
+include/kalarmcal/collectionattribute.h
+include/kalarmcal/compatibilityattribute.h
+include/kalarmcal/datetime.h
+include/kalarmcal/eventattribute.h
+include/kalarmcal/identities.h
+include/kalarmcal/kacalendar.h
+include/kalarmcal/kaevent.h
+include/kalarmcal/kalarmcal_export.h
+include/kalarmcal/karecurrence.h
+include/kalarmcal/repetition.h
+include/kalarmcal/version.h
 include/kblog/blog.h
 include/kblog/blogcomment.h
 include/kblog/blogger1.h
@@ -578,9 +699,55 @@ include/kcal/sortablelist.h
 include/kcal/todo.h
 include/kcal/vcaldrag.h
 include/kcal/vcalformat.h
+include/kcalcore/alarm.h
+include/kcalcore/attachment.h
+include/kcalcore/attendee.h
+include/kcalcore/calendar.h
+include/kcalcore/calfilter.h
+include/kcalcore/calformat.h
+include/kcalcore/calstorage.h
+include/kcalcore/compat.h
+include/kcalcore/customproperties.h
+include/kcalcore/duration.h
+include/kcalcore/event.h
+include/kcalcore/exceptions.h
+include/kcalcore/filestorage.h
+include/kcalcore/freebusy.h
+include/kcalcore/freebusycache.h
+include/kcalcore/freebusyperiod.h
+include/kcalcore/freebusyurlstore.h
+include/kcalcore/icalformat.h
+include/kcalcore/icaltimezones.h
+include/kcalcore/incidence.h
+include/kcalcore/incidencebase.h
+include/kcalcore/journal.h
+include/kcalcore/kcalcore_export.h
+include/kcalcore/memorycalendar.h
+include/kcalcore/period.h
+include/kcalcore/person.h
+include/kcalcore/recurrence.h
+include/kcalcore/recurrencerule.h
+include/kcalcore/schedulemessage.h
+include/kcalcore/sortablelist.h
+include/kcalcore/sorting.h
+include/kcalcore/supertrait.h
+include/kcalcore/todo.h
+include/kcalcore/vcalformat.h
+include/kcalcore/visitor.h
+include/kcalutils/dndfactory.h
+include/kcalutils/htmlexport.h
+include/kcalutils/htmlexportsettings.h
+include/kcalutils/icaldrag.h
+include/kcalutils/incidenceformatter.h
+include/kcalutils/kcalutils_export.h
+include/kcalutils/recurrenceactions.h
+include/kcalutils/scheduler.h
+include/kcalutils/stringify.h
+include/kcalutils/vcaldrag.h
 include/kholidays/astroseasons.h
 include/kholidays/holiday.h
 include/kholidays/holidayregion.h
+include/kholidays/holidayregionselector.h
 include/kholidays/holidays.h
 include/kholidays/kholidays_export.h
 include/kholidays/lunarphase.h
@@ -640,6 +807,9 @@ include/kldap/ldapserver.h
 include/kldap/ldapstructureproxymodel.h
 include/kldap/ldapurl.h
 include/kldap/ldif.h
+include/kmbox/kmbox_export.h
+include/kmbox/mbox.h
+include/kmbox/mboxentry.h
 include/kmime/boolflags.h
 include/kmime/kmime_charfreq.h
 include/kmime/kmime_codecs.h
@@ -670,9 +840,11 @@ include/kpimtextedit/kpimtextedit_export.h
 include/kpimtextedit/textedit.h
 include/kpimtextedit/textutils.h
 include/kpimutils/email.h
+include/kpimutils/emailvalidator.h
 include/kpimutils/kfileio.h
 include/kpimutils/kpimutils_export.h
 include/kpimutils/linklocator.h
+include/kpimutils/networkaccesshelper.h
 include/kpimutils/processes.h
 include/kpimutils/spellingfilter.h
 include/kpimutils/supertrait.h
@@ -704,9 +876,11 @@ include/mailtransport/mailtransport_export.h
 include/mailtransport/messagequeuejob.h
 include/mailtransport/precommandjob.h
 include/mailtransport/sendmailjob.h
+include/mailtransport/sentactionattribute.h
 include/mailtransport/sentbehaviourattribute.h
 include/mailtransport/servertest.h
 include/mailtransport/smtpjob.h
+include/mailtransport/socket.h
 include/mailtransport/transport.h
 include/mailtransport/transportattribute.h
 include/mailtransport/transportbase.h
@@ -810,84 +984,103 @@ lib/kde4/kio_nntp.so
 lib/kde4/kio_pop3.so
 lib/kde4/kio_sieve.so
 lib/kde4/kio_smtp.so
+lib/kde4/plugins/designer/kholidayswidgets.so
+lib/libakonadi-calendar.so
+lib/libakonadi-calendar.so.4
+lib/libakonadi-calendar.so.4.8.0
 lib/libakonadi-contact.so
 lib/libakonadi-contact.so.4
-lib/libakonadi-contact.so.4.5.0
+lib/libakonadi-contact.so.4.8.0
 lib/libakonadi-kabc.so
 lib/libakonadi-kabc.so.4
-lib/libakonadi-kabc.so.4.5.0
+lib/libakonadi-kabc.so.4.8.0
 lib/libakonadi-kcal.so
 lib/libakonadi-kcal.so.4
-lib/libakonadi-kcal.so.4.5.0
+lib/libakonadi-kcal.so.4.8.0
 lib/libakonadi-kde.so
 lib/libakonadi-kde.so.4
-lib/libakonadi-kde.so.4.5.0
+lib/libakonadi-kde.so.4.8.0
 lib/libakonadi-kmime.so
 lib/libakonadi-kmime.so.4
-lib/libakonadi-kmime.so.4.5.0
+lib/libakonadi-kmime.so.4.8.0
+lib/libakonadi-notes.so
+lib/libakonadi-notes.so.4
+lib/libakonadi-notes.so.4.8.0
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
-lib/libgpgme++-pthread.so.2.6.0
+lib/libgpgme++-pthread.so.2.8.0
 lib/libgpgme++.so
 lib/libgpgme++.so.2
-lib/libgpgme++.so.2.6.0
+lib/libgpgme++.so.2.8.0
 lib/libkabc.so
 lib/libkabc.so.4
-lib/libkabc.so.4.5.0
+lib/libkabc.so.4.8.0
 lib/libkabc_file_core.so
 lib/libkabc_file_core.so.4
-lib/libkabc_file_core.so.4.5.0
+lib/libkabc_file_core.so.4.8.0
+lib/libkalarmcal.so
+lib/libkalarmcal.so.2
+lib/libkalarmcal.so.2.7.0
 lib/libkblog.so
 lib/libkblog.so.4
-lib/libkblog.so.4.5.0
+lib/libkblog.so.4.8.0
 lib/libkcal.so
 lib/libkcal.so.4
-lib/libkcal.so.4.5.0
+lib/libkcal.so.4.8.0
+lib/libkcalcore.so
+lib/libkcalcore.so.4
+lib/libkcalcore.so.4.8.0
+lib/libkcalutils.so
+lib/libkcalutils.so.4
+lib/libkcalutils.so.4.8.0
 lib/libkholidays.so
 lib/libkholidays.so.4
-lib/libkholidays.so.4.5.0
+lib/libkholidays.so.4.8.0
 lib/libkimap.so
 lib/libkimap.so.4
-lib/libkimap.so.4.5.0
+lib/libkimap.so.4.8.0
 lib/libkldap.so
 lib/libkldap.so.4
-lib/libkldap.so.4.5.0
+lib/libkldap.so.4.8.0
+lib/libkmbox.so
+lib/libkmbox.so.4
+lib/libkmbox.so.4.8.0
 lib/libkmime.so
 lib/libkmime.so.4
-lib/libkmime.so.4.5.0
+lib/libkmime.so.4.8.0
 lib/libkontactinterface.so
 lib/libkontactinterface.so.4
-lib/libkontactinterface.so.4.5.0
+lib/libkontactinterface.so.4.8.0
 lib/libkpimidentities.so
 lib/libkpimidentities.so.4
-lib/libkpimidentities.so.4.5.0
+lib/libkpimidentities.so.4.8.0
 lib/libkpimtextedit.so
 lib/libkpimtextedit.so.4
-lib/libkpimtextedit.so.4.5.0
+lib/libkpimtextedit.so.4.8.0
 lib/libkpimutils.so
 lib/libkpimutils.so.4
-lib/libkpimutils.so.4.5.0
+lib/libkpimutils.so.4.8.0
 lib/libkresources.so
 lib/libkresources.so.4
-lib/libkresources.so.4.5.0
+lib/libkresources.so.4.8.0
 lib/libktnef.so
 lib/libktnef.so.4
-lib/libktnef.so.4.5.0
+lib/libktnef.so.4.8.0
 lib/libkxmlrpcclient.so
 lib/libkxmlrpcclient.so.4
-lib/libkxmlrpcclient.so.4.5.0
+lib/libkxmlrpcclient.so.4.8.0
 lib/libmailtransport.so
 lib/libmailtransport.so.4
-lib/libmailtransport.so.4.5.0
+lib/libmailtransport.so.4.8.0
 lib/libmicroblog.so
 lib/libmicroblog.so.4
-lib/libmicroblog.so.4.5.0
+lib/libmicroblog.so.4.8.0
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
 lib/libsyndication.so.4
-lib/libsyndication.so.4.5.0
+lib/libsyndication.so.4.8.0
 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
@@ -966,6 +1159,7 @@ share/kde/apps/libkholidays/plan2/holiday_de-by_de
 share/kde/apps/libkholidays/plan2/holiday_de_de
 share/kde/apps/libkholidays/plan2/holiday_dk_da
 share/kde/apps/libkholidays/plan2/holiday_ee_et
+share/kde/apps/libkholidays/plan2/holiday_eg_ar
 share/kde/apps/libkholidays/plan2/holiday_es-ct_ca
 share/kde/apps/libkholidays/plan2/holiday_es_es
 share/kde/apps/libkholidays/plan2/holiday_fi_fi
@@ -977,6 +1171,8 @@ 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_gt_es
+share/kde/apps/libkholidays/plan2/holiday_hk_en-gb
+share/kde/apps/libkholidays/plan2/holiday_hk_zh-cn
 share/kde/apps/libkholidays/plan2/holiday_hr_hr
 share/kde/apps/libkholidays/plan2/holiday_hu_hu
 share/kde/apps/libkholidays/plan2/holiday_ie_en-gb
@@ -992,9 +1188,11 @@ share/kde/apps/libkholidays/plan2/holiday_it_it
 share/kde/apps/libkholidays/plan2/holiday_jm_en-gb
 share/kde/apps/libkholidays/plan2/holiday_jp_en-us
 share/kde/apps/libkholidays/plan2/holiday_jp_ja
+share/kde/apps/libkholidays/plan2/holiday_kr_ko
 share/kde/apps/libkholidays/plan2/holiday_lt_lt
 share/kde/apps/libkholidays/plan2/holiday_lu_fr
 share/kde/apps/libkholidays/plan2/holiday_lu_lb
+share/kde/apps/libkholidays/plan2/holiday_lv_lv
 share/kde/apps/libkholidays/plan2/holiday_mq_fr
 share/kde/apps/libkholidays/plan2/holiday_mx_es
 share/kde/apps/libkholidays/plan2/holiday_na_en-gb
@@ -1012,6 +1210,7 @@ share/kde/apps/libkholidays/plan2/holiday_ru_ru
 share/kde/apps/libkholidays/plan2/holiday_se_sv
 share/kde/apps/libkholidays/plan2/holiday_si_sl
 share/kde/apps/libkholidays/plan2/holiday_sk_sk
+share/kde/apps/libkholidays/plan2/holiday_sm_it
 share/kde/apps/libkholidays/plan2/holiday_th_en-gb
 share/kde/apps/libkholidays/plan2/holiday_ua_uk
 share/kde/apps/libkholidays/plan2/holiday_us_en-us
@@ -1021,6 +1220,7 @@ share/kde/apps/libkholidays/plan2/holiday_yt_fr
 share/kde/apps/libkholidays/plan2/holiday_za_en-gb
 share/kde/config.kcfg/mailtransport.kcfg
 share/kde/config.kcfg/recentcontactscollections.kcfg
+share/kde/config.kcfg/resourcebase.kcfg
 share/kde/config.kcfg/specialmailcollections.kcfg
 share/kde4/services/akonadi/contact/aimprotocol.desktop
 share/kde4/services/akonadi/contact/gaduprotocol.desktop
@@ -1043,7 +1243,6 @@ share/kde4/services/kresources/kabc/file.desktop
 share/kde4/services/kresources/kabc/ldapkio.desktop
 share/kde4/services/kresources/kabc/net.desktop
 share/kde4/services/kresources/kabc_manager.desktop
-share/kde4/services/kresources/kcal/local.desktop
 share/kde4/services/kresources/kcal/localdir.desktop
 share/kde4/services/kresources/kcal_manager.desktop
 share/kde4/services/ldap.protocol
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index 8f0018ac51b..94e0e0ba79f 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.17 2011/10/02 04:32:22 markd Exp $
+$NetBSD: distinfo,v 1.18 2012/03/19 11:46:44 markd Exp $
 
-SHA1 (kdepimlibs-4.5.5.tar.bz2) = 436fd7897586294f327395981a714ae0695f4ee2
-RMD160 (kdepimlibs-4.5.5.tar.bz2) = 6e9e54fcf8fa2f1da1c76004a3998f9426a30f4c
-Size (kdepimlibs-4.5.5.tar.bz2) = 2674251 bytes
-SHA1 (patch-aa) = 4a90823acf9832232ea51cc1202dd88edebe5ee9
-SHA1 (patch-akonadi_CMakeLists.txt) = 01b0e467d7474312fb001af081648efa44d8278f
+SHA1 (kdepimlibs-4.8.0.tar.bz2) = 22409015a8047e3a78711093e3363775e8434fba
+RMD160 (kdepimlibs-4.8.0.tar.bz2) = 968c2a69ab6197741f20476c87b999ef5ea5c96a
+Size (kdepimlibs-4.8.0.tar.bz2) = 3306692 bytes
 SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
+SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
 SHA1 (patch-kblog_CMakeLists.txt) = 183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
+SHA1 (patch-kcalutils_CMakeLists.txt) = 5c212ab23d0b1006a43c765bc1d860be85da284a
+SHA1 (patch-kmbox_CMakeLists.txt) = 924bd70a84c8af1c7d37501d4f718343a0aa7121
+SHA1 (patch-kpimutils_CMakeLists.txt) = 0a9f7283e2b70b38e0c545240251bc9ecb615eab
 SHA1 (patch-qgpgme_CMakeLists.txt) = 0860963f371a008f1d006dad58ea40329c358cfd
diff --git a/misc/kdepimlibs4/patches/patch-aa b/misc/kdepimlibs4/patches/patch-aa
deleted file mode 100644
index 8ef48fcf3b5..00000000000
--- a/misc/kdepimlibs4/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/01/23 04:27:00 markd Exp $
-
-svn r1216162 fix memcpy with overlapping source/dest
-
---- kioslave/imap4/imap4.cpp	2011/01/21 16:55:50	1216161
-+++ kioslave/imap4/imap4.cpp	2011/01/21 17:03:35	1216162
-@@ -2577,7 +2577,7 @@
-     ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen;
-     memcpy(data, readBuffer, copyLen);
-     readBufferLen -= copyLen;
--    if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
-+    if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
-     return copyLen;
-   }
-   if (!isConnected()) return 0;
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt
deleted file mode 100644
index b589a3f2719..00000000000
--- a/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-akonadi_CMakeLists.txt,v 1.1 2011/10/02 04:32:22 markd Exp $
-
---- akonadi/CMakeLists.txt.orig	2011-09-27 09:07:39.000000000 +0000
-+++ akonadi/CMakeLists.txt
-@@ -1,6 +1,7 @@
- project(akonadi-kde)
- 
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5250 )
-+add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
- 
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
- if(CMAKE_COMPILE_GCOV)
diff --git a/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt
new file mode 100644
index 00000000000..46aa80d7eb8
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kalarmcal_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..55df5d3a90e
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kcalutils_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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-kmbox_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt
new file mode 100644
index 00000000000..13360c229ad
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kmbox_CMakeLists.txt
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..3f015ed0978
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
+
+--- kpimutils/CMakeLists.txt.orig	2011-07-27 18:34:56.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 )
+