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.

23 files changed, 174 insertions, 171 deletions

diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 7d1ffd6b949..650940939fa 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/22 02:57:10 markd Exp $
 
-DISTNAME=	kdeaddons-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeaddons-3.1.2
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index c15b705d85a..9817e485278 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/04/01 12:27:08 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/05/22 02:57:10 markd Exp $
 
-SHA1 (kdeaddons-3.1.1.tar.bz2) = 5f6c61e910025f1c646da80b102b717813a26cbf
-Size (kdeaddons-3.1.1.tar.bz2) = 1080706 bytes
+SHA1 (kdeaddons-3.1.2.tar.bz2) = 7f4f9d9ce036d64d1d1e9ed84e942d71863cc2d4
+Size (kdeaddons-3.1.2.tar.bz2) = 1079412 bytes
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index f9fc86b0419..a5db691946c 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/22 02:57:11 markd Exp $
 
-DISTNAME=	kdeadmin-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeadmin-3.1.2
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo
index 2afaa1246b3..641363180bd 100644
--- a/misc/kdeadmin3/distinfo
+++ b/misc/kdeadmin3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/05/05 12:19:17 markd Exp $
+$NetBSD: distinfo,v 1.9 2003/05/22 02:57:11 markd Exp $
 
-SHA1 (kdeadmin-3.1.1.tar.bz2) = 69fa9e9813d4c2e040ac7214eb1e8548d703c9f3
-Size (kdeadmin-3.1.1.tar.bz2) = 1563569 bytes
+SHA1 (kdeadmin-3.1.2.tar.bz2) = 4d51d828e951ace62f227eb281c7a9bbd4594b12
+Size (kdeadmin-3.1.2.tar.bz2) = 1557029 bytes
 SHA1 (patch-aa) = dd70a532b1ad09a58c59f4a7e2e2cff13484d023
 SHA1 (patch-ab) = fc8bbc150fd692be3e31d626439963899b0e5519
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 1543a6dd64c..3bfa0a622b6 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/22 02:57:11 markd Exp $
 
-DISTNAME=	kdeartwork-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeartwork-3.1.2
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo
index 2a65db7bead..18558bff57f 100644
--- a/misc/kdeartwork3/distinfo
+++ b/misc/kdeartwork3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/04/01 12:27:09 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/05/22 02:57:11 markd Exp $
 
-SHA1 (kdeartwork-3.1.1.tar.bz2) = 83e702abb23110ff542a29038fd0b0944cdd1cf3
-Size (kdeartwork-3.1.1.tar.bz2) = 13841579 bytes
-SHA1 (patch-aa) = 67ca2b9718e29c22773ea94ed88e50ab7bf6e708
+SHA1 (kdeartwork-3.1.2.tar.bz2) = 4c051cf1d0be9e653f080f1e74b762f2def7d12f
+Size (kdeartwork-3.1.2.tar.bz2) = 13854609 bytes
+SHA1 (patch-aa) = 03e56d80ae4d4d7588b93f6dc6a7e47d78d4018d
diff --git a/misc/kdeartwork3/patches/patch-aa b/misc/kdeartwork3/patches/patch-aa
index 0a50af6e874..38b129ca42e 100644
--- a/misc/kdeartwork3/patches/patch-aa
+++ b/misc/kdeartwork3/patches/patch-aa
@@ -1,13 +1,41 @@
-$NetBSD: patch-aa,v 1.1 2003/03/11 13:22:23 markd Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/22 02:57:12 markd Exp $
 
---- configure.orig	Tue Feb  4 01:11:07 2003
+--- configure.orig	Thu May  8 00:13:17 2003
 +++ configure
