10 files changed, 129 insertions, 78 deletions

diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index fd884f93e5aa..cdaf81b48169 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5
-SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da
-SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597
+MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e
+SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457
+SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index dafd1e582022..0a4e06a44c7d 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,7 +15,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
-LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 0c2772ca7f70..77abe98678d3 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559
-SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa
-SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075
+MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
+SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
+SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 87c64101eca7..be431fcaa3d6 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -41,6 +41,8 @@ bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
+include/akregator/akregator_export.h
+include/akregator/articleinterceptor.h
 include/akregator/feedstorage.h
 include/akregator/plugin.h
 include/akregator/storage.h
@@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd
 share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
+share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png
 share/apps/kdepimwidgets/pics/addresseelineedit.png
 share/apps/kdepimwidgets/pics/clicklineedit.png
 share/apps/kdepimwidgets/pics/kdateedit.png
@@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
@@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png
 share/apps/korganizer/korganizer_part.rc
 share/apps/korganizer/korganizerui.rc
@@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics
 share/apps/libical/zoneinfo/America/Thule.ics
 share/apps/libical/zoneinfo/America/Thunder_Bay.ics
 share/apps/libical/zoneinfo/America/Tijuana.ics
+share/apps/libical/zoneinfo/America/Toronto.ics
 share/apps/libical/zoneinfo/America/Tortola.ics
 share/apps/libical/zoneinfo/America/Vancouver.ics
 share/apps/libical/zoneinfo/America/Whitehorse.ics
@@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 share/apps/libical/zoneinfo/Asia/Kuching.ics
 share/apps/libical/zoneinfo/Asia/Kuwait.ics
 share/apps/libical/zoneinfo/Asia/Macao.ics
+share/apps/libical/zoneinfo/Asia/Macau.ics
 share/apps/libical/zoneinfo/Asia/Magadan.ics
 share/apps/libical/zoneinfo/Asia/Manila.ics
 share/apps/libical/zoneinfo/Asia/Muscat.ics
@@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at
 share/apps/libkholidays/holiday_au
 share/apps/libkholidays/holiday_bavarian
 share/apps/libkholidays/holiday_be
+share/apps/libkholidays/holiday_br
 share/apps/libkholidays/holiday_ca
 share/apps/libkholidays/holiday_catalan
 share/apps/libkholidays/holiday_ch
@@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt
 share/apps/libkholidays/holiday_py
 share/apps/libkholidays/holiday_quebec
 share/apps/libkholidays/holiday_ro
+share/apps/libkholidays/holiday_ru
 share/apps/libkholidays/holiday_se
 share/apps/libkholidays/holiday_si
 share/apps/libkholidays/holiday_th
@@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/kgantt
 @dirrm share/apps/kdepimwidgets/pics
 @dirrm share/apps/kdepimwidgets
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16
+@dirrm share/apps/kdepim/icons/crystalsvg
+@dirrm share/apps/kdepim/icons
+@dirrm share/apps/kdepim
 @dirrm share/apps/karmpart
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index dafd1e582022..0a4e06a44c7d 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,7 +15,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
-LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 0c2772ca7f70..77abe98678d3 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559
-SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa
-SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075
+MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
+SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
+SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 87c64101eca7..be431fcaa3d6 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -41,6 +41,8 @@ bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
+include/akregator/akregator_export.h
+include/akregator/articleinterceptor.h
 include/akregator/feedstorage.h
 include/akregator/plugin.h
 include/akregator/storage.h
@@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd
 share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
+share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png
 share/apps/kdepimwidgets/pics/addresseelineedit.png
 share/apps/kdepimwidgets/pics/clicklineedit.png
 share/apps/kdepimwidgets/pics/kdateedit.png
@@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
@@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png
 share/apps/korganizer/korganizer_part.rc
 share/apps/korganizer/korganizerui.rc
@@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics
 share/apps/libical/zoneinfo/America/Thule.ics
 share/apps/libical/zoneinfo/America/Thunder_Bay.ics
 share/apps/libical/zoneinfo/America/Tijuana.ics
+share/apps/libical/zoneinfo/America/Toronto.ics
 share/apps/libical/zoneinfo/America/Tortola.ics
 share/apps/libical/zoneinfo/America/Vancouver.ics
 share/apps/libical/zoneinfo/America/Whitehorse.ics
@@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 share/apps/libical/zoneinfo/Asia/Kuching.ics
 share/apps/libical/zoneinfo/Asia/Kuwait.ics
 share/apps/libical/zoneinfo/Asia/Macao.ics
