Update to kde 3.5.9

KAlarm
* New option to specify reminder times in minutes.
* Prevent multiple identical error messages accumulating for the same
  alarm.
* Remember main window show/hide options when KAlarm last closed, instead
  of setting them in the Preferences dialog.
* Replace simple repetitions with recurrence sub-repetitions, to reduce
  confusion.
* Simplifications and improvements to the alarm edit dialog layout and
  controls.
* Fix crash when saving Preferences, if 'xterm' is not installed in the
  system.
* Fix failure to trigger some recurring date-only alarms
* Fix date-only alarms repeating every minute from midnight until the
  start-of-day time.
* Fix KAlarm hanging especially on startup, and potentially freezing the
  system for a while.
* Fix deferral of non-recurring alarms not working.
* Fix inability to reactivate deleted alarms which still have repetitions
  to go.
* Fix sendmail error "Sender verify failed (in reply to RCPT TO command)"
  on some systems.
* Prevent error messages while typing a date value, until the user has
  finished entering it.

4 files changed, 52 insertions, 22 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 8c2fc745c09..ff67412a9bf 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2008/01/18 05:08:36 tnn Exp $
+# $NetBSD: Makefile,v 1.81 2008/02/20 10:09:20 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -26,6 +25,7 @@ REPLACE_PERL+=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.5-trigger-flag-migration.pl \
 		kmail/upgrade-signature.pl \
 		kmail/upgrade-transport.pl \
+		kresources/kolab/upgrade-resourcetype.pl \
 		libkpgp/kpgp-3.1-upgrade-address-data.pl
 
 CHECK_PORTABILITY_SKIP+=karm/test/booktime-baddate.sh \
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index e1c24856b42..aa21afc6a81 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2007/10/20 10:46:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.30 2008/02/20 10:09:20 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -37,6 +37,8 @@ bin/ktnef
 bin/kwatchgnupg
 bin/kxml_compiler
 bin/networkstatustestservice
+bin/scalixadmin
+bin/scalixwizard
 bin/sloxwizard
 include/KNotesAppIface.h
 include/KNotesIface.h
@@ -113,6 +115,7 @@ include/kleo/keylistjob.h
 include/kleo/keylistview.h
 include/kleo/keyrequester.h
 include/kleo/keyselectiondialog.h
+include/kleo/messagebox.h
 include/kleo/multideletejob.h
 include/kleo/passphrasedialog.h
 include/kleo/progressbar.h
@@ -264,6 +267,7 @@ lib/kde3/kabc_groupdav.la
 lib/kde3/kabc_groupwise.la
 lib/kde3/kabc_kolab.la
 lib/kde3/kabc_newexchange.la
+lib/kde3/kabc_scalix.la
 lib/kde3/kabc_slox.la
 lib/kde3/kabc_xmlrpc.la
 lib/kde3/kcal_groupdav.la
@@ -275,6 +279,7 @@ lib/kde3/kcal_localdir.la
 lib/kde3/kcal_newexchange.la
 lib/kde3/kcal_remote.la
 lib/kde3/kcal_resourcefeatureplan.la
+lib/kde3/kcal_scalix.la
 lib/kde3/kcal_slox.la
 lib/kde3/kcal_xmlrpc.la
 lib/kde3/kcm_kabconfig.la
@@ -298,9 +303,11 @@ lib/kde3/kfile_vcf.la
 lib/kde3/kio_groupwise.la
 lib/kde3/kio_imap4.la
 lib/kde3/kio_mbox.la
+lib/kde3/kio_scalix.la
 ${HAVE_SASL}lib/kde3/kio_sieve.la
 lib/kde3/knotes_kolab.la
 lib/kde3/knotes_local.la
+lib/kde3/knotes_scalix.la
 lib/kde3/knotes_xmlrpc.la
 lib/kde3/ldifvcardthumbnail.la
 lib/kde3/libakregator_mk4storage_plugin.la
@@ -352,6 +359,7 @@ lib/kde3/libkorg_hebrew.la
 lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorg_yearlyprint.la
 lib/kde3/libkorganizerpart.la
+lib/kde3/libscalixwizard.la
 lib/kde3/libsloxwizard.la
 lib/kde3/plugins/designer/kdepimwidgets.la
 lib/kde3/plugins/designer/kpartsdesignerplugin.la
@@ -366,6 +374,7 @@ lib/libkabc_newexchange.la
 lib/libkabc_slox.la
 lib/libkabc_xmlrpc.la
 lib/libkabckolab.la
+lib/libkabcscalix.la
 lib/libkabinterfaces.la
 lib/libkaddressbook.la
 lib/libkcal.la
@@ -377,6 +386,7 @@ lib/libkcal_resourceremote.la
 lib/libkcal_slox.la
 lib/libkcal_xmlrpc.la
 lib/libkcalkolab.la
