diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 8d0c982c8ff0..a0da5d605ea5 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/15 11:12:40 markd Exp $
 
-DISTNAME=	kdeutils-3.1.4
+DISTNAME=	kdeutils-3.1.5
 COMMENT=	Utilities for the KDE integrated X11 desktop
-PKGREVISION=	2
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index e53a9e0685ee..7d8912f8119a 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.17 2003/12/27 14:35:16 mrg Exp $
+$NetBSD: distinfo,v 1.18 2004/01/15 11:12:40 markd Exp $
 
-SHA1 (kdeutils-3.1.4.tar.bz2) = 0658f1a744490fb456928b2ae41fd9be678cf509
-Size (kdeutils-3.1.4.tar.bz2) = 1382821 bytes
+SHA1 (kdeutils-3.1.5.tar.bz2) = 7f4e4994b5da6c9658151a292df641e7ff029316
+Size (kdeutils-3.1.5.tar.bz2) = 1379702 bytes
 SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
-SHA1 (patch-ab) = a06c6dfaf16a6c124311de61f5d1df96b22895db
+SHA1 (patch-ab) = 138e5b88d9f214b6a79adb2d09a2ef68d2eed699
 SHA1 (patch-ac) = a679be9fd652ca2df67f136ace4ad6cee43fffbd
 SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = 95753640a0b56790749393e0797cd99818cdfe14
+SHA1 (patch-af) = e367d9098321324391e0c36e64b21ebf71a623af
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
 SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
-SHA1 (patch-ak) = a910a9440175c9772c3932fe59fead5b532b1df3
+SHA1 (patch-ak) = 62ba7cf0217ccebbf9c1458b34420a735ee78f80
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
-SHA1 (patch-ao) = c68f205ab70cd6a5331c052b234c3fe7fb0ad411
+SHA1 (patch-ao) = 1357a3d4df4811e8af59e39ff755e6bf7543987a
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
index 91984188b284..51d13878be34 100644
--- a/misc/kdeutils3/patches/patch-ab
+++ b/misc/kdeutils3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/15 11:12:40 markd Exp $
 
---- kcalc/Makefile.in.orig	2003-07-15 22:19:24.000000000 +1200
+--- kcalc/Makefile.in.orig	2003-12-29 11:33:17.000000000 +1300
 +++ kcalc/Makefile.in
-@@ -272,22 +272,26 @@ x_includes = @x_includes@
+@@ -273,22 +273,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.6 2003/07/30 14:24:50 markd Exp $
  kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  pics_DATA = 
-@@ -305,37 +309,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -307,37 +311,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -356,14 +371,15 @@ CXXLD = $(CXX)
+@@ -358,14 +373,15 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -119,7 +119,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -410,6 +426,8 @@ clean-libLTLIBRARIES:
+@@ -412,6 +428,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)
@@ -128,7 +128,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -450,9 +468,10 @@ distclean-compile:
+@@ -452,9 +470,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlabel.Plo@am__quote@
@@ -140,16 +140,16 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
  
-@@ -593,7 +612,7 @@ distclean-tags:
+@@ -595,7 +614,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=configure.in.in version.h cr16-app-kcalc.png kcalc.desktop optiondialog.h ToDo cr32-app-kcalc.png kcalclogo.xpm cr48-app-kcalc.png 
 +KDE_DIST=version.h cr32-app-kcalc.png kcalclogo.xpm configure.in.in Makefile.in.rej kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -736,9 +755,6 @@ uninstall-am: uninstall-kde-icons  unins
+@@ -737,19 +756,16 @@ uninstall-am: uninstall-kde-icons  unins
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -159,39 +159,43 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 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:
-@@ -750,20 +766,20 @@ kcalc.moc: $(srcdir)/kcalc.h
- #>+ 1
- mocs: kcalc.moc
+ 
  #>+ 3
 -dlabel.moc: $(srcdir)/dlabel.h
 -	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
--
--#>+ 1
++kcalc.moc: $(srcdir)/kcalc.h
++	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
+ 
+ #>+ 1
 -mocs: dlabel.moc
--#>+ 3
++mocs: kcalc.moc
+ #>+ 3
  optiondialog.moc: $(srcdir)/optiondialog.h
  	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
- 
+@@ -757,14 +773,14 @@ optiondialog.moc: $(srcdir)/optiondialog
  #>+ 1
  mocs: optiondialog.moc
  #>+ 3
+-kcalc.moc: $(srcdir)/kcalc.h
+-	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
 +dlabel.moc: $(srcdir)/dlabel.h
 +	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
