Update KDE to 3.1.2.

Changes:

kdeartwork:
* Fixed a potential printf() format string attack in the slideshow screensaver

kdepim:
* korganizer: Exchange plugin supports secure WebDAV.
* korganizer: Fix timezone handling when timezone names are Unicode strings.

kdeutils:
* kedit: Save immediately when Settings/Save Settings is called.
* khexedit: Fixed insertion of local files.

5 files changed, 19 insertions, 37 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index b9840b7c24c..69e07c3c9b3 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/22 02:57:12 markd Exp $
 
-DISTNAME=	kdepim-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdepim-3.1.2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 89de6dd4740..35e6125b768 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/03/11 13:22:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/05/22 02:57:13 markd Exp $
 bin/ical2vcal
 bin/kabc2mutt
 bin/kaddressbook
@@ -45,18 +45,12 @@ lib/kde3/kfile_vcf.la
 lib/kde3/kfile_vcf.so
 lib/kde3/libaddressconduit.la
 lib/kde3/libaddressconduit.so
-lib/kde3/libaddressconduit.so.0
-lib/kde3/libaddressconduit.so.0.0
 lib/kde3/libexpenseconduit.la
 lib/kde3/libexpenseconduit.so
-lib/kde3/libexpenseconduit.so.0
-lib/kde3/libexpenseconduit.so.0.0
 lib/kde3/libkaddressbookpart.la
 lib/kde3/libkaddressbookpart.so
 lib/kde3/libknotesconduit.la
 lib/kde3/libknotesconduit.so
-lib/kde3/libknotesconduit.so.0
-lib/kde3/libknotesconduit.so.0.0
 lib/kde3/libkorg_birthdays.la
 lib/kde3/libkorg_birthdays.so
 lib/kde3/libkorg_datenums.la
@@ -71,24 +65,14 @@ lib/kde3/libkorg_webexport.la
 lib/kde3/libkorg_webexport.so
 lib/kde3/libnullconduit.la
 lib/kde3/libnullconduit.so
-lib/kde3/libnullconduit.so.0
-lib/kde3/libnullconduit.so.0.0
 lib/kde3/libpopmailconduit.la
 lib/kde3/libpopmailconduit.so
-lib/kde3/libpopmailconduit.so.0
-lib/kde3/libpopmailconduit.so.0.0
 lib/kde3/libtimeconduit.la
 lib/kde3/libtimeconduit.so
-lib/kde3/libtimeconduit.so.0
-lib/kde3/libtimeconduit.so.0.0
 lib/kde3/libtodoconduit.la
 lib/kde3/libtodoconduit.so
-lib/kde3/libtodoconduit.so.0
-lib/kde3/libtodoconduit.so.0.0
 lib/kde3/libvcalconduit.la
 lib/kde3/libvcalconduit.so
-lib/kde3/libvcalconduit.so.0
-lib/kde3/libvcalconduit.so.0.0
 lib/libkalarmd.la
 lib/libkalarmd.so
 lib/libkalarmd.so.0
diff --git a/misc/kdepim3/buildlink2.mk b/misc/kdepim3/buildlink2.mk
index 42c66936e91..8ce7ec460da 100644
--- a/misc/kdepim3/buildlink2.mk
+++ b/misc/kdepim3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:54 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/22 02:57:13 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdepim.
 #
@@ -9,7 +9,7 @@
 KDEPIM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdepim
-BUILDLINK_DEPENDS.kdepim?=		kdepim>=3.1.1nb1
+BUILDLINK_DEPENDS.kdepim?=		kdepim>=3.1.2
 BUILDLINK_PKGSRCDIR.kdepim?=		../../misc/kdepim3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdepim=kdepim
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 8b2a60980b7..3ea1b79e214 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2003/04/01 12:27:10 markd Exp $
+$NetBSD: distinfo,v 1.11 2003/05/22 02:57:13 markd Exp $
 
-SHA1 (kdepim-3.1.1.tar.bz2) = f98479517f5fa6f9765db28b065637c361732702
-Size (kdepim-3.1.1.tar.bz2) = 3218417 bytes
-SHA1 (patch-ai) = bf8830cc013ffd5e28c3e888ef0a1c6f4f87ea89
+SHA1 (kdepim-3.1.2.tar.bz2) = c1f0666ca2a5dd12433df13ab530a05644c28b0f
+Size (kdepim-3.1.2.tar.bz2) = 3289340 bytes
+SHA1 (patch-ai) = c69ff8ba710838169de0deaaa2936c703deefd87
diff --git a/misc/kdepim3/patches/patch-ai b/misc/kdepim3/patches/patch-ai
index 6e475a64036..1c78b254002 100644
--- a/misc/kdepim3/patches/patch-ai
+++ b/misc/kdepim3/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2003/03/11 13:22:30 markd Exp $
+$NetBSD: patch-ai,v 1.4 2003/05/22 02:57:13 markd Exp $
 
---- configure.orig	Fri Jan 17 08:54:05 2003
+--- configure.orig	Thu May  8 00:10:34 2003
 +++ configure
-@@ -25661,65 +25661,6 @@ _ACEOF
+@@ -26272,64 +26272,6 @@ _ACEOF
  
  
  
@@ -10,14 +10,12 @@ $NetBSD: patch-ai,v 1.3 2003/03/11 13:22:30 markd Exp $
 -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
--#include "confdefs.h"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
 -int
 -main ()
 -{
@@ -46,7 +44,8 @@ $NetBSD: patch-ai,v 1.3 2003/03/11 13:22:30 markd Exp $
 -echo "${ECHO_T}yes" >&6
 -else
 -  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -
 -      echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6