today's set of KDE2 pullups

8 files changed, 16 insertions, 8 deletions

diff --git a/x11/kdebase/patches/patch-af b/x11/kdebase/patches/patch-af
index 06e87ba7185..c6a9cc36a99 100644
--- a/x11/kdebase/patches/patch-af
+++ b/x11/kdebase/patches/patch-af
@@ -1,5 +1,6 @@
-$NetBSD: patch-af,v 1.6 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-af,v 1.7 1999/12/12 19:06:37 jdolecek 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
 @@ -22,9 +22,15 @@
diff --git a/x11/kdebase/patches/patch-ai b/x11/kdebase/patches/patch-ai
index ca2477322fa..881dc9ef551 100644
--- a/x11/kdebase/patches/patch-ai
+++ b/x11/kdebase/patches/patch-ai
@@ -1,5 +1,6 @@
-$NetBSD: patch-ai,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ai,v 1.5 1999/12/12 19:06:37 jdolecek 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
 @@ -95,3 +95,8 @@
diff --git a/x11/kdebase/patches/patch-ak b/x11/kdebase/patches/patch-ak
index 68655804103..b81b171e894 100644
--- a/x11/kdebase/patches/patch-ak
+++ b/x11/kdebase/patches/patch-ak
@@ -1,5 +1,6 @@
-$NetBSD: patch-ak,v 1.3 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ak,v 1.4 1999/12/12 19:06:37 jdolecek 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
 @@ -49,9 +49,21 @@
diff --git a/x11/kdebase/patches/patch-al b/x11/kdebase/patches/patch-al
index 0b0cf8feafd..d09d837affd 100644
--- a/x11/kdebase/patches/patch-al
+++ b/x11/kdebase/patches/patch-al
@@ -1,5 +1,6 @@
-$NetBSD: patch-al,v 1.3 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-al,v 1.4 1999/12/12 19:06:37 jdolecek 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
 @@ -92,7 +92,7 @@
diff --git a/x11/kdebase/patches/patch-am b/x11/kdebase/patches/patch-am
index dd930d4375e..a32016f791c 100644
--- a/x11/kdebase/patches/patch-am
+++ b/x11/kdebase/patches/patch-am
@@ -1,5 +1,6 @@
-$NetBSD: patch-am,v 1.4 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-am,v 1.5 1999/12/12 19:06:37 jdolecek Exp $
 
+This patch is no longer needed in KDE2		jdolecek 1999/12/12
 --- ./kdm/session.c	Fri Aug 20 20:35:10 1999
 +++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/session.c	Fri Nov 12 05:10:30 1999
 @@ -50,6 +50,7 @@
diff --git a/x11/kdebase/patches/patch-at b/x11/kdebase/patches/patch-at
index efebdb8b022..5e375fb918a 100644
--- a/x11/kdebase/patches/patch-at
+++ b/x11/kdebase/patches/patch-at
@@ -1,5 +1,6 @@
-$NetBSD: patch-at,v 1.2 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-at,v 1.3 1999/12/12 19:06:37 jdolecek 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
 @@ -191,8 +191,6 @@
diff --git a/x11/kdebase/patches/patch-au b/x11/kdebase/patches/patch-au
index f42f4134036..d8f1f2b83d2 100644
--- a/x11/kdebase/patches/patch-au
+++ b/x11/kdebase/patches/patch-au
@@ -1,5 +1,6 @@
-$NetBSD: patch-au,v 1.2 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-au,v 1.3 1999/12/12 19:06:38 jdolecek 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
 @@ -28,8 +28,6 @@
diff --git a/x11/kdebase/patches/patch-av b/x11/kdebase/patches/patch-av
index b5b8e7435f7..74e3f101773 100644
--- a/x11/kdebase/patches/patch-av
+++ b/x11/kdebase/patches/patch-av
@@ -1,5 +1,6 @@
-$NetBSD: patch-av,v 1.2 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-av,v 1.3 1999/12/12 19:06:40 jdolecek Exp $
 
+Obsolete, kvt is not part of KDE2	jdolecek 1999/12/12
 --- ./kvt/xsetup.c	Tue Mar 30 10:23:20 1999
 +++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/xsetup.c	Fri Nov 12 05:10:31 1999
 @@ -135,8 +135,6 @@