+lib/libkcalscalix.la
 lib/libkdepim.la
 lib/libkgantt.la
 lib/libkgroupwarebase.la
@@ -389,6 +399,7 @@ lib/libkmime.la
 lib/libknodecommon.la
 lib/libknotes_xmlrpc.la
 lib/libknoteskolab.la
+lib/libknotesscalix.la
 lib/libkocorehelper.la
 lib/libkode.la
 lib/libkontact.la
@@ -422,6 +433,7 @@ share/applications/kde/kleopatra_import.desktop
 share/applications/kde/kmail_view.desktop
 share/applications/kde/knotes.desktop
 share/applications/kde/konsolekalendar.desktop
+share/applications/kde/kontactdcop.desktop
 share/applications/kde/korganizer.desktop
 share/applications/kde/kpalmdoc.desktop
 share/applications/kde/kpilot.desktop
@@ -924,6 +936,7 @@ share/kde/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
 share/kde/apps/kconf_update/kmail-pgpidentity.pl
 share/kde/apps/kconf_update/kmail-upd-identities.pl
 share/kde/apps/kconf_update/kmail.upd
+share/kde/apps/kconf_update/kolab-resource.upd
 share/kde/apps/kconf_update/korganizer.upd
 share/kde/apps/kconf_update/korn-3-4-config_change.upd
 share/kde/apps/kconf_update/korn-3-5-metadata-update.pl
@@ -933,6 +946,7 @@ share/kde/apps/kconf_update/kpalmdoc.upd
 share/kde/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 share/kde/apps/kconf_update/kpgp.upd
 share/kde/apps/kconf_update/kpilot.upd
+share/kde/apps/kconf_update/upgrade-resourcetype.pl
 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
@@ -1022,6 +1036,21 @@ share/kde/apps/kmail/kmail_part.rc
 share/kde/apps/kmail/kmcomposerui.rc
 share/kde/apps/kmail/kmmainwin.rc
 share/kde/apps/kmail/kmreadermainwin.rc
+share/kde/apps/kmail/pics/enterprise_bottom.png
+share/kde/apps/kmail/pics/enterprise_bottom_left.png
+share/kde/apps/kmail/pics/enterprise_bottom_right.png
+share/kde/apps/kmail/pics/enterprise_icon.png
+share/kde/apps/kmail/pics/enterprise_left.png
+share/kde/apps/kmail/pics/enterprise_right.png
+share/kde/apps/kmail/pics/enterprise_s_left.png
+share/kde/apps/kmail/pics/enterprise_s_right.png
+share/kde/apps/kmail/pics/enterprise_sbar.png
+share/kde/apps/kmail/pics/enterprise_sp_right.png
+share/kde/apps/kmail/pics/enterprise_sw.png
+share/kde/apps/kmail/pics/enterprise_top.png
+share/kde/apps/kmail/pics/enterprise_top_left.png
+share/kde/apps/kmail/pics/enterprise_top_right.png
+share/kde/apps/kmail/pics/enterprise_w.png
 share/kde/apps/kmail/pics/key.png
 share/kde/apps/kmail/pics/key_bad.png
 share/kde/apps/kmail/pics/key_ok.png
@@ -1123,6 +1152,12 @@ share/kde/apps/kontact/about/main.html
 share/kde/apps/kontact/about/top-right-kontact.png
 share/kde/apps/kontact/kontact.setdlg
 share/kde/apps/kontact/kontactui.rc
+share/kde/apps/kontact/profiles/KontactDefaults/kontactrc
+share/kde/apps/kontact/profiles/KontactDefaults/korganizerrc
+share/kde/apps/kontact/profiles/KontactDefaults/profile.cfg
+share/kde/apps/kontact/profiles/OutlookDefaults/kontactrc
+share/kde/apps/kontact/profiles/OutlookDefaults/korganizerrc
+share/kde/apps/kontact/profiles/OutlookDefaults/profile.cfg
 share/kde/apps/kontactsummary/kontactsummary_part.rc
 share/kde/apps/korgac/icons/crystalsvg/22x22/actions/korgac.png
 share/kde/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png
@@ -1723,6 +1758,7 @@ share/kde/config.kcfg/mk4config.kcfg
 share/kde/config.kcfg/pimemoticons.kcfg
 share/kde/config.kcfg/popmail.kcfg
 share/kde/config.kcfg/replyphrases.kcfg
+share/kde/config.kcfg/scalix.kcfg
 share/kde/config.kcfg/slox.kcfg
 share/kde/config.kcfg/sysinfoconduit.kcfg
 share/kde/config.kcfg/templatesconfiguration_kfg.kcfg
