Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or

1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely.
author: skrll <skrll@pkgsrc.org> 2003-01-02 09:12:19 +0000
committer: skrll <skrll@pkgsrc.org> 2003-01-02 09:12:19 +0000
commit: 42861251c282c37bda020c5e0ae0940c0461f7a9 (patch)
tree: 1ab9a94a1fd0409896e232322846793727e9e77a /misc/kdeutils3
parent: 89fcd02fac594d7b0f01bd59d1a6f1508ec74be2 (diff)
download: pkgsrc-42861251c282c37bda020c5e0ae0940c0461f7a9.tar.gz
5 files changed, 334 insertions, 273 deletions
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 30eff858b87..ec7c70b2aad 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2002/12/24 06:10:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/02 09:12:28 skrll Exp $
 
-DISTNAME=	kdeutils-3.0.4
-PKGREVISION=	1
+DISTNAME=	kdeutils-3.0.5a
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../x11/kde3/Makefile.kde3"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index e83fa465d8b..d75f480f767 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.6 2002/10/14 09:13:50 skrll Exp $
+$NetBSD: distinfo,v 1.7 2003/01/02 09:12:29 skrll Exp $
 
-SHA1 (kdeutils-3.0.4.tar.bz2) = c5a174a088a0d9ee4fdab6a4e2cd1d84ebb2b102
-Size (kdeutils-3.0.4.tar.bz2) = 1514778 bytes
+SHA1 (kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd
+Size (kdeutils-3.0.5a.tar.bz2) = 1515962 bytes
 SHA1 (patch-aa) = ac87861b38a93564e79e57cf5c8dc0de7f8c720a
-SHA1 (patch-ab) = 96c698f05666f61aa653528688535cdb33221842
+SHA1 (patch-ab) = 7e29e85c52c585b795f0a1a9f8c2a92bef6804a0
 SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3
 SHA1 (patch-ad) = 0661f7e149c704291d3c668384363bb1e8246c8f
 SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = 7118c3f53ea1d5831c53c071cc0fba6317f6b2d9
+SHA1 (patch-af) = 4091778400aded8120d59707eeeeaa4e8864cd34
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ah) = fe2b3a94957a2d9cf6a294cbd3a77d100af84164
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
 SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef
-SHA1 (patch-ak) = 1199959fd27b5084094c065f377cd48747bd8102
+SHA1 (patch-ak) = c45e16590bcc44b08d58f28ef5144545fbdceabc
 SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
index bda279f740b..94c76fcd3d9 100644
--- a/misc/kdeutils3/patches/patch-ab
+++ b/misc/kdeutils3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $
 
---- kcalc/Makefile.in.orig	Wed May  8 21:11:41 2002
+--- kcalc/Makefile.in.orig	Mon Dec 30 16:23:59 2002
 +++ kcalc/Makefile.in
-@@ -228,22 +228,25 @@
+@@ -227,22 +227,25 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  bin_PROGRAMS = kcalc
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  
 -kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
 +libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
- 	optiondialog.cpp
+ 	           optiondialog.cpp
  
 +libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm
 +
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  pics_DATA = 
-@@ -261,25 +264,31 @@
+@@ -260,24 +263,30 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -51,16 +51,14 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
 +am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
 +	optiondialog.lo
 +#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS)
- #>+ 6
+ #>+ 5
 -kcalc_la_final_OBJECTS = kcalc_la.all_cpp.lo 
 -kcalc_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
 +libkcalc_main_la_final_OBJECTS = libkcalc_main_la.all_cpp.lo 
 +libkcalc_main_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
- 	optiondialog.lo \
--	kcalc_la_meta_unload.lo 
+ 	optiondialog.lo
 -@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS)
-+	libkcalc_main_la_meta_unload.lo 
 +@KDE_USE_FINAL_FALSE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_final_OBJECTS)
  bin_PROGRAMS = kcalc$(EXEEXT)
@@ -77,21 +75,37 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -287,9 +296,10 @@
+@@ -285,16 +294,19 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
--	@AMDEP_TRUE@	$(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/stats.Plo
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
+-#>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcalc_la.all_cpp.P  $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/stats.Plo
++#>+ 9
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkcalc_main_la.all_cpp.P  $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/stats.Plo
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/stats.Plo
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -309,14 +319,15 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -315,14 +327,15 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -109,7 +123,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -365,6 +376,8 @@
+@@ -371,6 +384,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS)
@@ -118,7 +132,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -400,9 +413,10 @@
+@@ -406,9 +421,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dlabel.Plo@am__quote@
@@ -130,16 +144,16 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stats.Plo@am__quote@
  
-@@ -497,7 +511,7 @@
+@@ -503,7 +519,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=kcalclogo.xpm optiondialog.h hi32-app-kcalc.png ToDo configure.in.in hi16-app-kcalc.png kcalc.desktop hi48-app-kcalc.png version.h 
-+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png kcalc version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo 
+-KDE_DIST=hi16-app-kcalc.png optiondialog.h kcalc.desktop hi48-app-kcalc.png kcalclogo.xpm configure.in.in hi32-app-kcalc.png ToDo version.h 
++KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -620,9 +634,6 @@
+@@ -626,9 +642,6 @@ uninstall-am: uninstall-kde-icons  unins
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -149,79 +163,55 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll 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:
-@@ -668,28 +679,28 @@
- 
- 
- #>+ 12
--kcalc_la_meta_unload.cpp:  kcalc.moc optiondialog.moc dlabel.moc
--	@echo 'creating kcalc_la_meta_unload.cpp'
--	@-rm -f kcalc_la_meta_unload.cpp
-+libkcalc_main_la_meta_unload.cpp:  kcalc.moc optiondialog.moc dlabel.moc
-+	@echo 'creating libkcalc_main_la_meta_unload.cpp'
-+	@-rm -f libkcalc_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kcalc_la[] = {' > kcalc_la_meta_unload.cpp ;\
--		cat  kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcalc_la_meta_unload.cpp ;\
--		echo '0};' >> kcalc_la_meta_unload.cpp ;\
--		echo '#include <kunload.h>' >> kcalc_la_meta_unload.cpp ;\
--		echo '_UNLOAD(kcalc_la)' >> kcalc_la_meta_unload.cpp ;\
--	else echo > kcalc_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libkcalc_main_la[] = {' > libkcalc_main_la_meta_unload.cpp ;\
-+		cat  kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcalc_main_la_meta_unload.cpp ;\
-+		echo '0};' >> libkcalc_main_la_meta_unload.cpp ;\
-+		echo '#include <kunload.h>' >> libkcalc_main_la_meta_unload.cpp ;\
-+		echo '_UNLOAD(libkcalc_main_la)' >> libkcalc_main_la_meta_unload.cpp ;\
-+	else echo > libkcalc_main_la_meta_unload.cpp; fi
+@@ -638,16 +651,16 @@ kcalc.moc: $(srcdir)/kcalc.h
+ 	$(MOC) $(srcdir)/kcalc.h -o kcalc.moc
  
+ #>+ 3
+-dlabel.moc: $(srcdir)/dlabel.h
+-	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
+-
+-#>+ 3
+ optiondialog.moc: $(srcdir)/optiondialog.h
+ 	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
  
  #>+ 3
- clean-moc-classes:
--	-rm -f  kcalc_la_meta_unload.cpp
-+	-rm -f  libkcalc_main_la_meta_unload.cpp
++dlabel.moc: $(srcdir)/dlabel.h
++	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  kcalc.moc dlabel.moc optiondialog.moc
++	-rm -f  kcalc.moc optiondialog.moc dlabel.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -674,33 +687,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_la_meta_unload.cpp   kcalc.moc optiondialog.moc dlabel.moc 
-+kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp   kcalc.moc optiondialog.moc dlabel.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; \
--	for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp kcalc_la_meta_unload.cpp ; do \
-+	for file in kcalc_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \
- 	done; \
-@@ -697,11 +708,23 @@
- 	rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files
  
  #>+ 11
--kcalc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkcalc_main_la_meta_unload.cpp  
+-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
+-	@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; \
++libkcalc_main_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 optiondialog.moc dlabel.moc
 +	@echo 'creating libkcalc_main_la.all_cpp.cpp ...'; \
 +	rm -f libkcalc_main_la.all_cpp.files libkcalc_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkcalc_main_la.all_cpp.final; \
