Normalise patch format.

patchdiff now works.

30 files changed, 116 insertions, 138 deletions

diff --git a/x11/kdebase/distinfo b/x11/kdebase/distinfo
index a650dfba0f7..78be6b996fc 100644
--- a/x11/kdebase/distinfo
+++ b/x11/kdebase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:40 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/09/10 08:23:18 skrll Exp $
 
 SHA1 (kdebase-1.1.2.tar.bz2) = d48e7f48f1b6305c37b0a4b42c017e525bee012b
 Size (kdebase-1.1.2.tar.bz2) = 7181379 bytes
@@ -6,32 +6,32 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = f5cbf17ad7cc49613fa0377995b2922da6166148
-SHA1 (patch-ab) = f34c3a13e01ed2ba49beef268a4d42d6dc5e8b78
-SHA1 (patch-ac) = 0439450208f093dd7bae6b4bea6dd5067cbe0989
-SHA1 (patch-ad) = f2b0b5cfb0d01e3cefe3fb6575d059ed13e85bc8
-SHA1 (patch-ae) = 3ac8a60f28e343002c3734020af556af0585bbd6
-SHA1 (patch-af) = b7b3b2681aebb30dcc2e9781a92a799f04018aa4
-SHA1 (patch-ag) = 0436c1fd682612bfe8586d25f8d1c74591eb08fb
-SHA1 (patch-ah) = 0cb8be5aefb1cd3325b592a8ca268b8890056918
-SHA1 (patch-ai) = 8953e0cf3eaf775c886ec38d4d7eff6e25646740
-SHA1 (patch-aj) = b72a59db639b66789c0e3546de7e6303db3cac87
-SHA1 (patch-ak) = 0c0af76d0eeaf78ae791626d70b7c16aebc64172
-SHA1 (patch-al) = e3bb9f87c0389bb3018d6b1144a1ef393d8e0af0
-SHA1 (patch-am) = 22b7fef43a7de9cc65958417a2bf199a8b41e149
-SHA1 (patch-an) = 56fa0da91be2e22316a2141974dfa6bdb25edba8
-SHA1 (patch-ao) = a9997380770a8e49a34a2fded6a1af7a923049e2
-SHA1 (patch-ap) = 150f10e590ec8881de97b6b3fe40640c97347c18
-SHA1 (patch-aq) = b7ded99cb9dd2e9c501f62f11691fa8188557bfe
-SHA1 (patch-ar) = 3f58b75670aa17dbc7b6755a67fabd1d831de816
-SHA1 (patch-as) = 666e2bc8e3871d5a4329597b2e92b0c39e5041b1
-SHA1 (patch-at) = d5d62354bc47f1dc40f22f464fe2d6d91556846e
-SHA1 (patch-au) = 07f1b558437017a467012aba02a02e2a717e6371
-SHA1 (patch-av) = 68ccd9c765416731b2bd31175f102d4f7de26430
-SHA1 (patch-aw) = 53e990377d93202224b22bd966dfbabcccb786f1
-SHA1 (patch-ax) = 17b3393f376e755ef76b2e4c07fce06b21ae7308
-SHA1 (patch-ay) = b2385fd02d45e5944475c1ea4252164fc6a0ccf6
-SHA1 (patch-az) = 9481308f531f879e9e33d60258b816342ba8e22d
-SHA1 (patch-ba) = 2620a4ff27f8de77e6de7b9b2924eba296d13f56
-SHA1 (patch-bb) = 37e1e7e134dbf48181fbbaabb0fbd2567428ac52
-SHA1 (patch-bc) = e0a9fb53d9024db20ff710b0b107786c012adb69
+SHA1 (patch-aa) = 9c3c6d5d9ce0d17f453e260d441e66e12280ab6f
+SHA1 (patch-ab) = 63f61a2bb0f2b6c5544627b0bdb9d34b079f8c62
+SHA1 (patch-ac) = 5009bd1f5e74aa08e6a2c12e8be2e46f819dbe8a
+SHA1 (patch-ad) = 0451f149ed5743e8491e3ac59e05f16dfead3395
+SHA1 (patch-ae) = 996ef0fdbe67e679ccf0a2e3372013b8910144ff
+SHA1 (patch-af) = f43409e7ca9b068f8ef5a6dd273ee6f6b698f941
+SHA1 (patch-ag) = e0a31ce6256a137deabf5136ef959f66f19170e0
+SHA1 (patch-ah) = deed8c5a29757d5c396cdc437974bfe4f810d4b4
+SHA1 (patch-ai) = 4ab12bd1fd79677c2d99ba6d1f1316bf859a6e91
+SHA1 (patch-aj) = 9c3c13be94cab4ba5da6a5436db9b18d0b116003
+SHA1 (patch-ak) = e82f71c017ff9f703793970fa467e6ca4a26f45b
+SHA1 (patch-al) = 8be84da14fabb5e3bca800c1683f5ca416bf3bf0
+SHA1 (patch-am) = 76fb1000ae237b9ab45e63320fd022b9de0c802e
+SHA1 (patch-an) = 55519a86f1221c057c8ce5696c19160a1159d67c
+SHA1 (patch-ao) = f7521c825340cb17e224ff2ea98ed8a82751ad6e
+SHA1 (patch-ap) = 650d1d54fba73d66c47a595df4b77d99e49093ba
+SHA1 (patch-aq) = 081c8009c073d209d568112e48360999e68e5b06
+SHA1 (patch-ar) = 1ea00fff481c760ff8d57d8ba24da7d2c7229a38
+SHA1 (patch-as) = de86b6ba0d00f08805c8edfe5c042c213d7bb661
+SHA1 (patch-at) = 5ea95f7b47804c997988ae2d5a523e132d5303a2
+SHA1 (patch-au) = 2b720df8711852971cd929cb22c103f28a0fe365
+SHA1 (patch-av) = b9a0d5d0754e9054e3804dfb5c8cfa366f39f403
+SHA1 (patch-aw) = 02ac99aa2871d60f5941f0dd647d4e4015444348
+SHA1 (patch-ax) = 4fd054999d85a4ac27078e40367d7e6e33e26339
+SHA1 (patch-ay) = e9152d0d81e6245ab5aefbff65dacc72c97a349c
+SHA1 (patch-az) = 972be8473f6a42352f6aab72cfa2da1c471c4223
+SHA1 (patch-ba) = 00311ea6581f325b4db6eab29ac8bc01dc005e4b
+SHA1 (patch-bb) = 721f055bcf65211c5bbd8f721d66e32c53e10f46
+SHA1 (patch-bc) = f5db41722d9f79c9177bdefd8f564018562061af
diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa
index 45377d26468..4a6c7b57051 100644
--- a/x11/kdebase/patches/patch-aa
+++ b/x11/kdebase/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.18 2001/03/20 00:20:41 fredb Exp $
+$NetBSD: patch-aa,v 1.19 2001/09/10 08:23:19 skrll Exp $
 
