Update kdebase to 3.1.3.

Changes: * kate: Make saving of remote files during shutdown work. * kcontrol/colors: Don't reset widget selection dropdown when selecting a different theme * kcontrol/filetypes: Fixed removing of mimetypes specified by a .kdelnk file * kcontrol/input: fix application of large & white cursors * kcontrol/services: don't show kxmlrpcd, kalarmd and kwrited if they're not installed * kdesud: support empty passwords * kdm: Fix i18n support for the GuiStyle and ColorScheme combos * kdm: don't reset local Xserver if termination is requsted * keditbookmarks: Various bufixes * kio_sftp: Support OpenSSH 3.6+ * kio_sftp: Support older sftp protocol revisions * kio_smb: Huge update for samba 3.0. * kicker: Improve icon scaling in service menus * kicker: "Terminal Sessions" special button supports sessions with dots in filename * kicker: "Terminal Sessions" special button with same sort order as the one in Konsole. * kicker: Fix mimetype resolution in the quickbrowser * kicker: Fixes for stuck tooltips * kicker: Do not create local directories for .desktop files used in service buttons if no needed * kicker: Fix apply button not working for quickstart menu entries settings * kicker: Fix hide button preference effects reversed * kicker:Various fixes for recent apps history * kicker/minipager: don't show redundant tooltips when the page already shows names * konsole: Added Ctrl+Shift+N as alternate default shortcut for "New Session". * konsole: Fixed fixed-width with proportional-font drawing routine. * konsole: Fixed problems with mouse and paste support and detached windows. * konsole: Let new color schemes take effect once kcmkonsole tells to do so. * konsole: Wheel mouse fixes for Mode_Mouse1000. * konqueror: Flicker fixes inside the iconview * konqueror: Fix for inter-process copy-past with the listview * konqueror: Make sure the tab close button is properly enabled when a 2nd tab is first open through context menu entries * konqueror: Made Ctrl+Enter for new tab in URL combo working again. * konqueror: Various sidebar fixes * konqueror: make sure that the location label truly disappears when disabled * konqueror: konqueror warning for repeated POSTs * konqueror: Konqueror crash when dragging image from about:konqueror * konqueror: Improve tracking of listviewitems so that we don't crash when they get deleted somewhat unexpectedly * konqueror: Don't crash when updating toolbars without a part load * konqueror: Properly handle 'stop' when still listing the directory in the info list view * konqueror: Efficiency fix: make sure only one konqueror instance saves the history when it changes * konqueror: Don't use deleted KFileItems. * Don't crash when doing a copy w/o a currentItem * konqueror: Stop activity when the user tries hard to enter a URL * konqueror: Properly calculate column indices for the meta info listview * konqueror: Hide the find part on a second click on its toolbar button * konqueror: Handle _top/_blank, and so on, case-insensitively * libkonq: make sure KFileTip does not hold on to stale file items * libkonq: precaution: make sure that no preview jobs hold on to icon view's items when it's cleared * libkonq: fixes to cut-and-paste * libkonq: network-friendlier paste button state polling * kwin: Fix deactivation of window when loosing focus * kwin: New windows are drawn above open menus * kwin: Some non-resizable windows can still be resized * kwin: Fixes for click raise * kwin: If a window is hover-unshaded, then it's not shaded for the outside world * kwin: Keramik decoration: Properly detect XShape on Solaris * nsplugins: Fix relative URLs.
author: markd <markd@pkgsrc.org> 2003-07-30 13:34:58 +0000
committer: markd <markd@pkgsrc.org> 2003-07-30 13:34:58 +0000
commit: 70a657b20a22ae031403a22f50b4c48c22b98971 (patch)
tree: 52ad8b7e0f165948440d9dd37e931c75876b4f6a /x11
parent: d755cf3eb5b2e9e5e338c2784deca51f2946e4d8 (diff)
download: pkgsrc-70a657b20a22ae031403a22f50b4c48c22b98971.tar.gz
22 files changed, 622 insertions, 281 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index c0462d8db78..a01ba6570d7 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2003/07/13 13:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/07/30 13:34:58 markd Exp $
 
-DISTNAME=	kdebase-3.1.2
-PKGREVISION=	1
+DISTNAME=	kdebase-3.1.3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
-.include "../../x11/kde3/Makefile.kde3"
+.include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
@@ -89,7 +88,7 @@ FOO_MAIN_FILES= \
 	kxkb/kxkb_main.cpp \
 	legacyimport/klegacyimport_main.cpp
 
-.include "../../x11/kde3/Makefile.foo_main"
+.include "../../meta-pkgs/kde3/Makefile.foo_main"
 
 # Several programs need to be setuid-root, but due to the way that KDE3
 # finds executables, the files must have their read bit set so that
@@ -154,8 +153,8 @@ post-install:
 .include "../../databases/openldap/buildlink2.mk"
 .include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../x11/qt3-tools/buildlink2.mk"
-.include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdelibs3/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
index 0615f7b65a5..77f02f58fb3 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/07/13 13:54:24 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2003/07/30 13:34:58 markd Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdebase3
 BUILDLINK_PKGBASE.kdebase3?=	kdebase
-BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.1.2nb1
+BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.1.3
 BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index bffb9ee9a7e..7462f513707 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,41 +1,41 @@
-$NetBSD: distinfo,v 1.33 2003/07/13 11:19:29 wulf Exp $
+$NetBSD: distinfo,v 1.34 2003/07/30 13:34:58 markd Exp $
 
-SHA1 (kdebase-3.1.2.tar.bz2) = 2e75e74f902977c497e8bdc15074909009d8c91a
-Size (kdebase-3.1.2.tar.bz2) = 15229871 bytes
+SHA1 (kdebase-3.1.3.tar.bz2) = 4c7b39bb2ae0484e705bd1c2d43e3a2a47222ca3
+Size (kdebase-3.1.3.tar.bz2) = 15196014 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = b9b7d9d7beb65370b7b9429d3741fb7aeee7c976
+SHA1 (patch-aa) = c84de559cfdc320c96c5dd82b9abb139e509e1bd
 SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44
-SHA1 (patch-ac) = 4556a9bcdbf690e21bf67cca0d1dd6bb22a2f28f
+SHA1 (patch-ac) = 08793eed3b396839abf2b8ff3d52caafa3a9c59d
 SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302
 SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1
 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5
-SHA1 (patch-ai) = 904fa48dae37fcee1bf9a3a28171ae75e451bbfa
+SHA1 (patch-ai) = 4a210a71c4830f5a3dd6545c4a106e8bff8caba7
 SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0
 SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c
 SHA1 (patch-am) = e8e7f42749eeebc57f0d4e13fc44dbcd08f5f65c
 SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24
-SHA1 (patch-ao) = 2bbe8783d258ea3ce9cf85b7f51e729d9ee1c6f3
+SHA1 (patch-ao) = 62ea78c61d9e259a23aa8575b45bcfa5fed69b18
 SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2
 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d
 SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f
 SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d
-SHA1 (patch-aw) = b3d7d42e1a1c8f38a66cdee8766dad43aeddf320
+SHA1 (patch-aw) = 129011c80dadcfe63eb74cb5bd59da5554fc34d7
 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2
 SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81
-SHA1 (patch-ba) = c107de648ed80c9ad9a07134505593c25c386624
+SHA1 (patch-ba) = e1057d92ed873e84ad6121322fa2f8f969a05e9e
 SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a
 SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
 SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786
 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5
-SHA1 (patch-bg) = 826c58a957994c39e58b0d8b0b5d1c1348a120d9
+SHA1 (patch-bg) = e7f2975e44eec92e508c27c4c4bbf8ce9258cb2d
 SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164
 SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081
 SHA1 (patch-bk) = 270f5362478c4b71740a53c900e21c05e123efd5
 SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab
-SHA1 (patch-bm) = b38d4f2234eec6d1dde09b5a7a7f1ffbd2a4c8f6
+SHA1 (patch-bm) = adab3f3d8d395aadd4404f6e2395507f030dd7f3
 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef
 SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66
 SHA1 (patch-bp) = 1b51f504e3a0c72b4af9386813f767cc7957e90b
@@ -45,29 +45,29 @@ SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a
 SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16
 SHA1 (patch-bx) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
 SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b
-SHA1 (patch-bz) = 374da5a2a83642a7a0dc4b129cc752dfb989b12e
+SHA1 (patch-bz) = 87b82a90ac371949240f6dc68bc143666c1b356e
 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b
 SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144
-SHA1 (patch-cd) = e0b9f98b90dcc74c148a56cf4a8126e212bf1d84
+SHA1 (patch-cd) = 99838c42b20df7558df003bb34b736ae1e5d8f74
 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e
 SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5
-SHA1 (patch-ch) = 8ea03f14b1e95d480e8c74db784b7d9d9c178be1
+SHA1 (patch-ch) = e8ec78e6c10c363211f0faf16bed06a765cbac73
 SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4
-SHA1 (patch-cj) = ff652e90aea61ae84afeb6b4d6b41caab42fe514
+SHA1 (patch-cj) = b0991467eeb3c170e5172ea31c5cf75fc2d45766
 SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd
 SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec
-SHA1 (patch-cn) = 56ad5e5a8908b2ad8937a877e3603034eaab2078
+SHA1 (patch-cn) = 61d8b8f99505eaf8e42dfdf8ce2d3fd0622309b4
 SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f
 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f
 SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018
-SHA1 (patch-ct) = 047a43c7d140077427b2fba4d68e783f10f93c07
+SHA1 (patch-ct) = ee9cdc12d3e7c75ab0be238dbe53b785ad725e11
 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf
 SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00
 SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80
-SHA1 (patch-cz) = 60f90d32f372fdc73aef3c912ef171c9b7b2571b
+SHA1 (patch-cz) = f74d50e90acab6a9da6e95266f78fd38657ce0a8
 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81
 SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4
-SHA1 (patch-dh) = adf545ecb6ac090bd03682570e07c446df01996f
+SHA1 (patch-dh) = 6d3d963900e31e4359c526c4efc17103973cd799
 SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59
 SHA1 (patch-dj) = c3b5f503720234518192732e4ca3f32514aad1ff
 SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d
@@ -89,17 +89,17 @@ SHA1 (patch-dz) = 01b735d0aed64b2a046cd6bea8c7387a9bcefafc
 SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714
 SHA1 (patch-eb) = 2f1778a43bf5c64d3265380e0c7211d6b8279da2
 SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec
-SHA1 (patch-ed) = 630c378126a915b4545335b9dbc2de4fea3a303e
+SHA1 (patch-ed) = 7dd9f659d5b361daa1849ae0f06449985cfde74d
 SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3
 SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef
 SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610
-SHA1 (patch-eh) = 604ec8175c4001541a1e90cf99bfe1cd90bd418a
+SHA1 (patch-eh) = 0b1987583255018fdbc4b844b81715197f938bbf
 SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7
 SHA1 (patch-ej) = 3dea867394534af3902fa6654de7ca8e9b97137b
 SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94
 SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd
 SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1
