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.

6 files changed, 108 insertions, 103 deletions

diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 2f8b6137390..2f00d857088 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/12/24 06:10:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/02 09:12:24 skrll Exp $
 
-DISTNAME=	kdegames-3.0.4
-PKGREVISION=	1
+DISTNAME=	kdegames-3.0.5a
 CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index 62fcc68781e..dde01b392e7 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/10/14 09:13:46 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 09:12:24 skrll Exp $
 
-SHA1 (kdegames-3.0.4.tar.bz2) = b1c9256e3ae36375402d7e4e93a79b5b1f3e6db6
-Size (kdegames-3.0.4.tar.bz2) = 7239970 bytes
+SHA1 (kdegames-3.0.5a.tar.bz2) = 340253ebfe393f3f1e4d8d70f2b536837471820f
+Size (kdegames-3.0.5a.tar.bz2) = 7250288 bytes
 SHA1 (patch-aa) = c0103abe8c12e83800c09b3e87048a0bb86b365f
-SHA1 (patch-ab) = 68875cb7ddd517bd65a2490143b9600001c359d2
+SHA1 (patch-ab) = 239eaff9f0a7a38857f95317ac40054f0fc8ce31
 SHA1 (patch-ac) = 8fb1279b5ffc348bf2c54186f8156c9f9680c559
 SHA1 (patch-ad) = aa0658f3523f0f5b6d41f61748900c413e704f69
diff --git a/games/kdegames3/patches/patch-ab b/games/kdegames3/patches/patch-ab
index 85f4876c1aa..378c12ff40c 100644
--- a/games/kdegames3/patches/patch-ab
+++ b/games/kdegames3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/02 09:12:25 skrll Exp $
 
---- kbackgammon/Makefile.in.orig	Fri May 10 15:29:29 2002
+--- kbackgammon/Makefile.in.orig	Mon Dec 30 20:02:01 2002
 +++ kbackgammon/Makefile.in
-@@ -229,24 +229,25 @@
+@@ -228,24 +228,25 @@ x_libraries = @x_libraries@
  INCLUDES = -I$(top_srcdir)/libkdegames -I$(top_srcdir)/libkdegames/kgame/ -I$(srcdir)/engines $(all_includes)
  
  bin_PROGRAMS = kbackgammon
@@ -13,11 +13,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
 -
 -kbackgammon_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \
 +libkbackgammon_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \
- 	./engines/libkbgengines.la
+ 			./engines/libkbgengines.la
  
 -kbackgammon_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \
 +libkbackgammon_main_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \
- 	kbgstatus.cpp
+ 			kbgstatus.cpp
  
  
 +kbackgammon_la_LIBADD = libkbackgammon_main.la
@@ -28,14 +28,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  
 -kbackgammon_LDADD = kbackgammon.la $(top_builddir)/libkdegames/libkdegames.la \
 +kbackgammon_LDADD = libkbackgammon_main.la $(top_builddir)/libkdegames/libkdegames.la \
- 	$(LIB_KSYCOCA)
+ 		$(LIB_KSYCOCA)
  
 -kbackgammon_SOURCES = dummy.cpp
 +kbackgammon_SOURCES = kbackgammon_main.cpp
  kbackgammon_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = version.h kbg.h kbgboard.h kbgtextview.h kbgstatus.h
-@@ -266,25 +267,31 @@
+@@ -265,24 +266,30 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -52,17 +52,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
 +am_libkbackgammon_main_la_OBJECTS = main.lo kbg.lo kbgboard.lo \
 +	kbgtextview.lo kbgstatus.lo
 +#>- libkbackgammon_main_la_OBJECTS = $(am_libkbackgammon_main_la_OBJECTS)
- #>+ 6
+ #>+ 5
 -kbackgammon_la_final_OBJECTS = kbackgammon_la.all_cpp.lo 
 -kbackgammon_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo kbgtextview.lo \