---- configure.orig	Tue Sep  7 17:21:06 1999
-+++ configure	Sun Apr  2 23:16:38 2000
+--- configure.orig	Tue Sep  7 16:21:06 1999
++++ configure
 @@ -517,9 +517,10 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
@@ -158,7 +158,7 @@ $NetBSD: patch-aa,v 1.18 2001/03/20 00:20:41 fredb Exp $
  s%@LIBVOLMGT@%$LIBVOLMGT%g
  s%@topdir@%$topdir%g
  s%@RUN_KAPPFINDER@%$RUN_KAPPFINDER%g
-@@ -7567,7 +7608,6 @@
+@@ -7567,7 +7609,6 @@
  	kdehelp/Makefile \
  	kdehelp/index/Makefile \
  	kdehelp/search/Makefile \
diff --git a/x11/kdebase/patches/patch-ab b/x11/kdebase/patches/patch-ab
index 0a0eecb355c..075b567f04c 100644
--- a/x11/kdebase/patches/patch-ab
+++ b/x11/kdebase/patches/patch-ab
@@ -1,9 +1,7 @@
-$NetBSD: patch-ab,v 1.11 1999/12/11 23:21:51 jdolecek Exp $
+$NetBSD: patch-ab,v 1.12 2001/09/10 08:23:19 skrll Exp $
 
