Update to KDE 3.5.5

Changes:
KAlarm
* Use an alarm's previous deferral time interval as default for its next
  deferral.
KMail
* Add missing top and bottom buttons for the filter dialog.
* Improve GUI-strings.
* Fixing a crash on start when using IMAP.

4 files changed, 44 insertions, 66 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 1076a1c2a61..603366d4f42 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/08/02 14:02:00 markd Exp $
+# $NetBSD: Makefile,v 1.66 2006/10/12 10:53:45 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -35,10 +35,6 @@ REPLACE_PERL+=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-USE_TOOLS+=	gawk:pkgsrc
-.endif
-
 .include "../../meta-pkgs/kde3/kde3.mk"
 BUILDLINK_DEPMETHOD.qt3-tools=	full
 
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index d7b25007671..09a67cc9e2f 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2006/06/01 14:04:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.25 2006/10/12 10:53:45 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -42,6 +42,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
@@ -832,6 +834,29 @@ share/kde/apps/kconf_update/kpgp.upd
 share/kde/apps/kconf_update/kpilot.upd
 share/kde/apps/kconf_update/upgrade-signature.pl
 share/kde/apps/kconf_update/upgrade-transport.pl
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png
+share/kde/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png
+share/kde/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png
+share/kde/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png
+share/kde/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png
+share/kde/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png
+share/kde/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png
 share/kde/apps/kdepimwidgets/pics/addresseelineedit.png
 share/kde/apps/kdepimwidgets/pics/clicklineedit.png
 share/kde/apps/kdepimwidgets/pics/kdateedit.png
@@ -994,27 +1019,20 @@ share/kde/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/month.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png
-share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png
 share/kde/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png
@@ -1022,34 +1040,21 @@ share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/month.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/search.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/send.png
-share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png
 share/kde/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png
-share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png
-share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/list.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/month.png
-share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png
 share/kde/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png
 share/kde/apps/korganizer/korganizer_part.rc
 share/kde/apps/korganizer/korganizerui.rc
@@ -1273,6 +1278,7 @@ share/kde/apps/libical/zoneinfo/America/Tegucigalpa.ics
 share/kde/apps/libical/zoneinfo/America/Thule.ics
 share/kde/apps/libical/zoneinfo/America/Thunder_Bay.ics
 share/kde/apps/libical/zoneinfo/America/Tijuana.ics
+share/kde/apps/libical/zoneinfo/America/Toronto.ics
 share/kde/apps/libical/zoneinfo/America/Tortola.ics
 share/kde/apps/libical/zoneinfo/America/Vancouver.ics
 share/kde/apps/libical/zoneinfo/America/Whitehorse.ics
@@ -1332,6 +1338,7 @@ share/kde/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 share/kde/apps/libical/zoneinfo/Asia/Kuching.ics
 share/kde/apps/libical/zoneinfo/Asia/Kuwait.ics
 share/kde/apps/libical/zoneinfo/Asia/Macao.ics
+share/kde/apps/libical/zoneinfo/Asia/Macau.ics
 share/kde/apps/libical/zoneinfo/Asia/Magadan.ics
 share/kde/apps/libical/zoneinfo/Asia/Manila.ics
 share/kde/apps/libical/zoneinfo/Asia/Muscat.ics
@@ -1515,6 +1522,7 @@ share/kde/apps/libkholidays/holiday_at
 share/kde/apps/libkholidays/holiday_au
 share/kde/apps/libkholidays/holiday_bavarian
 share/kde/apps/libkholidays/holiday_be
+share/kde/apps/libkholidays/holiday_br
 share/kde/apps/libkholidays/holiday_ca
 share/kde/apps/libkholidays/holiday_catalan
 share/kde/apps/libkholidays/holiday_ch
@@ -1545,6 +1553,7 @@ share/kde/apps/libkholidays/holiday_pt
 share/kde/apps/libkholidays/holiday_py
 share/kde/apps/libkholidays/holiday_quebec
 share/kde/apps/libkholidays/holiday_ro
+share/kde/apps/libkholidays/holiday_ru
 share/kde/apps/libkholidays/holiday_se
 share/kde/apps/libkholidays/holiday_si
 share/kde/apps/libkholidays/holiday_th
@@ -2088,6 +2097,15 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/kgantt
 @dirrm share/kde/apps/kdepimwidgets/pics
 @dirrm share/kde/apps/kdepimwidgets
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/32x32/actions
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/32x32
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/22x22/actions
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/22x22
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kdepim/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kdepim/icons/crystalsvg
+@dirrm share/kde/apps/kdepim/icons
+@dirrm share/kde/apps/kdepim
 @comment in kde: @dirrm share/kde/apps/kconf_update
 @dirrm share/kde/apps/karmpart
 @dirrm share/kde/apps/karm/pics
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 0372b8322aa..f42f049c7a2 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.46 2006/08/02 14:02:00 markd Exp $
+$NetBSD: distinfo,v 1.47 2006/10/12 10:53:45 markd Exp $
 
-SHA1 (kdepim-3.5.4.tar.bz2) = 5db32e856be53d22d5f71a2465f877db4e8be91d
-RMD160 (kdepim-3.5.4.tar.bz2) = d3ecf9353dc578c392e1b82c72c7b8a2a88fdcdc
-Size (kdepim-3.5.4.tar.bz2) = 12925075 bytes
+SHA1 (kdepim-3.5.5.tar.bz2) = 612f34307c5fac9279c85a4efb1488db4b438f12
+RMD160 (kdepim-3.5.5.tar.bz2) = 5bdcf98909f450ce3839fa72a404571f6cde22f6
+Size (kdepim-3.5.5.tar.bz2) = 12908968 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
 SHA1 (patch-ac) = 2ead8593be03d780cf5b4e333dc4ead1d29b8073
@@ -13,4 +13,3 @@ SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
 SHA1 (patch-am) = 29066a35ac983764a8cfa9392b9d67df581b35d3
 SHA1 (patch-an) = cb4cacc1e8ad1f3c5e4103149243829047ce94fe
 SHA1 (patch-ao) = f3760617e77fe74d80733613a18905971ee4c5f9
-SHA1 (patch-ap) = be70d56c66e3956a969f6d858947d83082ae2673
diff --git a/misc/kdepim3/patches/patch-ap b/misc/kdepim3/patches/patch-ap
deleted file mode 100644
index a57d6610601..00000000000
--- a/misc/kdepim3/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/07/24 12:43:40 markd Exp $
-
---- korganizer/koprefs.cpp.orig	2006-01-20 05:56:37.000000000 +1300
-+++ korganizer/koprefs.cpp
-@@ -41,6 +41,7 @@
- #include <kemailsettings.h>
- #include <kstaticdeleter.h>
- #include <kstringhandler.h>
-+#include <ktimezones.h>
- 
- #include "koprefs.h"
- #include <libkpimidentities/identitymanager.h>
-@@ -145,17 +146,12 @@ void KOPrefs::fillMailDefaults()
- void KOPrefs::setTimeZoneIdDefault()
- {
-   QString zone;
-+  KTimezones *db;
- 
--  char zonefilebuf[100];
--  int len = readlink("/etc/localtime",zonefilebuf,100);
--  if (len > 0 && len < 100) {
--    zonefilebuf[len] = '\0';
--    zone = zonefilebuf;
--    zone = zone.mid(zone.find("zoneinfo/") + 9);
--  } else {
--    tzset();
--    zone = tzname[0];
--  }
-+  db = new KTimezones();
-+
-+  zone = (db->local())->name();
-+  delete db;
- 
-   kdDebug () << "----- time zone: " << zone << endl;
-