-SHA1 (patch-ep) = dfe68fe99903c5bf0d59df9f4a1c64f9baa82a84
+SHA1 (patch-ep) = 6762a5d93ea1d0c4ba7ef0b447eb1e3fb3deac82
 SHA1 (patch-eq) = 917ad364f7b1d4779d8972d78ceba0a966812077
 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380
 SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index 7e9a39bb5c2..948ab08ff8e 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.7 2003/06/05 21:29:33 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2003/07/30 13:34:59 markd Exp $
 
---- configure.orig	2003-05-13 13:08:06.000000000 +0200
-+++ configure	2003-06-05 20:04:56.000000000 +0200
-@@ -31619,63 +31619,6 @@
+--- configure.orig	2003-07-15 22:03:59.000000000 +1200
++++ configure
+@@ -31616,63 +31616,6 @@ _ACEOF
  
  
  
 -  echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
 -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
+-/* #line $LINENO "configure" */
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/05 21:29:33 drochner Exp $
  echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
  echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
  
-@@ -33796,6 +33739,23 @@
+@@ -33793,6 +33736,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -90,7 +90,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/05 21:29:33 drochner Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -38423,6 +38383,7 @@
+@@ -38659,6 +38619,7 @@ fi
  case "$UNAME" in
  	Linux) LIBHOSTS="$LIBSENSORS" ;;
  	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac
index af8db489b15..f5696a5d413 100644
--- a/x11/kdebase3/patches/patch-ac
+++ b/x11/kdebase3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
+$NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kate/app/Makefile.in.orig	Tue May 13 23:07:53 2003
+--- kate/app/Makefile.in.orig	2003-07-15 22:03:17.000000000 +1200
 +++ kate/app/Makefile.in
-@@ -420,7 +420,7 @@ target_os = @target_os@
+@@ -421,7 +421,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
  bin_PROGRAMS = kate kwrite
  
  #>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \
-@@ -440,20 +440,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp
+@@ -441,20 +441,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp
  
  libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la
  libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
@@ -189,11 +189,11 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h katefileselector.h katedocmanager.h kateviewspace.h katemain.h kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h kbookmarkhandler.h kateviewmanager.h kateIface.h katefilelist.h kwritedialogs.h kateconsole.h katedockcontainer.h kategrepdialog.h 
-+KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h 
++KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h Makefile.in.rej kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -967,91 +991,85 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -967,28 +991,28 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  dummy_kate_la.cpp:
  	echo > dummy_kate_la.cpp