-The ossaudio check pulled into KDE. 1999-12-11 jdolecek
-
---- ./kaudio/Makefile.in	Tue Sep  7 17:20:48 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kaudio/Makefile.in	Fri Nov 12 05:10:31 1999
+--- kaudio/Makefile.in.orig	Tue Sep  7 16:20:48 1999
++++ kaudio/Makefile.in
 @@ -201,7 +201,7 @@
  CPPFLAGS = @CPPFLAGS@
  LIBS = @LIBS@
diff --git a/x11/kdebase/patches/patch-ac b/x11/kdebase/patches/patch-ac
index 2794fa1b7af..76ec37da146 100644
--- a/x11/kdebase/patches/patch-ac
+++ b/x11/kdebase/patches/patch-ac
@@ -1,8 +1,7 @@
-$NetBSD: patch-ac,v 1.7 1999/12/11 23:21:51 jdolecek Exp $
+$NetBSD: patch-ac,v 1.8 2001/09/10 08:23:19 skrll Exp $
 
-Pulled into KDE. jdolecek 1999-12-11
---- ./kcontrol/info/info.cpp	Fri Jul 23 23:56:57 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/info.cpp	Fri Nov 12 05:10:33 1999
+--- kcontrol/info/info.cpp.orig	Fri Jul 23 22:56:57 1999
++++ kcontrol/info/info.cpp
 @@ -116,6 +116,8 @@
  #include "info_fbsd.cpp"
  #elif hpux
diff --git a/x11/kdebase/patches/patch-ad b/x11/kdebase/patches/patch-ad
index 8fa574b0a57..1627704df30 100644
--- a/x11/kdebase/patches/patch-ad
+++ b/x11/kdebase/patches/patch-ad
@@ -1,10 +1,7 @@
-$NetBSD: patch-ad,v 1.9 1999/12/11 23:21:51 jdolecek Exp $
+$NetBSD: patch-ad,v 1.10 2001/09/10 08:23:19 skrll Exp $
 
-Pulled into KDE, though needed serious rework, as the internal interface
-changed in KDE2.
-			jdolecek 1999-12-11
---- ./kcontrol/info/memory.cpp	Fri Jul 23 23:56:59 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/memory.cpp	Fri Nov 12 05:10:32 1999
+--- kcontrol/info/memory.cpp.orig	Fri Jul 23 22:56:59 1999
++++ kcontrol/info/memory.cpp
 @@ -30,6 +30,23 @@
    freeMem->setAutoResize(TRUE);
    freeMem->setFont(courierFont);
diff --git a/x11/kdebase/patches/patch-ae b/x11/kdebase/patches/patch-ae
index e4e31a93203..d44c13fdfd7 100644
--- a/x11/kdebase/patches/patch-ae
+++ b/x11/kdebase/patches/patch-ae
@@ -1,10 +1,7 @@
-$NetBSD: patch-ae,v 1.7 1999/12/11 23:21:51 jdolecek Exp $
+$NetBSD: patch-ae,v 1.8 2001/09/10 08:23:19 skrll Exp $
 
-Pulled into KDE, though needed serious rework, as the internal interface
-changed in KDE2.
-			jdolecek 1999-12-11
---- ./kcontrol/info/memory.h	Mon Nov 17 20:05:18 1997
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/memory.h	Fri Nov 12 05:10:32 1999
+--- kcontrol/info/memory.h.orig	Mon Nov 17 19:05:18 1997
++++ kcontrol/info/memory.h
 @@ -26,7 +26,11 @@
  
  private:
diff --git a/x11/kdebase/patches/patch-af b/x11/kdebase/patches/patch-af
index c6a9cc36a99..26b4653008c 100644
--- a/x11/kdebase/patches/patch-af
+++ b/x11/kdebase/patches/patch-af
@@ -1,8 +1,7 @@
-$NetBSD: patch-af,v 1.7 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-af,v 1.8 2001/09/10 08:23:19 skrll Exp $
 