-@@ -24320,7 +24320,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
- XSCREENSAVER_HACKS_DIR=
- 
- if test "$XSCREENSAVER" != "NO"; then
--   hackdir=`echo $XSCREENSAVER | sed -e "s,/bin/xscreensaver,/lib/xscreensaver,"`
-+   hackdir=`echo $XSCREENSAVER | sed -e "s,/bin/xscreensaver,/libexec/xscreensaver,"`
-    echo "$as_me:$LINENO: checking for $hackdir/flame" >&5
- echo $ECHO_N "checking for $hackdir/flame... $ECHO_C" >&6
-    if test -x $hackdir/flame; then
+@@ -24849,12 +24849,12 @@ done
+ IFS=$old_IFS
+ 
+ 
+-   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
+-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
++   echo "$as_me:$LINENO: checking for libexec/xscreensaver/flame" >&5
++echo $ECHO_N "checking for libexec/xscreensaver/flame... $ECHO_C" >&6
+    if test -n "$XSCREENSAVER"; then
+         kde_cv_path="$XSCREENSAVER";
+    else
+-        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
++        kde_cache=`echo libexec/xscreensaver/flame | sed 'y%./+-%__p_%'`
+ 
+         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24870,16 +24870,16 @@ else
+ 	IFS=$kde_save_IFS
+ 
+         for dir in $dirs; do
+-	  if test -x "$dir/lib/xscreensaver/flame"; then
++	  if test -x "$dir/libexec/xscreensaver/flame"; then
+ 	    if test -n ""
+ 	    then
+-              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
++              evalstr="$dir/libexec/xscreensaver/flame  2>&1 "
+ 	      if eval $evalstr; then
+-                kde_cv_path="$dir/lib/xscreensaver/flame"
++                kde_cv_path="$dir/libexec/xscreensaver/flame"
+                 break
+ 	      fi
+             else
+-		kde_cv_path="$dir/lib/xscreensaver/flame"
++		kde_cv_path="$dir/libexec/xscreensaver/flame"
+                 break
+ 	    fi
+           fi
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index e3cc8f1725f..049a1bd5b4a 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/22 02:57:12 markd Exp $
 
-DISTNAME=	kdeedu-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeedu-3.1.2
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeedu3/PLIST b/misc/kdeedu3/PLIST
index 32010c22832..bdb39097f14 100644
--- a/misc/kdeedu3/PLIST
+++ b/misc/kdeedu3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/11 13:22:23 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/22 02:57:12 markd Exp $
 bin/flashkard
 bin/kalzium
 bin/keduca
@@ -908,6 +908,7 @@ share/kde/apps/kstars/venus.R3.vsop
 share/kde/apps/kstars/venus.R4.vsop
 share/kde/apps/kstars/venus.R5.vsop
 share/kde/apps/kstars/venus.png
+share/kde/apps/ktouch/danish-2.ktouch
 share/kde/apps/ktouch/danish.ktouch
 share/kde/apps/ktouch/de-ch.keyboard
 share/kde/apps/ktouch/de.keyboard
@@ -920,9 +921,12 @@ share/kde/apps/ktouch/english.ktouch
 share/kde/apps/ktouch/es.keyboard
 share/kde/apps/ktouch/fi.keyboard
 share/kde/apps/ktouch/fr.keyboard
+share/kde/apps/ktouch/fr_ch.keyboard
 share/kde/apps/ktouch/french-2.ktouch
 share/kde/apps/ktouch/french.ktouch
+share/kde/apps/ktouch/german-2.ktouch
 share/kde/apps/ktouch/german.ktouch
+share/kde/apps/ktouch/he.keyboard
 share/kde/apps/ktouch/it.keyboard
 share/kde/apps/ktouch/ktouchui.rc
 share/kde/apps/ktouch/la.keyboard
@@ -930,8 +934,10 @@ share/kde/apps/ktouch/no.keyboard
 share/kde/apps/ktouch/norwegian.ktouch
 share/kde/apps/ktouch/number.keyboard
 share/kde/apps/ktouch/number.ktouch
+share/kde/apps/ktouch/portuguese.ktouch
 share/kde/apps/ktouch/pt.keyboard
 share/kde/apps/ktouch/se.keyboard
+share/kde/apps/ktouch/spanish.ktouch
 share/kde/apps/ktouch/splash.png
 share/kde/apps/ktouch/up.wav
 share/kde/apps/kverbos/kverbosui.rc
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index a0950f85060..2889f7e17f7 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/04/01 12:27:10 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/05/22 02:57:12 markd Exp $
 
-SHA1 (kdeedu-3.1.1.tar.bz2) = e89fef00721af4362882c770d5a4ddf9a0504ce2
-Size (kdeedu-3.1.1.tar.bz2) = 19968353 bytes
+SHA1 (kdeedu-3.1.2.tar.bz2) = d961c79482abf428f86ee4a8b07bd81d070a05e1
+Size (kdeedu-3.1.2.tar.bz2) = 20028913 bytes
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
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 79b3d0559e5..8680755cb67 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:55 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/22 02:57:13 markd Exp $
 
-DISTNAME=	kdeutils-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeutils-3.1.2
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 CONFLICTS=	efax-[0-9]*
diff --git a/misc/kdeutils3/buildlink2.mk b/misc/kdeutils3/buildlink2.mk
index f2372558eef..6d9e767eb85 100644
--- a/misc/kdeutils3/buildlink2.mk
+++ b/misc/kdeutils3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:55 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/22 02:57:13 markd Exp $
 #
 # This Makefile fragment is included by packages that use kdeutils.
 #