@@ -211,113 +211,168 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
 +katefilelist.moc: $(srcdir)/katefilelist.h
 +	$(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc
 +
++#>+ 1
++mocs: katefilelist.moc
 +#>+ 3
  kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h
  	$(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc
  
+ #>+ 1
+ mocs: kateconfigdialog.moc
  #>+ 3
 -kateconsole.moc: $(srcdir)/kateconsole.h
 -	$(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
 +kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h
 +	$(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc
  
+ #>+ 1
+-mocs: kateconsole.moc
++mocs: kateconfigplugindialogpage.moc
  #>+ 3
  katemainwindow.moc: $(srcdir)/katemainwindow.h
  	$(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
- 
+@@ -996,41 +1020,41 @@ katemainwindow.moc: $(srcdir)/katemainwi
+ #>+ 1
+ mocs: katemainwindow.moc
  #>+ 3
 -katedocmanager.moc: $(srcdir)/katedocmanager.h
 -	$(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc
 +katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
 +	$(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc
  
+ #>+ 1
+-mocs: katedocmanager.moc
++mocs: katemailfilesdialog.moc
  #>+ 3
 -kategrepdialog.moc: $(srcdir)/kategrepdialog.h
 -	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
 +kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h
 +	$(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc
  
+ #>+ 1
+-mocs: kategrepdialog.moc
++mocs: kbookmarkhandler.moc
  #>+ 3
 -kwritemain.moc: $(srcdir)/kwritemain.h
 -	$(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
 +kactionselector.moc: $(srcdir)/kactionselector.h
 +	$(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc
  
+ #>+ 1
+-mocs: kwritemain.moc
++mocs: kactionselector.moc
  #>+ 3
 -kateviewspace.moc: $(srcdir)/kateviewspace.h
 -	$(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc
 +katedockcontainer.moc: $(srcdir)/katedockcontainer.h
 +	$(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc
  
+ #>+ 1
+-mocs: kateviewspace.moc
++mocs: katedockcontainer.moc
  #>+ 3
 -kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h
 -	$(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc
 +kategrepdialog.moc: $(srcdir)/kategrepdialog.h
 +	$(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
  
+ #>+ 1
+-mocs: kbookmarkhandler.moc
++mocs: kategrepdialog.moc
  #>+ 3
 -katefiledialog.moc: $(srcdir)/katefiledialog.h
 -	$(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc
 +kateconsole.moc: $(srcdir)/kateconsole.h
 +	$(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
  
+ #>+ 1
+-mocs: katefiledialog.moc
++mocs: kateconsole.moc
  #>+ 3
  katefileselector.moc: $(srcdir)/katefileselector.h
  	$(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc
- 
+@@ -1038,29 +1062,23 @@ katefileselector.moc: $(srcdir)/katefile
+ #>+ 1
+ mocs: katefileselector.moc
  #>+ 3
 -katedockcontainer.moc: $(srcdir)/katedockcontainer.h
 -	$(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc
 -
+-#>+ 1
+-mocs: katedockcontainer.moc
 -#>+ 3
 -katepluginmanager.moc: $(srcdir)/katepluginmanager.h
 -	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
 +katesplitter.moc: $(srcdir)/katesplitter.h
 +	$(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc
  
+ #>+ 1
+-mocs: katepluginmanager.moc
++mocs: katesplitter.moc
  #>+ 3
 -katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
 -	$(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc
 +kateviewmanager.moc: $(srcdir)/kateviewmanager.h
 +	$(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc
  
+ #>+ 1
+-mocs: katemailfilesdialog.moc
++mocs: kateviewmanager.moc
  #>+ 3
 -katefilelist.moc: $(srcdir)/katefilelist.h
 -	$(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc
 +kwritemain.moc: $(srcdir)/kwritemain.h
 +	$(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
  
+ #>+ 1
+-mocs: katefilelist.moc
++mocs: kwritemain.moc
  #>+ 3
  kateapp.moc: $(srcdir)/kateapp.h
  	$(MOC) $(srcdir)/kateapp.h -o kateapp.moc
- 
+@@ -1068,29 +1086,29 @@ kateapp.moc: $(srcdir)/kateapp.h
+ #>+ 1
+ mocs: kateapp.moc
  #>+ 3
 -katesplitter.moc: $(srcdir)/katesplitter.h
 -	$(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc
 +kateviewspace.moc: $(srcdir)/kateviewspace.h
 +	$(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc
  
+ #>+ 1
+-mocs: katesplitter.moc
++mocs: kateviewspace.moc
  #>+ 3
 -kateviewmanager.moc: $(srcdir)/kateviewmanager.h
 -	$(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc
 +katefiledialog.moc: $(srcdir)/katefiledialog.h
 +	$(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc
  
+ #>+ 1
+-mocs: kateviewmanager.moc
++mocs: katefiledialog.moc
  #>+ 3
 -kactionselector.moc: $(srcdir)/kactionselector.h
 -	$(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc
 +katedocmanager.moc: $(srcdir)/katedocmanager.h
 +	$(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc
  
+ #>+ 1
+-mocs: kactionselector.moc
++mocs: katedocmanager.moc
  #>+ 3
 -kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h
 -	$(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc
 +katepluginmanager.moc: $(srcdir)/katepluginmanager.h
 +	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
  
+ #>+ 1
+-mocs: kateconfigplugindialogpage.moc
++mocs: katepluginmanager.moc
  #>+ 3
  kwritedialogs.moc: $(srcdir)/kwritedialogs.h
-@@ -1065,7 +1083,7 @@ kateIface_skel.cpp: kateIface.kidl
+ 	$(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc
+@@ -1105,7 +1123,7 @@ kateIface_skel.cpp: kateIface.kidl
  
  #>+ 3
  clean-metasources:
@@ -326,7 +381,7 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -1083,19 +1101,7 @@ force-reedit:
+@@ -1123,19 +1141,7 @@ force-reedit:
  
  
  #>+ 11
@@ -347,7 +402,7 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
  	@echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
  	rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
-@@ -1106,22 +1112,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd
+@@ -1146,22 +1152,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd
  	cat libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files > libkateinterfaces_la.all_cpp.cpp; \
  	rm -f libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files
  
@@ -387,7 +442,7 @@ $NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1131,43 +1149,43 @@ kde-rpo-clean:
+@@ -1171,43 +1189,43 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 41
diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai
index 6fc4e79958b..fc251a7c7cb 100644
--- a/x11/kdebase3/patches/patch-ai
+++ b/x11/kdebase3/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $
+$NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $
 
---- kcontrol/access/Makefile.in.orig	Tue May 13 23:07:53 2003
+--- kcontrol/access/Makefile.in.orig	2003-07-15 22:03:17.000000000 +1200
 +++ kcontrol/access/Makefile.in
-@@ -426,16 +426,20 @@ INCLUDES = $(all_includes)
+@@ -427,16 +427,20 @@ INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kaccess
  
@@ -133,11 +133,11 @@ $NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kaccess.h configure.in.in kcmaccess.desktop kaccess.desktop 
-+KDE_DIST=kcmaccess.desktop kaccess.desktop kaccess.h configure.in.in 
++KDE_DIST=configure.in.in Makefile.in.rej kcmaccess.desktop kaccess.desktop kaccess.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -924,21 +942,18 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -924,25 +942,22 @@ uninstall-am: uninstall-binPROGRAMS unin
  messages:
  	$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
  	$(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot
@@ -152,18 +152,24 @@ $NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $
 -kcmaccess.moc: $(srcdir)/kcmaccess.h
 -	$(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc
 -
+-#>+ 1
+-mocs: kcmaccess.moc
 -#>+ 3
  kaccess.moc: $(srcdir)/kaccess.h
  	$(MOC) $(srcdir)/kaccess.h -o kaccess.moc
  
+ #>+ 1
+ mocs: kaccess.moc
 +#>+ 3
 +kcmaccess.moc: $(srcdir)/kcmaccess.h
 +	$(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc
 +
++#>+ 1
++mocs: kcmaccess.moc
  #>+ 8
  kcm_access.la.closure: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES)
  	@echo "int main() {return 0;}" > kcm_access_la_closure.cpp
-@@ -950,7 +965,7 @@ kcm_access.la.closure: $(kcm_access_la_O
+@@ -954,7 +969,7 @@ kcm_access.la.closure: $(kcm_access_la_O
  
  #>+ 3
  clean-metasources:
@@ -172,7 +178,7 @@ $NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -967,33 +982,33 @@ force-reedit:
+@@ -971,33 +986,33 @@ force-reedit:
  
  
  #>+ 11
@@ -219,7 +225,7 @@ $NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1003,7 +1018,7 @@ kde-rpo-clean:
+@@ -1007,7 +1022,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao
index 5382a7ea683..dd1ae609c46 100644
--- a/x11/kdebase3/patches/patch-ao
+++ b/x11/kdebase3/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
+$NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kcontrol/kcontrol/Makefile.in.orig	Tue May 13 23:07:54 2003
+--- kcontrol/kcontrol/Makefile.in.orig	2003-07-15 22:03:19.000000000 +1200
 +++ kcontrol/kcontrol/Makefile.in
-@@ -445,52 +445,65 @@ INCLUDES = $(all_includes)
+@@ -446,52 +446,65 @@ INCLUDES = $(all_includes)
  
  SUBDIRS = . pics
  
@@ -311,16 +311,16 @@ $NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcrootonly.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kecdialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@@ -991,7 +1051,7 @@ distclean-tags:
+@@ -985,7 +1045,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=cr32-app-kcontrol.png cr48-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png aboutwidget.h global.h toplevel.h modulemenu.h modulemenu.cpp kinfocenterui.rc kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h moduleiconview.h dockcontainer.h kecdialog.h cr16-app-kcontrol.png version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h kcrootonly.h 
-+KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h 
++KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h Makefile.in.rej moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1065,7 +1125,6 @@ install-strip:
+@@ -1059,7 +1119,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -328,7 +328,7 @@ $NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1170,84 +1229,81 @@ install-data-local: KControl_NoDisplay.d
+@@ -1164,49 +1223,34 @@ install-data-local: KControl_NoDisplay.d
  
  messages: rc.cpp
  	$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
@@ -343,111 +343,165 @@ $NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
 -moduleinfo.moc: $(srcdir)/moduleinfo.h
 -	$(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc
 -
+-#>+ 1
+-mocs: moduleinfo.moc
 -#>+ 3
  indexwidget.moc: $(srcdir)/indexwidget.h
  	$(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc
  
+ #>+ 1
+ mocs: indexwidget.moc
  #>+ 3
 -moduleiconview.moc: $(srcdir)/moduleiconview.h
 -	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
 -
+-#>+ 1
+-mocs: moduleiconview.moc
 -#>+ 3
 -dockcontainer.moc: $(srcdir)/dockcontainer.h
 -	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
 +main.moc: $(srcdir)/main.h
 +	$(MOC) $(srcdir)/main.h -o main.moc
  
+ #>+ 1
+-mocs: dockcontainer.moc
++mocs: main.moc
  #>+ 3
 -aboutwidget.moc: $(srcdir)/aboutwidget.h
 -	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
 +moduleinfo.moc: $(srcdir)/moduleinfo.h
 +	$(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc
  
+ #>+ 1
+-mocs: aboutwidget.moc
++mocs: moduleinfo.moc
  #>+ 3
 -proxywidget.moc: $(srcdir)/proxywidget.h
 -	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
 +kcmshell.moc: $(srcdir)/kcmshell.h
 +	$(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc
  
+ #>+ 1
+-mocs: proxywidget.moc
++mocs: kcmshell.moc
  #>+ 3
  helpwidget.moc: $(srcdir)/helpwidget.h
  	$(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc
- 
+@@ -1214,17 +1258,29 @@ helpwidget.moc: $(srcdir)/helpwidget.h
+ #>+ 1
+ mocs: helpwidget.moc
  #>+ 3
 -quickhelp.moc: $(srcdir)/quickhelp.h
 -	$(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc
 +toplevel.moc: $(srcdir)/toplevel.h
 +	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
  
+ #>+ 1
+-mocs: quickhelp.moc
++mocs: toplevel.moc
  #>+ 3
 -main.moc: $(srcdir)/main.h
 -	$(MOC) $(srcdir)/main.h -o main.moc
 +moduletreeview.moc: $(srcdir)/moduletreeview.h
 +	$(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc
-+
+ 
+ #>+ 1
+-mocs: main.moc
++mocs: moduletreeview.moc
 +#>+ 3
 +kecdialog.moc: $(srcdir)/kecdialog.h
 +	$(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc
 +
++#>+ 1
++mocs: kecdialog.moc
 +#>+ 3
 +modulemenu.moc: $(srcdir)/modulemenu.h
 +	$(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc
- 
++
++#>+ 1
++mocs: modulemenu.moc
  #>+ 3
  modules.moc: $(srcdir)/modules.h
  	$(MOC) $(srcdir)/modules.h -o modules.moc
- 
+@@ -1232,53 +1288,53 @@ modules.moc: $(srcdir)/modules.h
+ #>+ 1
+ mocs: modules.moc
  #>+ 3
 -kcdialog.moc: $(srcdir)/kcdialog.h
 -	$(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc
 +moduleiconview.moc: $(srcdir)/moduleiconview.h
 +	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
  
+ #>+ 1
+-mocs: kcdialog.moc
++mocs: moduleiconview.moc
  #>+ 3
 -moduletreeview.moc: $(srcdir)/moduletreeview.h
 -	$(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc
 +kcdialog.moc: $(srcdir)/kcdialog.h
 +	$(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc
  
+ #>+ 1
+-mocs: moduletreeview.moc
++mocs: kcdialog.moc
  #>+ 3
 -kecdialog.moc: $(srcdir)/kecdialog.h
 -	$(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc
 +searchwidget.moc: $(srcdir)/searchwidget.h
 +	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
  
+ #>+ 1
+-mocs: kecdialog.moc
++mocs: searchwidget.moc
  #>+ 3
 -toplevel.moc: $(srcdir)/toplevel.h
 -	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
 +moduleIface.moc: $(srcdir)/moduleIface.h
 +	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
  
+ #>+ 1
+-mocs: toplevel.moc
++mocs: moduleIface.moc
  #>+ 3
 -modulemenu.moc: $(srcdir)/modulemenu.h
 -	$(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc
 +aboutwidget.moc: $(srcdir)/aboutwidget.h
 +	$(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
  
+ #>+ 1
+-mocs: modulemenu.moc
++mocs: aboutwidget.moc
  #>+ 3
 -kcmshell.moc: $(srcdir)/kcmshell.h
 -	$(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc
 +proxywidget.moc: $(srcdir)/proxywidget.h
 +	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
  
+ #>+ 1
+-mocs: kcmshell.moc
++mocs: proxywidget.moc
  #>+ 3
 -moduleIface.moc: $(srcdir)/moduleIface.h
 -	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
 +dockcontainer.moc: $(srcdir)/dockcontainer.h
 +	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
  
+ #>+ 1
+-mocs: moduleIface.moc
++mocs: dockcontainer.moc
  #>+ 3
 -searchwidget.moc: $(srcdir)/searchwidget.h
 -	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
 +quickhelp.moc: $(srcdir)/quickhelp.h
 +	$(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc
  
+ #>+ 1
+-mocs: searchwidget.moc
++mocs: quickhelp.moc
  #>+ 5
  kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES)
-@@ -1263,7 +1319,7 @@ moduleIface_skel.cpp: moduleIface.kidl
+ 	$(DCOPIDL) $(srcdir)/kcdialog.h > kcdialog.kidl || ( rm -f kcdialog.kidl ; false )
+@@ -1293,7 +1349,7 @@ moduleIface_skel.cpp: moduleIface.kidl
  
  #>+ 3
  clean-metasources:
@@ -456,7 +510,7 @@ $NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  #>+ 5
  clean-idl:
-@@ -1314,45 +1370,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi
+@@ -1344,45 +1400,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi
  	rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files
  
  #>+ 11
@@ -535,7 +589,7 @@ $NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1362,39 +1430,39 @@ kde-rpo-clean:
+@@ -1392,39 +1460,39 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 37
diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw
index 3588e71b1f3..acf7c9181c2 100644
--- a/x11/kdebase3/patches/patch-aw
+++ b/x11/kdebase3/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $
+$NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kdeprint/kjobviewer/Makefile.in.orig	Tue May 13 23:07:56 2003
+--- kdeprint/kjobviewer/Makefile.in.orig	2003-07-15 22:03:29.000000000 +1200
 +++ kdeprint/kjobviewer/Makefile.in
-@@ -423,15 +423,20 @@ x_libraries = @x_libraries@
+@@ -424,15 +424,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kjobviewer
@@ -128,7 +128,7 @@ $NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kjobviewerui.rc cr16-app-kjobviewer.png cr32-app-kjobviewer.png kjobviewer.desktop 
-+KDE_DIST=kjobviewerui.rc cr16-app-kjobviewer.png kjobviewer.desktop cr32-app-kjobviewer.png 
++KDE_DIST=cr32-app-kjobviewer.png Makefile.in.rej kjobviewerui.rc cr16-app-kjobviewer.png kjobviewer.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
@@ -142,13 +142,15 @@ $NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $
  messages: rc.cpp
  	$(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-@@ -885,8 +899,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h
- 	$(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc
- 
+@@ -887,8 +901,14 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h
+ #>+ 1
+ mocs: kjobviewer.moc
  #>+ 3
 +kjobviewer.moc: $(srcdir)/kjobviewer.h
 +	$(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc
 +
++#>+ 1
++mocs: kjobviewer.moc
 +#>+ 3
  clean-metasources:
 -	-rm -f  kjobviewer.moc
@@ -156,7 +158,7 @@ $NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -910,33 +928,33 @@ force-reedit:
+@@ -912,33 +932,33 @@ force-reedit:
  
  
  #>+ 11
@@ -203,7 +205,7 @@ $NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -946,5 +964,5 @@ kde-rpo-clean:
+@@ -948,5 +968,5 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 3
diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba
index 24bffb00fda..422a227444c 100644
--- a/x11/kdebase3/patches/patch-ba
+++ b/x11/kdebase3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
+$NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kdesktop/Makefile.in.orig	Tue May 13 23:07:56 2003
+--- kdesktop/Makefile.in.orig	2003-07-15 22:03:30.000000000 +1200
 +++ kdesktop/Makefile.in
-@@ -422,10 +422,17 @@ x_includes = @x_includes@
+@@ -423,10 +423,17 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
@@ -22,7 +22,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  SUBDIRS = . lock pics patterns programs init kwebdesktop
  
-@@ -433,22 +440,24 @@ SUBDIRS = . lock pics patterns programs 
+@@ -434,22 +441,24 @@ SUBDIRS = . lock pics patterns programs 
  ####### Files
  bin_PROGRAMS = kdesktop
  bin_SCRIPTS = kdeeject
@@ -178,30 +178,30 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdiconview.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krootwm.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockeng.Plo@am__quote@
-@@ -934,7 +958,7 @@ distclean-tags:
+@@ -928,7 +952,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kcustommenu.h kdesktopbindings.cpp DESIGN kdesktop.desktop kdesktop_custom_menu1 kdiconview.h kdeeject kdesktop_custom_menu2 
-+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject 
++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h Makefile.in.rej kdesktopbindings.cpp kdeeject 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1109,35 +1133,21 @@ dummy.cc:
+@@ -1103,44 +1127,30 @@ dummy.cc:
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
 -#>+ 13
 -KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false )
 -KDesktopIface_skel.cc: KDesktopIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl
 -KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false )
 -KScreensaverIface_skel.cc: KScreensaverIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl
 -KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false )
 -KBackgroundIface_skel.cc: KBackgroundIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
 -
@@ -211,66 +211,91 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
 +xautolock.moc: $(srcdir)/xautolock.h
 +	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
  
+ #>+ 1
+-mocs: krootwm.moc
++mocs: xautolock.moc
  #>+ 3
 -minicli.moc: $(srcdir)/minicli.h
 -	$(MOC) $(srcdir)/minicli.h -o minicli.moc
 +lockeng.moc: $(srcdir)/lockeng.h
 +	$(MOC) $(srcdir)/lockeng.h -o lockeng.moc
  
+ #>+ 1
+-mocs: minicli.moc
++mocs: lockeng.moc
  #>+ 3
 -startupid.moc: $(srcdir)/startupid.h
 -	$(MOC) $(srcdir)/startupid.h -o startupid.moc
 +bgmanager.moc: $(srcdir)/bgmanager.h
 +	$(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc
  
+ #>+ 1
+-mocs: startupid.moc
++mocs: bgmanager.moc
  #>+ 3
 -lockeng.moc: $(srcdir)/lockeng.h
 -	$(MOC) $(srcdir)/lockeng.h -o lockeng.moc
 +kdiconview.moc: $(srcdir)/kdiconview.h
 +	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
  
+ #>+ 1
+-mocs: lockeng.moc
++mocs: kdiconview.moc
  #>+ 3
  desktop.moc: $(srcdir)/desktop.h
-@@ -1148,24 +1158,38 @@ pixmapserver.moc: $(srcdir)/pixmapserver
- 	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
- 
+ 	$(MOC) $(srcdir)/desktop.h -o desktop.moc
+@@ -1154,32 +1164,46 @@ pixmapserver.moc: $(srcdir)/pixmapserver
+ #>+ 1
+ mocs: pixmapserver.moc
  #>+ 3
 +startupid.moc: $(srcdir)/startupid.h
 +	$(MOC) $(srcdir)/startupid.h -o startupid.moc
 +
++#>+ 1
++mocs: startupid.moc
 +#>+ 3
  kcustommenu.moc: $(srcdir)/kcustommenu.h
  	$(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
  
+ #>+ 1
+ mocs: kcustommenu.moc
  #>+ 3
 -kdiconview.moc: $(srcdir)/kdiconview.h
 -	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
 +minicli.moc: $(srcdir)/minicli.h
 +	$(MOC) $(srcdir)/minicli.h -o minicli.moc
  
+ #>+ 1
+-mocs: kdiconview.moc
++mocs: minicli.moc
  #>+ 3
 -xautolock.moc: $(srcdir)/xautolock.h
 -	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
 +krootwm.moc: $(srcdir)/krootwm.h
 +	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
  
+ #>+ 1
+-mocs: xautolock.moc
 -#>+ 3
 -bgmanager.moc: $(srcdir)/bgmanager.h
 -	$(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc
++mocs: krootwm.moc
 +#>+ 13
 +KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false )
 +KDesktopIface_skel.cc: KDesktopIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl
 +KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false )
 +KScreensaverIface_skel.cc: KScreensaverIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl
 +KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false )
 +KBackgroundIface_skel.cc: KBackgroundIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
  
+-#>+ 1
+-mocs: bgmanager.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
@@ -278,7 +303,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  #>+ 6
  clean-idl:
-@@ -1185,45 +1209,45 @@ force-reedit:
+@@ -1199,45 +1223,45 @@ force-reedit:
  
  
  #>+ 11
@@ -347,7 +372,7 @@ $NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1233,23 +1257,23 @@ kde-rpo-clean:
+@@ -1247,23 +1271,23 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 21
diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg
index b71337bf46f..0c2950e8974 100644
--- a/x11/kdebase3/patches/patch-bg
+++ b/x11/kdebase3/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $
+$NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- khotkeys/khotkeys/Makefile.in.orig	Tue May 13 23:07:57 2003
+--- khotkeys/khotkeys/Makefile.in.orig	2003-07-15 22:03:33.000000000 +1200
 +++ khotkeys/khotkeys/Makefile.in
-@@ -424,16 +424,20 @@ x_includes = @x_includes@
+@@ -425,16 +425,20 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  
  bin_PROGRAMS = khotkeys
@@ -129,11 +129,11 @@ $NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=khkglobalaccel.cpp khotkeys.desktop khkglobalaccel.h 
-+KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp 
++KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp Makefile.in.rej 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -848,30 +864,27 @@ uninstall-am: uninstall-autostartDATA un
+@@ -848,34 +864,31 @@ uninstall-am: uninstall-autostartDATA un
  	uninstall-binPROGRAMS uninstall-info-am \
  	uninstall-libLTLIBRARIES
  
@@ -146,26 +146,32 @@ $NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $
  
 -#>+ 5
 -khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
 -khotkeys_skel.cpp: khotkeys.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
 +#>+ 3
 +khotkeys.moc: $(srcdir)/khotkeys.h
 +	$(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc
  
++#>+ 1
++mocs: khotkeys.moc
  #>+ 3
  khkglobalaccel.moc: $(srcdir)/khkglobalaccel.h
  	$(MOC) $(srcdir)/khkglobalaccel.h -o khkglobalaccel.moc
  
+ #>+ 1
+ mocs: khkglobalaccel.moc
 -#>+ 3
 -khotkeys.moc: $(srcdir)/khotkeys.h
 -	$(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc
 +#>+ 5
 +khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
 +khotkeys_skel.cpp: khotkeys.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
  
+-#>+ 1
+-mocs: khotkeys.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  khkglobalaccel.moc khotkeys.moc
@@ -173,7 +179,7 @@ $NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -889,33 +902,33 @@ force-reedit:
+@@ -893,33 +906,33 @@ force-reedit:
  
  
  #>+ 11
@@ -220,7 +226,7 @@ $NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -926,6 +939,6 @@ kde-rpo-clean:
+@@ -930,6 +943,6 @@ kde-rpo-clean:
  
  #>+ 5
  khotkeys.lo: khotkeys.moc 
diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm
index 87975e86d06..2763a82bf02 100644
--- a/x11/kdebase3/patches/patch-bm
+++ b/x11/kdebase3/patches/patch-bm
@@ -1,17 +1,16 @@
-$NetBSD: patch-bm,v 1.5 2003/05/22 02:42:49 markd Exp $
+$NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kicker/applets/launcher/Makefile.in.orig	Tue May 13 23:07:57 2003
+--- kicker/applets/launcher/Makefile.in.orig	2003-07-15 22:03:33.000000000 +1200
 +++ kicker/applets/launcher/Makefile.in
-@@ -436,7 +436,7 @@ lnk_DATA = quicklauncher.desktop
+@@ -437,14 +437,14 @@ lnk_DATA = quicklauncher.desktop
  EXTRA_DIST = $(lnk_DATA)
  
  launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 -launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI)
 +launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI)
  subdir = kicker/applets/launcher
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-@@ -444,7 +444,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
@@ -20,24 +19,37 @@ $NetBSD: patch-bm,v 1.5 2003/05/22 02:42:49 markd Exp $
  am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \
  	quickaddappsmenu.lo
  #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS)
-@@ -829,10 +829,6 @@ launcher_panelapplet.la.closure: $(launc
+@@ -673,7 +673,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=quicklauncher.desktop 
++KDE_DIST=Makefile.in.rej quicklauncher.desktop 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -829,12 +829,6 @@ launcher_panelapplet.la.closure: $(launc
  
  
  #>+ 3
 -quickbutton.moc: $(srcdir)/quickbutton.h
 -	$(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
 -
+-#>+ 1
+-mocs: quickbutton.moc
 -#>+ 3
  quickaddappsmenu.moc: $(srcdir)/quickaddappsmenu.h
  	$(MOC) $(srcdir)/quickaddappsmenu.h -o quickaddappsmenu.moc
  
-@@ -841,8 +837,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch
- 	$(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc
- 
+@@ -847,8 +841,14 @@ quicklauncher.moc: $(srcdir)/quicklaunch
+ #>+ 1
+ mocs: quicklauncher.moc
  #>+ 3
 +quickbutton.moc: $(srcdir)/quickbutton.h
 +	$(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
 +
++#>+ 1
++mocs: quickbutton.moc
 +#>+ 3
  clean-metasources:
 -	-rm -f  quickbutton.moc quickaddappsmenu.moc quicklauncher.moc
@@ -45,7 +57,7 @@ $NetBSD: patch-bm,v 1.5 2003/05/22 02:42:49 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -859,7 +859,7 @@ force-reedit:
+@@ -865,7 +865,7 @@ force-reedit:
  
  
  #>+ 11
@@ -54,7 +66,7 @@ $NetBSD: patch-bm,v 1.5 2003/05/22 02:42:49 markd Exp $
  	@echo 'creating launcher_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f launcher_panelapplet_la.all_cpp.files launcher_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> launcher_panelapplet_la.all_cpp.final; \
-@@ -895,9 +895,9 @@ kde-rpo-clean:
+@@ -901,9 +901,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz
index 7218a599136..0c0f318ea28 100644
--- a/x11/kdebase3/patches/patch-bz
+++ b/x11/kdebase3/patches/patch-bz
@@ -1,8 +1,8 @@
-$NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
+$NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $
 
---- klipper/Makefile.in.orig	Tue May 13 23:07:59 2003
+--- klipper/Makefile.in.orig	2003-07-15 22:03:37.000000000 +1200
 +++ klipper/Makefile.in
-@@ -423,27 +423,29 @@ x_libraries = @x_libraries@
+@@ -424,27 +424,29 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = klipper
@@ -163,7 +163,7 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=toplevel.h cr64-app-klipper.png klipperrc.desktop klipperbindings.cpp cr48-app-klipper.png klipper.desktop cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd klipper-kde31.sh cr128-app-klipper.png configdialog.h cr16-app-klipper.png klipper-1-2.pl version.h klippershortcuts.upd applet.h 
-+KDE_DIST=applet.h cr128-app-klipper.png cr22-app-klipper.png toplevel.h cr48-app-klipper.png cr64-app-klipper.png klipper-kde31.sh klipperbindings.cpp version.h configdialog.h cr32-app-klipper.png klipper-1-2.pl cr16-app-klipper.png klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop klippershortcuts.upd 
++KDE_DIST=applet.h cr128-app-klipper.png cr22-app-klipper.png toplevel.h cr48-app-klipper.png cr64-app-klipper.png klipper-kde31.sh klipperbindings.cpp version.h configdialog.h cr32-app-klipper.png klipper-1-2.pl cr16-app-klipper.png klipper.desktop Makefile.in.rej klipperrc.upd urlgrabber.h klipperrc.desktop klippershortcuts.upd 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
@@ -175,18 +175,18 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1004,16 +1016,18 @@ dummy.cpp:
+@@ -1004,18 +1016,18 @@ dummy.cpp:
  .NOEXPORT:
  
  #>+ 5
 +applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; false )
 +applet_skel.cpp: applet.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl
 +
 +#>+ 5
  toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
- 	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false )
+ 	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; false )
  toplevel_skel.cpp: toplevel.kidl
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
  
@@ -194,23 +194,27 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
 -configdialog.moc: $(srcdir)/configdialog.h
 -	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
 -
+-#>+ 1
+-mocs: configdialog.moc
 -#>+ 3
  urlgrabber.moc: $(srcdir)/urlgrabber.h
  	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
  
-@@ -1025,21 +1039,19 @@ toplevel.moc: $(srcdir)/toplevel.h
- applet.moc: $(srcdir)/applet.h
- 	$(MOC) $(srcdir)/applet.h -o applet.moc
+@@ -1033,21 +1045,21 @@ applet.moc: $(srcdir)/applet.h
  
+ #>+ 1
+ mocs: applet.moc
 -#>+ 5
 -applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; false )
 -applet_skel.cpp: applet.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl
 +#>+ 3
 +configdialog.moc: $(srcdir)/configdialog.h
 +	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
  
++#>+ 1
++mocs: configdialog.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  configdialog.moc urlgrabber.moc toplevel.moc applet.moc
@@ -226,7 +230,7 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -1075,18 +1087,6 @@ force-reedit:
+@@ -1083,18 +1095,6 @@ force-reedit:
  
  
  #>+ 11
@@ -245,7 +249,7 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
  klipper_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/applet.cpp applet_skel.cpp  applet.moc
  	@echo 'creating klipper_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f klipper_panelapplet_la.all_cpp.files klipper_panelapplet_la.all_cpp.final; \
-@@ -1098,22 +1098,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr
+@@ -1106,22 +1106,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr
  	cat klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files > klipper_panelapplet_la.all_cpp.cpp; \
  	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
  
@@ -285,7 +289,7 @@ $NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1123,11 +1135,11 @@ kde-rpo-clean:
+@@ -1131,11 +1143,11 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 9
diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd
index 4ec7a95a179..764aea58434 100644
--- a/x11/kdebase3/patches/patch-cd
+++ b/x11/kdebase3/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $
+$NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $
 
---- kmenuedit/Makefile.in.orig	Tue May 13 23:07:59 2003
+--- kmenuedit/Makefile.in.orig	2003-07-15 22:03:38.000000000 +1200
 +++ kmenuedit/Makefile.in
-@@ -423,17 +423,19 @@ x_libraries = @x_libraries@
+@@ -424,17 +424,19 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kmenuedit
@@ -144,16 +144,16 @@ $NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menueditview.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Plo@am__quote@
-@@ -833,7 +849,7 @@ distclean-tags:
+@@ -827,7 +843,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=cr48-app-kmenuedit.png uninstall.desktop kmenuedit.desktop cr16-app-kmenuedit.png kmenueditui.rc cr32-app-kmenuedit.png 
-+KDE_DIST=cr32-app-kmenuedit.png cr16-app-kmenuedit.png cr48-app-kmenuedit.png kmenuedit.desktop kmenueditui.rc uninstall.desktop 
++KDE_DIST=cr32-app-kmenuedit.png cr16-app-kmenuedit.png cr48-app-kmenuedit.png kmenuedit.desktop Makefile.in.rej kmenueditui.rc uninstall.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -907,7 +923,6 @@ install-strip:
+@@ -901,7 +917,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -161,34 +161,43 @@ $NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1012,10 +1027,6 @@ dummy.cpp:
+@@ -1006,12 +1021,6 @@ dummy.cpp:
  .NOEXPORT:
  
  #>+ 3
 -menueditview.moc: $(srcdir)/menueditview.h
 -	$(MOC) $(srcdir)/menueditview.h -o menueditview.moc
 -
+-#>+ 1
+-mocs: menueditview.moc
 -#>+ 3
  basictab.moc: $(srcdir)/basictab.h
  	$(MOC) $(srcdir)/basictab.h -o basictab.moc
  
-@@ -1024,16 +1035,20 @@ treeview.moc: $(srcdir)/treeview.h
- 	$(MOC) $(srcdir)/treeview.h -o treeview.moc
- 
+@@ -1024,11 +1033,11 @@ treeview.moc: $(srcdir)/treeview.h
+ #>+ 1
+ mocs: treeview.moc
  #>+ 3
 -kmenuedit.moc: $(srcdir)/kmenuedit.h
 -	$(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc
 +menueditview.moc: $(srcdir)/menueditview.h
 +	$(MOC) $(srcdir)/menueditview.h -o menueditview.moc
  
+ #>+ 1
+-mocs: kmenuedit.moc
++mocs: menueditview.moc
  #>+ 3
  desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h
  	$(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc
- 
+@@ -1036,8 +1045,14 @@ desktopfileeditor.moc: $(srcdir)/desktop
+ #>+ 1
+ mocs: desktopfileeditor.moc
  #>+ 3
 +kmenuedit.moc: $(srcdir)/kmenuedit.h
 +	$(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc
 +
++#>+ 1
++mocs: kmenuedit.moc
 +#>+ 3
  clean-metasources:
 -	-rm -f  menueditview.moc basictab.moc treeview.moc kmenuedit.moc desktopfileeditor.moc
@@ -196,7 +205,7 @@ $NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -1060,33 +1075,33 @@ force-reedit:
+@@ -1064,33 +1079,33 @@ force-reedit:
  
  
  #>+ 11
@@ -243,7 +252,7 @@ $NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1096,13 +1111,13 @@ kde-rpo-clean:
+@@ -1100,13 +1115,13 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 11
diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch
index de14355ff0d..b0248ebbb2d 100644
--- a/x11/kdebase3/patches/patch-ch
+++ b/x11/kdebase3/patches/patch-ch
@@ -1,8 +1,8 @@
-$NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
+$NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $
 
---- konqueror/Makefile.in.orig	Tue May 13 23:07:59 2003
+--- konqueror/Makefile.in.orig	2003-07-15 22:03:39.000000000 +1200
 +++ konqueror/Makefile.in
-@@ -427,7 +427,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t
+@@ -428,7 +428,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t
  #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar
  SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  konqdatadir = $(kde_datadir)/konqueror
  konqdata_DATA = konqueror.rc
-@@ -444,7 +444,7 @@ include_HEADERS = KonquerorIface.h
+@@ -445,7 +445,7 @@ include_HEADERS = KonquerorIface.h
  
  bin_PROGRAMS = konqueror
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>- 	    KonquerorIface.cc KonquerorIface.skel \
  #>- 	    KonqMainWindowIface.cc KonqMainWindowIface.skel \
  #>- 	    KonqViewIface.cc KonqViewIface.skel \
-@@ -459,7 +459,7 @@ bin_PROGRAMS = konqueror
+@@ -460,7 +460,7 @@ bin_PROGRAMS = konqueror
  #>- 	    konq_browseriface.cc \
  #>- 	    delayedinitializer.cc
  #>+ 14
@@ -29,7 +29,7 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  	    KonquerorIface.cc  \
  	    KonqMainWindowIface.cc  \
  	    KonqViewIface.cc  \
-@@ -482,11 +482,15 @@ noinst_HEADERS = KonqMainWindowIface.h K
+@@ -483,11 +483,15 @@ noinst_HEADERS = KonqMainWindowIface.h K
  	konq_view.h konq_viewmgr.h version.h
  
  
@@ -198,16 +198,16 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -1064,7 +1083,7 @@ distclean-tags:
+@@ -1058,7 +1077,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop DESIGN profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop uninstall.desktop convert_kdelnk.sh IDEAS konqueror.rc profile_filemanagement.desktop DESIGN_config konquerorsu.desktop Home.desktop kfmclient.desktop konqueror_config.desktop 
-+KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop 
++KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop Makefile.in.rej kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1246,9 +1265,6 @@ uninstall-info: uninstall-info-recursive
+@@ -1240,9 +1259,6 @@ uninstall-info: uninstall-info-recursive
  #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la
  #konqueror_static_LDFLAGS = $(all_libraries) -static
  
@@ -217,113 +217,151 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  messages: rc.cpp
  	$(EXTRACTRC) *.rc */*.rc >> rc.cpp
  	$(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp
-@@ -1269,23 +1285,13 @@ uninstall-local:
+@@ -1263,26 +1279,24 @@ uninstall-local:
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
 -#>+ 13
 -KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
 -KonquerorIface_skel.cc: KonquerorIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl
 -KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false )
 -KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl
 -KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false )
 -KonqViewIface_skel.cc: KonqViewIface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl
 +#>+ 3
 +konq_view.moc: $(srcdir)/konq_view.h
 +	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
  
++#>+ 1
++mocs: konq_view.moc
  #>+ 3
 -konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h
 -	$(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc
 +konq_browseriface.moc: $(srcdir)/konq_browseriface.h
 +	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
  
+ #>+ 1
+-mocs: konq_profiledlg.moc
++mocs: konq_browseriface.moc
++#>+ 3
++konq_misc.moc: $(srcdir)/konq_misc.h
++	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
++
++#>+ 1
++mocs: konq_misc.moc
  #>+ 3
  delayedinitializer.moc: $(srcdir)/delayedinitializer.h
-@@ -1296,40 +1302,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main
- 	$(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc
- 
+ 	$(MOC) $(srcdir)/delayedinitializer.h -o delayedinitializer.moc
+@@ -1296,35 +1310,35 @@ konq_mainwindow.moc: $(srcdir)/konq_main
+ #>+ 1
+ mocs: konq_mainwindow.moc
  #>+ 3
 -konq_actions.moc: $(srcdir)/konq_actions.h
 -	$(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
 +konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h
 +	$(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc
  
+ #>+ 1
+-mocs: konq_actions.moc
++mocs: konq_profiledlg.moc
  #>+ 3
 -konq_frame.moc: $(srcdir)/konq_frame.h
 -	$(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc
 +konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
 +	$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
  
+ #>+ 1
+-mocs: konq_frame.moc
++mocs: konq_viewmgr.moc
  #>+ 3
 -konq_browseriface.moc: $(srcdir)/konq_browseriface.h
 -	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
 +konq_actions.moc: $(srcdir)/konq_actions.h
 +	$(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
  
+ #>+ 1
+-mocs: konq_browseriface.moc
++mocs: konq_actions.moc
  #>+ 3
--konq_view.moc: $(srcdir)/konq_view.h
--	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+-konq_misc.moc: $(srcdir)/konq_misc.h
+-	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
 +konq_combo.moc: $(srcdir)/konq_combo.h
 +	$(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc
  
+ #>+ 1
+-mocs: konq_misc.moc
++mocs: konq_combo.moc
  #>+ 3
--konq_run.moc: $(srcdir)/konq_run.h
--	$(MOC) $(srcdir)/konq_run.h -o konq_run.moc
+-konq_view.moc: $(srcdir)/konq_view.h
+-	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
 +konq_guiclients.moc: $(srcdir)/konq_guiclients.h
 +	$(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc
  
+ #>+ 1
+-mocs: konq_view.moc
++mocs: konq_guiclients.moc
+ #>+ 3
+ konq_run.moc: $(srcdir)/konq_run.h
+ 	$(MOC) $(srcdir)/konq_run.h -o konq_run.moc
+@@ -1332,26 +1346,28 @@ konq_run.moc: $(srcdir)/konq_run.h
+ #>+ 1
+ mocs: konq_run.moc
  #>+ 3
 -konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
 -	$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
-+konq_run.moc: $(srcdir)/konq_run.h
-+	$(MOC) $(srcdir)/konq_run.h -o konq_run.moc
- 
- #>+ 3
+-
+-#>+ 1
+-mocs: konq_viewmgr.moc
+-#>+ 3
 -konq_guiclients.moc: $(srcdir)/konq_guiclients.h
 -	$(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc
 +konq_frame.moc: $(srcdir)/konq_frame.h
 +	$(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc
  
+ #>+ 1
+-mocs: konq_guiclients.moc
 -#>+ 3
 -konq_combo.moc: $(srcdir)/konq_combo.h
 -	$(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc
++mocs: konq_frame.moc
 +#>+ 13
 +KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
 +KonquerorIface_skel.cc: KonquerorIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl
 +KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false )
 +KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl
 +KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false )
 +KonqViewIface_skel.cc: KonqViewIface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl
  
+-#>+ 1
+-mocs: konq_combo.moc
  #>+ 3
  clean-metasources:
--	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc
-+	-rm -f  konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc
+-	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc
++	-rm -f  konq_view.moc konq_browseriface.moc konq_misc.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc
  
  #>+ 6
  clean-idl:
-@@ -1349,33 +1365,33 @@ force-reedit:
+@@ -1371,33 +1387,33 @@ force-reedit:
  
  
  #>+ 11
--konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc
+-konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc
 -	@echo 'creating konqueror_la.all_cc.cc ...'; \
 -	rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \
 -	echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \
-+libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc
++libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_view.moc konq_browseriface.moc konq_misc.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc
 +	@echo 'creating libkonqueror_main_la.all_cc.cc ...'; \
 +	rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \
@@ -362,10 +400,10 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1385,25 +1401,25 @@ kde-rpo-clean:
+@@ -1407,27 +1423,27 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
- #>+ 23
+ #>+ 25
 -konq_guiclients.lo: konq_guiclients.moc 
 -konq_run.o: konq_run.moc 
 -konq_mainwindow.lo: konq_mainwindow.moc 
@@ -376,6 +414,7 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
 -konq_frame.o: konq_frame.moc 
 -konq_guiclients.o: konq_guiclients.moc 
  konq_frame.lo: konq_frame.moc 
+-konq_misc.o: konq_misc.moc 
 -delayedinitializer.o: delayedinitializer.moc 
 -konq_profiledlg.o: konq_profiledlg.moc 
 -konq_browseriface.lo: konq_browseriface.moc 
@@ -385,22 +424,24 @@ $NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $
  konq_view.o: konq_view.moc 
 +konq_browseriface.lo: konq_browseriface.moc 
 +konq_browseriface.o: konq_browseriface.moc 
++konq_misc.o: konq_misc.moc 
 +konq_combo.lo: konq_combo.moc 
  konq_actions.o: konq_actions.moc 
--konq_mainwindow.o: konq_mainwindow.moc 
 +delayedinitializer.o: delayedinitializer.moc 
 +konq_profiledlg.lo: konq_profiledlg.moc 
 +konq_run.lo: konq_run.moc 
- delayedinitializer.lo: delayedinitializer.moc 
--konq_combo.lo: konq_combo.moc 
--konq_browseriface.o: konq_browseriface.moc 
++delayedinitializer.lo: delayedinitializer.moc 
 +konq_guiclients.lo: konq_guiclients.moc 
 +konq_frame.o: konq_frame.moc 
+ konq_misc.lo: konq_misc.moc 
 +konq_run.o: konq_run.moc 
 +konq_viewmgr.o: konq_viewmgr.moc 
 +konq_combo.o: konq_combo.moc 
 +konq_guiclients.o: konq_guiclients.moc 
 +konq_mainwindow.lo: konq_mainwindow.moc 
-+konq_mainwindow.o: konq_mainwindow.moc 
+ konq_mainwindow.o: konq_mainwindow.moc 
+-delayedinitializer.lo: delayedinitializer.moc 
+-konq_combo.lo: konq_combo.moc 
+-konq_browseriface.o: konq_browseriface.moc 
 +konq_viewmgr.lo: konq_viewmgr.moc 
  konq_actions.lo: konq_actions.moc 
diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj
index 530bc6a2b74..4356d4e59a1 100644
--- a/x11/kdebase3/patches/patch-cj
+++ b/x11/kdebase3/patches/patch-cj
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
+$NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $
 
---- konqueror/client/Makefile.in.orig	Tue May 13 23:07:59 2003
+--- konqueror/client/Makefile.in.orig	2003-07-15 22:03:39.000000000 +1200
 +++ konqueror/client/Makefile.in
-@@ -423,14 +423,18 @@ x_libraries = @x_libraries@
+@@ -424,14 +424,18 @@ x_libraries = @x_libraries@
  AM_CPPFLAGS = -DQT_NO_CAST_ASCII
  
  bin_PROGRAMS = kfmclient
@@ -26,7 +26,7 @@ $NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  noinst_HEADERS = kfmclient.h
  #>- METASOURCES = AUTO
-@@ -438,9 +442,9 @@ noinst_HEADERS = kfmclient.h
+@@ -439,39 +443,50 @@ noinst_HEADERS = kfmclient.h
  KonquerorIface_DIR = $(srcdir)/..
  KDesktopIface_DIR = $(top_srcdir)/kdesktop
  
@@ -36,9 +36,8 @@ $NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
 -kfmclient_LDADD = kfmclient.la
 +kfmclient_LDADD = libkfmclient_main.la
  subdir = konqueror/client
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-@@ -448,30 +452,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -128,7 +127,21 @@ $NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -816,15 +835,16 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -683,7 +702,12 @@ GTAGS:
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 4
++KDE_DIST=Makefile.in.rej 
++
++DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++
+ 
+ top_distdir = ../..
+ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+@@ -816,15 +840,18 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-libLTLIBRARIES
  
  
@@ -145,21 +158,25 @@ $NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
 +kfmclient.moc: $(srcdir)/kfmclient.h
 +	$(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
 +
++#>+ 1
++mocs: kfmclient.moc
  #>+ 9
  KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES)
- 	$(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false )
-@@ -836,10 +856,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl
+ 	$(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
+@@ -836,12 +863,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl
  	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl
  
  #>+ 3
 -kfmclient.moc: $(srcdir)/kfmclient.h
 -	$(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
 -
+-#>+ 1
+-mocs: kfmclient.moc
 -#>+ 3
  clean-metasources:
  	-rm -f  kfmclient.moc
  
-@@ -860,33 +876,33 @@ force-reedit:
+@@ -862,33 +883,33 @@ force-reedit:
  
  
  #>+ 11
@@ -206,7 +223,7 @@ $NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -896,8 +912,8 @@ kde-rpo-clean:
+@@ -898,8 +919,8 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 6
diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn
index 5347bdca508..32fc2282399 100644
--- a/x11/kdebase3/patches/patch-cn
+++ b/x11/kdebase3/patches/patch-cn
@@ -1,8 +1,8 @@
-$NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $
+$NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $
 
---- konqueror/keditbookmarks/Makefile.in.orig	Tue May 13 23:07:59 2003
+--- konqueror/keditbookmarks/Makefile.in.orig	2003-07-15 22:03:40.000000000 +1200
 +++ konqueror/keditbookmarks/Makefile.in
-@@ -424,20 +424,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all
+@@ -425,20 +425,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all
  
  #>- METASOURCES = AUTO
  
@@ -140,7 +140,7 @@ $NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=toplevel.h cr48-app-keditbookmarks.png cr128-app-keditbookmarks.png cr32-app-keditbookmarks.png uninstall.desktop cr64-app-keditbookmarks.png keditbookmarksui.rc favicons.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h 
-+KDE_DIST=commands.h kinsertionsort.h favicons.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc cr128-app-keditbookmarks.png cr48-app-keditbookmarks.png cr16-app-keditbookmarks.png uninstall.desktop 
++KDE_DIST=commands.h kinsertionsort.h favicons.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc cr128-app-keditbookmarks.png cr48-app-keditbookmarks.png Makefile.in.rej cr16-app-keditbookmarks.png uninstall.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
@@ -154,37 +154,45 @@ $NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $
  install-data-local: uninstall.desktop
  	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet
  	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop
-@@ -869,27 +887,27 @@ install-data-local: uninstall.desktop
+@@ -869,12 +887,6 @@ install-data-local: uninstall.desktop
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
 -#>+ 5
 -toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; false )
 -toplevel_skel.cpp: toplevel.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
 -
  #>+ 3
  favicons.moc: $(srcdir)/favicons.h
  	$(MOC) $(srcdir)/favicons.h -o favicons.moc
- 
+@@ -882,20 +894,26 @@ favicons.moc: $(srcdir)/favicons.h
+ #>+ 1
+ mocs: favicons.moc
  #>+ 3
 +commands.moc: $(srcdir)/commands.h
 +	$(MOC) $(srcdir)/commands.h -o commands.moc
 +
++#>+ 1
++mocs: commands.moc
 +#>+ 3
  toplevel.moc: $(srcdir)/toplevel.h
  	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
  
+ #>+ 1
+ mocs: toplevel.moc
 -#>+ 3
 -commands.moc: $(srcdir)/commands.h
 -	$(MOC) $(srcdir)/commands.h -o commands.moc
 +#>+ 5
 +toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; false )
 +toplevel_skel.cpp: toplevel.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
  
+-#>+ 1
+-mocs: commands.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  favicons.moc toplevel.moc commands.moc
@@ -192,7 +200,7 @@ $NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -927,33 +945,33 @@ force-reedit:
+@@ -933,33 +951,33 @@ force-reedit:
  
  
  #>+ 11
@@ -239,7 +247,7 @@ $NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -963,9 +981,9 @@ kde-rpo-clean:
+@@ -969,9 +987,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct
index 00aee26b456..5a34b27cd72 100644
--- a/x11/kdebase3/patches/patch-ct
+++ b/x11/kdebase3/patches/patch-ct
@@ -1,8 +1,8 @@
-$NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
+$NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $
 
---- konsole/konsole/Makefile.in.orig	Tue May 13 23:08:00 2003
+--- konsole/konsole/Makefile.in.orig	2003-07-15 22:03:42.000000000 +1200
 +++ konsole/konsole/Makefile.in
-@@ -437,7 +437,7 @@ INCLUDES = -I. $(all_includes)
+@@ -438,7 +438,7 @@ INCLUDES = -I. $(all_includes)
  
  # you can add here more. This one gets installed
  bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole
@@ -11,7 +11,7 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  
  
  # libkonsolepart is a part, but konsole.la links directly to it, so we can't
-@@ -472,30 +472,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar
+@@ -473,30 +473,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar
  libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS)
  
  # kwrited kdeinit module
@@ -275,11 +275,11 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults konsole_part.h konsolerc konsoleiface.h 
-+KDE_DIST=konsoleiface.h konsole_part.h x-konsole.desktop konsolerc sessioniface.h MakeDefaults 
++KDE_DIST=konsoleiface.h konsole_part.h Makefile.in.rej x-konsole.desktop konsolerc sessioniface.h MakeDefaults 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1154,50 +1192,37 @@ messages: rc.cpp
+@@ -1154,29 +1192,16 @@ messages: rc.cpp
  	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot
  	rm -f schemas.cpp
  	rm -f tips.cpp
@@ -292,11 +292,11 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  
 -#>+ 9
 -konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; false )
 -konsoleiface_skel.cpp: konsoleiface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl
 -sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; false )
 -sessioniface_skel.cpp: sessioniface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
 -
@@ -306,70 +306,98 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
 +konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
 +	$(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
  
+ #>+ 1
+-mocs: kwrited.moc
++mocs: konsolebookmarkmenu.moc
  #>+ 3
  TEWidget.moc: $(srcdir)/TEWidget.h
  	$(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc
- 
+@@ -1184,35 +1209,35 @@ TEWidget.moc: $(srcdir)/TEWidget.h
+ #>+ 1
+ mocs: TEWidget.moc
  #>+ 3
 -konsole_child.moc: $(srcdir)/konsole_child.h
 -	$(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc
 -
+-#>+ 1
+-mocs: konsole_child.moc
 -#>+ 3
  TEmulation.moc: $(srcdir)/TEmulation.h
  	$(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
  
+ #>+ 1
+ mocs: TEmulation.moc
  #>+ 3
 -konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
 -	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
 +kwrited.moc: $(srcdir)/kwrited.h
 +	$(MOC) $(srcdir)/kwrited.h -o kwrited.moc
  
+ #>+ 1
+-mocs: konsolebookmarkhandler.moc
++mocs: kwrited.moc
  #>+ 3
 -konsole.moc: $(srcdir)/konsole.h
 -	$(MOC) $(srcdir)/konsole.h -o konsole.moc
 +TEPty.moc: $(srcdir)/TEPty.h
 +	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
  
+ #>+ 1
+-mocs: konsole.moc
++mocs: TEPty.moc
  #>+ 3
 -konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
 -	$(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
 +konsole_part.moc: $(srcdir)/konsole_part.h
 +	$(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc
-+
+ 
+ #>+ 1
+-mocs: konsolebookmarkmenu.moc
++mocs: konsole_part.moc
 +#>+ 3
 +konsole.moc: $(srcdir)/konsole.h
 +	$(MOC) $(srcdir)/konsole.h -o konsole.moc
- 
++
++#>+ 1
++mocs: konsole.moc
  #>+ 3
  session.moc: $(srcdir)/session.h
-@@ -1208,12 +1233,22 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h
- 	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
- 
+ 	$(MOC) $(srcdir)/session.h -o session.moc
+@@ -1226,17 +1251,27 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h
+ #>+ 1
+ mocs: TEmuVt102.moc
  #>+ 3
 -konsole_part.moc: $(srcdir)/konsole_part.h
 -	$(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc
 +konsole_child.moc: $(srcdir)/konsole_child.h
 +	$(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc
  
+ #>+ 1
+-mocs: konsole_part.moc
++mocs: konsole_child.moc
  #>+ 3
 -TEPty.moc: $(srcdir)/TEPty.h
 -	$(MOC) $(srcdir)/TEPty.h -o TEPty.moc
 +konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
 +	$(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
-+
+ 
+ #>+ 1
+-mocs: TEPty.moc
++mocs: konsolebookmarkhandler.moc
 +#>+ 9
 +konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; false )
 +konsoleiface_skel.cpp: konsoleiface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl
 +sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; false )
 +sessioniface_skel.cpp: sessioniface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
- 
++
  #>+ 8
  libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES)
-@@ -1226,7 +1261,7 @@ libkonsolepart.la.closure: $(libkonsolep
+ 	@echo "int main() {return 0;}" > libkonsolepart_la_closure.cpp
+@@ -1248,7 +1283,7 @@ libkonsolepart.la.closure: $(libkonsolep
  
  #>+ 3
  clean-metasources:
@@ -378,7 +406,7 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  
  #>+ 7
  clean-idl:
-@@ -1251,19 +1286,19 @@ force-reedit:
+@@ -1273,19 +1308,19 @@ force-reedit:
  
  
  #>+ 11
@@ -407,7 +435,7 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
  	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
-@@ -1276,20 +1311,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir)
+@@ -1298,20 +1333,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir)
  
  #>+ 3
  clean-final:
@@ -433,7 +461,7 @@ $NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1299,25 +1334,25 @@ kde-rpo-clean:
+@@ -1321,25 +1356,25 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 23
diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz
index 4fbcbe0a891..f08cbafff09 100644
--- a/x11/kdebase3/patches/patch-cz
+++ b/x11/kdebase3/patches/patch-cz
@@ -1,8 +1,8 @@
-$NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $
+$NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $
 
---- ksmserver/Makefile.in.orig	Tue May 13 23:08:01 2003
+--- ksmserver/Makefile.in.orig	2003-07-15 22:03:43.000000000 +1200
 +++ ksmserver/Makefile.in
-@@ -443,20 +443,23 @@ SUBDIRS = .
+@@ -444,20 +444,23 @@ SUBDIRS = .
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = ksmserver
@@ -131,16 +131,16 @@ $NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shutdown.Plo@am__quote@
-@@ -846,7 +860,7 @@ distclean-tags:
+@@ -840,7 +854,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE KSMServerInterface.h configure.in.in 
-+KDE_DIST=move_session_config.sh LICENSE ksmserver.upd shutdownkonq.png configure.in.in KSMServerInterface.h 
++KDE_DIST=configure.in.in KSMServerInterface.h LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png Makefile.in.rej 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1007,30 +1021,27 @@ uninstall-info: uninstall-info-recursive
+@@ -1001,34 +1015,31 @@ uninstall-info: uninstall-info-recursive
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
@@ -153,26 +153,32 @@ $NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $
  
 -#>+ 5
 -KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; false )
 -KSMServerInterface_skel.cpp: KSMServerInterface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl
 +#>+ 3
 +server.moc: $(srcdir)/server.h
 +	$(MOC) $(srcdir)/server.h -o server.moc
  
++#>+ 1
++mocs: server.moc
  #>+ 3
  shutdown.moc: $(srcdir)/shutdown.h
  	$(MOC) $(srcdir)/shutdown.h -o shutdown.moc
  
+ #>+ 1
+ mocs: shutdown.moc
 -#>+ 3
 -server.moc: $(srcdir)/server.h
 -	$(MOC) $(srcdir)/server.h -o server.moc
 +#>+ 5
 +KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; false )
 +KSMServerInterface_skel.cpp: KSMServerInterface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl
  
+-#>+ 1
+-mocs: server.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  shutdown.moc server.moc
@@ -180,7 +186,7 @@ $NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -1048,33 +1059,33 @@ force-reedit:
+@@ -1046,33 +1057,33 @@ force-reedit:
  
  
  #>+ 11
@@ -227,7 +233,7 @@ $NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1084,7 +1095,7 @@ kde-rpo-clean:
+@@ -1082,7 +1093,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh
index f2b11e3cfa3..3b9f6f2e0e4 100644
--- a/x11/kdebase3/patches/patch-dh
+++ b/x11/kdebase3/patches/patch-dh
@@ -1,8 +1,8 @@
-$NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
+$NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $
 
---- kwin/Makefile.in.orig	Tue May 13 23:08:02 2003
+--- kwin/Makefile.in.orig	2003-07-15 22:03:46.000000000 +1200
 +++ kwin/Makefile.in
-@@ -426,18 +426,22 @@ INCLUDES = $(all_includes)
+@@ -427,18 +427,22 @@ INCLUDES = $(all_includes)
  SUBDIRS = . kcmkwin pics clients
  
  bin_PROGRAMS = kwin
@@ -29,7 +29,7 @@ $NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
  kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
  
  include_HEADERS = KWinInterface.h
-@@ -446,7 +450,7 @@ kwinincludedir = $(includedir)/kwin
+@@ -447,7 +451,7 @@ kwinincludedir = $(includedir)/kwin
  kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
  
  kwin_SOURCES = kwin_main.cpp
@@ -38,7 +38,7 @@ $NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
  kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  KDE_ICON = kwin
-@@ -457,7 +461,6 @@ data_DATA = eventsrc
+@@ -458,7 +462,6 @@ data_DATA = eventsrc
  
  sounddir = $(kde_sounddir)
  sound_DATA = pop.wav
@@ -163,54 +163,64 @@ $NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwin_main.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwinbutton.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@@ -907,7 +918,7 @@ distclean-tags:
+@@ -901,7 +912,7 @@ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h kwin.upd pop.wav cr16-app-kwin.png pluginlibFix.pl placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h cr48-app-kwin.png tabbox.h 
-+KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc 
++KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h Makefile.in.rej NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1085,25 +1096,15 @@ messages:
+@@ -1079,12 +1090,12 @@ messages:
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
 -#>+ 5
 -KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
--	$(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false )
+-	$(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false )
 -KWinInterface_skel.cpp: KWinInterface.kidl
 -	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
 +#>+ 3
 +workspace.moc: $(srcdir)/workspace.h
 +	$(MOC) $(srcdir)/workspace.h -o workspace.moc
  
++#>+ 1
++mocs: workspace.moc
  #>+ 3
  client.moc: $(srcdir)/client.h
  	$(MOC) $(srcdir)/client.h -o client.moc
- 
+@@ -1092,18 +1103,6 @@ client.moc: $(srcdir)/client.h
+ #>+ 1
+ mocs: client.moc
  #>+ 3
 -plugins.moc: $(srcdir)/plugins.h
 -	$(MOC) $(srcdir)/plugins.h -o plugins.moc
 -
+-#>+ 1
+-mocs: plugins.moc
 -#>+ 3
 -workspace.moc: $(srcdir)/workspace.h
 -	$(MOC) $(srcdir)/workspace.h -o workspace.moc
 -
+-#>+ 1
+-mocs: workspace.moc
 -#>+ 3
  options.moc: $(srcdir)/options.h
  	$(MOC) $(srcdir)/options.h -o options.moc
  
-@@ -1120,8 +1121,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h
- 	$(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc
- 
+@@ -1128,8 +1127,20 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h
+ #>+ 1
+ mocs: kwinbutton.moc
  #>+ 3
 +plugins.moc: $(srcdir)/plugins.h
 +	$(MOC) $(srcdir)/plugins.h -o plugins.moc
 +
++#>+ 1
++mocs: plugins.moc
 +#>+ 5
 +KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
-+	$(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false )
++	$(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false )
 +KWinInterface_skel.cpp: KWinInterface.kidl
 +	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
 +
@@ -221,7 +231,7 @@ $NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -1153,33 +1164,33 @@ force-reedit:
+@@ -1161,33 +1172,33 @@ force-reedit:
  
  
  #>+ 11
@@ -268,7 +278,7 @@ $NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1189,17 +1200,17 @@ kde-rpo-clean:
+@@ -1197,17 +1208,17 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 15
diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed
index 2ac876a5888..e0387f3d03c 100644
--- a/x11/kdebase3/patches/patch-ed
+++ b/x11/kdebase3/patches/patch-ed
@@ -1,8 +1,8 @@
-$NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
+$NetBSD: patch-ed,v 1.5 2003/07/30 13:35:00 markd Exp $
 
---- kwin/clients/riscos/Makefile.in.orig	Fri Jan 17 09:03:12 2003
+--- kwin/clients/riscos/Makefile.in.orig	2003-07-15 22:03:50.000000000 +1200
 +++ kwin/clients/riscos/Makefile.in
-@@ -299,7 +299,7 @@ StickyButton.cpp \
+@@ -436,7 +436,7 @@ StickyButton.cpp \
  HelpButton.cpp \
  Static.cpp
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
  kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
  
  #>- METASOURCES = AUTO
-@@ -325,7 +325,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -462,7 +462,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
@@ -20,7 +20,16 @@ $NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
  am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \
  	LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \
  	HelpButton.lo Static.lo
-@@ -683,40 +683,40 @@ kwin_riscos.la.closure: $(kwin_riscos_la
+@@ -711,7 +711,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=riscos.desktop Palette.h 
++KDE_DIST=riscos.desktop Palette.h Makefile.in.rej 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -861,11 +861,11 @@ kwin_riscos.la.closure: $(kwin_riscos_la
  
  
  #>+ 3
@@ -29,46 +38,69 @@ $NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
 +Button.moc: $(srcdir)/Button.h
 +	$(MOC) $(srcdir)/Button.h -o Button.moc
  
+ #>+ 1
+-mocs: LowerButton.moc
++mocs: Button.moc
  #>+ 3
  StickyButton.moc: $(srcdir)/StickyButton.h
  	$(MOC) $(srcdir)/StickyButton.h -o StickyButton.moc
- 
+@@ -873,44 +873,44 @@ StickyButton.moc: $(srcdir)/StickyButton
+ #>+ 1
+ mocs: StickyButton.moc
  #>+ 3
 -MaximiseButton.moc: $(srcdir)/MaximiseButton.h
 -	$(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc
 +LowerButton.moc: $(srcdir)/LowerButton.h
 +	$(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc
  
+ #>+ 1
+-mocs: MaximiseButton.moc
++mocs: LowerButton.moc
  #>+ 3
 -HelpButton.moc: $(srcdir)/HelpButton.h
 -	$(MOC) $(srcdir)/HelpButton.h -o HelpButton.moc
 +IconifyButton.moc: $(srcdir)/IconifyButton.h
 +	$(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc
  
+ #>+ 1
+-mocs: HelpButton.moc
++mocs: IconifyButton.moc
  #>+ 3
 -Button.moc: $(srcdir)/Button.h
 -	$(MOC) $(srcdir)/Button.h -o Button.moc
 +Manager.moc: $(srcdir)/Manager.h
 +	$(MOC) $(srcdir)/Manager.h -o Manager.moc
  
+ #>+ 1
+-mocs: Button.moc
++mocs: Manager.moc
  #>+ 3
 -CloseButton.moc: $(srcdir)/CloseButton.h
 -	$(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc
 +HelpButton.moc: $(srcdir)/HelpButton.h
 +	$(MOC) $(srcdir)/HelpButton.h -o HelpButton.moc
  
+ #>+ 1
+-mocs: CloseButton.moc
++mocs: HelpButton.moc
  #>+ 3
 -Manager.moc: $(srcdir)/Manager.h
 -	$(MOC) $(srcdir)/Manager.h -o Manager.moc
 +CloseButton.moc: $(srcdir)/CloseButton.h
 +	$(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc
  
+ #>+ 1
+-mocs: Manager.moc
++mocs: CloseButton.moc
  #>+ 3
 -IconifyButton.moc: $(srcdir)/IconifyButton.h
 -	$(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc
 +MaximiseButton.moc: $(srcdir)/MaximiseButton.h
 +	$(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc
  
+ #>+ 1
+-mocs: IconifyButton.moc
++mocs: MaximiseButton.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  LowerButton.moc StickyButton.moc MaximiseButton.moc HelpButton.moc Button.moc CloseButton.moc Manager.moc IconifyButton.moc
@@ -76,7 +108,7 @@ $NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -733,7 +733,7 @@ force-reedit:
+@@ -927,7 +927,7 @@ force-reedit:
  
  
  #>+ 11
@@ -85,7 +117,7 @@ $NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $
  	@echo 'creating kwin_riscos_la.all_cpp.cpp ...'; \
  	rm -f kwin_riscos_la.all_cpp.files kwin_riscos_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kwin_riscos_la.all_cpp.final; \
-@@ -769,19 +769,19 @@ kde-rpo-clean:
+@@ -963,19 +963,19 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 17
diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh
index 9b1ae765157..dbb7e413435 100644
--- a/x11/kdebase3/patches/patch-eh
+++ b/x11/kdebase3/patches/patch-eh
@@ -1,8 +1,8 @@
-$NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
+$NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $
 
---- kwin/clients/web/Makefile.in.orig	Fri Jan 17 09:03:12 2003
+--- kwin/clients/web/Makefile.in.orig	2003-07-15 22:03:50.000000000 +1200
 +++ kwin/clients/web/Makefile.in
-@@ -309,7 +309,7 @@ noinst_HEADERS = \
+@@ -446,7 +446,7 @@ noinst_HEADERS = \
    WebButtonSticky.h
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
  kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
  #>- METASOURCES = AUTO
  
-@@ -322,7 +322,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -459,7 +459,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
@@ -20,7 +20,16 @@ $NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
  am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \
  	WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \
  	WebButtonMaximize.lo WebButtonSticky.lo
-@@ -679,40 +679,40 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC
+@@ -707,7 +707,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=web.desktop 
++KDE_DIST=web.desktop Makefile.in.rej 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -857,56 +857,56 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC
  
  
  #>+ 3
@@ -29,48 +38,72 @@ $NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
 +WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h
 +	$(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc
  
+ #>+ 1
+-mocs: WebButtonLower.moc
++mocs: WebButtonSticky.moc
  #>+ 3
 -WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
 -	$(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
 +WebButtonClose.moc: $(srcdir)/WebButtonClose.h
 +	$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
  
+ #>+ 1
+-mocs: WebButtonMaximize.moc
++mocs: WebButtonClose.moc
  #>+ 3
 -WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
 -	$(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
 +Web.moc: $(srcdir)/Web.h
 +	$(MOC) $(srcdir)/Web.h -o Web.moc
  
+ #>+ 1
+-mocs: WebButtonIconify.moc
++mocs: Web.moc
  #>+ 3
 -WebButton.moc: $(srcdir)/WebButton.h
 -	$(MOC) $(srcdir)/WebButton.h -o WebButton.moc
 +WebButtonLower.moc: $(srcdir)/WebButtonLower.h
 +	$(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc
  
+ #>+ 1
+-mocs: WebButton.moc
++mocs: WebButtonLower.moc
  #>+ 3
 -Web.moc: $(srcdir)/Web.h
 -	$(MOC) $(srcdir)/Web.h -o Web.moc
 +WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h
 +	$(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc
  
+ #>+ 1
+-mocs: Web.moc
++mocs: WebButtonHelp.moc
  #>+ 3
 -WebButtonClose.moc: $(srcdir)/WebButtonClose.h
 -	$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
 +WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
 +	$(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
  
+ #>+ 1
+-mocs: WebButtonClose.moc
++mocs: WebButtonMaximize.moc
  #>+ 3
 -WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h
 -	$(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc
 +WebButton.moc: $(srcdir)/WebButton.h
 +	$(MOC) $(srcdir)/WebButton.h -o WebButton.moc
  
+ #>+ 1
+-mocs: WebButtonSticky.moc
++mocs: WebButton.moc
  #>+ 3
 -WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h
 -	$(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc
 +WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
 +	$(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
  
+ #>+ 1
+-mocs: WebButtonHelp.moc
++mocs: WebButtonIconify.moc
  #>+ 3
  clean-metasources:
 -	-rm -f  WebButtonLower.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc
@@ -78,7 +111,7 @@ $NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -729,7 +729,7 @@ force-reedit:
+@@ -923,7 +923,7 @@ force-reedit:
  
  
  #>+ 11
@@ -87,7 +120,7 @@ $NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $
  	@echo 'creating kwin_web_la.all_cpp.cpp ...'; \
  	rm -f kwin_web_la.all_cpp.files kwin_web_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kwin_web_la.all_cpp.final; \
-@@ -765,19 +765,19 @@ kde-rpo-clean:
+@@ -959,19 +959,19 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 17
diff --git a/x11/kdebase3/patches/patch-ep b/x11/kdebase3/patches/patch-ep
index 2aa771a5407..01a3f354d95 100644
--- a/x11/kdebase3/patches/patch-ep
+++ b/x11/kdebase3/patches/patch-ep
@@ -1,6 +1,6 @@
-$NetBSD: patch-ep,v 1.3 2003/03/11 13:10:29 markd Exp $
+$NetBSD: patch-ep,v 1.4 2003/07/30 13:35:00 markd Exp $
 
---- startkde.orig	Sun Dec  1 06:58:15 2002
+--- startkde.orig	2003-07-14 08:10:07.000000000 +1200
 +++ startkde
 @@ -21,7 +21,7 @@ trap 'echo GOT SIGHUP' HUP
  #
@@ -10,15 +10,9 @@ $NetBSD: patch-ep,v 1.3 2003/03/11 13:10:29 markd Exp $
 +#   2) everything in $KDEDIR/share/kde/autostart (kdesktop, kicker, etc.)
  #   3) the rest of the session.
  
- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-@@ -60,15 +60,15 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
- # Where X is the original font database that was set up before this script
- # runs.
- 
--usr_odir=$kdehome/share/fonts/override
--usr_fdir=$kdehome/share/fonts
-+usr_odir=$kdehome/share/kde/fonts/override
-+usr_fdir=$kdehome/share/kde/fonts
+ # The user's personal KDE directory is usually ~/.kde, but this setting
+@@ -51,11 +51,11 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
  if test -n "$KDEDIRS"; then
    kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
 -  sys_odir=$kdedirs_first/share/fonts/override
@@ -33,7 +27,7 @@ $NetBSD: patch-ep,v 1.3 2003/03/11 13:10:29 markd Exp $
  fi
  
  # We run mkfontdir on the user's font dirs (if we have permission) to pick
-@@ -83,7 +83,7 @@ test -d "$sys_fdir" && xset fp+ "$sys_fd
+@@ -70,7 +70,7 @@ test -d "$sys_fdir" && xset fp+ "$sys_fd
  
  #
  # Add any user-installed font directories to the X font path
author	markd <markd@pkgsrc.org>	2003-07-30 13:34:58 +0000
committer	markd <markd@pkgsrc.org>	2003-07-30 13:34:58 +0000
commit	70a657b20a22ae031403a22f50b4c48c22b98971 (patch)
tree	52ad8b7e0f165948440d9dd37e931c75876b4f6a /x11
parent	d755cf3eb5b2e9e5e338c2784deca51f2946e4d8 (diff)
download	pkgsrc-70a657b20a22ae031403a22f50b4c48c22b98971.tar.gz