Fix the Interix fix. gcc 3.3 supplies its own <stddef.h>, which shadows

the one in the OS (which happens to be where [u]intptr_t is defined).
Interix 5.2 should fix this, but to support Interix 3.5, a special case is
needed here.

Since this changes glheader.h for all platforms, bump PKGREVISION (but only
for the MesaLib package).

3 files changed, 17 insertions, 13 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 02b26d828b8..03adb6e8c2c 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/10/09 12:52:35 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2007/01/24 19:55:01 tv Exp $
 
 PKGNAME=	MesaLib-${MESA_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 .include "../../graphics/Mesa/Makefile.lib"
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index a6badd6727a..02646e2a660 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.43 2006/11/21 21:26:03 tv Exp $
+$NetBSD: distinfo,v 1.44 2007/01/24 19:55:01 tv Exp $
 
-SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
-RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
-Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
-SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
-RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
-Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
 SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
 RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
 Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
+SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
+RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
+Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
+SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
+RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
+Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
 SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606
 SHA1 (patch-ab) = c257a57d4570576f160e9a4c029384718402c1bd
 SHA1 (patch-ac) = a12c3538907aaa63184371037c0f70924861fbe4
@@ -19,6 +19,6 @@ SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac
 SHA1 (patch-ah) = 94faa48a6945aa6e7a0fc8806129a463d99d4338
 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558
 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a
-SHA1 (patch-ak) = 88dd3b142b255af9c43bb11e0c9e0e2bb4f6a3d9
+SHA1 (patch-ak) = 9f3480d08d2b6b7048b018956c57ad6e5d253174
 SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7
 SHA1 (patch-am) = 9b5679fea4c98ce620386fb50ea787727aaed20b
diff --git a/graphics/MesaLib/patches/patch-ak b/graphics/MesaLib/patches/patch-ak
index c56e7739efd..ab994973c9d 100644
--- a/graphics/MesaLib/patches/patch-ak
+++ b/graphics/MesaLib/patches/patch-ak
@@ -1,13 +1,17 @@
-$NetBSD: patch-ak,v 1.4 2006/11/21 21:26:03 tv Exp $
+$NetBSD: patch-ak,v 1.5 2007/01/24 19:55:01 tv Exp $
 
 --- src/mesa/main/glheader.h.orig	2005-11-27 13:16:31.000000000 -0500
 +++ src/mesa/main/glheader.h
-@@ -77,6 +77,8 @@
+@@ -77,6 +77,12 @@
  #  if _MSC_VER == 1200
       typedef UINT_PTR uintptr_t;
  #  endif 
 +#elif defined(__INTERIX)
-+#  include <stdlib.h>
++/* Interix 3.x has a gcc that shadows this. */
++#  ifndef _UINTPTR_T_DEFINED
++     typedef unsigned long uintptr_t;
++#  define _UINTPTR_T_DEFINED
++#  endif
  #else
  #  include <inttypes.h>
  #endif