today's KDE pullups

5 files changed, 15 insertions, 5 deletions

diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa
index 2bfe92b2a6a..ab71ee927c7 100644
--- a/x11/kdebase/patches/patch-aa
+++ b/x11/kdebase/patches/patch-aa
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.14 1999/12/06 20:44:59 bouyer Exp $
+$NetBSD: patch-aa,v 1.15 1999/12/11 23:21:51 jdolecek Exp $
 
+The ossaudio check pulled into KDE. 1999-12-11 jdolecek
 --- configure.old	Tue Sep  7 17:21:06 1999
 +++ configure	Fri Dec  3 18:56:37 1999
 @@ -517,9 +517,10 @@
diff --git a/x11/kdebase/patches/patch-ab b/x11/kdebase/patches/patch-ab
index f1bb6833c45..0a0eecb355c 100644
--- a/x11/kdebase/patches/patch-ab
+++ b/x11/kdebase/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.10 1999/12/06 20:44:59 bouyer Exp $
+$NetBSD: patch-ab,v 1.11 1999/12/11 23:21:51 jdolecek 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
diff --git a/x11/kdebase/patches/patch-ac b/x11/kdebase/patches/patch-ac
index 509a4a2c8ba..2794fa1b7af 100644
--- a/x11/kdebase/patches/patch-ac
+++ b/x11/kdebase/patches/patch-ac
@@ -1,5 +1,6 @@
-$NetBSD: patch-ac,v 1.6 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ac,v 1.7 1999/12/11 23:21:51 jdolecek 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
 @@ -116,6 +116,8 @@
diff --git a/x11/kdebase/patches/patch-ad b/x11/kdebase/patches/patch-ad
index 337c194ba56..8fa574b0a57 100644
--- a/x11/kdebase/patches/patch-ad
+++ b/x11/kdebase/patches/patch-ad
@@ -1,5 +1,8 @@
-$NetBSD: patch-ad,v 1.8 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ad,v 1.9 1999/12/11 23:21:51 jdolecek 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
 @@ -30,6 +30,23 @@
diff --git a/x11/kdebase/patches/patch-ae b/x11/kdebase/patches/patch-ae
index c2ff5db3e34..e4e31a93203 100644
--- a/x11/kdebase/patches/patch-ae
+++ b/x11/kdebase/patches/patch-ae
@@ -1,5 +1,8 @@
-$NetBSD: patch-ae,v 1.6 1999/11/12 04:50:00 hubertf Exp $
+$NetBSD: patch-ae,v 1.7 1999/12/11 23:21:51 jdolecek 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
 @@ -26,7 +26,11 @@