Update kdeutils to 3.1.3.

Changes:
* kcalc: ignore keypresses combined with alt, Meta or Control
* kjots: Fix DnD issues
* kedit: correct overwrite/insert handling
* kedit: fix session management
* ark: fix .rar archive handling.
* klaptopdaemon: icon updates.
* kdf: fix handling of mountpoints with whitespaces
* build system fixes

7 files changed, 110 insertions, 72 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index e0a7e6fd329..94144525d50 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/07/13 13:52:43 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/07/30 14:24:49 markd Exp $
 
-DISTNAME=	kdeutils-3.1.2
-PKGREVISION=	1
+DISTNAME=	kdeutils-3.1.3
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
-.include "../../x11/kde3/Makefile.kde3"
+.include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
@@ -25,9 +24,9 @@ FOO_MAIN_FILES= \
 	kedit/kedit_main.cpp \
 	klaptopdaemon/klaptopdaemon_main.cpp
 
-.include "../../x11/kde3/Makefile.foo_main"
+.include "../../meta-pkgs/kde3/Makefile.foo_main"
 
-.include "../../x11/kde3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index 539f738bd5a..fec7a978972 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/11 13:22:30 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/07/30 14:24:49 markd Exp $
 bin/ark
 bin/kcalc
 bin/kcharselect
@@ -192,6 +192,10 @@ share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
 share/kde/apps/konqueror/servicemenus/arkservicemenu.desktop
 share/kde/apps/kregexpeditor/pics/altn.png
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 84f2fb667b8..3f35cfb68fe 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.14 2003/05/22 02:57:13 markd Exp $
+$NetBSD: distinfo,v 1.15 2003/07/30 14:24:49 markd Exp $
 
-SHA1 (kdeutils-3.1.2.tar.bz2) = a993c2344e36e80f082f11343268df019a1b3c7c
-Size (kdeutils-3.1.2.tar.bz2) = 1377277 bytes
+SHA1 (kdeutils-3.1.3.tar.bz2) = 22931f0d8b0b68e15298ac6e4c705847a74dbe69
+Size (kdeutils-3.1.3.tar.bz2) = 1382661 bytes
 SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
-SHA1 (patch-ab) = 2d1eff6d877e244ec8609727475f2d81c2235703
+SHA1 (patch-ab) = a06c6dfaf16a6c124311de61f5d1df96b22895db
 SHA1 (patch-ac) = a679be9fd652ca2df67f136ace4ad6cee43fffbd
 SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = fcf330e06f925fb73cff9574cdd0ae92d475297e
+SHA1 (patch-af) = 95753640a0b56790749393e0797cd99818cdfe14
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
 SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
-SHA1 (patch-ak) = 7f6e6e1a8be841a7b9a7463f09381636dcee516f
+SHA1 (patch-ak) = a910a9440175c9772c3932fe59fead5b532b1df3
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
-SHA1 (patch-ao) = 1b7b84805b05bb13a39c7b730bd465835322841c
+SHA1 (patch-ao) = edc0a6cf7f73889dbfea0525ffe5cf3d76f58baf
 SHA1 (patch-ap) = 7938c4a33fa178740b0d2f704f4aab1b693ee112
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
index 2df6cfb54f8..91984188b28 100644
--- a/misc/kdeutils3/patches/patch-ab
+++ b/misc/kdeutils3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 markd Exp $
+$NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
 
---- kcalc/Makefile.in.orig	Thu May  8 00:08:45 2003
+--- kcalc/Makefile.in.orig	2003-07-15 22:19:24.000000000 +1200
 +++ kcalc/Makefile.in
-@@ -271,22 +271,26 @@ x_includes = @x_includes@
+@@ -272,22 +272,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.5 2003/05/22 02:57:14 markd Exp $
  kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  pics_DATA = 
-@@ -304,37 +308,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -305,37 +309,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -101,7 +101,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -355,14 +370,15 @@ CXXLD = $(CXX)
+@@ -356,14 +371,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.5 2003/05/22 02:57:14 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -409,6 +425,8 @@ clean-libLTLIBRARIES:
+@@ -410,6 +426,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.5 2003/05/22 02:57:14 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -449,9 +467,10 @@ distclean-compile:
+@@ -450,9 +468,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.5 2003/05/22 02:57:14 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
  
-@@ -592,7 +611,7 @@ distclean-tags:
+@@ -593,7 +612,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 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 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)
  
-@@ -735,9 +754,6 @@ uninstall-am: uninstall-kde-icons  unins
+@@ -736,9 +755,6 @@ uninstall-am: uninstall-kde-icons  unins
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -159,21 +159,27 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 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:
-@@ -747,16 +763,16 @@ kcalc.moc: $(srcdir)/kcalc.h
- 	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
- 
+@@ -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
+-mocs: dlabel.moc
 -#>+ 3
  optiondialog.moc: $(srcdir)/optiondialog.h
  	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
  
+ #>+ 1
+ mocs: optiondialog.moc
  #>+ 3
 +dlabel.moc: $(srcdir)/dlabel.h
 +	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
 +
++#>+ 1
++mocs: dlabel.moc
 +#>+ 3
  clean-metasources:
 -	-rm -f  kcalc.moc dlabel.moc optiondialog.moc
@@ -181,7 +187,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -783,33 +799,33 @@ force-reedit:
+@@ -790,33 +806,33 @@ force-reedit:
  
  
  #>+ 11
@@ -228,7 +234,7 @@ $NetBSD: patch-ab,v 1.5 2003/05/22 02:57:14 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -822,6 +838,6 @@ kde-rpo-clean:
+@@ -829,6 +845,6 @@ kde-rpo-clean:
  optiondialog.o: optiondialog.moc 
  kcalc.lo: kcalc.moc 
  optiondialog.lo: optiondialog.moc 
diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af
index e1ab8e90bbd..6f1079ede5f 100644
--- a/misc/kdeutils3/patches/patch-af
+++ b/misc/kdeutils3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
+$NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
 
---- kedit/Makefile.in.orig	Thu May  8 00:08:45 2003
+--- kedit/Makefile.in.orig	2003-07-15 22:19:24.000000000 +1200
 +++ kedit/Makefile.in
-@@ -280,16 +280,20 @@ x_libraries = @x_libraries@
+@@ -281,16 +281,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kedit
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
  kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -313,34 +317,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -314,34 +318,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -87,7 +87,7 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 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
  
-@@ -362,7 +376,8 @@ CXXLD = $(CXX)
+@@ -363,7 +377,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.4 2003/05/22 02:57:14 markd Exp $
  DATA = $(apps_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -376,7 +391,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -377,7 +392,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.4 2003/05/22 02:57:14 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -423,6 +438,8 @@ clean-libLTLIBRARIES:
+@@ -424,6 +439,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.4 2003/05/22 02:57:14 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -462,8 +479,9 @@ mostlyclean-compile:
+@@ -463,8 +480,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -126,16 +126,16 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 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@
-@@ -669,7 +687,7 @@ distclean-tags:
+@@ -670,7 +688,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)
  
-@@ -829,14 +847,15 @@ uninstall-info: uninstall-info-recursive
+@@ -830,14 +848,17 @@ uninstall-info: uninstall-info-recursive
  
  messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -150,17 +150,21 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
 +optiondialog.moc: $(srcdir)/optiondialog.h
 +	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
 +
++#>+ 1
++mocs: optiondialog.moc
 +#>+ 3
  mail.moc: $(srcdir)/mail.h
  	$(MOC) $(srcdir)/mail.h -o mail.moc
  
-@@ -849,12 +868,8 @@ kedit.moc: $(srcdir)/kedit.h
- 	$(MOC) $(srcdir)/kedit.h -o kedit.moc
- 
+@@ -856,14 +877,8 @@ kedit.moc: $(srcdir)/kedit.h
+ #>+ 1
+ mocs: kedit.moc
  #>+ 3
 -optiondialog.moc: $(srcdir)/optiondialog.h
 -	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
 -
+-#>+ 1
+-mocs: optiondialog.moc
 -#>+ 3
  clean-metasources:
 -	-rm -f  mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc
@@ -168,7 +172,7 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -867,33 +882,33 @@ force-reedit:
+@@ -876,33 +891,33 @@ force-reedit:
  
  
  #>+ 11
@@ -215,7 +219,7 @@ $NetBSD: patch-af,v 1.4 2003/05/22 02:57:14 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -904,10 +919,10 @@ kde-rpo-clean:
+@@ -913,10 +928,10 @@ kde-rpo-clean:
  
  #>+ 9
  optiondialog.o: optiondialog.moc 
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index 140f87ff29c..bcc05324d40 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 markd Exp $
+$NetBSD: patch-ak,v 1.6 2003/07/30 14:24:50 markd Exp $
 
---- klaptopdaemon/Makefile.in.orig	Thu May  8 00:08:46 2003
+--- klaptopdaemon/Makefile.in.orig	2003-07-15 22:19:25.000000000 +1200
 +++ 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.5 2003/05/22 02:57:14 markd Exp $
  LIBCOMPAT = @LIBCOMPAT@
  LIBCRYPT = @LIBCRYPT@
  LIBDL = @LIBDL@
-@@ -270,20 +270,24 @@ target_os = @target_os@
+@@ -271,20 +271,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.5 2003/05/22 02:57:14 markd Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
  	portable.cpp acpi_config.cpp
-@@ -310,49 +314,60 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
+@@ -311,49 +315,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.5 2003/05/22 02:57:14 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 \
-@@ -377,7 +392,7 @@ CXXLD = $(CXX)
+@@ -378,7 +393,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.5 2003/05/22 02:57:14 markd Exp $
  
  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
+@@ -387,7 +402,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.5 2003/05/22 02:57:14 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -466,6 +481,8 @@ clean-libLTLIBRARIES:
+@@ -467,6 +482,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.5 2003/05/22 02:57:14 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -508,7 +525,8 @@ distclean-compile:
+@@ -509,7 +526,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.5 2003/05/22 02:57:14 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@
-@@ -684,7 +702,7 @@ distclean-tags:
+@@ -685,7 +703,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 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 Makefile.in.rej kpcmcia.h laptop_daemon.h notify.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -850,9 +868,6 @@ uninstall-info: uninstall-info-recursive
+@@ -851,9 +869,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,62 +178,87 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 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:
-@@ -871,20 +886,32 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
- 	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
- 
+@@ -874,11 +889,23 @@ kpcmcia.moc: $(srcdir)/kpcmcia.h
+ #>+ 1
+ mocs: kpcmcia.moc
  #>+ 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
-+
+ 
+ #>+ 1
+-mocs: kpcmciainfo.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
+ #>+ 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
-@@ -895,24 +922,12 @@ warning.moc: $(srcdir)/warning.h
- 	$(MOC) $(srcdir)/warning.h -o warning.moc
- 
+ 	$(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
  #>+ 3
 -acpi_config.moc: $(srcdir)/acpi_config.h
 -	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
 -
+-#>+ 1
+-mocs: acpi_config.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
@@ -241,7 +266,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -929,7 +944,7 @@ force-reedit:
+@@ -952,7 +967,7 @@ force-reedit:
  
  
  #>+ 11
@@ -250,7 +275,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 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; \
-@@ -941,33 +956,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
+@@ -964,33 +979,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
  	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
  
  #>+ 11
@@ -297,7 +322,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 02:57:14 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -978,24 +993,24 @@ kde-rpo-clean:
+@@ -1001,24 +1016,24 @@ kde-rpo-clean:
  
  #>+ 23
  kpcmcia.o: kpcmcia.moc 
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index 4ae61d758d9..b692579a3d4 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,15 +1,15 @@
-$NetBSD: patch-ao,v 1.4 2003/05/22 02:57:14 markd Exp $
+$NetBSD: patch-ao,v 1.5 2003/07/30 14:24:51 markd Exp $
 
---- configure.orig	Thu May  8 00:08:48 2003
+--- configure.orig	2003-07-15 22:19:29.000000000 +1200
 +++ configure
-@@ -26402,62 +26402,6 @@ _ACEOF
+@@ -26411,62 +26411,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