-Obsoleted, the file is no longer pertinent in KDE2       jdolecek 1999-12-12
---- ./kdehelp/khelp.h	Mon Mar 30 21:28:15 1998
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdehelp/khelp.h	Fri Nov 12 05:10:33 1999
+--- kdehelp/khelp.h.orig	Mon Mar 30 20:28:15 1998
++++ kdehelp/khelp.h
 @@ -22,9 +22,15 @@
  #include <sys/msg.h>
  
diff --git a/x11/kdebase/patches/patch-ag b/x11/kdebase/patches/patch-ag
index c158b1a5b2a..13dd76e5e1b 100644
--- a/x11/kdebase/patches/patch-ag
+++ b/x11/kdebase/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ag,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- ./kdm/Makefile.in	Tue Sep  7 17:20:54 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/Makefile.in	Fri Nov 12 05:10:30 1999
+--- kdm/Makefile.in.orig	Tue Sep  7 16:20:54 1999
++++ kdm/Makefile.in
 @@ -101,7 +101,7 @@
  LIBXDMCP = @LIBXDMCP@
  LIBZ = @LIBZ@
diff --git a/x11/kdebase/patches/patch-ah b/x11/kdebase/patches/patch-ah
index 6e458c8006f..acaff167bdd 100644
--- a/x11/kdebase/patches/patch-ah
+++ b/x11/kdebase/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.3 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ah,v 1.4 2001/09/10 08:23:19 skrll Exp $
 
---- ./kdm/daemon.c	Wed Sep 30 23:19:53 1998
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/daemon.c	Fri Nov 12 05:10:31 1999
+--- kdm/daemon.c.orig	Wed Sep 30 22:19:53 1998
++++ kdm/daemon.c
 @@ -38,6 +38,10 @@
  
  #include <X11/Xos.h>
diff --git a/x11/kdebase/patches/patch-ai b/x11/kdebase/patches/patch-ai
index 881dc9ef551..0f5b2042d01 100644
--- a/x11/kdebase/patches/patch-ai
+++ b/x11/kdebase/patches/patch-ai
@@ -1,8 +1,7 @@
-$NetBSD: patch-ai,v 1.5 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-ai,v 1.6 2001/09/10 08:23:19 skrll Exp $
 
-Pulled into KDE2	jdolecek 1999/12/12
---- ./kdm/kdm-config.h	Tue Mar  9 17:49:34 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdm-config.h	Fri Nov 12 05:10:31 1999
+--- kdm/kdm-config.h.orig	Tue Mar  9 16:49:34 1999
++++ kdm/kdm-config.h
 @@ -95,3 +95,8 @@
  #ifdef __cplusplus
  }
diff --git a/x11/kdebase/patches/patch-aj b/x11/kdebase/patches/patch-aj
index a5646869e50..0da11e011b5 100644
--- a/x11/kdebase/patches/patch-aj
+++ b/x11/kdebase/patches/patch-aj
@@ -1,8 +1,7 @@
-$NetBSD: patch-aj,v 1.6 1999/12/12 19:04:00 jdolecek Exp $
+$NetBSD: patch-aj,v 1.7 2001/09/10 08:23:19 skrll Exp $
 
-A bit different patch pulled into KDE2	jdolecek	1999/12/12
---- ./kdm/kdmconfig.cpp	Fri Apr 23 15:12:54 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmconfig.cpp	Fri Nov 12 05:10:32 1999
+--- kdm/kdmconfig.cpp.orig	Fri Apr 23 14:12:54 1999
++++ kdm/kdmconfig.cpp
 @@ -134,10 +134,26 @@
                 _shutdownButton = KNone;
            _shutdown         = new QString( kc->readEntry(  "Shutdown"));
@@ -18,14 +17,13 @@ A bit different patch pulled into KDE2	jdolecek	1999/12/12
 +#endif /* __NetBSD__ */
            _restart          = new QString( kc->readEntry(   "Restart"));
            if( _restart->isNull())
--               *_restart = "/sbin/reboot";
 +#ifdef    __NetBSD__
 +               *_restart = "/sbin/shutdown -r now";
 +#else /* !__NetBSD__ */
 +#ifdef    __SVR4
 +               *_restart = "/usr/sbin/reboot";
 +#else /* !__SVR4 */
-+               *_restart = "/sbin/reboot";
+                *_restart = "/sbin/reboot";
 +#endif /* __SVR4 */
 +#endif /* __NetBSD__ */
       } else
diff --git a/x11/kdebase/patches/patch-ak b/x11/kdebase/patches/patch-ak
index b81b171e894..aa50189da5b 100644
--- a/x11/kdebase/patches/patch-ak
+++ b/x11/kdebase/patches/patch-ak
@@ -1,8 +1,7 @@
-$NetBSD: patch-ak,v 1.4 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-ak,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
-A bit different patch pulled into KDE2		jdolecek 1999/12/12
---- ./kdm/kdmshutdown.h	Fri Sep  4 17:33:00 1998
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmshutdown.h	Fri Nov 12 05:10:32 1999
+--- kdm/kdmshutdown.h.orig	Fri Sep  4 16:33:00 1998
++++ kdm/kdmshutdown.h
 @@ -49,9 +49,21 @@
  class KDMShutdown : public FDialog {
       Q_OBJECT
diff --git a/x11/kdebase/patches/patch-al b/x11/kdebase/patches/patch-al
index d09d837affd..4bc3a3aa138 100644
--- a/x11/kdebase/patches/patch-al
+++ b/x11/kdebase/patches/patch-al
@@ -1,8 +1,7 @@
-$NetBSD: patch-al,v 1.4 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-al,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
-Pulled into KDE2	jdolecek 1999/12/12
---- ./kdm/resource.c	Thu Jan 28 15:10:02 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/resource.c	Fri Nov 12 05:10:30 1999
+--- kdm/resource.c.orig	Thu Jan 28 14:10:02 1999
++++ kdm/resource.c
 @@ -92,7 +92,7 @@
  #define DEF_SESSION XDMDIR"/Xsession" /* QUOTE(XBINDIR) "xterm -ls" */
  #endif
diff --git a/x11/kdebase/patches/patch-am b/x11/kdebase/patches/patch-am
index 2404a4df63a..8e53ed5544b 100644
--- a/x11/kdebase/patches/patch-am
+++ b/x11/kdebase/patches/patch-am
@@ -1,9 +1,7 @@
-$NetBSD: patch-am,v 1.7 2000/01/28 13:23:31 jdolecek Exp $
+$NetBSD: patch-am,v 1.8 2001/09/10 08:23:19 skrll Exp $
 
-The login_cap fix committed to KDE2 source tree (jdolecek 19990128)
-
---- kdm/session.c.orig	Fri Aug 20 20:35:10 1999
-+++ kdm/session.c	Sun Jan 23 01:22:47 2000
+--- kdm/session.c.orig	Fri Aug 20 19:35:10 1999
++++ kdm/session.c
 @@ -50,6 +50,7 @@
  #include <pwd.h>
  #include <grp.h>
diff --git a/x11/kdebase/patches/patch-an b/x11/kdebase/patches/patch-an
index 901dc6a18e9..375701cad6c 100644
--- a/x11/kdebase/patches/patch-an
+++ b/x11/kdebase/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-an,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kbind.cpp	Wed Sep  1 16:52:08 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kbind.cpp	Fri Nov 12 05:10:34 1999
+--- kfm/kbind.cpp.orig	Wed Sep  1 15:52:08 1999
++++ kfm/kbind.cpp
 @@ -644,11 +644,12 @@
  			    _pixlist.append( emptyPixmap );
  			}
diff --git a/x11/kdebase/patches/patch-ao b/x11/kdebase/patches/patch-ao
index 197cc1d60c5..a6fedc03abe 100644
--- a/x11/kdebase/patches/patch-ao
+++ b/x11/kdebase/patches/patch-ao
@@ -1,9 +1,7 @@
-$NetBSD: patch-ao,v 1.6 2000/01/28 13:23:31 jdolecek Exp $
+$NetBSD: patch-ao,v 1.7 2001/09/10 08:23:19 skrll Exp $
 
-The login_cap fix committed to KDE2 source tree (jdolecek 19990128)
-
---- kdm/kgreeter.cpp.orig	Mon Aug 16 13:36:34 1999
-+++ kdm/kgreeter.cpp	Sun Jan 23 01:23:53 2000
+--- kdm/kgreeter.cpp.orig	Mon Aug 16 12:36:34 1999
++++ kdm/kgreeter.cpp
 @@ -65,7 +65,7 @@
  #include <shadow.h>
  #endif
diff --git a/x11/kdebase/patches/patch-ap b/x11/kdebase/patches/patch-ap
index b329e4832e8..229321a1ec4 100644
--- a/x11/kdebase/patches/patch-ap
+++ b/x11/kdebase/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ap,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kiojob.cpp	Thu May  6 00:10:12 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kiojob.cpp	Fri Nov 12 05:10:33 1999
+--- kfm/kiojob.cpp.orig	Wed May  5 23:10:12 1999
++++ kfm/kiojob.cpp
 @@ -163,10 +163,11 @@
      server->getSlave( this );
  }
diff --git a/x11/kdebase/patches/patch-aq b/x11/kdebase/patches/patch-aq
index bcf56c2e805..091a4f4caa8 100644
--- a/x11/kdebase/patches/patch-aq
+++ b/x11/kdebase/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-aq,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kiojob.h	Mon Dec 21 23:21:00 1998
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kiojob.h	Fri Nov 12 05:10:34 1999
+--- kfm/kiojob.h.orig	Mon Dec 21 22:21:00 1998
++++ kfm/kiojob.h
 @@ -58,7 +58,7 @@
       * give values for every parameter.
       */
diff --git a/x11/kdebase/patches/patch-ar b/x11/kdebase/patches/patch-ar
index 8ba43e9f65b..21a4a23b132 100644
--- a/x11/kdebase/patches/patch-ar
+++ b/x11/kdebase/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ar,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kioserver.cpp	Mon Aug 23 18:01:03 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kioserver.cpp	Fri Nov 12 05:10:34 1999
+--- kfm/kioserver.cpp.orig	Mon Aug 23 17:01:03 1999
++++ kfm/kioserver.cpp
 @@ -19,7 +19,7 @@
  #include <sys/mnttab.h>
  #endif
diff --git a/x11/kdebase/patches/patch-as b/x11/kdebase/patches/patch-as
index 65a8cd57dbf..7616eba4264 100644
--- a/x11/kdebase/patches/patch-as
+++ b/x11/kdebase/patches/patch-as
@@ -1,7 +1,7 @@
-$NetBSD: patch-as,v 1.7 1999/12/06 20:44:59 bouyer Exp $
+$NetBSD: patch-as,v 1.8 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kioslave/main.cpp.old	Thu Apr  8 00:56:48 1999
-+++ ./kfm/kioslave/main.cpp	Fri Dec  3 17:25:19 1999
+--- kfm/kioslave/main.cpp.orig	Wed Apr  7 23:56:48 1999
++++ kfm/kioslave/main.cpp
 @@ -319,7 +319,7 @@
      return;
  }
diff --git a/x11/kdebase/patches/patch-at b/x11/kdebase/patches/patch-at
index 5e375fb918a..c4378132b42 100644
--- a/x11/kdebase/patches/patch-at
+++ b/x11/kdebase/patches/patch-at
@@ -1,8 +1,7 @@
-$NetBSD: patch-at,v 1.3 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-at,v 1.4 2001/09/10 08:23:19 skrll Exp $
 
-Obsolete, kvt is not part of KDE2	jdolecek 1999/12/12
---- ./kvt/command.c	Mon Aug 30 22:09:45 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/command.c	Fri Nov 12 05:10:31 1999
+--- kvt/command.c.orig	Mon Aug 30 21:09:45 1999
++++ kvt/command.c
 @@ -191,8 +191,6 @@
  extern int console;
  