+share/apps/libical/zoneinfo/Asia/Macau.ics
 share/apps/libical/zoneinfo/Asia/Magadan.ics
 share/apps/libical/zoneinfo/Asia/Manila.ics
 share/apps/libical/zoneinfo/Asia/Muscat.ics
@@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at
 share/apps/libkholidays/holiday_au
 share/apps/libkholidays/holiday_bavarian
 share/apps/libkholidays/holiday_be
+share/apps/libkholidays/holiday_br
 share/apps/libkholidays/holiday_ca
 share/apps/libkholidays/holiday_catalan
 share/apps/libkholidays/holiday_ch
@@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt
 share/apps/libkholidays/holiday_py
 share/apps/libkholidays/holiday_quebec
 share/apps/libkholidays/holiday_ro
+share/apps/libkholidays/holiday_ru
 share/apps/libkholidays/holiday_se
 share/apps/libkholidays/holiday_si
 share/apps/libkholidays/holiday_th
@@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/kgantt
 @dirrm share/apps/kdepimwidgets/pics
 @dirrm share/apps/kdepimwidgets
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16
+@dirrm share/apps/kdepim/icons/crystalsvg
+@dirrm share/apps/kdepim/icons
+@dirrm share/apps/kdepim
 @dirrm share/apps/karmpart
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index dafd1e582022..0a4e06a44c7d 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,7 +15,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
-LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 0c2772ca7f70..77abe98678d3 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559
-SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa
-SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075
+MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
+SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
+SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 87c64101eca7..be431fcaa3d6 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -41,6 +41,8 @@ bin/networkstatustestservice
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
+include/akregator/akregator_export.h
+include/akregator/articleinterceptor.h
 include/akregator/feedstorage.h
 include/akregator/plugin.h
 include/akregator/storage.h
@@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd
 share/apps/kconf_update/kpilot.upd
 share/apps/kconf_update/upgrade-signature.pl
 share/apps/kconf_update/upgrade-transport.pl
+share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png
+share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png
+share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png
+share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png
 share/apps/kdepimwidgets/pics/addresseelineedit.png
 share/apps/kdepimwidgets/pics/clicklineedit.png
 share/apps/kdepimwidgets/pics/kdateedit.png
@@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
-share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
@@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
 share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
-share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png
 share/apps/korganizer/korganizer_part.rc
 share/apps/korganizer/korganizerui.rc
@@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics
 share/apps/libical/zoneinfo/America/Thule.ics
 share/apps/libical/zoneinfo/America/Thunder_Bay.ics
 share/apps/libical/zoneinfo/America/Tijuana.ics
+share/apps/libical/zoneinfo/America/Toronto.ics
 share/apps/libical/zoneinfo/America/Tortola.ics
 share/apps/libical/zoneinfo/America/Vancouver.ics
 share/apps/libical/zoneinfo/America/Whitehorse.ics
@@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 share/apps/libical/zoneinfo/Asia/Kuching.ics
 share/apps/libical/zoneinfo/Asia/Kuwait.ics
 share/apps/libical/zoneinfo/Asia/Macao.ics
+share/apps/libical/zoneinfo/Asia/Macau.ics
 share/apps/libical/zoneinfo/Asia/Magadan.ics
 share/apps/libical/zoneinfo/Asia/Manila.ics
 share/apps/libical/zoneinfo/Asia/Muscat.ics
@@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at
 share/apps/libkholidays/holiday_au
 share/apps/libkholidays/holiday_bavarian
 share/apps/libkholidays/holiday_be
+share/apps/libkholidays/holiday_br
 share/apps/libkholidays/holiday_ca
 share/apps/libkholidays/holiday_catalan
 share/apps/libkholidays/holiday_ch
@@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt
 share/apps/libkholidays/holiday_py
 share/apps/libkholidays/holiday_quebec
 share/apps/libkholidays/holiday_ro
+share/apps/libkholidays/holiday_ru
 share/apps/libkholidays/holiday_se
 share/apps/libkholidays/holiday_si
 share/apps/libkholidays/holiday_th
@@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/kgantt
 @dirrm share/apps/kdepimwidgets/pics
 @dirrm share/apps/kdepimwidgets
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/32x32
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/22x22
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdepim/icons/crystalsvg/16x16
+@dirrm share/apps/kdepim/icons/crystalsvg
+@dirrm share/apps/kdepim/icons
+@dirrm share/apps/kdepim
 @dirrm share/apps/karmpart
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm