Update to KDE-3.1.5

Changes: * networking: Fix crash related to SOCKS * kate: C syntax highlighting * konqueror: Improved handling of long filenames in icon view. * khtml: Minor rendering fixes * khtml: Improved loading of large images * java: Crash fix * webdav: Fixed renaming of files via secure connection
author: markd <markd> 2004-01-15 09:52:51 +0000
committer: markd <markd> 2004-01-15 09:52:51 +0000
commit: b6bc3316f70e5f5729c38e90822b5079f99c356a (patch)
tree: 4d5f55a1d0ccbc54171584eb302e70434aa9db54 /x11/kdelibs3
parent: 98e45ded7c6f47d9277b2b537666f4fc674a4903 (diff)
download: pkgsrc-b6bc3316f70e5f5729c38e90822b5079f99c356a.tar.gz
13 files changed, 550 insertions, 455 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 3b68fae9f3d..02062b1f752 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2004/01/12 09:46:05 cjep Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/15 09:52:51 markd Exp $
 
-DISTNAME=	kdelibs-3.1.4
-PKGREVISION=	3
+DISTNAME=	kdelibs-3.1.5
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -147,3 +146,9 @@ CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
 CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
 .  endif
 .endif
+
+.if ${OPSYS} == "SunOS"
+# We require use of a recent enough libbz2 to have the BZ2_ prefixes
+# so force this as configure gets this wrong on Solaris 9
+CONFIGURE_ENV+= ac_cv_lib_bzip2='no'
+.endif
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index c65e67ba1f7..6965daa05e7 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/07/30 13:16:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/01/15 09:52:51 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -3710,6 +3710,8 @@ share/kde/mimelnk/application/x-cda.desktop
 share/kde/mimelnk/application/x-compress.desktop
 share/kde/mimelnk/application/x-core.desktop
 share/kde/mimelnk/application/x-cpio.desktop
+share/kde/mimelnk/application/x-cue.desktop
+share/kde/mimelnk/application/x-dbase.desktop
 share/kde/mimelnk/application/x-designer.desktop
 share/kde/mimelnk/application/x-desktop.desktop
 share/kde/mimelnk/application/x-dvi.desktop
@@ -3725,6 +3727,7 @@ share/kde/mimelnk/application/x-gnumeric.desktop
 share/kde/mimelnk/application/x-graphite.desktop
 share/kde/mimelnk/application/x-gzip.desktop
 share/kde/mimelnk/application/x-hancomword.desktop
+share/kde/mimelnk/application/x-iso.desktop
 share/kde/mimelnk/application/x-jar.desktop
 share/kde/mimelnk/application/x-java-applet.desktop
 share/kde/mimelnk/application/x-java.desktop
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index cb8f73168ba..a88d672d8be 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,43 +1,43 @@
-$NetBSD: distinfo,v 1.28 2003/09/21 12:14:20 markd Exp $
+$NetBSD: distinfo,v 1.29 2004/01/15 09:52:51 markd Exp $
 
-SHA1 (kdelibs-3.1.4.tar.bz2) = 573a8cc045978edd8fb8cf10793b9eee7bcc6d63
-Size (kdelibs-3.1.4.tar.bz2) = 10537433 bytes
+SHA1 (kdelibs-3.1.5.tar.bz2) = ee6f3f60e66e82ed8b433a57e1c6c79c1a522b18
+Size (kdelibs-3.1.5.tar.bz2) = 10549741 bytes
 SHA1 (patch-aa) = 4e79f488d54f6b05a23951c6e206e6582ef2a2a7
-SHA1 (patch-ab) = 5b2188a3e4edd1f5eb0f3516f6a846e9a8c8c055
+SHA1 (patch-ab) = 7b71c198b0588c339a2dbfbcf5d2ea85f51d2420
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
-SHA1 (patch-af) = 5b19804a42f5358f26ded54e9606efbc9a9a19b4
-SHA1 (patch-ag) = 2b0aac962badf6e57f7baafa9497e73be503af59
+SHA1 (patch-af) = 4986e0d064e57c2897972cf59df914c20451a2e4
+SHA1 (patch-ag) = 67f03f7cc7c705f62e7f293b3dedb532685a2372
 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd
 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3
 SHA1 (patch-ak) = c72a871cbcd343c86145e705dd93c00b82051d5b
 SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901
 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab
 SHA1 (patch-ao) = 6f7e381fd3d5c66e7d03ce28dd8e17d8af0608c2
-SHA1 (patch-ap) = d6bf9271eea905aadfcaa847f9c9363c81bc1df8
+SHA1 (patch-ap) = ea21692595d0b84366ebccc346c4772ba476a647
 SHA1 (patch-aq) = 69cd39a625654839c1e8358284df291f947682e5
 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988
 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1
-SHA1 (patch-av) = f68e06883c6f1f8e49514c71e5c66cbbce28b805
+SHA1 (patch-av) = 72cc57b98d74386846a86893a1e710f8b6913811
 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620
 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0
 SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710
-SHA1 (patch-ba) = 6ef0c507b513d332d4abaa24c20dd0a21272ce5c
+SHA1 (patch-ba) = bab79f14e1b756ba32c30c384a377136ecf2a6b1
 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 4f4a1fc17108f539c3e459744ccc0dc6f71bb989
 SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd
-SHA1 (patch-bh) = d2f2f4d506412d1f12dde4e2e6a0c88e82853eca
+SHA1 (patch-bh) = a835be74a386dd177189a9a5f36cfe8f65a5e759
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bm) = 9b5326099e3006c491a90ac8ad8e5f5aa0eed945
-SHA1 (patch-bn) = 4840127102ac4e79481c09eb378b5af8df9a930b
+SHA1 (patch-bn) = 279687e99974d0f17752fa780bdb1cb23962c385
 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20
 SHA1 (patch-bq) = 24af1fd6fba160ccc293cb28dd7139b80c52eb87
-SHA1 (patch-br) = 7f9bb52a0181115a5c0bbea3b219441eb4d3d89e
+SHA1 (patch-br) = 3fa15ea8a562e58a5775ecd847461c29756c5c1b
 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
-SHA1 (patch-cd) = e9f1096e9c293c545a2121c73ceb238d98e9b486
+SHA1 (patch-cd) = 27f7358d40dd7f02ae877ab0ff501086006ec12a
 SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab
index 25c9f83e2d0..040dbfbb3f5 100644
--- a/x11/kdelibs3/patches/patch-ab
+++ b/x11/kdelibs3/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/15 09:52:51 markd Exp $
 
---- arts/knotify/Makefile.in.orig	2003-07-16 12:59:51.000000000 +1200
+--- arts/knotify/Makefile.in.orig	2003-12-29 11:16:52.000000000 +1300
 +++ arts/knotify/Makefile.in
-@@ -379,17 +379,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
+@@ -380,17 +380,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
  
  ####### Files
  bin_PROGRAMS = knotify
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  check_PROGRAMS = knotifytest
-@@ -407,23 +412,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -409,23 +414,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
  #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
  #>+ 1
-@@ -433,12 +443,18 @@ knotifytest_DEPENDENCIES =
+@@ -435,12 +445,18 @@ knotifytest_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -92,7 +92,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/knotifytest.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -459,14 +475,14 @@ CXXLD = $(CXX)
+@@ -461,14 +477,14 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -110,7 +110,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -513,6 +529,8 @@ clean-libLTLIBRARIES:
+@@ -515,6 +531,8 @@ clean-libLTLIBRARIES:
  	done
  knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
@@ -119,7 +119,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -562,8 +580,9 @@ mostlyclean-compile:
+@@ -564,8 +582,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -130,7 +130,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
  
  distclean-depend:
-@@ -685,7 +704,7 @@ distclean-tags:
+@@ -687,7 +706,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
@@ -139,7 +139,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -825,13 +844,16 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -826,13 +845,16 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  messages:
  	$(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
@@ -159,7 +159,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>+ 5
  knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES)
  	$(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; false )
-@@ -846,7 +868,7 @@ knotify.moc: $(srcdir)/knotify.h
+@@ -847,7 +869,7 @@ knotify.moc: $(srcdir)/knotify.h
  mocs: knotify.moc
  #>+ 3
  clean-metasources:
@@ -168,7 +168,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -864,33 +886,33 @@ force-reedit:
+@@ -865,33 +887,33 @@ force-reedit:
  
  
  #>+ 11
@@ -215,11 +215,11 @@ $NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -900,5 +922,5 @@ kde-rpo-clean:
+@@ -901,5 +923,5 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 3
--knotify.o: knotify.moc 
 -knotify.lo: knotify.moc 
+-knotify.o: knotify.moc 
 +knotify.lo: knotify.moc knotify.moc 
 +knotify.o: knotify.moc knotify.moc 
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
index 3f7d4b51bf1..b20b39abe54 100644
--- a/x11/kdelibs3/patches/patch-af
+++ b/x11/kdelibs3/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2003/03/11 13:10:34 markd Exp $
+$NetBSD: patch-af,v 1.4 2004/01/15 09:52:51 markd Exp $
 
---- dcop/Makefile.am.orig	Mon Sep 16 09:12:54 2002
+--- dcop/Makefile.am.orig	2003-12-17 03:37:17.000000000 +1300
 +++ dcop/Makefile.am
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ INCLUDES=  $(all_includes)
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:10:34 markd Exp $
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -45,13 +45,17 @@
+@@ -41,13 +41,17 @@ METASOURCES = AUTO
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
@@ -33,13 +33,13 @@ $NetBSD: patch-af,v 1.3 2003/03/11 13:10:34 markd Exp $
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -64,9 +68,6 @@
- testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
+@@ -61,9 +65,6 @@ testdcopc_LDADD =  KDE-ICE/libkICE.la $(
+ 
+ EXTRA_DIST = HOWTO ICE Mainpage.dox
  
- EXTRA_DIST = HOWTO ICE
--
 -dummy.cpp:
 -	echo > dummy.cpp
- 
+-
  DOXYGEN_REFERENCES = kdecore
- DOXYGEN_EXCLUDE = KDE-ICE/*
+ DOXYGEN_EXCLUDE = KDE-ICE
+ 
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
index b1c6e515388..a726ac824f7 100644
--- a/x11/kdelibs3/patches/patch-ag
+++ b/x11/kdelibs3/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
+$NetBSD: patch-ag,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- dcop/Makefile.in.orig	Thu May  8 05:24:03 2003
+--- dcop/Makefile.in.orig	2003-12-29 11:16:52.000000000 +1300
 +++ dcop/Makefile.in
-@@ -404,7 +404,7 @@ INCLUDES = $(all_includes)
+@@ -406,7 +406,7 @@ INCLUDES = $(all_includes)
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -420,13 +420,17 @@ noinst_HEADERS = version.h dcopglobal.h 
+@@ -418,13 +418,17 @@ noinst_HEADERS = version.h dcopglobal.h 
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -448,14 +452,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -447,14 +451,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = dcop-path.h
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la
  am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \
  	dcopclient.lo
-@@ -466,15 +467,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo
+@@ -465,15 +466,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo
  	dcopclient.lo
  @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
@@ -79,7 +79,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
  #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
  #>+ 1
-@@ -502,25 +511,31 @@ am__depfiles_maybe = depfiles
+@@ -501,25 +510,31 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/dcopserver.Plo \
@@ -119,7 +119,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -548,8 +563,9 @@ CXXLD = $(CXX)
+@@ -547,8 +562,9 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
@@ -131,7 +131,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  HEADERS = $(include_HEADERS) $(noinst_HEADERS)
  
  
-@@ -562,7 +578,7 @@ DIST_COMMON = $(include_HEADERS) $(noins
+@@ -561,7 +577,7 @@ DIST_COMMON = $(include_HEADERS) $(noins
  	$(srcdir)/../admin/Doxyfile.am Makefile.am Makefile.in \
  	dcop-path.h.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -140,7 +140,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -616,6 +632,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) 
+@@ -615,6 +631,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) 
  @KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
  @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
@@ -149,7 +149,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -676,10 +694,11 @@ distclean-compile:
+@@ -675,10 +693,11 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopobject.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopref.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver.Plo@am__quote@
@@ -162,7 +162,16 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcop.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@
  
-@@ -1059,9 +1078,6 @@ uninstall-info: uninstall-info-recursive
+@@ -904,7 +923,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=dcopc.h configure.in.in 
++KDE_DIST=configure.in.in Makefile.in.rej dcopc.h 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -1064,9 +1083,6 @@ uninstall-info: uninstall-info-recursive
  	uninstall-info-recursive uninstall-libLTLIBRARIES \
  	uninstall-local uninstall-recursive
  
@@ -172,7 +181,40 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  apidox-am-yes:
  	@if test "$(subdir)" != "."; then \
  		$(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\
-@@ -1266,18 +1282,6 @@ force-reedit:
+@@ -1250,17 +1266,17 @@ testdcop.moc: $(srcdir)/testdcop.h
+ #>+ 1
+ mocs: testdcop.moc
+ #>+ 3
+-dcopserver.moc: $(srcdir)/dcopserver.h
+-	$(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc
+-
+-#>+ 1
+-mocs: dcopserver.moc
+-#>+ 3
+ dcopclient.moc: $(srcdir)/dcopclient.h
+ 	$(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
+ 
+ #>+ 1
+ mocs: dcopclient.moc
++#>+ 3
++dcopserver.moc: $(srcdir)/dcopserver.h
++	$(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc
++
++#>+ 1
++mocs: dcopserver.moc
+ #>+ 8
+ libDCOP.la.closure: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
+ 	@echo "int main() {return 0;}" > libDCOP_la_closure.cpp
+@@ -1272,7 +1288,7 @@ libDCOP.la.closure: $(libDCOP_la_OBJECTS
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  testdcop.moc dcopserver.moc dcopclient.moc
++	-rm -f  testdcop.moc dcopclient.moc dcopserver.moc
+ 
+ #>+ 3
+ clean-closures:
+@@ -1289,18 +1305,6 @@ force-reedit:
  
  
  #>+ 11
@@ -191,7 +233,7 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopref.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopclient.cpp  dcopclient.moc
  	@echo 'creating libDCOP_la.all_cpp.cpp ...'; \
  	rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \
-@@ -1289,22 +1293,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi
+@@ -1312,22 +1316,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi
  	cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \
  	rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files
  
@@ -231,15 +273,15 @@ $NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1314,9 +1330,9 @@ kde-rpo-clean:
+@@ -1337,9 +1353,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
-+dcopclient.lo: dcopclient.moc 
+-dcopclient.o: dcopclient.moc 
+ dcopclient.lo: dcopclient.moc 
  testdcop.lo: testdcop.moc 
+ dcopserver.o: dcopserver.moc 
+-dcopserver.lo: dcopserver.moc 
++dcopclient.o: dcopclient.moc 
  testdcop.o: testdcop.moc 
--dcopclient.lo: dcopclient.moc 
--dcopserver.o: dcopserver.moc 
- dcopclient.o: dcopclient.moc 
-+dcopserver.o: dcopserver.moc 
- dcopserver.lo: dcopserver.moc 
++dcopserver.lo: dcopserver.moc 
diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap
index 4fe16f5754b..b97395c12bc 100644
--- a/x11/kdelibs3/patches/patch-ap
+++ b/x11/kdelibs3/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
+$NetBSD: patch-ap,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- kded/Makefile.in.orig	Thu May  8 05:24:05 2003
+--- kded/Makefile.in.orig	2003-12-29 11:16:54.000000000 +1300
 +++ kded/Makefile.in
-@@ -394,18 +394,22 @@ x_libraries = @x_libraries@
+@@ -396,18 +396,22 @@ x_libraries = @x_libraries@
  
  INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
  
@@ -32,7 +32,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  				kbuildservicefactory.cpp \
  				kbuildservicegroupfactory.cpp \
  				kbuildimageiofactory.cpp \
-@@ -413,15 +417,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c
+@@ -415,15 +419,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c
  				kctimefactory.cpp
  
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  kdontchangethehostname_LDADD = $(LIB_KDECORE) 
-@@ -448,46 +456,56 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -451,46 +459,56 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -138,7 +138,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT)
  #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS)
  #>+ 1
-@@ -497,33 +515,39 @@ kdontchangethehostname_DEPENDENCIES =
+@@ -500,33 +518,39 @@ kdontchangethehostname_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -185,7 +185,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -545,6 +569,7 @@ CXXLD = $(CXX)
+@@ -548,6 +572,7 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
@@ -193,7 +193,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  	$(kbuildsycoca_SOURCES) $(kded_SOURCES) \
  	$(kdontchangethehostname_SOURCES)
  DATA = $(servicetype_DATA) $(update_DATA)
-@@ -553,7 +578,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE
+@@ -556,7 +581,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE
  
  DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -202,7 +202,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -602,6 +627,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC
+@@ -605,6 +630,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC
  	$(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS)
  kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS)
@@ -213,7 +213,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -647,15 +676,18 @@ mostlyclean-compile:
+@@ -650,15 +679,18 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -233,16 +233,16 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdedmodule.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khostname.Po@am__quote@
  
-@@ -814,7 +846,7 @@ distclean-tags:
+@@ -817,7 +849,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h 
-+KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h 
+-KDE_DIST=kdedmodule.desktop README.kded kded.h HOWTO DESIGN kctimefactory.h kded.upd 
++KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO Makefile.in.rej kded.upd kctimefactory.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -953,9 +985,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -955,19 +987,16 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-info-am uninstall-libLTLIBRARIES \
  	uninstall-servicetypeDATA uninstall-updateDATA
  
@@ -252,7 +252,39 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 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:
-@@ -987,45 +1016,45 @@ force-reedit:
+ 
+ #>+ 3
+-kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h
+-	$(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc
++kded.moc: $(srcdir)/kded.h
++	$(MOC) $(srcdir)/kded.h -o kded.moc
+ 
+ #>+ 1
+-mocs: kbuildsycoca.moc
++mocs: kded.moc
+ #>+ 3
+ kdedmodule.moc: $(srcdir)/kdedmodule.h
+ 	$(MOC) $(srcdir)/kdedmodule.h -o kdedmodule.moc
+@@ -975,14 +1004,14 @@ kdedmodule.moc: $(srcdir)/kdedmodule.h
+ #>+ 1
+ mocs: kdedmodule.moc
+ #>+ 3
+-kded.moc: $(srcdir)/kded.h
+-	$(MOC) $(srcdir)/kded.h -o kded.moc
++kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h
++	$(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc
+ 
+ #>+ 1
+-mocs: kded.moc
++mocs: kbuildsycoca.moc
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kbuildsycoca.moc kdedmodule.moc kded.moc
++	-rm -f  kded.moc kdedmodule.moc kbuildsycoca.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -995,45 +1024,45 @@ force-reedit:
  
  
  #>+ 11
@@ -276,7 +308,7 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
 +	rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files
  
  #>+ 11
--kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp  kded.moc kdedmodule.moc
+-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp  kdedmodule.moc kded.moc
 -	@echo 'creating kded_la.all_cpp.cpp ...'; \
 -	rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \
@@ -319,15 +351,16 @@ $NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1036,8 +1065,8 @@ kde-rpo-clean:
+@@ -1043,9 +1072,9 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
  
  #>+ 7
- kbuildsycoca.lo: kbuildsycoca.moc 
--kbuildsycoca.o: kbuildsycoca.moc 
--kded.lo: kded.moc 
+-kded.o: kded.moc 
+-kdedmodule.o: kdedmodule.moc 
 -kdedmodule.lo: kdedmodule.moc 
- kded.o: kded.moc 
-+kded.lo: kded.moc 
- kdedmodule.o: kdedmodule.moc 
-+kbuildsycoca.o: kbuildsycoca.moc 
+ kbuildsycoca.lo: kbuildsycoca.moc 
++kded.o: kded.moc 
+ kded.lo: kded.moc 
++kdedmodule.o: kdedmodule.moc 
+ kbuildsycoca.o: kbuildsycoca.moc 
 +kdedmodule.lo: kdedmodule.moc 
diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av
index b3812ddac38..15dd9353d74 100644
--- a/x11/kdelibs3/patches/patch-av
+++ b/x11/kdelibs3/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
+$NetBSD: patch-av,v 1.7 2004/01/15 09:52:51 markd Exp $
 
---- kdeprint/management/Makefile.in.orig	2003-07-16 12:59:54.000000000 +1200
+--- kdeprint/management/Makefile.in.orig	2003-12-29 11:16:54.000000000 +1300
 +++ kdeprint/management/Makefile.in
-@@ -375,15 +375,19 @@ x_includes = @x_includes@
+@@ -376,15 +376,19 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
  
@@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
  
  libkdeprint_management_la_SOURCES = \
-@@ -428,11 +432,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -430,11 +434,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -49,7 +49,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la
  am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \
  	kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \
-@@ -477,18 +488,20 @@ libkdeprint_management_la_nofinal_OBJECT
+@@ -479,18 +490,20 @@ libkdeprint_management_la_nofinal_OBJECT
  bin_PROGRAMS = kaddprinterwizard$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -74,7 +74,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kiconselectaction.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kmconfigcommand.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kmconfigdialog.Plo \
-@@ -535,10 +548,12 @@ am__depfiles_maybe = depfiles
+@@ -537,10 +550,12 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@	./$(DEPDIR)/networkscanner.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/pluginaction.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
@@ -89,7 +89,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kiconselectaction.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmconfigcommand.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmconfigdialog.Plo \
-@@ -586,8 +601,10 @@ am__depfiles_maybe = depfiles
+@@ -588,8 +603,10 @@ am__depfiles_maybe = depfiles
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/pluginaction.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =   ./$(DEPDIR)/cjanuswidget.Plo \
@@ -101,7 +101,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kiconselectaction.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmconfigcommand.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmconfigdialog.Plo \
-@@ -654,6 +671,7 @@ CXXLD = $(CXX)
+@@ -656,6 +673,7 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
@@ -109,7 +109,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  	$(libkdeprint_management_la_SOURCES) \
  	$(kaddprinterwizard_SOURCES)
  DATA = $(dataicon_DATA)
-@@ -662,7 +680,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
+@@ -664,7 +682,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H
  
  DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \
  	Makefile.in
@@ -118,7 +118,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -709,6 +727,8 @@ clean-libLTLIBRARIES:
+@@ -711,6 +729,8 @@ clean-libLTLIBRARIES:
  	done
  kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS)
@@ -127,7 +127,7 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) 
-@@ -754,9 +774,10 @@ distclean-compile:
+@@ -756,9 +776,10 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjanuswidget.Plo@am__quote@
@@ -139,16 +139,16 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiconselectaction.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigcommand.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigdialog.Plo@am__quote@
-@@ -949,7 +970,7 @@ distclean-tags:
+@@ -951,7 +972,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=tileup.png tiledown.png side.png 
+-KDE_DIST=tiledown.png tileup.png side.png 
 +KDE_DIST=Makefile.in.rej side.png tiledown.png tileup.png 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1086,9 +1107,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -1087,9 +1108,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \
  	uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES
  
@@ -158,482 +158,485 @@ $NetBSD: patch-av,v 1.6 2003/07/30 13:16:57 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:
-@@ -1103,11 +1121,11 @@ libkdeprint_management.la.closure: $(lib
+@@ -1104,83 +1122,77 @@ libkdeprint_management.la.closure: $(lib
  
  
  #>+ 3
--kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
--	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
+-kmjobviewer.moc: $(srcdir)/kmjobviewer.h
+-	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
+-
+-#>+ 1
+-mocs: kmjobviewer.moc
+-#>+ 3
+-kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
+-	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
 +kmmainview.moc: $(srcdir)/kmmainview.h
 +	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
  
  #>+ 1
--mocs: kmpropcontainer.moc
+-mocs: kmwsocketutil.moc
 +mocs: kmmainview.moc
  #>+ 3
- kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
- 	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
-@@ -1115,107 +1133,107 @@ kmconfigfonts.moc: $(srcdir)/kmconfigfon
+-kmwsmb.moc: $(srcdir)/kmwsmb.h
+-	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
++kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
++	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
+ 
  #>+ 1
- mocs: kmconfigfonts.moc
+-mocs: kmwsmb.moc
++mocs: kmconfigfonts.moc
  #>+ 3
--kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
--	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
+-kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
+-	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
 +kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
 +	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
  
  #>+ 1
--mocs: kmwsocketutil.moc
+-mocs: kmwdrivertest.moc
 +mocs: kmdriverdbwidget.moc
  #>+ 3
--kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
--	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
+-kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
+-	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
 +kmconfigpage.moc: $(srcdir)/kmconfigpage.h
 +	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
  
  #>+ 1
--mocs: kmspecialprinterdlg.moc
+-mocs: kmconfigdialog.moc
 +mocs: kmconfigpage.moc
  #>+ 3
--kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
--	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
+-pluginaction.moc: $(srcdir)/pluginaction.h
+-	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
 +smbview.moc: $(srcdir)/smbview.h
 +	$(MOC) $(srcdir)/smbview.h -o smbview.moc
  
  #>+ 1
--mocs: kmconfigfilter.moc
+-mocs: pluginaction.moc
 +mocs: smbview.moc
  #>+ 3
--kmwclass.moc: $(srcdir)/kmwclass.h
--	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
+-kmdriverdb.moc: $(srcdir)/kmdriverdb.h
+-	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
 +kmwsmb.moc: $(srcdir)/kmwsmb.h
 +	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
  
  #>+ 1
--mocs: kmwclass.moc
+-mocs: kmdriverdb.moc
 +mocs: kmwsmb.moc
  #>+ 3
--kmconfigpage.moc: $(srcdir)/kmconfigpage.h
--	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
+-kmtimer.moc: $(srcdir)/kmtimer.h
+-	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
 +cjanuswidget.moc: $(srcdir)/cjanuswidget.h
 +	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
  
  #>+ 1
--mocs: kmconfigpage.moc
+-mocs: kmtimer.moc
 +mocs: cjanuswidget.moc
  #>+ 3
--pluginaction.moc: $(srcdir)/pluginaction.h
--	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
+-kmiconview.moc: $(srcdir)/kmiconview.h
+-	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
 +networkscanner.moc: $(srcdir)/networkscanner.h
 +	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
  
  #>+ 1
--mocs: pluginaction.moc
+-mocs: kmiconview.moc
 +mocs: networkscanner.moc
  #>+ 3
--kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
--	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
+-kmmainview.moc: $(srcdir)/kmmainview.h
+-	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
 +kmlistview.moc: $(srcdir)/kmlistview.h
 +	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
  
  #>+ 1
--mocs: kmwdriverselect.moc
+-mocs: kmmainview.moc
 +mocs: kmlistview.moc
  #>+ 3
--kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
--	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
+-kmconfigpage.moc: $(srcdir)/kmconfigpage.h
+-	$(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc
 +pluginaction.moc: $(srcdir)/pluginaction.h
 +	$(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc
  
  #>+ 1
--mocs: kxmlcommanddlg.moc
+-mocs: kmconfigpage.moc
 +mocs: pluginaction.moc
  #>+ 3
--kmwizardpage.moc: $(srcdir)/kmwizardpage.h
--	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
+-kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
+-	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
 +kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
 +	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
  
  #>+ 1
--mocs: kmwizardpage.moc
+-mocs: kmpropcontainer.moc
 +mocs: kmconfiggeneral.moc
  #>+ 3
--kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
--	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
+-kmdbcreator.moc: $(srcdir)/kmdbcreator.h
+-	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
 +kmwclass.moc: $(srcdir)/kmwclass.h
 +	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
  
  #>+ 1
--mocs: kmdriverdbwidget.moc
+-mocs: kmdbcreator.moc
 +mocs: kmwclass.moc
  #>+ 3
--kmdbcreator.moc: $(srcdir)/kmdbcreator.h
--	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
-+kminstancepage.moc: $(srcdir)/kminstancepage.h
-+	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
- 
+ kminstancepage.moc: $(srcdir)/kminstancepage.h
+ 	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
+@@ -1188,17 +1200,23 @@ kminstancepage.moc: $(srcdir)/kminstance
  #>+ 1
--mocs: kmdbcreator.moc
-+mocs: kminstancepage.moc
+ mocs: kminstancepage.moc
  #>+ 3
--kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
--	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
+-networkscanner.moc: $(srcdir)/networkscanner.h
+-	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
 +kmprinterview.moc: $(srcdir)/kmprinterview.h
 +	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
  
  #>+ 1
--mocs: kxmlcommandselector.moc
+-mocs: networkscanner.moc
 +mocs: kmprinterview.moc
  #>+ 3
--kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
--	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
+-kmwclass.moc: $(srcdir)/kmwclass.h
+-	$(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc
 +kmiconview.moc: $(srcdir)/kmiconview.h
 +	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
  
  #>+ 1
--mocs: kmwdrivertest.moc
+-mocs: kmwclass.moc
 +mocs: kmiconview.moc
- #>+ 3
--kmmainview.moc: $(srcdir)/kmmainview.h
--	$(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc
++#>+ 3
 +kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h
 +	$(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc
- 
- #>+ 1
--mocs: kmmainview.moc
++
++#>+ 1
 +mocs: kmpropcontainer.moc
  #>+ 3
--kmwizard.moc: $(srcdir)/kmwizard.h
--	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
-+kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
-+	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
- 
+ kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h
+ 	$(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc
+@@ -1206,65 +1224,65 @@ kmwdriverselect.moc: $(srcdir)/kmwdriver
  #>+ 1
--mocs: kmwizard.moc
-+mocs: kmwdriverselect.moc
+ mocs: kmwdriverselect.moc
  #>+ 3
--kmpropwidget.moc: $(srcdir)/kmpropwidget.h
--	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
+-kmwizardpage.moc: $(srcdir)/kmwizardpage.h
+-	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
 +kmdbcreator.moc: $(srcdir)/kmdbcreator.h
 +	$(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc
  
  #>+ 1
--mocs: kmpropwidget.moc
+-mocs: kmwizardpage.moc
 +mocs: kmdbcreator.moc
  #>+ 3
--cjanuswidget.moc: $(srcdir)/cjanuswidget.h
--	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
+-kmwlocal.moc: $(srcdir)/kmwlocal.h
+-	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
 +kmpropwidget.moc: $(srcdir)/kmpropwidget.h
 +	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
  
  #>+ 1
--mocs: cjanuswidget.moc
+-mocs: kmwlocal.moc
 +mocs: kmpropwidget.moc
  #>+ 3
- kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
- 	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
-@@ -1223,83 +1241,83 @@ kmconfigdialog.moc: $(srcdir)/kmconfigdi
+-kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
+-	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
++kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h
++	$(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc
+ 
  #>+ 1
- mocs: kmconfigdialog.moc
+-mocs: kmconfigjobs.moc
++mocs: kmconfigdialog.moc
  #>+ 3
--kminstancepage.moc: $(srcdir)/kminstancepage.h
--	$(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc
+-kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
+-	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
 +kmwlocal.moc: $(srcdir)/kmwlocal.h
 +	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
  
  #>+ 1
--mocs: kminstancepage.moc
+-mocs: kmconfigfilter.moc
 +mocs: kmwlocal.moc
  #>+ 3
--kiconselectaction.moc: $(srcdir)/kiconselectaction.h
--	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
+-kmwsocket.moc: $(srcdir)/kmwsocket.h
+-	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
 +kmjobviewer.moc: $(srcdir)/kmjobviewer.h
 +	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
  
  #>+ 1
--mocs: kiconselectaction.moc
+-mocs: kmwsocket.moc
 +mocs: kmjobviewer.moc
  #>+ 3
--kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
--	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
+-kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h
+-	$(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc
 +kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
 +	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
  
  #>+ 1
--mocs: kmdriverdialog.moc
+-mocs: kmconfigfonts.moc
 +mocs: kmspecialprinterdlg.moc
  #>+ 3
--kmlistview.moc: $(srcdir)/kmlistview.h
--	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
+-kmpropwidget.moc: $(srcdir)/kmpropwidget.h
+-	$(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc
 +kiconselectaction.moc: $(srcdir)/kiconselectaction.h
 +	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
  
  #>+ 1
--mocs: kmlistview.moc
+-mocs: kmpropwidget.moc
 +mocs: kiconselectaction.moc
  #>+ 3
--kmwsmb.moc: $(srcdir)/kmwsmb.h
--	$(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc
+-kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
+-	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
 +kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h
 +	$(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc
  
  #>+ 1
--mocs: kmwsmb.moc
+-mocs: kxmlcommanddlg.moc
 +mocs: kmwsocketutil.moc
  #>+ 3
--kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
--	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
+-kmwizard.moc: $(srcdir)/kmwizard.h
+-	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
 +kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h
 +	$(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc
  
  #>+ 1
--mocs: kmconfiggeneral.moc
+-mocs: kmwizard.moc
 +mocs: kmconfigfilter.moc
  #>+ 3
--kmwlocal.moc: $(srcdir)/kmwlocal.h
--	$(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc
+-kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
+-	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
 +kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h
 +	$(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc
  
  #>+ 1
--mocs: kmwlocal.moc
+-mocs: kxmlcommandselector.moc
 +mocs: kxmlcommanddlg.moc
  #>+ 3
--kmprinterview.moc: $(srcdir)/kmprinterview.h
--	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
-+kmpropertypage.moc: $(srcdir)/kmpropertypage.h
-+	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
- 
+ kmpropertypage.moc: $(srcdir)/kmpropertypage.h
+ 	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
+@@ -1272,62 +1290,62 @@ kmpropertypage.moc: $(srcdir)/kmproperty
  #>+ 1
--mocs: kmprinterview.moc
-+mocs: kmpropertypage.moc
+ mocs: kmpropertypage.moc
  #>+ 3
--smbview.moc: $(srcdir)/smbview.h
--	$(MOC) $(srcdir)/smbview.h -o smbview.moc
+-kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
+-	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
 +kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
 +	$(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc
  
  #>+ 1
--mocs: smbview.moc
+-mocs: kmdriverdialog.moc
 +mocs: kxmlcommandselector.moc
  #>+ 3
--kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
--	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
+-kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h
+-	$(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc
 +kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h
 +	$(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc
  
  #>+ 1
--mocs: kmconfigjobs.moc
+-mocs: kmdriverdbwidget.moc
 +mocs: kmwdrivertest.moc
  #>+ 3
--networkscanner.moc: $(srcdir)/networkscanner.h
--	$(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc
+-smbview.moc: $(srcdir)/smbview.h
+-	$(MOC) $(srcdir)/smbview.h -o smbview.moc
 +kmwsocket.moc: $(srcdir)/kmwsocket.h
 +	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
  
  #>+ 1
--mocs: networkscanner.moc
+-mocs: smbview.moc
 +mocs: kmwsocket.moc
  #>+ 3
--kmdriverdb.moc: $(srcdir)/kmdriverdb.h
--	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
+-kmlistview.moc: $(srcdir)/kmlistview.h
+-	$(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc
 +kmwizard.moc: $(srcdir)/kmwizard.h
 +	$(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc
  
  #>+ 1
--mocs: kmdriverdb.moc
+-mocs: kmlistview.moc
 +mocs: kmwizard.moc
  #>+ 3
--kmwsocket.moc: $(srcdir)/kmwsocket.h
--	$(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc
+-kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h
+-	$(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc
 +kmdriverdb.moc: $(srcdir)/kmdriverdb.h
 +	$(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc
  
  #>+ 1
--mocs: kmwsocket.moc
+-mocs: kmconfiggeneral.moc
 +mocs: kmdriverdb.moc
  #>+ 3
- kmtimer.moc: $(srcdir)/kmtimer.h
- 	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
-@@ -1307,26 +1325,26 @@ kmtimer.moc: $(srcdir)/kmtimer.h
+-kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
+-	$(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc
++kmtimer.moc: $(srcdir)/kmtimer.h
++	$(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc
+ 
  #>+ 1
- mocs: kmtimer.moc
+-mocs: kmspecialprinterdlg.moc
++mocs: kmtimer.moc
  #>+ 3
--kmiconview.moc: $(srcdir)/kmiconview.h
--	$(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc
+-kiconselectaction.moc: $(srcdir)/kiconselectaction.h
+-	$(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc
 +kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h
 +	$(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc
  
  #>+ 1
--mocs: kmiconview.moc
+-mocs: kiconselectaction.moc
 +mocs: kmconfigjobs.moc
  #>+ 3
--kmpropertypage.moc: $(srcdir)/kmpropertypage.h
--	$(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc
+-kmprinterview.moc: $(srcdir)/kmprinterview.h
+-	$(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc
 +kmwizardpage.moc: $(srcdir)/kmwizardpage.h
 +	$(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc
  
  #>+ 1
--mocs: kmpropertypage.moc
+-mocs: kmprinterview.moc
 +mocs: kmwizardpage.moc
  #>+ 3
--kmjobviewer.moc: $(srcdir)/kmjobviewer.h
--	$(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc
+-cjanuswidget.moc: $(srcdir)/cjanuswidget.h
+-	$(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc
 +kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h
 +	$(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc
  
  #>+ 1
--mocs: kmjobviewer.moc
+-mocs: cjanuswidget.moc
 +mocs: kmdriverdialog.moc
  #>+ 3
  clean-metasources:
--	-rm -f  kmpropcontainer.moc kmconfigfonts.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc
+-	-rm -f  kmjobviewer.moc kmwsocketutil.moc kmwsmb.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmlistview.moc kmconfiggeneral.moc kmspecialprinterdlg.moc kiconselectaction.moc kmprinterview.moc cjanuswidget.moc
 +	-rm -f  kmmainview.moc kmconfigfonts.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmwizardpage.moc kmdriverdialog.moc
  
  #>+ 3
  clean-closures:
-@@ -1343,7 +1361,7 @@ force-reedit:
+@@ -1344,7 +1362,7 @@ force-reedit:
  
  
  #>+ 11
--libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmpropcontainer.moc kmwsocketutil.moc kmconfigfonts.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kmwdriverselect.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmpropwidget.moc kmwizard.moc cjanuswidget.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmconfigjobs.moc networkscanner.moc kmdriverdb.moc kmwsocket.moc kmiconview.moc kmtimer.moc kmjobviewer.moc kmpropertypage.moc
+-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmwsmb.moc kmwsocketutil.moc kmjobviewer.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmspecialprinterdlg.moc kmconfiggeneral.moc kmlistview.moc kmprinterview.moc kiconselectaction.moc cjanuswidget.moc
 +libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp  kmconfigfonts.moc kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmdriverdialog.moc kmwizardpage.moc
  	@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
  	rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
-@@ -1379,77 +1397,77 @@ kde-rpo-clean:
+@@ -1380,77 +1398,77 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 75
--kmtimer.o: kmtimer.moc 
--kmpropertypage.o: kmpropertypage.moc 
--smbview.lo: smbview.moc 
--kmdriverdialog.o: kmdriverdialog.moc 
- kmmainview.o: kmmainview.moc 
+-kiconselectaction.lo: kiconselectaction.moc 
 -kmwsmb.o: kmwsmb.moc 
--kmwclass.lo: kmwclass.moc 
--kmconfigfonts.o: kmconfigfonts.moc 
--kmwsocket.o: kmwsocket.moc 
+-kmwsocket.lo: kmwsocket.moc 
+-kmconfigfilter.o: kmconfigfilter.moc 
+-kmconfiggeneral.o: kmconfiggeneral.moc 
+-kmdriverdialog.o: kmdriverdialog.moc 
+-kmconfigjobs.o: kmconfigjobs.moc 
+-kxmlcommandselector.lo: kxmlcommandselector.moc 
+-cjanuswidget.lo: cjanuswidget.moc 
+-kmdriverdbwidget.lo: kmdriverdbwidget.moc 
+-kmiconview.lo: kmiconview.moc 
+-kminstancepage.o: kminstancepage.moc 
+-kmwsocketutil.o: kmwsocketutil.moc 
+-kmdriverdb.o: kmdriverdb.moc 
+-kmconfigpage.lo: kmconfigpage.moc 
+-kmwdrivertest.o: kmwdrivertest.moc 
+-kmdbcreator.o: kmdbcreator.moc 
+-kmconfigdialog.lo: kmconfigdialog.moc 
+-kmtimer.o: kmtimer.moc 
++kmmainview.o: kmmainview.moc 
 +kmpropcontainer.lo: kmpropcontainer.moc 
-+kmmainview.lo: kmmainview.moc 
+ kmmainview.lo: kmmainview.moc 
+-kmwsocket.o: kmwsocket.moc 
+-kmdriverdialog.lo: kmdriverdialog.moc 
+-kmdbcreator.lo: kmdbcreator.moc 
+-kmjobviewer.lo: kmjobviewer.moc 
+-kminstancepage.lo: kminstancepage.moc 
+-kmconfigfilter.lo: kmconfigfilter.moc 
 +kmconfigjobs.o: kmconfigjobs.moc 
-+kmpropwidget.o: kmpropwidget.moc 
-+kmdbcreator.o: kmdbcreator.moc 
-+kmwizardpage.lo: kmwizardpage.moc 
-+kmwclass.o: kmwclass.moc 
- kmwlocal.lo: kmwlocal.moc 
-+kmconfigpage.o: kmconfigpage.moc 
-+pluginaction.lo: pluginaction.moc 
- kmwdrivertest.o: kmwdrivertest.moc 
+ kmpropwidget.o: kmpropwidget.moc 
+-kmpropcontainer.lo: kmpropcontainer.moc 
+-kmconfiggeneral.lo: kmconfiggeneral.moc 
 -kmpropertypage.lo: kmpropertypage.moc 
--kmwlocal.o: kmwlocal.moc 
--kxmlcommanddlg.lo: kxmlcommanddlg.moc 
--kminstancepage.lo: kminstancepage.moc 
--kiconselectaction.lo: kiconselectaction.moc 
--kxmlcommandselector.lo: kxmlcommandselector.moc 
+-pluginaction.lo: pluginaction.moc 
+-kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
 -kmconfigfonts.lo: kmconfigfonts.moc 
--kmwsocket.lo: kmwsocket.moc 
--kmmainview.lo: kmmainview.moc 
--kxmlcommanddlg.o: kxmlcommanddlg.moc 
--kmconfiggeneral.lo: kmconfiggeneral.moc 
--kmlistview.lo: kmlistview.moc 
+-kmwlocal.lo: kmwlocal.moc 
+-kmconfigfonts.o: kmconfigfonts.moc 
++kmdbcreator.o: kmdbcreator.moc 
+ kmwizardpage.lo: kmwizardpage.moc 
++kmwclass.o: kmwclass.moc 
++kmwlocal.lo: kmwlocal.moc 
+ kmconfigpage.o: kmconfigpage.moc 
 -kmwsocketutil.lo: kmwsocketutil.moc 
++pluginaction.lo: pluginaction.moc 
++kmwdrivertest.o: kmwdrivertest.moc 
 +smbview.lo: smbview.moc 
- kmconfigdialog.lo: kmconfigdialog.moc 
--kmdriverdbwidget.lo: kmdriverdbwidget.moc 
--kmdbcreator.lo: kmdbcreator.moc 
--kmjobviewer.o: kmjobviewer.moc 
--kmpropcontainer.lo: kmpropcontainer.moc 
--kmwclass.o: kmwclass.moc 
- kmwizardpage.o: kmwizardpage.moc 
-+kmwdrivertest.lo: kmwdrivertest.moc 
++kmconfigdialog.lo: kmconfigdialog.moc 
++kmwizardpage.o: kmwizardpage.moc 
+ kmwdrivertest.lo: kmwdrivertest.moc 
 +kiconselectaction.o: kiconselectaction.moc 
-+kmiconview.o: kmiconview.moc 
+ kmiconview.o: kmiconview.moc 
+-kmwdriverselect.o: kmwdriverselect.moc 
 +kmdriverdb.o: kmdriverdb.moc 
 +kmpropcontainer.o: kmpropcontainer.moc 
 +kmtimer.o: kmtimer.moc 
 +kmjobviewer.o: kmjobviewer.moc 
 +kmtimer.lo: kmtimer.moc 
- kmwdriverselect.lo: kmwdriverselect.moc 
-+cjanuswidget.o: cjanuswidget.moc 
++kmwdriverselect.lo: kmwdriverselect.moc 
+ cjanuswidget.o: cjanuswidget.moc 
+-kmprinterview.o: kmprinterview.moc 
 +kmwlocal.o: kmwlocal.moc 
 +kmjobviewer.lo: kmjobviewer.moc 
- kmdriverdbwidget.o: kmdriverdbwidget.moc 
--pluginaction.lo: pluginaction.moc 
--kxmlcommandselector.o: kxmlcommandselector.moc 
--smbview.o: smbview.moc 
--kmwdrivertest.lo: kmwdrivertest.moc 
--kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
--kmprinterview.o: kmprinterview.moc 
--kmpropwidget.o: kmpropwidget.moc 
--kmwizardpage.lo: kmwizardpage.moc 
++kmdriverdbwidget.o: kmdriverdbwidget.moc 
 +kmconfiggeneral.lo: kmconfiggeneral.moc 
- kmconfigdialog.o: kmconfigdialog.moc 
--cjanuswidget.lo: cjanuswidget.moc 
++kmconfigdialog.o: kmconfigdialog.moc 
 +smbview.o: smbview.moc 
 +kmwsmb.lo: kmwsmb.moc 
 +kiconselectaction.lo: kiconselectaction.moc 
-+kxmlcommandselector.o: kxmlcommandselector.moc 
+ kxmlcommandselector.o: kxmlcommandselector.moc 
 +kminstancepage.o: kminstancepage.moc 
 +kmconfiggeneral.o: kmconfiggeneral.moc 
 +kmwclass.lo: kmwclass.moc 
 +kmwdriverselect.o: kmwdriverselect.moc 
-+networkscanner.lo: networkscanner.moc 
+ networkscanner.lo: networkscanner.moc 
 +kmdbcreator.lo: kmdbcreator.moc 
 +kmconfigfonts.o: kmconfigfonts.moc 
 +networkscanner.o: networkscanner.moc 
- kmconfigfilter.lo: kmconfigfilter.moc 
--kmconfigfilter.o: kmconfigfilter.moc 
--pluginaction.o: pluginaction.moc 
--kmiconview.o: kmiconview.moc 
--kiconselectaction.o: kiconselectaction.moc 
++kmconfigfilter.lo: kmconfigfilter.moc 
 +kmconfigfonts.lo: kmconfigfonts.moc 
 +kmdriverdbwidget.lo: kmdriverdbwidget.moc 
 +kmwsocketutil.lo: kmwsocketutil.moc 
 +kminstancepage.lo: kminstancepage.moc 
- kmwizard.lo: kmwizard.moc 
--kmconfigjobs.lo: kmconfigjobs.moc 
--kmconfigpage.o: kmconfigpage.moc 
--kmdbcreator.o: kmdbcreator.moc 
--networkscanner.lo: networkscanner.moc 
--kmwsocketutil.o: kmwsocketutil.moc 
--cjanuswidget.o: cjanuswidget.moc 
--kmlistview.o: kmlistview.moc 
-+kmpropwidget.lo: kmpropwidget.moc 
- kmprinterview.lo: kmprinterview.moc 
--kmtimer.lo: kmtimer.moc 
--kmconfigjobs.o: kmconfigjobs.moc 
++kmwizard.lo: kmwizard.moc 
+ kmpropwidget.lo: kmpropwidget.moc 
++kmprinterview.lo: kmprinterview.moc 
 +kmwsocket.lo: kmwsocket.moc 
 +cjanuswidget.lo: cjanuswidget.moc 
 +kmwsmb.o: kmwsmb.moc 
 +kmlistview.o: kmlistview.moc 
- kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
--kmdriverdb.lo: kmdriverdb.moc 
-+pluginaction.o: pluginaction.moc 
-+kxmlcommanddlg.lo: kxmlcommanddlg.moc 
++kmspecialprinterdlg.lo: kmspecialprinterdlg.moc 
+ pluginaction.o: pluginaction.moc 
+-kmpropertypage.o: kmpropertypage.moc 
+ kxmlcommanddlg.lo: kxmlcommanddlg.moc 
+-kmwclass.lo: kmwclass.moc 
+-kxmlcommanddlg.o: kxmlcommanddlg.moc 
+-kmwlocal.o: kmwlocal.moc 
 +kxmlcommandselector.lo: kxmlcommandselector.moc 
-+kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
- kmconfigpage.lo: kmconfigpage.moc 
--kmdriverdb.o: kmdriverdb.moc 
--kmjobviewer.lo: kmjobviewer.moc 
--kmwizard.o: kmwizard.moc 
--kmpropwidget.lo: kmpropwidget.moc 
--networkscanner.o: networkscanner.moc 
--kmconfiggeneral.o: kmconfiggeneral.moc 
--kmwsmb.lo: kmwsmb.moc 
- kmiconview.lo: kmiconview.moc 
--kminstancepage.o: kminstancepage.moc 
--kmwdriverselect.o: kmwdriverselect.moc 
--kmpropcontainer.o: kmpropcontainer.moc 
+ kmspecialprinterdlg.o: kmspecialprinterdlg.moc 
+-kmmainview.o: kmmainview.moc 
++kmconfigpage.lo: kmconfigpage.moc 
++kmiconview.lo: kmiconview.moc 
 +kxmlcommanddlg.o: kxmlcommanddlg.moc 
 +kmconfigfilter.o: kmconfigfilter.moc 
 +kmwsocketutil.o: kmwsocketutil.moc 
-+kmconfigjobs.lo: kmconfigjobs.moc 
-+kmdriverdb.lo: kmdriverdb.moc 
+ kmconfigjobs.lo: kmconfigjobs.moc 
+-kmlistview.o: kmlistview.moc 
+-networkscanner.o: networkscanner.moc 
+-kmwizardpage.o: kmwizardpage.moc 
+-kmwizard.o: kmwizard.moc 
+-kmprinterview.lo: kmprinterview.moc 
+-kmconfigdialog.o: kmconfigdialog.moc 
+-kmwsmb.lo: kmwsmb.moc 
+-kmwdriverselect.lo: kmwdriverselect.moc 
+-kiconselectaction.o: kiconselectaction.moc 
+-kmdriverdbwidget.o: kmdriverdbwidget.moc 
+-kmtimer.lo: kmtimer.moc 
+-kmjobviewer.o: kmjobviewer.moc 
+-kmpropcontainer.o: kmpropcontainer.moc 
+-kmlistview.lo: kmlistview.moc 
+-kmwizard.lo: kmwizard.moc 
+-smbview.o: smbview.moc 
+ kmdriverdb.lo: kmdriverdb.moc 
+-kmwclass.o: kmwclass.moc 
+-smbview.lo: smbview.moc 
 +kmprinterview.o: kmprinterview.moc 
 +kmwsocket.o: kmwsocket.moc 
 +kmpropertypage.o: kmpropertypage.moc 
- kmdriverdialog.lo: kmdriverdialog.moc 
++kmdriverdialog.lo: kmdriverdialog.moc 
 +kmlistview.lo: kmlistview.moc 
 +kmdriverdialog.o: kmdriverdialog.moc 
 +kmpropertypage.lo: kmpropertypage.moc 
diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba
index c92bd4af4fd..187259380e2 100644
--- a/x11/kdelibs3/patches/patch-ba
+++ b/x11/kdelibs3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $
+$NetBSD: patch-ba,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- kinit/Makefile.in.orig	Thu May  8 05:24:09 2003
+--- kinit/Makefile.in.orig	2003-12-29 11:16:58.000000000 +1300
 +++ kinit/Makefile.in
-@@ -431,8 +431,7 @@ klauncher_la_LIBADD = $(LIB_KIO)
+@@ -433,8 +433,7 @@ klauncher_la_LIBADD = $(LIB_KIO)
  klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
  
  klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $
  
  #>- METASOURCES = AUTO
  
-@@ -481,11 +480,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
+@@ -484,11 +483,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT)
  #>+ 1
  kioslave_OBJECTS = kioslave.$(OBJEXT)
  kioslave_DEPENDENCIES =
@@ -28,7 +28,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $
  am_kshell_OBJECTS = shell.$(OBJEXT)
  #>- kshell_OBJECTS = $(am_kshell_OBJECTS)
  #>+ 1
-@@ -508,28 +508,25 @@ lnusertemp_DEPENDENCIES =
+@@ -511,28 +511,25 @@ lnusertemp_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -70,7 +70,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $
  
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -678,13 +675,13 @@ distclean-compile:
+@@ -681,13 +678,13 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autostart.Plo@am__quote@
@@ -85,16 +85,16 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@
-@@ -887,7 +884,7 @@ distclean-tags:
+@@ -896,7 +893,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example 
-+KDE_DIST=startkde.example LICENSE.setproctitle README.wrapper README.autostart README.DCOP 
+-KDE_DIST=startkde.example README.wrapper README.autostart LICENSE.setproctitle README.DCOP 
++KDE_DIST=startkde.example Makefile.in.rej LICENSE.setproctitle README.wrapper README.autostart README.DCOP 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1047,9 +1044,6 @@ uninstall-info: uninstall-info-recursive
+@@ -1056,9 +1053,6 @@ uninstall-info: uninstall-info-recursive
  kwrapper.o: wrapper.c
  
  shell.o: wrapper.c
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh
index e00f627b170..84da979f373 100644
--- a/x11/kdelibs3/patches/patch-bh
+++ b/x11/kdelibs3/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
+$NetBSD: patch-bh,v 1.7 2004/01/15 09:52:51 markd Exp $
 
---- kio/misc/Makefile.in.orig	2003-07-16 12:59:59.000000000 +1200
+--- kio/misc/Makefile.in.orig	2003-12-29 11:17:00.000000000 +1300
 +++ kio/misc/Makefile.in
-@@ -398,17 +398,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
+@@ -399,17 +399,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
  
  SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile
  
@@ -30,7 +30,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  observer_DIR = $(top_srcdir)/kio/kio
-@@ -436,23 +440,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -438,23 +442,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -68,7 +68,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  am_kmailservice_OBJECTS = kmailservice.$(OBJEXT)
  #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS)
  #>+ 1
-@@ -467,14 +476,20 @@ ktelnetservice_DEPENDENCIES =
+@@ -469,14 +478,20 @@ ktelnetservice_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -93,7 +93,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ktelnetservice.Po \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/uiserver.Plo
  
-@@ -496,7 +511,8 @@ CXXLD = $(CXX)
+@@ -498,7 +513,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -103,7 +103,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  	$(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
  DATA = $(kde_services_DATA) $(protocol_DATA)
  
-@@ -510,7 +526,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -512,7 +528,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	check-recursive installcheck-recursive
  DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -112,7 +112,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -557,6 +573,8 @@ clean-libLTLIBRARIES:
+@@ -559,6 +575,8 @@ clean-libLTLIBRARIES:
  	done
  kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS)
@@ -121,7 +121,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -602,7 +620,8 @@ mostlyclean-compile:
+@@ -604,7 +622,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -131,16 +131,16 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmailservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktelnetservice.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiserver.Plo@am__quote@
-@@ -826,7 +845,7 @@ distclean-tags:
+@@ -834,7 +853,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=rlogin.protocol telnet.protocol rtsp.protocol kmailservice.protocol kio_uiserver.desktop 
+-KDE_DIST=rlogin.protocol kio_uiserver.desktop kmailservice.protocol rtsp.protocol telnet.protocol 
 +KDE_DIST=kio_uiserver.desktop rlogin.protocol Makefile.in.rej kmailservice.protocol telnet.protocol rtsp.protocol 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -994,6 +1013,12 @@ dummy.cpp: uiserver.kidl
+@@ -1002,6 +1021,12 @@ dummy.cpp: uiserver.kidl
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
@@ -153,7 +153,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>+ 9
  uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES)
  	$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; false )
-@@ -1005,12 +1030,6 @@ observer_stub.h: observer.kidl
+@@ -1013,12 +1038,6 @@ observer_stub.h: observer.kidl
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
  
  #>+ 3
@@ -166,7 +166,7 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  clean-metasources:
  	-rm -f  uiserver.moc
  
-@@ -1031,33 +1050,33 @@ force-reedit:
+@@ -1039,33 +1058,33 @@ force-reedit:
  
  
  #>+ 11
@@ -213,14 +213,12 @@ $NetBSD: patch-bh,v 1.6 2003/07/30 13:16:57 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1067,7 +1086,7 @@ kde-rpo-clean:
+@@ -1075,7 +1094,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
--uiserver.o: uiserver.moc 
--uiserver.lo: uiserver.moc 
--observer_stub.cpp: observer_stub.h 
- $(srcdir)/uiserver.cpp: observer_stub.h 
-+observer_stub.cpp: observer_stub.h 
-+uiserver.lo: uiserver.moc 
-+uiserver.o: uiserver.moc 
++$(srcdir)/uiserver.cpp: observer_stub.h 
+ observer_stub.cpp: observer_stub.h 
+ uiserver.lo: uiserver.moc 
+ uiserver.o: uiserver.moc 
+-$(srcdir)/uiserver.cpp: observer_stub.h 
diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn
index 7ce2c8315a2..00a9d02da32 100644
--- a/x11/kdelibs3/patches/patch-bn
+++ b/x11/kdelibs3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
+$NetBSD: patch-bn,v 1.7 2004/01/15 09:52:51 markd Exp $
 
---- kioslave/http/Makefile.in.orig	Thu May  8 05:24:13 2003
+--- kioslave/http/Makefile.in.orig	2003-12-29 11:17:01.000000000 +1300
 +++ kioslave/http/Makefile.in
-@@ -383,7 +383,7 @@ INCLUDES = -I$(top_srcdir)/interfaces $(
+@@ -385,7 +385,7 @@ INCLUDES = -I$(top_srcdir)/interfaces $(
  
  ####### Files
  bin_PROGRAMS = kio_http_cache_cleaner
@@ -11,7 +11,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  kde_module_LTLIBRARIES = kio_http.la
  
  kio_http_la_SOURCES = http.cc httpfilter.cc
-@@ -391,12 +391,15 @@ kio_http_la_SOURCES = http.cc httpfilter
+@@ -393,12 +393,15 @@ kio_http_la_SOURCES = http.cc httpfilter
  kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ)
  kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  
@@ -31,7 +31,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version $(all_libraries)
  
  noinst_HEADERS = http.h
-@@ -419,33 +422,47 @@ kio_http_la_final_OBJECTS = kio_http_la.
+@@ -422,33 +425,47 @@ kio_http_la_final_OBJECTS = kio_http_la.
  kio_http_la_nofinal_OBJECTS = http.lo httpfilter.lo
  @KDE_USE_FINAL_FALSE@kio_http_la_OBJECTS = $(kio_http_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@kio_http_la_OBJECTS = $(kio_http_la_final_OBJECTS)
@@ -89,7 +89,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/httpfilter.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -468,6 +485,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -471,6 +488,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kio_http_la_SOURCES) \
  	$(kio_http_cache_cleaner_la_SOURCES) \
@@ -97,7 +97,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  	$(kio_http_cache_cleaner_SOURCES)
  DATA = $(kdelnk_DATA)
  
-@@ -481,7 +499,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -484,7 +502,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -106,7 +106,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -561,6 +579,8 @@ clean-libLTLIBRARIES:
+@@ -564,6 +582,8 @@ clean-libLTLIBRARIES:
  	$(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS)
  kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS)
@@ -115,7 +115,7 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -600,9 +620,10 @@ mostlyclean-compile:
+@@ -603,9 +623,10 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -127,16 +127,16 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@
  
  distclean-depend:
-@@ -821,7 +842,7 @@ distclean-tags:
+@@ -830,7 +851,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav rfc2817.txt THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2818.txt rfc2616.txt http.protocol https.protocol httpfilter.h rfc3253.txt rfc2518.txt 
-+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2817.txt httpfilter.h webdavs.protocol rfc3253.txt rfc2818.txt http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2518.txt rfc2617.txt THOUGHTS 
+-KDE_DIST=http_cache_cleaner.desktop rfc2818.txt webdavs.protocol rfc2518.txt rfc2817.txt webdav.protocol rfc2616.txt https.protocol rfc3253.txt http.protocol README.webdav rfc2617.txt README.http_cache_cleaner THOUGHTS httpfilter.h 
++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2817.txt httpfilter.h webdavs.protocol rfc3253.txt rfc2818.txt http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2518.txt rfc2617.txt Makefile.in.rej THOUGHTS 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -985,9 +1006,6 @@ uninstall-info: uninstall-info-recursive
+@@ -994,9 +1015,6 @@ uninstall-info: uninstall-info-recursive
  	uninstall-kdelnkDATA uninstall-libLTLIBRARIES \
  	uninstall-recursive
  
@@ -146,13 +146,50 @@ $NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 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:
-@@ -1064,7 +1082,7 @@ kde-rpo-clean:
+@@ -1011,20 +1029,20 @@ kio_http.la.closure: $(kio_http_la_OBJEC
+ 
+ 
+ #>+ 3
+-httpfilter.moc: $(srcdir)/httpfilter.h
+-	$(MOC) $(srcdir)/httpfilter.h -o httpfilter.moc
+-
+-#>+ 1
+-mocs: httpfilter.moc
+-#>+ 3
+ http.moc: $(srcdir)/http.h
+ 	$(MOC) $(srcdir)/http.h -o http.moc
+ 
+ #>+ 1
+ mocs: http.moc
+ #>+ 3
++httpfilter.moc: $(srcdir)/httpfilter.h
++	$(MOC) $(srcdir)/httpfilter.h -o httpfilter.moc
++
++#>+ 1
++mocs: httpfilter.moc
++#>+ 3
+ clean-metasources:
+-	-rm -f  httpfilter.moc http.moc
++	-rm -f  http.moc httpfilter.moc
+ 
+ #>+ 3
+ clean-closures:
+@@ -1041,7 +1059,7 @@ force-reedit:
+ 
+ 
+ #>+ 11
+-kio_http_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/http.cc $(srcdir)/httpfilter.cc  httpfilter.moc http.moc
++kio_http_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/http.cc $(srcdir)/httpfilter.cc  http.moc httpfilter.moc
+ 	@echo 'creating kio_http_la.all_cc.cc ...'; \
+ 	rm -f kio_http_la.all_cc.files kio_http_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kio_http_la.all_cc.final; \
+@@ -1077,7 +1095,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
+-httpfilter.o: httpfilter.moc 
 +http.o: http.moc 
-+httpfilter.lo: httpfilter.moc 
- httpfilter.o: httpfilter.moc 
+ httpfilter.lo: httpfilter.moc 
++httpfilter.o: httpfilter.moc 
  http.lo: http.moc 
--httpfilter.lo: httpfilter.moc 
 -http.o: http.moc 
diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br
index 4eb9ae06095..43dd90d3b57 100644
--- a/x11/kdelibs3/patches/patch-br
+++ b/x11/kdelibs3/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
+$NetBSD: patch-br,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- kioslave/http/kcookiejar/Makefile.in.orig	Thu May  8 05:24:13 2003
+--- kioslave/http/kcookiejar/Makefile.in.orig	2003-12-29 11:17:01.000000000 +1300
 +++ kioslave/http/kcookiejar/Makefile.in
-@@ -381,13 +381,17 @@ INCLUDES = $(all_includes)
+@@ -383,13 +383,17 @@ INCLUDES = $(all_includes)
  
  ####### Files
  bin_PROGRAMS = kcookiejar
@@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  
  #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
  #>- 			kcookieserver.skel kcookiewin.cpp 
-@@ -398,8 +402,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp
+@@ -400,8 +404,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp
  kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
  kded_kcookiejar_la_LIBADD = $(LIB_KIO)
  
@@ -34,7 +34,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  kded_DATA = kcookiejar.desktop
-@@ -413,11 +417,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -416,11 +420,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
@@ -49,7 +49,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  kded_kcookiejar_la_DEPENDENCIES =
  am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \
  	kcookiewin.lo
-@@ -428,26 +432,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco
+@@ -431,26 +435,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco
  	kcookiewin.lo kcookieserver_skel.lo
  @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS)
@@ -94,7 +94,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcookieserver.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
  
-@@ -470,11 +485,11 @@ CXXLD = $(CXX)
+@@ -473,11 +488,11 @@ CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) \
@@ -108,7 +108,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  
  #>- all: all-am
  #>+ 1
-@@ -551,6 +566,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) 
+@@ -554,6 +569,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) 
  	$(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS)
  kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS)
@@ -117,7 +117,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -590,8 +607,9 @@ mostlyclean-compile:
+@@ -593,8 +610,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -128,16 +128,16 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookieserver.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiewin.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@@ -733,7 +751,7 @@ distclean-tags:
+@@ -736,7 +754,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h kcookiewin.h rfc2109 kcookiejar.desktop 
-+KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h 
+-KDE_DIST=kcookieserver.h netscape_cookie_spec.html kcookiejar.desktop kcookiewin.h rfc2965 kcookiescfg.upd rfc2109 kcookiejar.h 
++KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 Makefile.in.rej kcookiejar.desktop kcookieserver.h kcookiejar.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -880,25 +898,22 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \
  	uninstall-libLTLIBRARIES uninstall-updateDATA
  
@@ -147,7 +147,38 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 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:
-@@ -919,7 +934,7 @@ force-reedit:
+ 
+ #>+ 3
+-kcookiewin.moc: $(srcdir)/kcookiewin.h
+-	$(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
+-
+-#>+ 1
+-mocs: kcookiewin.moc
+-#>+ 3
+ kcookieserver.moc: $(srcdir)/kcookieserver.h
+ 	$(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc
+ 
+ #>+ 1
+ mocs: kcookieserver.moc
++#>+ 3
++kcookiewin.moc: $(srcdir)/kcookiewin.h
++	$(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc
++
++#>+ 1
++mocs: kcookiewin.moc
+ #>+ 5
+ kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES)
+ 	$(DCOPIDL) $(srcdir)/kcookieserver.h > kcookieserver.kidl || ( rm -f kcookieserver.kidl ; false )
+@@ -907,7 +922,7 @@ kcookieserver_skel.cpp: kcookieserver.ki
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcookiewin.moc kcookieserver.moc
++	-rm -f  kcookieserver.moc kcookiewin.moc
+ 
+ #>+ 4
+ clean-idl:
+@@ -925,7 +940,7 @@ force-reedit:
  
  
  #>+ 11
@@ -156,13 +187,13 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $
  	@echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \
  	rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \
-@@ -955,7 +970,7 @@ kde-rpo-clean:
+@@ -961,7 +976,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
 -kcookiewin.lo: kcookiewin.moc 
--kcookieserver.lo: kcookieserver.moc 
+-kcookiewin.o: kcookiewin.moc 
  kcookieserver.o: kcookieserver.moc 
- kcookiewin.o: kcookiewin.moc 
++kcookiewin.o: kcookiewin.moc 
 +kcookiewin.lo: kcookiewin.moc 
-+kcookieserver.lo: kcookieserver.moc 
+ kcookieserver.lo: kcookieserver.moc 
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
index 388734c0bd1..f6d4fb64cc7 100644
--- a/x11/kdelibs3/patches/patch-cd
+++ b/x11/kdelibs3/patches/patch-cd
@@ -1,70 +1,13 @@
-$NetBSD: patch-cd,v 1.5 2003/05/22 02:42:43 markd Exp $
+$NetBSD: patch-cd,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- kdefx/Makefile.in.orig	Thu May  8 05:24:05 2003
+--- kdefx/Makefile.in.orig	2003-12-29 11:16:54.000000000 +1300
 +++ kdefx/Makefile.in
-@@ -476,12 +476,15 @@ DIST_COMMON = $(include_HEADERS) $(srcdi
- 	Makefile.am Makefile.in
- SOURCES = $(libkdefx_la_SOURCES)
+@@ -660,7 +660,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=configure.in.in 
++KDE_DIST=configure.in.in Makefile.in.rej 
  
-+CXXCOMPILE_NOOPT=${CXXCOMPILE:-O%=}
-+LTCXXCOMPILE_NOOPT=${LTCXXCOMPILE:-O%=}
-+
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
- .SUFFIXES:
--.SUFFIXES: .cpp .lo .o .obj
-+.SUFFIXES: .cc .cpp .lo .o .obj
- $(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- #>- 	cd $(top_srcdir) && \
- #>- 	  $(AUTOMAKE) --foreign  kdefx/Makefile
-@@ -574,6 +577,42 @@ distclean-depend:
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
-+.cc.o:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+.cc.obj:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE_NOOPT) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+
-+.cc.lo:
-+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+.cpp.cc:
-+	cp -f $< $@
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-@@ -1025,3 +1064,5 @@ kde-rpo-clean:
- #>+ 3
- kstyle.lo: kstyle.moc 
- kstyle.o: kstyle.moc 
-+
-+kpixmap.o: kpixmap.cc
author	markd <markd>	2004-01-15 09:52:51 +0000
committer	markd <markd>	2004-01-15 09:52:51 +0000
commit	b6bc3316f70e5f5729c38e90822b5079f99c356a (patch)
tree	4d5f55a1d0ccbc54171584eb302e70434aa9db54 /x11/kdelibs3
parent	98e45ded7c6f47d9277b2b537666f4fc674a4903 (diff)
download	pkgsrc-b6bc3316f70e5f5729c38e90822b5079f99c356a.tar.gz