From 9c1693ae327a0c2d23d56d51cbbd0ff24007ef8c Mon Sep 17 00:00:00 2001
From: skrll <skrll@pkgsrc.org>
Date: Mon, 10 Sep 2001 08:28:27 +0000
Subject: xmesa.h shouldn't be directly included.

This should hopefully fix build problems on XF4 installations, eg. Hubert's
bulk build machine.
---
 x11/kdebase/distinfo         |  5 ++++-
 x11/kdebase/patches/patch-bd | 12 ++++++++++++
 x11/kdebase/patches/patch-be | 12 ++++++++++++
 x11/kdebase/patches/patch-bf | 12 ++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 x11/kdebase/patches/patch-bd
 create mode 100644 x11/kdebase/patches/patch-be
 create mode 100644 x11/kdebase/patches/patch-bf

(limited to 'x11')

diff --git a/x11/kdebase/distinfo b/x11/kdebase/distinfo
index 78be6b996fc..8c87f280af2 100644
--- a/x11/kdebase/distinfo
+++ b/x11/kdebase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/09/10 08:23:18 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/09/10 08:28:27 skrll Exp $
 
 SHA1 (kdebase-1.1.2.tar.bz2) = d48e7f48f1b6305c37b0a4b42c017e525bee012b
 Size (kdebase-1.1.2.tar.bz2) = 7181379 bytes
@@ -35,3 +35,6 @@ SHA1 (patch-az) = 972be8473f6a42352f6aab72cfa2da1c471c4223
 SHA1 (patch-ba) = 00311ea6581f325b4db6eab29ac8bc01dc005e4b
 SHA1 (patch-bb) = 721f055bcf65211c5bbd8f721d66e32c53e10f46
 SHA1 (patch-bc) = f5db41722d9f79c9177bdefd8f564018562061af
+SHA1 (patch-bd) = f1ff5a7d305d3bf3ee93c55bcb542bafbfe80aac
+SHA1 (patch-be) = 09dc8e7fca408e70daf6257b2a3b0ddb485d47a0
+SHA1 (patch-bf) = 641f2f9ec589415c27db842e19d4a147b00c5eb8
diff --git a/x11/kdebase/patches/patch-bd b/x11/kdebase/patches/patch-bd
new file mode 100644
index 00000000000..80c4a470f82
--- /dev/null
+++ b/x11/kdebase/patches/patch-bd
@@ -0,0 +1,12 @@
+$NetBSD: patch-bd,v 1.1 2001/09/10 08:28:28 skrll Exp $
+
+--- kscreensaver/space.cpp.orig	Sat Aug  7 02:09:28 1999
++++ kscreensaver/space.cpp
+@@ -64,7 +64,6 @@
+ #include <space.h>
+ #include <math.h>
+ #include <X11/Intrinsic.h>
+-#include <GL/xmesa.h>
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ 
diff --git a/x11/kdebase/patches/patch-be b/x11/kdebase/patches/patch-be
new file mode 100644
index 00000000000..7b5869f6ab4
--- /dev/null
+++ b/x11/kdebase/patches/patch-be
@@ -0,0 +1,12 @@
+$NetBSD: patch-be,v 1.1 2001/09/10 08:28:28 skrll Exp $
+
+--- kscreensaver/morph3d.cpp.orig	Sun Mar 21 00:17:33 1999
++++ kscreensaver/morph3d.cpp
+@@ -52,7 +52,6 @@
+ 
+ #include <math.h>
+ #include <X11/Intrinsic.h>
+-#include <GL/xmesa.h>
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ 
diff --git a/x11/kdebase/patches/patch-bf b/x11/kdebase/patches/patch-bf
new file mode 100644
index 00000000000..6294dbb4af2
--- /dev/null
+++ b/x11/kdebase/patches/patch-bf
@@ -0,0 +1,12 @@
+$NetBSD: patch-bf,v 1.1 2001/09/10 08:28:28 skrll Exp $
+
+--- kscreensaver/pipes.cpp.orig	Sun Mar 21 00:17:35 1999
++++ kscreensaver/pipes.cpp
+@@ -128,7 +128,6 @@
+ 
+ #ifdef HAVE_GL
+ 
+-#include <GL/xmesa.h>
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ 
-- 
cgit v1.2.3