From 30911b7ace54b85e73c9926ac734419ce97b80d1 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 18 Jun 2001 21:20:36 +0000
Subject: Instead of explicitly including ${includedir} in header search path,
 just use Mesa's buildlink.mk file to handle all possible combinations of
 XFree86 versions and xpkgwedge installations.

---
 graphics/gle/Makefile         |  5 +++--
 graphics/gle/distinfo         |  4 ++--
 graphics/gle/patches/patch-aa | 14 +++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 76b6a089aba..1f050053d03 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 17:00:32 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/18 21:20:36 jlam Exp $
 #
 
 DISTNAME=		gle-3.0.3
@@ -11,11 +11,12 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.linas.org/gle/
 COMMENT=		GL subroutines for drawing tubing and extrusions
 
-USE_MESA=		YES
+#USE_MESA=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/distinfo b/graphics/gle/distinfo
index 165b0b2c10e..1b761dd6f36 100644
--- a/graphics/gle/distinfo
+++ b/graphics/gle/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/06/18 20:45:35 veego Exp $
+$NetBSD: distinfo,v 1.3 2001/06/18 21:20:36 jlam Exp $
 
 SHA1 (gle-3.0.3.tar.gz) = bd469b571bc4128fe9eac75703d7f96b31a506ac
 Size (gle-3.0.3.tar.gz) = 702445 bytes
-SHA1 (patch-aa) = f78f264c1b0a638f7c511fe66c7f0c23cc1fbb62
+SHA1 (patch-aa) = 6462fbc9389723c79edd6deb971d013ef006d1b4
 SHA1 (patch-ab) = b583b4ffcc389548f07f83b7e88d6c665aaca3ef
diff --git a/graphics/gle/patches/patch-aa b/graphics/gle/patches/patch-aa
index 41c36a9ca49..dd241dea538 100644
--- a/graphics/gle/patches/patch-aa
+++ b/graphics/gle/patches/patch-aa
@@ -1,13 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2001/06/18 20:45:36 veego Exp $
+$NetBSD: patch-aa,v 1.3 2001/06/18 21:20:36 jlam Exp $
 
---- examples/Makefile.in	Wed Apr 25 21:57:44 2001
-+++ examples/Makefile.in	Mon Jun 18 22:38:37 2001
-@@ -97,10 +97,10 @@
- noinst_HEADERS =    main.h   texture.h
- 
- 
--INCLUDES =    @X_CFLAGS@   -I${top_srcdir}   -I${top_srcdir}/src 
-+INCLUDES =    @X_CFLAGS@ -I${includedir} -I${top_srcdir} -I${top_srcdir}/src 
+--- examples/Makefile.in.orig	Wed Apr 25 15:57:44 2001
++++ examples/Makefile.in
+@@ -100,7 +100,7 @@
+ INCLUDES =    @X_CFLAGS@   -I${top_srcdir}   -I${top_srcdir}/src 
  
  
 -LDADD = @X_LIBS@  -L../src/.libs
-- 
cgit v1.2.3