diff --git a/x11/kdebase/patches/patch-au b/x11/kdebase/patches/patch-au
index d8f1f2b83d2..e69abcd34fc 100644
--- a/x11/kdebase/patches/patch-au
+++ b/x11/kdebase/patches/patch-au
@@ -1,8 +1,7 @@
-$NetBSD: patch-au,v 1.3 1999/12/12 19:06:38 jdolecek Exp $
+$NetBSD: patch-au,v 1.4 2001/09/10 08:23:19 skrll Exp $
 
-Obsolete, kvt is not part of KDE2	jdolecek 1999/12/12
---- ./kvt/resources.c	Tue Mar 30 10:23:19 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/resources.c	Fri Nov 12 05:10:31 1999
+--- kvt/resources.c.orig	Tue Mar 30 09:23:19 1999
++++ kvt/resources.c
 @@ -28,8 +28,6 @@
  extern int login_shell,fat_sbar, MetaHandling;
  extern WindowInfo MyWinInfo;
diff --git a/x11/kdebase/patches/patch-av b/x11/kdebase/patches/patch-av
index 7d296bd910c..7623deb380b 100644
--- a/x11/kdebase/patches/patch-av
+++ b/x11/kdebase/patches/patch-av
@@ -1,7 +1,7 @@
-$NetBSD: patch-av,v 1.4 2000/02/01 14:55:09 tron Exp $
+$NetBSD: patch-av,v 1.5 2001/09/10 08:23:19 skrll Exp $
 
---- kvt/xsetup.c.orig	Tue Mar 30 10:23:20 1999
-+++ kvt/xsetup.c	Tue Feb  1 15:28:00 2000
+--- kvt/xsetup.c.orig	Tue Mar 30 09:23:20 1999
++++ kvt/xsetup.c
 @@ -135,8 +135,6 @@
  
  
diff --git a/x11/kdebase/patches/patch-aw b/x11/kdebase/patches/patch-aw
index e371180b7fd..30d91d80e1f 100644
--- a/x11/kdebase/patches/patch-aw
+++ b/x11/kdebase/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.2 1999/11/12 04:50:01 hubertf Exp $
+$NetBSD: patch-aw,v 1.3 2001/09/10 08:23:19 skrll Exp $
 
---- ./po/cs/kcminfo.po	Tue Mar 30 01:21:49 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/po/cs/kcminfo.po	Fri Nov 12 05:10:32 1999
+--- po/cs/kcminfo.po.orig	Tue Mar 30 00:21:49 1999
++++ po/cs/kcminfo.po
 @@ -205,6 +205,13 @@
  msgid "Buffer memory"
  msgstr "Vyrovnávací pamě»"
diff --git a/x11/kdebase/patches/patch-ax b/x11/kdebase/patches/patch-ax
index 8045aead26a..ab59b300e34 100644
--- a/x11/kdebase/patches/patch-ax
+++ b/x11/kdebase/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.2 1999/11/12 04:50:01 hubertf Exp $
+$NetBSD: patch-ax,v 1.3 2001/09/10 08:23:19 skrll Exp $
 
---- ./po/kcminfo.pot	Tue Mar 30 01:21:33 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/po/kcminfo.pot	Fri Nov 12 05:10:32 1999
+--- po/kcminfo.pot.orig	Tue Mar 30 00:21:33 1999
++++ po/kcminfo.pot
 @@ -200,6 +200,13 @@
  msgid "Buffer memory"
  msgstr ""
@@ -16,4 +16,3 @@ $NetBSD: patch-ax,v 1.2 1999/11/12 04:50:01 hubertf Exp $
  #: memory.cpp:49
  msgid "Swap memory"
  msgstr ""