-+
-+#>+ 1
+ 
+ #>+ 1
+-mocs: kcalc.moc
 +mocs: dlabel.moc
-+#>+ 3
+ #>+ 3
  clean-metasources:
--	-rm -f  kcalc.moc dlabel.moc optiondialog.moc
+-	-rm -f  dlabel.moc optiondialog.moc kcalc.moc
 +	-rm -f  kcalc.moc optiondialog.moc dlabel.moc
  
  #>+ 2
  docs-am:
-@@ -790,33 +806,33 @@ force-reedit:
+@@ -791,33 +807,33 @@ force-reedit:
  
  
  #>+ 11
--kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  kcalc.moc dlabel.moc optiondialog.moc
+-kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  dlabel.moc kcalc.moc optiondialog.moc
 -	@echo 'creating kcalc_la.all_cpp.cpp ...'; \
 -	rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \
@@ -234,11 +238,16 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -829,6 +845,6 @@ kde-rpo-clean:
- optiondialog.o: optiondialog.moc 
- kcalc.lo: kcalc.moc 
- optiondialog.lo: optiondialog.moc 
+@@ -827,9 +843,9 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 7
+-kcalc.o: kcalc.moc 
 -dlabel.lo: dlabel.moc 
- kcalc.o: kcalc.moc 
+ optiondialog.o: optiondialog.moc 
+-optiondialog.lo: optiondialog.moc 
+ kcalc.lo: kcalc.moc 
++optiondialog.lo: optiondialog.moc 
++kcalc.o: kcalc.moc 
 +dlabel.lo: dlabel.moc 
  dlabel.o: dlabel.moc 
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
index 6f1079ede5fb..58bdc512b50c 100644
--- a/misc/kdeutils3/patches/patch-af
+++ b/misc/kdeutils3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
+$NetBSD: patch-af,v 1.6 2004/01/15 11:12:40 markd Exp $
 
---- kedit/Makefile.in.orig	2003-07-15 22:19:24.000000000 +1200
+--- kedit/Makefile.in.orig	2003-12-29 11:33:17.000000000 +1300
 +++ kedit/Makefile.in
-@@ -281,16 +281,20 @@ x_libraries = @x_libraries@
+@@ -282,16 +282,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kedit
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -314,34 +318,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -316,34 +320,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -87,7 +87,7 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 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
  
-@@ -363,7 +377,8 @@ CXXLD = $(CXX)
+@@ -365,7 +379,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -97,7 +97,7 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  DATA = $(apps_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -377,7 +392,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -379,7 +394,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
  	Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -106,7 +106,7 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -424,6 +439,8 @@ clean-libLTLIBRARIES:
+@@ -426,6 +441,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)
@@ -115,7 +115,7 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -463,8 +480,9 @@ mostlyclean-compile:
+@@ -465,8 +482,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -126,16 +126,16 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 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@
-@@ -670,7 +688,7 @@ distclean-tags:
+@@ -678,7 +696,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 
+-KDE_DIST=KEdit.desktop keditui.rc optionstate.h 
 +KDE_DIST=KEdit.desktop keditui.rc Makefile.in.rej optionstate.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -830,14 +848,17 @@ uninstall-info: uninstall-info-recursive
+@@ -838,19 +856,16 @@ uninstall-info: uninstall-info-recursive
  
  messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -147,36 +147,46 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  .NOEXPORT:
  
  #>+ 3
