From dc618de551927cfea6ad0a00bb04e2612d207e0a Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 1 Sep 2002 11:49:42 +0000
Subject: [PATCH] Fix problem with XFree86 checks under Solaris.

---
 graphics/MesaLib/Makefile      | 4 ++--
 graphics/MesaLib/buildlink2.mk | 4 ++--
 graphics/glu/Makefile          | 4 ++--
 graphics/glu/buildlink2.mk     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 485eb47fe369..d1d0cffee31f 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:55 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/01 11:49:43 tron Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+=	--without-glut
 .include "../../mk/bsd.prefs.mk"
 
 # Check if we got Mesa distributed with XFree86 4.x.
-.if exists(${X11BASE}/include/GL/glx.h)
+.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glx.h)
 _IS_BUILTIN_MESA!=	${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
 .else
 _IS_BUILTIN_MESA=	0
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index 9931e11acaf2..ed1c0961e604 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/01 11:49:43 tron Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 # depend on the Mesa package.
 #
 _REQUIRE_BUILTIN_MESALIB?=	NO
-.if exists(${X11BASE}/include/GL/glx.h)
+.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glx.h)
 _IS_BUILTIN_MESALIB!=	${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
 .else
 _IS_BUILTIN_MESALIB=	0
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index d03c8f88302b..05bf4edc2004 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:06 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/01 11:49:42 tron Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
 WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
@@ -16,7 +16,7 @@ USE_X11BASE=		yes
 .include "../../mk/bsd.prefs.mk"
 
 # Check if we got libGLU distributed with XFree86 4.x.
-.if exists(${X11BASE}/include/GL/glu.h)
+.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glu.h)
 _IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
 .else
 _IS_BUILTIN_GLU=	0
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index 6ce4d584bd04..a75c51d16634 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/01 11:49:42 tron Exp $
 
 .if !defined(GLU_BUILDLINK2_MK)
 GLU_BUILDLINK2_MK=	# defined
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 # depend on the glu package.
 #
 _REQUIRE_BUILTIN_GLU?=	NO
-.if exists(${X11BASE}/include/GL/glu.h)
+.if (${OPSYS} != SunOS) && exists(${X11BASE}/include/GL/glu.h)
 _IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
 .else
 _IS_BUILTIN_GLU=	0