@@ -1841,6 +1877,7 @@ share/kde/services/kresources/kabc/kabc_ox.desktop
 share/kde/services/kresources/kabc/kabc_slox.desktop
 share/kde/services/kresources/kabc/kabc_xmlrpc.desktop
 share/kde/services/kresources/kabc/kolab.desktop
+share/kde/services/kresources/kabc/scalix.desktop
 share/kde/services/kresources/kcal/exchange.desktop
 share/kde/services/kresources/kcal/imap.desktop
 share/kde/services/kresources/kcal/kabc.desktop
@@ -1856,11 +1893,13 @@ share/kde/services/kresources/kcal/kolab.desktop
 share/kde/services/kresources/kcal/local.desktop
 share/kde/services/kresources/kcal/localdir.desktop
 share/kde/services/kresources/kcal/remote.desktop
+share/kde/services/kresources/kcal/scalix.desktop
 share/kde/services/kresources/kcal_manager.desktop
 share/kde/services/kresources/knotes/imap.desktop
 share/kde/services/kresources/knotes/knotes_xmlrpc.desktop
 share/kde/services/kresources/knotes/kolabresource.desktop
 share/kde/services/kresources/knotes/local.desktop
+share/kde/services/kresources/knotes/scalix.desktop
 share/kde/services/kresources/knotes_manager.desktop
 share/kde/services/ldifvcardthumbnail.desktop
 share/kde/services/mal_conduit.desktop
@@ -1868,6 +1907,8 @@ share/kde/services/mbox.protocol
 share/kde/services/memofile-conduit.desktop
 share/kde/services/notepad-conduit.desktop
 share/kde/services/popmail-conduit.desktop
+share/kde/services/scalix.protocol
+share/kde/services/scalixs.protocol
 ${HAVE_SASL}share/kde/services/sieve.protocol
 share/kde/services/sysinfo_conduit.desktop
 share/kde/services/time_conduit.desktop
@@ -1972,9 +2013,11 @@ share/kde/servicetypes/kpilotconduit.desktop
 @dirrm share/kde/apps/korgac/icons
 @dirrm share/kde/apps/korgac
 @dirrm share/kde/apps/kontactsummary
+@dirrm share/kde/apps/kontact/profiles/OutlookDefaults
+@dirrm share/kde/apps/kontact/profiles/KontactDefaults
+@dirrm share/kde/apps/kontact/profiles
 @dirrm share/kde/apps/kontact/about
 @dirrm share/kde/apps/kontact
-@comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/knotes/icons/crystalsvg/16x16/actions
 @dirrm share/kde/apps/knotes/icons/crystalsvg/16x16
 @dirrm share/kde/apps/knotes/icons/crystalsvg
@@ -2099,6 +2142,7 @@ share/kde/servicetypes/kpilotconduit.desktop
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in kde: @dirrm share/icons/crystalsvg/64x64/actions
 @comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
 @comment in kde: @dirrm share/icons/crystalsvg/48x48/actions
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index b15927f82f1..b5d56a56db3 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.57 2007/10/20 10:46:41 markd Exp $
+$NetBSD: distinfo,v 1.58 2008/02/20 10:09:20 markd Exp $
 
-SHA1 (kdepim-3.5.8.tar.bz2) = 8284db2d3d767228cfb2cad4bf8d5221848d64f2
-RMD160 (kdepim-3.5.8.tar.bz2) = bb34c7e88227a1ebdd8ff38ee41445f85969175e
-Size (kdepim-3.5.8.tar.bz2) = 14107449 bytes
+SHA1 (kdepim-3.5.9.tar.bz2) = 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15
+RMD160 (kdepim-3.5.9.tar.bz2) = 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54
+Size (kdepim-3.5.9.tar.bz2) = 14497974 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
 SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
 SHA1 (patch-am) = 29066a35ac983764a8cfa9392b9d67df581b35d3
-SHA1 (patch-an) = cb4cacc1e8ad1f3c5e4103149243829047ce94fe
 SHA1 (patch-ao) = f3760617e77fe74d80733613a18905971ee4c5f9
diff --git a/misc/kdepim3/patches/patch-an b/misc/kdepim3/patches/patch-an
deleted file mode 100644
index 029d305f1ca..00000000000
--- a/misc/kdepim3/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/07/15 21:04:07 markd Exp $
-
---- kalarm/dcophandler.cpp.orig	2006-07-09 08:22:05.120179000 +1200
-+++ kalarm/dcophandler.cpp
-@@ -479,7 +479,7 @@ bool DcopHandlerOld::process(const QCStr
- 	kdDebug(5950) << "DcopHandlerOld::process(): " << func << endl;
- 	enum
- 	{
--		ERR            = 0,
-+		ERRx            = 0,
- 		OPERATION      = 0x0007,    // mask for main operation
- 		  HANDLE       = 0x0001,
- 		  CANCEL       = 0x0002,