-
diff --git a/x11/kdebase/patches/patch-ay b/x11/kdebase/patches/patch-ay
index d15a07822fc..3f64fe27d41 100644
--- a/x11/kdebase/patches/patch-ay
+++ b/x11/kdebase/patches/patch-ay
@@ -1,7 +1,7 @@
-$NetBSD: patch-ay,v 1.2 1999/11/12 04:50:01 hubertf Exp $
+$NetBSD: patch-ay,v 1.3 2001/09/10 08:23:19 skrll Exp $
 
---- ./kfm/kfmprops.cpp	Wed Aug 18 18:15:38 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kfmprops.cpp	Fri Nov 12 05:10:33 1999
+--- kfm/kfmprops.cpp.orig	Wed Aug 18 17:15:38 1999
++++ kfm/kfmprops.cpp
 @@ -2156,14 +2156,18 @@
      mountpoint = new QLineEdit( this, "LineEdit_2" );
      mountpoint->setGeometry( 10, 110, 180, 30 );
diff --git a/x11/kdebase/patches/patch-az b/x11/kdebase/patches/patch-az
index a62406ef2c3..228b59cf0ff 100644
--- a/x11/kdebase/patches/patch-az
+++ b/x11/kdebase/patches/patch-az
@@ -1,6 +1,6 @@
-$NetBSD: patch-az,v 1.1 2001/02/26 19:21:57 hubertf Exp $
+$NetBSD: patch-az,v 1.2 2001/09/10 08:23:19 skrll Exp $
 
---- kcontrol/kwm/titlebar.cpp.orig	Mon Feb 26 15:10:39 2001
+--- kcontrol/kwm/titlebar.cpp.orig	Fri Apr  9 03:55:32 1999
 +++ kcontrol/kwm/titlebar.cpp
 @@ -66,7 +66,7 @@
  static QPixmap* loadIcon(const char* name)
diff --git a/x11/kdebase/patches/patch-ba b/x11/kdebase/patches/patch-ba
index b8158d4317f..b5906e0bde7 100644
--- a/x11/kdebase/patches/patch-ba
+++ b/x11/kdebase/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2001/03/20 00:20:41 fredb Exp $
+$NetBSD: patch-ba,v 1.2 2001/09/10 08:23:19 skrll Exp $
 
---- kdehelp/Makefile.am.orig	Sun Aug  8 09:26:45 1999
+--- kdehelp/Makefile.am.orig	Sun Aug  8 15:26:45 1999
 +++ kdehelp/Makefile.am
 @@ -2,7 +2,7 @@
  INCLUDES =  $(all_includes)
diff --git a/x11/kdebase/patches/patch-bb b/x11/kdebase/patches/patch-bb
index ed59e07de2c..9a2741206e8 100644
--- a/x11/kdebase/patches/patch-bb
+++ b/x11/kdebase/patches/patch-bb
@@ -1,6 +1,6 @@
-$NetBSD: patch-bb,v 1.1 2001/03/20 00:20:41 fredb Exp $
+$NetBSD: patch-bb,v 1.2 2001/09/10 08:23:19 skrll Exp $
 
---- kdehelp/Makefile.in.orig	Tue Sep  7 10:20:54 1999
+--- kdehelp/Makefile.in.orig	Tue Sep  7 16:20:54 1999
 +++ kdehelp/Makefile.in
 @@ -174,7 +174,7 @@
  INCLUDES = $(all_includes)
diff --git a/x11/kdebase/patches/patch-bc b/x11/kdebase/patches/patch-bc
index b2493282b68..198d1095084 100644
--- a/x11/kdebase/patches/patch-bc
+++ b/x11/kdebase/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.3 2001/03/20 12:08:40 fredb Exp $
+$NetBSD: patch-bc,v 1.4 2001/09/10 08:23:20 skrll Exp $
 
---- kdehelp/man.cpp.orig	Thu Aug 19 14:32:11 1999
-+++ kdehelp/man.cpp	Tue Mar 20 06:03:40 2001
+--- kdehelp/man.cpp.orig	Thu Aug 19 20:32:11 1999
++++ kdehelp/man.cpp
 @@ -20,6 +20,9 @@
  #include "man.h"
  #include "error.h"