@@ -9,7 +9,7 @@
 KDEUTILS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdeutils
-BUILDLINK_DEPENDS.kdeutils?=		kdeutils>=3.1.1nb1
+BUILDLINK_DEPENDS.kdeutils?=		kdeutils>=3.1.2
 BUILDLINK_PKGSRCDIR.kdeutils?=		../../misc/kdeutils3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdeutils=kdeutils
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index d45f2edbf8e..84f2fb667b8 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.13 2003/04/01 12:27:10 markd Exp $
+$NetBSD: distinfo,v 1.14 2003/05/22 02:57:13 markd Exp $
 
-SHA1 (kdeutils-3.1.1.tar.bz2) = bc539da0ae28a4fba1f3a760a6160206125c04bc
-Size (kdeutils-3.1.1.tar.bz2) = 1372307 bytes
+SHA1 (kdeutils-3.1.2.tar.bz2) = a993c2344e36e80f082f11343268df019a1b3c7c
+Size (kdeutils-3.1.2.tar.bz2) = 1377277 bytes
 SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
-SHA1 (patch-ab) = cb92ee33598ddc88f4c208643d30eec7fe1939e3
-SHA1 (patch-ac) = 82f07ddce0b787e8b66a968be94fda88936315eb
+SHA1 (patch-ab) = 2d1eff6d877e244ec8609727475f2d81c2235703
+SHA1 (patch-ac) = a679be9fd652ca2df67f136ace4ad6cee43fffbd
 SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = afde2d8744a38ed54d2c864708f3aa3b60a5b850
+SHA1 (patch-af) = fcf330e06f925fb73cff9574cdd0ae92d475297e
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
 SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
-SHA1 (patch-ak) = 1467f9378baa739ea44bfa064975623c3d458c19
+SHA1 (patch-ak) = 7f6e6e1a8be841a7b9a7463f09381636dcee516f
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
-SHA1 (patch-ao) = ea325f7a07260a8a7277aa9b040bb92d4f0d916c
+SHA1 (patch-ao) = 1b7b84805b05bb13a39c7b730bd465835322841c
 SHA1 (patch-ap) = 7938c4a33fa178740b0d2f704f4aab1b693ee112
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
index 4746b59638c..2df6cfb54f8 100644
--- a/misc/kdeutils3/patches/patch-ab
+++ b/misc/kdeutils3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
+$NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 markd Exp $
 
---- kcalc/Makefile.in.orig	Fri Jan 17 08:58:06 2003
+--- kcalc/Makefile.in.orig	Thu May  8 00:08:45 2003
 +++ kcalc/Makefile.in
-@@ -247,22 +247,26 @@ x_includes = @x_includes@
+@@ -271,22 +271,26 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  AM_CPPFLAGS = -D_GNU_SOURCE -D_ISOC99_SOURCE
  bin_PROGRAMS = kcalc
@@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  pics_DATA = 
-@@ -280,24 +284,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -304,37 +308,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -73,10 +73,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
 +kcalc_OBJECTS = kcalc_main.$(OBJEXT)
 +kcalc_DEPENDENCIES = libkcalc_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -306,15 +315,21 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
 -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dlabel.Plo ./$(DEPDIR)/dummy.Po \
@@ -104,10 +101,10 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -336,14 +351,15 @@ CXXLD = $(CXX)
+@@ -355,14 +370,15 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
 +DIST_SOURCES = $(kcalc_la_SOURCES) $(libkcalc_main_la_SOURCES) \
 +	$(kcalc_SOURCES)
@@ -122,7 +119,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -390,6 +406,8 @@ clean-libLTLIBRARIES:
+@@ -409,6 +425,8 @@ clean-libLTLIBRARIES:
  	done
  kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS)
@@ -131,7 +128,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -430,9 +448,10 @@ distclean-compile:
+@@ -449,9 +467,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlabel.Plo@am__quote@
@@ -143,16 +140,16 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
  
-@@ -541,7 +560,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -592,7 +611,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=cr32-app-kcalc.png cr48-app-kcalc.png optiondialog.h kcalc.desktop kcalclogo.xpm configure.in.in cr16-app-kcalc.png ToDo version.h 
-+KDE_DIST=version.h cr32-app-kcalc.png Makefile.am.rej kcalclogo.xpm configure.in.in kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo 
++KDE_DIST=version.h cr32-app-kcalc.png kcalclogo.xpm configure.in.in kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -670,9 +689,6 @@ uninstall-am: uninstall-kde-icons  unins
+@@ -735,9 +754,6 @@ uninstall-am: uninstall-kde-icons  unins
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -162,7 +159,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -682,16 +698,16 @@ kcalc.moc: $(srcdir)/kcalc.h
+@@ -747,16 +763,16 @@ kcalc.moc: $(srcdir)/kcalc.h
  	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
  
  #>+ 3
@@ -184,7 +181,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -718,33 +734,33 @@ force-reedit:
+@@ -783,33 +799,33 @@ force-reedit:
  
  
  #>+ 11
@@ -231,7 +228,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:22:31 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -757,6 +773,6 @@ kde-rpo-clean:
+@@ -822,6 +838,6 @@ kde-rpo-clean:
  optiondialog.o: optiondialog.moc 
  kcalc.lo: kcalc.moc 
  optiondialog.lo: optiondialog.moc 
diff --git a/misc/kdeutils3/patches/patch-ac b/misc/kdeutils3/patches/patch-ac
index 1f29403fb91..b43e5df9e37 100644
--- a/misc/kdeutils3/patches/patch-ac
+++ b/misc/kdeutils3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2003/03/11 13:22:31 markd Exp $
+$NetBSD: patch-ac,v 1.3 2003/05/22 02:57:14 markd Exp $
 
---- kcalc/kcalc.cpp.orig	Fri Jan  3 18:07:36 2003
+--- kcalc/kcalc.cpp.orig	Wed May  7 23:48:58 2003
 +++ kcalc/kcalc.cpp
-@@ -2320,7 +2320,9 @@ bool QtCalculator::eventFilter(QObject *
+@@ -2324,7 +2324,9 @@ bool QtCalculator::eventFilter(QObject *
  //-------------------------------------------------------------------------
  // Name: main(int argc, char *argv[])
  //-------------------------------------------------------------------------
@@ -12,4 +12,4 @@ $NetBSD: patch-ac,v 1.2 2003/03/11 13:22:31 markd Exp $
 +int kdemain(int argc, char *argv[])
  {
          QString precisionStatement;
-         
+ 
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
index b3e5deaf1d7..e1ab8e90bbd 100644
--- a/misc/kdeutils3/patches/patch-af
+++ b/misc/kdeutils3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
+$NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
 
---- kedit/Makefile.in.orig	Fri Jan 17 08:58:06 2003
+--- kedit/Makefile.in.orig	Thu May  8 00:08:45 2003
 +++ kedit/Makefile.in
-@@ -256,16 +256,20 @@ x_libraries = @x_libraries@
+@@ -280,16 +280,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kedit
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -289,22 +293,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -313,34 +317,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -66,10 +66,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
 +kedit_OBJECTS = kedit_main.$(OBJEXT)
 +kedit_DEPENDENCIES = libkedit_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -313,14 +324,17 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
 -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
@@ -90,17 +87,17 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo
  
-@@ -343,7 +357,8 @@ CXXLD = $(CXX)
+@@ -362,7 +376,8 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
 +DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \
 +	$(kedit_SOURCES)
  DATA = $(apps_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -356,7 +371,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -376,7 +391,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
  	Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -109,7 +106,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -403,6 +418,8 @@ clean-libLTLIBRARIES:
+@@ -423,6 +438,8 @@ clean-libLTLIBRARIES:
  	done
  kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS)
@@ -118,7 +115,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -442,8 +459,9 @@ mostlyclean-compile:
+@@ -462,8 +479,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -129,8 +126,8 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktextfiledlg.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
-@@ -613,7 +631,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -669,7 +687,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=optionstate.h keditui.rc KEdit.desktop 
@@ -138,7 +135,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -758,14 +776,15 @@ uninstall-info: uninstall-info-recursive
+@@ -829,14 +847,15 @@ uninstall-info: uninstall-info-recursive
  
  messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -157,7 +154,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  mail.moc: $(srcdir)/mail.h
  	$(MOC) $(srcdir)/mail.h -o mail.moc
  
-@@ -778,12 +797,8 @@ kedit.moc: $(srcdir)/kedit.h
+@@ -849,12 +868,8 @@ kedit.moc: $(srcdir)/kedit.h
  	$(MOC) $(srcdir)/kedit.h -o kedit.moc
  
  #>+ 3
@@ -171,7 +168,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -796,33 +811,33 @@ force-reedit:
+@@ -867,33 +882,33 @@ force-reedit:
  
  
  #>+ 11
@@ -218,7 +215,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -833,10 +848,10 @@ kde-rpo-clean:
+@@ -904,10 +919,10 @@ kde-rpo-clean:
  
  #>+ 9
  optiondialog.o: optiondialog.moc 
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index 3b65505b3b5..140f87ff29c 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,9 +1,18 @@
-$NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
+$NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 markd Exp $
 
---- klaptopdaemon/Makefile.in.orig	Fri Jan 17 08:58:07 2003
+--- klaptopdaemon/Makefile.in.orig	Thu May  8 00:08:46 2003
 +++ klaptopdaemon/Makefile.in
-@@ -245,20 +245,24 @@ qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
+@@ -91,7 +91,7 @@ KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FAL
+ KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
+ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
+ 
+-LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
++LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
+ LIBCOMPAT = @LIBCOMPAT@
+ LIBCRYPT = @LIBCRYPT@
+ LIBDL = @LIBDL@
+@@ -270,20 +270,24 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
 -lib_LTLIBRARIES = klaptopdaemon.la
@@ -32,16 +41,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
  	portable.cpp acpi_config.cpp
-@@ -268,7 +272,7 @@ kcm_laptop_la_LIBADD = $(LIB_KFILE)
- 
- INCLUDES = $(all_includes)
- 
--LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
- 
- #>- kcm_laptop_la_METASOURCES = AUTO
- subdir = klaptopdaemon
-@@ -287,24 +291,32 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
+@@ -310,49 +314,60 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
  	warning.lo portable.lo acpi_config.lo
  @KDE_USE_FINAL_FALSE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS)
@@ -84,9 +84,8 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
 +klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
 +klaptopdaemon_DEPENDENCIES = libklaptopdaemon_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -314,25 +326,28 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi_config.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
@@ -123,17 +122,17 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
-@@ -358,7 +373,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -377,7 +392,7 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
 -	$(klaptopdaemon_SOURCES)
 +	$(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
  
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- 	uninstall-info-recursive all-recursive install-data-recursive \
-@@ -366,7 +381,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+ 	ps-recursive install-info-recursive uninstall-info-recursive \
+@@ -386,7 +401,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = README Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(klaptopdaemon_SOURCES)
@@ -141,7 +140,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -446,6 +461,8 @@ clean-libLTLIBRARIES:
+@@ -466,6 +481,8 @@ clean-libLTLIBRARIES:
  	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS)
  klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS)
@@ -150,7 +149,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -488,7 +505,8 @@ distclean-compile:
+@@ -508,7 +525,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi_config.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battery.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemondock.Plo@am__quote@
@@ -160,16 +159,16 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpcmcia.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kpcmciainfo.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/laptop_daemon.Plo@am__quote@
-@@ -628,7 +646,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -684,7 +702,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h acpi_config.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h 
-+KDE_DIST=power.h Makefile.am.rej warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h kpcmcia.h laptop_daemon.h notify.h 
++KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h kpcmcia.h laptop_daemon.h notify.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -778,9 +796,6 @@ uninstall-info: uninstall-info-recursive
+@@ -850,9 +868,6 @@ uninstall-info: uninstall-info-recursive
  messages:
  	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
  	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
@@ -179,7 +178,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-@@ -799,20 +814,32 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
+@@ -871,20 +886,32 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
  	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
  
  #>+ 3
@@ -216,7 +215,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  
  #>+ 3
  power.moc: $(srcdir)/power.h
-@@ -823,24 +850,12 @@ warning.moc: $(srcdir)/warning.h
+@@ -895,24 +922,12 @@ warning.moc: $(srcdir)/warning.h
  	$(MOC) $(srcdir)/warning.h -o warning.moc
  
  #>+ 3
@@ -242,7 +241,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -857,7 +872,7 @@ force-reedit:
+@@ -929,7 +944,7 @@ force-reedit:
  
  
  #>+ 11
@@ -251,7 +250,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  	@echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \
  	rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \
-@@ -869,33 +884,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
+@@ -941,33 +956,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
  	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
  
  #>+ 11
@@ -298,7 +297,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:22:32 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -906,24 +921,24 @@ kde-rpo-clean:
+@@ -978,24 +993,24 @@ kde-rpo-clean:
  
  #>+ 23
  kpcmcia.o: kpcmcia.moc 
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index b941c2a8096..4ae61d758d9 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2003/03/11 13:22:32 markd Exp $
+$NetBSD: patch-ao,v 1.4 2003/05/22 02:57:14 markd Exp $
 
---- configure.orig	Fri Jan 17 08:58:13 2003
+--- configure.orig	Thu May  8 00:08:48 2003
 +++ configure
-@@ -25795,63 +25795,6 @@ _ACEOF
+@@ -26402,62 +26402,6 @@ _ACEOF
  
  
  
@@ -10,14 +10,12 @@ $NetBSD: patch-ao,v 1.3 2003/03/11 13:22:32 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-ao,v 1.3 2003/03/11 13:22:32 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