--	kbgstatus.lo \
--	kbackgammon_la_meta_unload.lo 
+-	kbgstatus.lo
 -@KDE_USE_FINAL_FALSE@kbackgammon_la_OBJECTS = $(kbackgammon_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kbackgammon_la_OBJECTS = $(kbackgammon_la_final_OBJECTS)
 +libkbackgammon_main_la_final_OBJECTS = libkbackgammon_main_la.all_cpp.lo 
 +libkbackgammon_main_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo \
-+	kbgtextview.lo kbgstatus.lo \
-+	libkbackgammon_main_la_meta_unload.lo 
++	kbgtextview.lo kbgstatus.lo
 +@KDE_USE_FINAL_FALSE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_final_OBJECTS)
  bin_PROGRAMS = kbackgammon$(EXEEXT)
@@ -79,17 +77,29 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  	$(top_builddir)/libkdegames/libkdegames.la
  
  DEFS = @DEFS@
-@@ -293,7 +300,8 @@
+@@ -291,14 +298,17 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \
-+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \
-+	@AMDEP_TRUE@	$(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \
- 	@AMDEP_TRUE@	$(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -315,7 +323,8 @@
+-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \
++#>- @AMDEP_TRUE@	$(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \
+ #>- @AMDEP_TRUE@	$(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo
+-#>+ 7
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/kbackgammon_la.all_cpp.P  $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \
++#>+ 9
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libkbackgammon_main_la.all_cpp.P  $(DEPDIR)/kbackgammon_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	$(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   $(DEPDIR)/kbackgammon_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	$(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo
+ 
+@@ -321,7 +331,8 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
@@ -99,7 +109,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  DATA = $(applnk_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -328,7 +337,7 @@
+@@ -334,7 +345,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = README $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in \
  	TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -108,7 +118,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -377,6 +386,8 @@
+@@ -383,6 +394,8 @@ clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
  kbackgammon.la: $(kbackgammon_la_OBJECTS) $(kbackgammon_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kbackgammon_la_LDFLAGS) $(kbackgammon_la_OBJECTS) $(kbackgammon_la_LIBADD) $(LIBS)
@@ -117,7 +127,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -411,7 +422,8 @@
+@@ -417,7 +430,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -127,16 +137,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbg.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgboard.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgstatus.Plo@am__quote@
-@@ -569,7 +581,7 @@
+@@ -575,7 +589,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc 
-+KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc kbackgammon dummy.cpp 
+-KDE_DIST=eventsrc kbackgammonui.rc kbackgammon.desktop 
++KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -631,7 +643,6 @@
+@@ -637,7 +651,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -144,7 +154,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-@@ -712,9 +723,6 @@
+@@ -718,9 +731,6 @@ messages: rc.cpp	
  	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
  	$(XGETTEXT) $$LIST -o $(podir)/kbackgammon.pot
  
@@ -154,79 +164,58 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
  install-data-local:
  #>- 	rm -rf $(kde_appsdir)/Games/kbackgammon.desktop
  #>+ 1
-@@ -754,28 +762,28 @@
- 
- 
- #>+ 12
--kbackgammon_la_meta_unload.cpp:  kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc
--	@echo 'creating kbackgammon_la_meta_unload.cpp'
--	@-rm -f kbackgammon_la_meta_unload.cpp
-+libkbackgammon_main_la_meta_unload.cpp:  kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc
-+	@echo 'creating libkbackgammon_main_la_meta_unload.cpp'
-+	@-rm -f libkbackgammon_main_la_meta_unload.cpp
- 	@if test ${kde_qtver} = 2; then \
--		echo 'static const char * _metalist_kbackgammon_la[] = {' > kbackgammon_la_meta_unload.cpp ;\
--		cat  kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbackgammon_la_meta_unload.cpp ;\
--		echo '0};' >> kbackgammon_la_meta_unload.cpp ;\
--		echo '#include <kunload.h>' >> kbackgammon_la_meta_unload.cpp ;\
--		echo '_UNLOAD(kbackgammon_la)' >> kbackgammon_la_meta_unload.cpp ;\
--	else echo > kbackgammon_la_meta_unload.cpp; fi
-+		echo 'static const char * _metalist_libkbackgammon_main_la[] = {' > libkbackgammon_main_la_meta_unload.cpp ;\
-+		cat  kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbackgammon_main_la_meta_unload.cpp ;\
-+		echo '0};' >> libkbackgammon_main_la_meta_unload.cpp ;\
-+		echo '#include <kunload.h>' >> libkbackgammon_main_la_meta_unload.cpp ;\
-+		echo '_UNLOAD(libkbackgammon_main_la)' >> libkbackgammon_main_la_meta_unload.cpp ;\
-+	else echo > libkbackgammon_main_la_meta_unload.cpp; fi
+@@ -730,10 +740,6 @@ install-data-local:
+ .NOEXPORT:
  
+ #>+ 3
+-kbg.moc: $(srcdir)/kbg.h
+-	$(MOC) $(srcdir)/kbg.h -o kbg.moc
+-
+-#>+ 3
+ kbgboard.moc: $(srcdir)/kbgboard.h
+ 	$(MOC) $(srcdir)/kbgboard.h -o kbgboard.moc
+ 
+@@ -746,8 +752,12 @@ kbgstatus.moc: $(srcdir)/kbgstatus.h
+ 	$(MOC) $(srcdir)/kbgstatus.h -o kbgstatus.moc
  
  #>+ 3
- clean-moc-classes:
--	-rm -f  kbackgammon_la_meta_unload.cpp
-+	-rm -f  libkbackgammon_main_la_meta_unload.cpp
++kbg.moc: $(srcdir)/kbg.h
++	$(MOC) $(srcdir)/kbg.h -o kbg.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  kbg.moc kbgboard.moc kbgtextview.moc kbgstatus.moc
++	-rm -f  kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -760,33 +770,33 @@ force-reedit:
  
- #>+ 11
--kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp kbackgammon_la_meta_unload.cpp   kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc 
-+kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp   kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc 
- 	@echo 'creating kbackgammon_la.all_cpp.cpp ...'; \
- 	rm -f kbackgammon_la.all_cpp.files kbackgammon_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbackgammon_la.all_cpp.final; \
--	for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp kbackgammon_la_meta_unload.cpp ; do \
-+	for file in kbackgammon_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kbackgammon_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon_la.all_cpp.final; \
- 	done; \
-@@ -783,11 +791,23 @@
- 	rm -f kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files
  
  #>+ 11
--kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+libkbackgammon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp  
+-kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp  kbg.moc kbgtextview.moc kbgboard.moc kbgstatus.moc
+-	@echo 'creating kbackgammon_la.all_cpp.cpp ...'; \
+-	rm -f kbackgammon_la.all_cpp.files kbackgammon_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kbackgammon_la.all_cpp.final; \
++libkbackgammon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp  kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc
 +	@echo 'creating libkbackgammon_main_la.all_cpp.cpp ...'; \
 +	rm -f libkbackgammon_main_la.all_cpp.files libkbackgammon_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkbackgammon_main_la.all_cpp.final; \
-+	for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp ; do \
+ 	for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp ; do \
+-	  echo "#include \"$$file\"" >> kbackgammon_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon_la.all_cpp.final; \
 +	  echo "#include \"$$file\"" >> libkbackgammon_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbackgammon_main_la.all_cpp.final; \
-+	done; \
-+	cat libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files  > libkbackgammon_main_la.all_cpp.cpp; \
-+	rm -f libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files
-+
-+#>+ 11
-+kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp  
- 	@echo 'creating kbackgammon.all_cpp.cpp ...'; \
- 	rm -f kbackgammon.all_cpp.files kbackgammon.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbackgammon.all_cpp.final; \
--	for file in dummy.cpp ; do \
-+	for file in kbackgammon_main.cpp ; do \
- 	  echo "#include \"$$file\"" >> kbackgammon.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon.all_cpp.final; \
  	done; \
-@@ -796,20 +816,20 @@
+-	cat kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files > kbackgammon_la.all_cpp.cpp; \
+-	rm -f kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files
++	cat libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files > libkbackgammon_main_la.all_cpp.cpp; \
++	rm -f libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files
  
  #>+ 3
  clean-final:
--	-rm -f kbackgammon_la.all_cpp.cpp kbackgammon.all_cpp.cpp
-+	-rm -f kbackgammon_la.all_cpp.cpp libkbackgammon_main_la.all_cpp.cpp kbackgammon.all_cpp.cpp
+-	-rm -f kbackgammon_la.all_cpp.cpp
++	-rm -f libkbackgammon_main_la.all_cpp.cpp
  
  #>+ 2
  final:
@@ -246,4 +235,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $
 +	$(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_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
+@@ -796,11 +806,11 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 9
+-kbgstatus.o: kbgstatus.moc 
+-kbg.o: kbg.moc 
+-kbgboard.o: kbgboard.moc 
+-kbg.lo: kbg.moc 
+-kbgstatus.lo: kbgstatus.moc 
+ kbgtextview.lo: kbgtextview.moc 
++kbgboard.o: kbgboard.moc 
+ kbgtextview.o: kbgtextview.moc 
++kbgstatus.o: kbgstatus.moc 
++kbgstatus.lo: kbgstatus.moc 
+ kbgboard.lo: kbgboard.moc 
++kbg.lo: kbg.moc 
++kbg.o: kbg.moc 
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index 0115ec1deb2..db4ac28cc62 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:25 skrll Exp $
 
-DISTNAME=	kdetoys-3.0.4
-PKGREVISION=	1
+DISTNAME=	kdetoys-3.0.5a
 CATEGORIES=	games
 COMMENT=	Toys for the KDE integrated X11 desktop
 
diff --git a/games/kdetoys3/PLIST b/games/kdetoys3/PLIST
index 22ebfabbcf6..64d5d068558 100644
--- a/games/kdetoys3/PLIST
+++ b/games/kdetoys3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:49:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:25 skrll Exp $
 bin/amor
 bin/kaphorism
 bin/kmoon
@@ -586,8 +586,9 @@ share/kde/icons/locolor/32x32/apps/ktux.png
 @comment dirrm share/kde/icons/hicolor/32x32/apps
 @comment dirrm share/kde/icons/hicolor/16x16/apps
 @dirrm share/kde/apps/kworldclock/pics
-@dirrm share/kde/apps/kworldclock/maps/depths
-@comment dirrm share/kde/apps/kworldclock
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths >/dev/null || true
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps >/dev/null || true
+@unexec ${RMDIR} %D/share/kde/apps/kworldclock >/dev/null || true
 @dirrm share/kde/apps/kweather
 @dirrm share/kde/apps/ktux/sprites
 @dirrm share/kde/apps/ktux
diff --git a/games/kdetoys3/distinfo b/games/kdetoys3/distinfo
index dad116f5994..9bced7236b9 100644
--- a/games/kdetoys3/distinfo
+++ b/games/kdetoys3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/10/14 09:13:47 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 09:12:25 skrll Exp $
 
-SHA1 (kdetoys-3.0.4.tar.bz2) = fc734331e3c7f29d1f72dcf1f976d47c7b172822
-Size (kdetoys-3.0.4.tar.bz2) = 1426222 bytes
+SHA1 (kdetoys-3.0.5a.tar.bz2) = 06df8464b2b0c9ed6a9a65b1fa0e2c3bccfd1e60
+Size (kdetoys-3.0.5a.tar.bz2) = 1428350 bytes