-+	for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp libkcalc_main_la_meta_unload.cpp ; do \
+ 	for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp ; do \
+-	  echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libkcalc_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcalc_main_la.all_cpp.final; \
-+	done; \
-+	cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files  > libkcalc_main_la.all_cpp.cpp; \
-+	rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files
-+
-+#>+ 11
-+kcalc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp  
- 	@echo 'creating kcalc.all_cpp.cpp ...'; \
- 	rm -f kcalc.all_cpp.files kcalc.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcalc.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kcalc_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kcalc.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc.all_cpp.final; \
  	done; \
-@@ -710,20 +733,20 @@
+-	cat kcalc_la.all_cpp.final kcalc_la.all_cpp.files > kcalc_la.all_cpp.cpp; \
+-	rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files
++	cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \
++	rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files
  
  #>+ 3
  clean-final:
--	-rm -f kcalc_la.all_cpp.cpp kcalc.all_cpp.cpp
-+	-rm -f kcalc_la.all_cpp.cpp libkcalc_main_la.all_cpp.cpp kcalc.all_cpp.cpp
+-	-rm -f kcalc_la.all_cpp.cpp
++	-rm -f libkcalc_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -241,4 +231,12 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $
 +	$(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -713,6 +726,6 @@ kde-rpo-clean:
+ optiondialog.o: optiondialog.moc 
+ kcalc.lo: kcalc.moc 
+ optiondialog.lo: optiondialog.moc 
+-dlabel.lo: dlabel.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 5395b324c3a..d7cdbf2f2f0 100644
--- a/misc/kdeutils3/patches/patch-af
+++ b/misc/kdeutils3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+$NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $
 
---- kedit/Makefile.in.orig	Wed May  8 21:11:41 2002
+--- kedit/Makefile.in.orig	Mon Dec 30 16:24:30 2002
 +++ kedit/Makefile.in
-@@ -237,16 +237,20 @@
+@@ -236,16 +236,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kedit
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
 -kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
 +libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
- 	mail.cpp  optiondialog.cpp 
+ 		mail.cpp  optiondialog.cpp 
  
 -kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
 +libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -270,23 +274,30 @@
+@@ -269,22 +273,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -37,10 +37,9 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +kedit_la_DEPENDENCIES = libkedit_main.la
 +am_kedit_la_OBJECTS = kedit_main.lo
  #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS)
--#>+ 5
+-#>+ 4
 -kedit_la_final_OBJECTS = kedit_la.all_cpp.lo 
--kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \
--	kedit_la_meta_unload.lo 
+-kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo
 -@KDE_USE_FINAL_FALSE@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS)
 +#>+ 1
@@ -49,11 +48,10 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
 +	optiondialog.lo
 +#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS)
-+#>+ 6
++#>+ 5
 +libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo 
 +libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
-+	optiondialog.lo \
-+	libkedit_main_la_meta_unload.lo 
++	optiondialog.lo
 +@KDE_USE_FINAL_FALSE@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS)
  bin_PROGRAMS = kedit$(EXEEXT)
@@ -70,20 +68,33 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -294,9 +305,9 @@
+@@ -292,16 +303,16 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
+ #>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kedit_la.all_cpp.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/optiondialog.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \
+-@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
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkedit_main_la.all_cpp.P  $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo
+ 
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
-@@ -316,7 +327,8 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -322,7 +333,8 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -93,7 +104,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  DATA = $(apps_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -329,7 +341,7 @@
+@@ -335,7 +347,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
  	Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -102,7 +113,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -378,6 +390,8 @@
+@@ -384,6 +396,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS)
@@ -111,7 +122,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -412,8 +426,9 @@
+@@ -418,8 +432,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -122,16 +133,16 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll 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@
-@@ -569,7 +584,7 @@
+@@ -575,7 +590,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=optionstate.h KEdit.desktop keditui.rc 
-+KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h 
+-KDE_DIST=optionstate.h keditui.rc KEdit.desktop 
++KDE_DIST=KEdit.desktop keditui.rc optionstate.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -708,9 +723,6 @@
+@@ -714,14 +729,15 @@ uninstall-info: uninstall-info-recursive
  
  messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -141,79 +152,56 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll 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:
-@@ -746,28 +758,28 @@
- 
- 
- #>+ 12
--kedit_la_meta_unload.cpp:  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
--	@echo 'creating kedit_la_meta_unload.cpp'
--	@-rm -f kedit_la_meta_unload.cpp
-+libkedit_main_la_meta_unload.cpp:  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
-+	@echo 'creating libkedit_main_la_meta_unload.cpp'
-+	@-rm -f libkedit_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\
--		cat  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\
--		echo '0};' >> kedit_la_meta_unload.cpp ;\
--		echo '#include <kunload.h>' >> kedit_la_meta_unload.cpp ;\
--		echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\
--	else echo > kedit_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\
-+		cat  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\
-+		echo '0};' >> libkedit_main_la_meta_unload.cpp ;\
-+		echo '#include <kunload.h>' >> libkedit_main_la_meta_unload.cpp ;\
-+		echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\
-+	else echo > libkedit_main_la_meta_unload.cpp; fi
  
+ #>+ 3
++optiondialog.moc: $(srcdir)/optiondialog.h
++	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
++
++#>+ 3
+ mail.moc: $(srcdir)/mail.h
+ 	$(MOC) $(srcdir)/mail.h -o mail.moc
+ 
+@@ -734,12 +750,8 @@ kedit.moc: $(srcdir)/kedit.h
+ 	$(MOC) $(srcdir)/kedit.h -o kedit.moc
  
  #>+ 3
- clean-moc-classes:
--	-rm -f  kedit_la_meta_unload.cpp
-+	-rm -f  libkedit_main_la_meta_unload.cpp
+-optiondialog.moc: $(srcdir)/optiondialog.h
+-	$(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
+-
+-#>+ 3
+ clean-metasources:
+-	-rm -f  mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc
++	-rm -f  optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -752,33 +764,33 @@ force-reedit:
  
- #>+ 11
--kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp   optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc 
-+kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp   optiondialog.moc mail.moc ktextfiledlg.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; \
--	for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \
-+	for file in kedit_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \
- 	done; \
-@@ -775,11 +787,23 @@
- 	rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files
  
  #>+ 11
--kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp  
+-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
+-	@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; \
++libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp  optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
 +	@echo 'creating libkedit_main_la.all_cpp.cpp ...'; \
 +	rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \
-+	for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp libkedit_main_la_meta_unload.cpp ; do \
+ 	for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \
+-	  echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \
-+	done; \
-+	cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files  > libkedit_main_la.all_cpp.cpp; \
-+	rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files
-+
-+#>+ 11
-+kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp  
- 	@echo 'creating kedit.all_cpp.cpp ...'; \
- 	rm -f kedit.all_cpp.files kedit.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kedit_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kedit.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \
  	done; \
-@@ -788,20 +812,20 @@
+-	cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \
+-	rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files
++	cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \
++	rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files
  
  #>+ 3
  clean-final:
--	-rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp
-+	-rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.all_cpp.cpp
+-	-rm -f kedit_la.all_cpp.cpp
++	-rm -f libkedit_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -233,4 +221,18 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +	$(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -789,10 +801,10 @@ kde-rpo-clean:
+ 
+ #>+ 9
+ 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 
+-mail.lo: mail.moc 
++ktextfiledlg.lo: ktextfiledlg.moc 
+ kedit.o: kedit.moc 
diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak
index 80184cdf168..cc41ec9cbc7 100644
--- a/misc/kdeutils3/patches/patch-ak
+++ b/misc/kdeutils3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $
 
---- klaptopdaemon/Makefile.in.orig	Wed May  8 21:11:42 2002
+--- klaptopdaemon/Makefile.in.orig	Mon Dec 30 16:24:30 2002
 +++ klaptopdaemon/Makefile.in
-@@ -227,18 +227,22 @@
+@@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
  
@@ -30,8 +30,8 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  kcm_laptop_la_SOURCES = battery.cpp  main.cpp  pcmcia.cpp  power.cpp  warning.cpp portable.cpp
  
-@@ -267,25 +271,31 @@
- 	kcm_laptop_la_meta_unload.lo 
+@@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
+ 	warning.lo portable.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)
 -klaptopdaemon_la_DEPENDENCIES =
@@ -46,18 +46,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \
 +	kpcmciainfo.lo daemondock.lo notify.lo portable.lo
 +#>- libklaptopdaemon_main_la_OBJECTS = \
-+#>- $(am_libklaptopdaemon_main_la_OBJECTS)
- #>+ 6
++#>- 	$(am_libklaptopdaemon_main_la_OBJECTS)
+ #>+ 5
 -klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo 
 -klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
--	daemondock.lo notify.lo portable.lo \
--	klaptopdaemon_la_meta_unload.lo 
+-	daemondock.lo notify.lo portable.lo
 -@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
 +libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo 
 +libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \
-+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
-+	libklaptopdaemon_main_la_meta_unload.lo 
++	kpcmciainfo.lo daemondock.lo notify.lo portable.lo
 +@KDE_USE_FINAL_FALSE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS)
  bin_PROGRAMS = klaptopdaemon$(EXEEXT)
@@ -74,19 +72,42 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -293,8 +303,9 @@
+@@ -290,23 +300,26 @@ CPPFLAGS = @CPPFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
--	@AMDEP_TRUE@	$(DEPDIR)/kpcmciainfo.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Po \
-+	@AMDEP_TRUE@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
-@@ -319,7 +330,7 @@
+ #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
+-#>- @AMDEP_TRUE@	$(DEPDIR)/kpcmciainfo.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Po \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/warning.Plo
+-#>+ 15
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P  $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kpcmciainfo.Plo \
++#>+ 17
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P  $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/warning.Plo
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kpcmciainfo.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/klaptopdaemon_main.Po \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
+ @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 \
+@@ -332,7 +345,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
@@ -95,7 +116,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
  	uninstall-info-recursive all-recursive install-data-recursive \
-@@ -327,7 +338,7 @@
+@@ -340,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = README Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -104,7 +125,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -400,6 +411,8 @@
+@@ -413,6 +426,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)
@@ -113,7 +134,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -436,7 +449,8 @@
+@@ -449,7 +464,8 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/battery.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/daemondock.Plo@am__quote@
@@ -123,16 +144,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll 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@
-@@ -564,7 +578,7 @@
+@@ -577,7 +593,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h 
-+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp 
+-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.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 battery.h version.h portable.h daemondock.h pcmcia.h kpcmcia.h laptop_daemon.h notify.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -708,9 +722,6 @@
+@@ -721,9 +737,6 @@ uninstall-info: uninstall-info-recursive
  messages:
  	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
  	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
@@ -142,88 +163,97 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll 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:
-@@ -792,24 +803,24 @@
- 
- 
- #>+ 12
--klaptopdaemon_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
--	@echo 'creating klaptopdaemon_la_meta_unload.cpp'
--	@-rm -f klaptopdaemon_la_meta_unload.cpp
-+libklaptopdaemon_main_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
-+	@echo 'creating libklaptopdaemon_main_la_meta_unload.cpp'
-+	@-rm -f libklaptopdaemon_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\
--		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\
--		echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\
--		echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\
--		echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\
--	else echo > klaptopdaemon_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\
-+		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\
-+		echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
-+		echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
-+		echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
-+	else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi
+@@ -738,20 +751,28 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O
+ 
+ 
+ #>+ 3
++kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
++	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
++
++#>+ 3
+ kpcmcia.moc: $(srcdir)/kpcmcia.h
+ 	$(MOC) $(srcdir)/kpcmcia.h -o 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
++
++#>+ 3
++daemondock.moc: $(srcdir)/daemondock.h
++	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
+ 
+ #>+ 3
+ battery.moc: $(srcdir)/battery.h
+ 	$(MOC) $(srcdir)/battery.h -o battery.moc
+ 
+ #>+ 3
+-daemondock.moc: $(srcdir)/daemondock.h
+-	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
++notify.moc: $(srcdir)/notify.h
++	$(MOC) $(srcdir)/notify.h -o notify.moc
+ 
+ #>+ 3
+ power.moc: $(srcdir)/power.h
+@@ -762,20 +783,12 @@ warning.moc: $(srcdir)/warning.h
+ 	$(MOC) $(srcdir)/warning.h -o warning.moc
  
+ #>+ 3
+-pcmcia.moc: $(srcdir)/pcmcia.h
+-	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
+-
+-#>+ 3
+-notify.moc: $(srcdir)/notify.h
+-	$(MOC) $(srcdir)/notify.h -o notify.moc
+-
+-#>+ 3
+ laptop_daemon.moc: $(srcdir)/laptop_daemon.h
+ 	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
  
  #>+ 3
- clean-moc-classes:
--	-rm -f  kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp
-+	-rm -f  kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp
+ clean-metasources:
+-	-rm -f  kpcmcia.moc kpcmciainfo.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc
++	-rm -f  kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc
+ 
+ #>+ 3
+ clean-closures:
+@@ -792,7 +805,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 kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.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)/kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.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  battery.moc pcmcia.moc warning.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  pcmcia.moc battery.moc power.moc warning.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; \
-@@ -821,11 +832,11 @@
+@@ -804,33 +817,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 klaptopdaemon_la_meta_unload.cpp  
-+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
- 	@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; \
--	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \
-+	for file in klaptopdaemon_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
- 	done; \
-@@ -833,11 +844,23 @@
- 	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
- 
- #>+ 11
--klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libklaptopdaemon_main_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 libklaptopdaemon_main_la_meta_unload.cpp  
+-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  daemondock.moc kpcmcia.moc laptop_daemon.moc notify.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; \
++libklaptopdaemon_main_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  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
 +	@echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \
 +	rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \
-+	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp libklaptopdaemon_main_la_meta_unload.cpp ; do \
+ 	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp ; do \
+-	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \
-+	done; \
-+	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files  > libklaptopdaemon_main_la.all_cpp.cpp; \
-+	rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files
-+
-+#>+ 11
-+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
- 	@echo 'creating klaptopdaemon.all_cpp.cpp ...'; \
- 	rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in klaptopdaemon_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \
  	done; \
-@@ -846,20 +869,20 @@
+-	cat klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files > klaptopdaemon_la.all_cpp.cpp; \
+-	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
++	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \
++	rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files
  
  #>+ 3
  clean-final:
--	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
-+	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
+-	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp
++	-rm -f kcm_laptop_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -243,4 +273,36 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" install-am
  #>+ 3
  cvs-clean:
- 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+ 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -841,20 +854,20 @@ kde-rpo-clean:
+ 
+ #>+ 19
+ kpcmcia.o: kpcmcia.moc 
+-battery.lo: battery.moc 
+-notify.o: notify.moc 
+-pcmcia.lo: pcmcia.moc 
+ kpcmcia.lo: kpcmcia.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 
++warning.lo: warning.moc 
++warning.o: warning.moc 
++laptop_daemon.lo: laptop_daemon.moc 
++kpcmciainfo.o: kpcmciainfo.moc 
+ battery.o: battery.moc 
+-pcmcia.o: pcmcia.moc 
++pcmcia.lo: pcmcia.moc 
++battery.lo: battery.moc 
+ daemondock.lo: daemondock.moc 
+-warning.o: warning.moc 
++daemondock.o: daemondock.moc 
++pcmcia.o: pcmcia.moc 
+ kpcmciainfo.lo: kpcmciainfo.moc 
+-laptop_daemon.o: laptop_daemon.moc 
+-warning.lo: warning.moc 
+-kpcmciainfo.o: kpcmciainfo.moc 
++power.lo: power.moc
author	skrll <skrll@pkgsrc.org>	2003-01-02 09:12:19 +0000
committer	skrll <skrll@pkgsrc.org>	2003-01-02 09:12:19 +0000
commit	42861251c282c37bda020c5e0ae0940c0461f7a9 (patch)
tree	1ab9a94a1fd0409896e232322846793727e9e77a /misc/kdeutils3
parent	89fcd02fac594d7b0f01bd59d1a6f1508ec74be2 (diff)
download	pkgsrc-42861251c282c37bda020c5e0ae0940c0461f7a9.tar.gz