+-ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h
+-	$(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc
 +optiondialog.moc: $(srcdir)/optiondialog.h
 +	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
-+
-+#>+ 1
+ 
+ #>+ 1
+-mocs: ktextfiledlg.moc
 +mocs: optiondialog.moc
-+#>+ 3
+ #>+ 3
  mail.moc: $(srcdir)/mail.h
  	$(MOC) $(srcdir)/mail.h -o mail.moc
- 
-@@ -856,14 +877,8 @@ kedit.moc: $(srcdir)/kedit.h
+@@ -858,11 +873,11 @@ mail.moc: $(srcdir)/mail.h
  #>+ 1
- mocs: kedit.moc
+ mocs: mail.moc
  #>+ 3
 -optiondialog.moc: $(srcdir)/optiondialog.h
 -	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
--
--#>+ 1
++ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h
++	$(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc
+ 
+ #>+ 1
 -mocs: optiondialog.moc
--#>+ 3
++mocs: ktextfiledlg.moc
+ #>+ 3
+ kedit.moc: $(srcdir)/kedit.h
+ 	$(MOC) $(srcdir)/kedit.h -o kedit.moc
+@@ -871,7 +886,7 @@ kedit.moc: $(srcdir)/kedit.h
+ mocs: kedit.moc
+ #>+ 3
  clean-metasources:
--	-rm -f  mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc
+-	-rm -f  ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc
 +	-rm -f  optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc
  
  #>+ 2
  docs-am:
-@@ -876,33 +891,33 @@ force-reedit:
+@@ -884,33 +899,33 @@ force-reedit:
  
  
  #>+ 11
--kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp  mail.moc kedit.moc ktextfiledlg.moc optiondialog.moc
+-kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp  ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc
 -	@echo 'creating kedit_la.all_cpp.cpp ...'; \
 -	rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \
@@ -219,17 +229,20 @@ $NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -913,10 +928,10 @@ kde-rpo-clean:
+@@ -920,11 +935,11 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
  
  #>+ 9
+-kedit.o: kedit.moc 
+-ktextfiledlg.lo: ktextfiledlg.moc 
+-ktextfiledlg.o: ktextfiledlg.moc 
  optiondialog.o: optiondialog.moc 
--mail.o: mail.moc 
 +mail.lo: mail.moc 
  optiondialog.lo: optiondialog.moc 
-+mail.o: mail.moc 
- kedit.lo: kedit.moc 
--ktextfiledlg.lo: ktextfiledlg.moc 
- ktextfiledlg.o: ktextfiledlg.moc 
+-kedit.lo: kedit.moc 
+ mail.o: mail.moc 
 -mail.lo: mail.moc 
++kedit.lo: kedit.moc 
++ktextfiledlg.o: ktextfiledlg.moc 
 +ktextfiledlg.lo: ktextfiledlg.moc 
- kedit.o: kedit.moc 
++kedit.o: kedit.moc 
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index bcc05324d400..287d78b5218d 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
+$NetBSD: patch-ak,v 1.7 2004/01/15 11:12:40 markd Exp $
 
---- klaptopdaemon/Makefile.in.orig	2003-07-15 22:19:25.000000000 +1200
+--- klaptopdaemon/Makefile.in.orig	2003-12-29 11:33:18.000000000 +1300
 +++ klaptopdaemon/Makefile.in
 @@ -91,7 +91,7 @@ KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FAL
  KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  LIBCOMPAT = @LIBCOMPAT@
  LIBCRYPT = @LIBCRYPT@
  LIBDL = @LIBDL@
-@@ -271,20 +271,24 @@ target_os = @target_os@
+@@ -272,20 +272,24 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
@@ -41,7 +41,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
  	portable.cpp acpi_config.cpp
-@@ -311,49 +315,60 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
+@@ -313,49 +317,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)
@@ -122,7 +122,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 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 \
-@@ -378,7 +393,7 @@ CXXLD = $(CXX)
+@@ -380,7 +395,7 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
@@ -131,7 +131,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
  	ps-recursive install-info-recursive uninstall-info-recursive \
-@@ -387,7 +402,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -389,7 +404,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	check-recursive installcheck-recursive
  DIST_COMMON = README Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -140,7 +140,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -467,6 +482,8 @@ clean-libLTLIBRARIES:
+@@ -469,6 +484,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)
@@ -149,7 +149,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -509,7 +526,8 @@ distclean-compile:
+@@ -511,7 +528,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@
@@ -159,16 +159,16 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 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@
-@@ -685,7 +703,7 @@ distclean-tags:
+@@ -693,7 +711,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=laptop_daemon.h pcmcia.h acpi_config.h warning.h notify.h power.h configure.in.in version.h battery.h portable.h kpcmciainfo.h main.h kpcmcia.h daemondock.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 Makefile.in.rej kpcmcia.h laptop_daemon.h notify.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -851,9 +869,6 @@ uninstall-info: uninstall-info-recursive
+@@ -859,9 +877,6 @@ uninstall-info: uninstall-info-recursive
  messages:
  	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
  	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
@@ -178,81 +178,33 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 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:
-@@ -874,11 +889,23 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
- #>+ 1
- mocs: kpcmcia.moc
+@@ -876,17 +891,17 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O
+ 
+ 
  #>+ 3
--kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
--	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
+-pcmcia.moc: $(srcdir)/pcmcia.h
+-	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
++kpcmcia.moc: $(srcdir)/kpcmcia.h
++	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
+ 
+ #>+ 1
+-mocs: pcmcia.moc
++mocs: kpcmcia.moc
+ #>+ 3
+-battery.moc: $(srcdir)/battery.h
+-	$(MOC) $(srcdir)/battery.h -o battery.moc
 +pcmcia.moc: $(srcdir)/pcmcia.h
 +	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
  
  #>+ 1
--mocs: kpcmciainfo.moc
+-mocs: battery.moc
 +mocs: pcmcia.moc
-+#>+ 3
-+daemondock.moc: $(srcdir)/daemondock.h
-+	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
-+
-+#>+ 1
-+mocs: daemondock.moc
-+#>+ 3
-+notify.moc: $(srcdir)/notify.h
-+	$(MOC) $(srcdir)/notify.h -o notify.moc
-+
-+#>+ 1
-+mocs: notify.moc
  #>+ 3
- main.moc: $(srcdir)/main.h
- 	$(MOC) $(srcdir)/main.h -o main.moc
-@@ -886,17 +913,23 @@ main.moc: $(srcdir)/main.h
+ daemondock.moc: $(srcdir)/daemondock.h
+ 	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
+@@ -894,41 +909,35 @@ daemondock.moc: $(srcdir)/daemondock.h
  #>+ 1
- mocs: main.moc
- #>+ 3
-+kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-+	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
-+
-+#>+ 1
-+mocs: kpcmciainfo.moc
-+#>+ 3
- battery.moc: $(srcdir)/battery.h
- 	$(MOC) $(srcdir)/battery.h -o battery.moc
- 
- #>+ 1
- mocs: battery.moc
- #>+ 3
--daemondock.moc: $(srcdir)/daemondock.h
--	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
-+acpi_config.moc: $(srcdir)/acpi_config.h
-+	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
- 
- #>+ 1
--mocs: daemondock.moc
-+mocs: acpi_config.moc
- #>+ 3
- power.moc: $(srcdir)/power.h
- 	$(MOC) $(srcdir)/power.h -o power.moc
-@@ -910,32 +943,14 @@ warning.moc: $(srcdir)/warning.h
- #>+ 1
- mocs: warning.moc
- #>+ 3
--pcmcia.moc: $(srcdir)/pcmcia.h
--	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
--
--#>+ 1
--mocs: pcmcia.moc
--#>+ 3
--notify.moc: $(srcdir)/notify.h
--	$(MOC) $(srcdir)/notify.h -o notify.moc
--
--#>+ 1
--mocs: notify.moc
--#>+ 3
- laptop_daemon.moc: $(srcdir)/laptop_daemon.h
- 	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
- 
- #>+ 1
- mocs: laptop_daemon.moc
+ mocs: daemondock.moc
  #>+ 3
 -acpi_config.moc: $(srcdir)/acpi_config.h
 -	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
@@ -260,26 +212,92 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
 -#>+ 1
 -mocs: acpi_config.moc
 -#>+ 3
+-kpcmcia.moc: $(srcdir)/kpcmcia.h
+-	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
+-
+-#>+ 1
+-mocs: kpcmcia.moc
+-#>+ 3
+ notify.moc: $(srcdir)/notify.h
+ 	$(MOC) $(srcdir)/notify.h -o notify.moc
+ 
+ #>+ 1
+ mocs: notify.moc
+ #>+ 3
+-warning.moc: $(srcdir)/warning.h
+-	$(MOC) $(srcdir)/warning.h -o warning.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 1
+-mocs: warning.moc
++mocs: main.moc
+ #>+ 3
+-laptop_daemon.moc: $(srcdir)/laptop_daemon.h
+-	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
++kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
++	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
+ 
+ #>+ 1
+-mocs: laptop_daemon.moc
++mocs: kpcmciainfo.moc
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
++battery.moc: $(srcdir)/battery.h
++	$(MOC) $(srcdir)/battery.h -o battery.moc
+ 
+ #>+ 1
+-mocs: main.moc
++mocs: battery.moc
++#>+ 3
++acpi_config.moc: $(srcdir)/acpi_config.h
++	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
++
++#>+ 1
++mocs: acpi_config.moc
+ #>+ 3
+ power.moc: $(srcdir)/power.h
+ 	$(MOC) $(srcdir)/power.h -o power.moc
+@@ -936,14 +945,20 @@ power.moc: $(srcdir)/power.h
+ #>+ 1
+ mocs: power.moc
+ #>+ 3
+-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
+-	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
++warning.moc: $(srcdir)/warning.h
++	$(MOC) $(srcdir)/warning.h -o warning.moc
+ 
+ #>+ 1
+-mocs: kpcmciainfo.moc
++mocs: warning.moc
++#>+ 3
++laptop_daemon.moc: $(srcdir)/laptop_daemon.h
++	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
++
++#>+ 1
++mocs: laptop_daemon.moc
+ #>+ 3
  clean-metasources:
--	-rm -f  kpcmcia.moc kpcmciainfo.moc main.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc acpi_config.moc
+-	-rm -f  pcmcia.moc battery.moc daemondock.moc acpi_config.moc kpcmcia.moc notify.moc warning.moc laptop_daemon.moc main.moc power.moc kpcmciainfo.moc
 +	-rm -f  kpcmcia.moc pcmcia.moc daemondock.moc notify.moc main.moc kpcmciainfo.moc battery.moc acpi_config.moc power.moc warning.moc laptop_daemon.moc
  
  #>+ 3
  clean-closures:
-@@ -952,7 +967,7 @@ force-reedit:
+@@ -960,7 +975,7 @@ force-reedit:
  
  
  #>+ 11
--kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  battery.moc pcmcia.moc warning.moc power.moc acpi_config.moc main.moc
+-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc battery.moc acpi_config.moc warning.moc main.moc power.moc
 +kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc main.moc battery.moc acpi_config.moc warning.moc power.moc
  	@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; \
-@@ -964,33 +979,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
+@@ -972,33 +987,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
  	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
  
  #>+ 11
--klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc acpi_config.moc
+-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc acpi_config.moc kpcmcia.moc notify.moc laptop_daemon.moc kpcmciainfo.moc
 -	@echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \
 -	rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \
@@ -322,43 +340,45 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1001,24 +1016,24 @@ kde-rpo-clean:
+@@ -1008,25 +1023,25 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
  
  #>+ 23
- kpcmcia.o: kpcmcia.moc 
--battery.lo: battery.moc 
--main.lo: main.moc 
--notify.o: notify.moc 
--pcmcia.lo: pcmcia.moc 
- kpcmcia.lo: kpcmcia.moc 
--main.o: main.moc 
 -laptop_daemon.lo: laptop_daemon.moc 
-+laptop_daemon.o: laptop_daemon.moc 
-+notify.o: notify.moc 
- power.o: power.moc 
 -daemondock.o: daemondock.moc 
--power.lo: power.moc 
- notify.lo: notify.moc 
--battery.o: battery.moc 
 -pcmcia.o: pcmcia.moc 
-+warning.lo: warning.moc 
+-kpcmciainfo.lo: kpcmciainfo.moc 
+-battery.lo: battery.moc 
+-power.o: power.moc 
++kpcmcia.o: kpcmcia.moc 
++kpcmcia.lo: kpcmcia.moc 
++laptop_daemon.o: laptop_daemon.moc 
+ notify.o: notify.moc 
+-power.lo: power.moc 
+-daemondock.lo: daemondock.moc 
+-pcmcia.lo: pcmcia.moc 
++power.o: power.moc 
++notify.lo: notify.moc 
+ warning.lo: warning.moc 
+-kpcmcia.o: kpcmcia.moc 
+-kpcmciainfo.o: kpcmciainfo.moc 
 +warning.o: warning.moc 
  acpi_config.lo: acpi_config.moc 
--daemondock.lo: daemondock.moc 
-+main.lo: main.moc 
+ main.lo: main.moc 
 +laptop_daemon.lo: laptop_daemon.moc 
 +kpcmciainfo.o: kpcmciainfo.moc 
 +battery.o: battery.moc 
  acpi_config.o: acpi_config.moc 
+-notify.lo: notify.moc 
 -warning.o: warning.moc 
 +pcmcia.lo: pcmcia.moc 
 +battery.lo: battery.moc 
 +daemondock.lo: daemondock.moc 
 +daemondock.o: daemondock.moc 
 +pcmcia.o: pcmcia.moc 
-+main.o: main.moc 
- kpcmciainfo.lo: kpcmciainfo.moc 
+ main.o: main.moc 
+-battery.o: battery.moc 
+-kpcmcia.lo: kpcmcia.moc 
 -laptop_daemon.o: laptop_daemon.moc 
--warning.lo: warning.moc 
--kpcmciainfo.o: kpcmciainfo.moc 
++kpcmciainfo.lo: kpcmciainfo.moc 
 +power.lo: power.moc 
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index b830b7f7c11e..14109e581c4c 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,15 +1,15 @@
-$NetBSD: patch-ao,v 1.6 2003/09/17 23:41:37 markd Exp $
+$NetBSD: patch-ao,v 1.7 2004/01/15 11:12:40 markd Exp $
 
---- configure.orig	2003-09-10 14:39:36.000000000 +1200
+--- configure.orig	2003-12-17 13:58:48.000000000 +1300
 +++ configure
-@@ -26414,62 +26414,6 @@ _ACEOF
+@@ -26231,62 +26231,6 @@ _ACEOF
  
  
  
 -  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
 -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
+-/* #line $LINENO "configure" */
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext