[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Look for libGL.so, not any particular...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd2681895f15
branches:  trunk
changeset: 398571:bd2681895f15
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Sep 02 22:30:34 2009 +0000

description:
Look for libGL.so, not any particular libGL.so.<X>, on NetBSD.
Bump PKGREVISION.

>From mrg@

diffstat:

 graphics/MesaLib/Makefile         |   4 ++--
 graphics/MesaLib/distinfo         |   3 ++-
 graphics/MesaLib/patches/patch-an |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 41bb11e7899a -r bd2681895f15 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Wed Sep 02 22:05:42 2009 +0000
+++ b/graphics/MesaLib/Makefile Wed Sep 02 22:30:34 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2009/08/25 05:27:57 hasso Exp $
+# $NetBSD: Makefile,v 1.82 2009/09/02 22:30:34 wiz Exp $
 
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Graphics library similar to SGI's OpenGL
 
 MESA_HEADERS=  gl.h gl_mangle.h glext.h glx.h glxext.h \
diff -r 41bb11e7899a -r bd2681895f15 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Wed Sep 02 22:05:42 2009 +0000
+++ b/graphics/MesaLib/distinfo Wed Sep 02 22:30:34 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2009/08/08 08:25:51 wiz Exp $
+$NetBSD: distinfo,v 1.69 2009/09/02 22:30:34 wiz Exp $
 
 SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
 RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
@@ -22,6 +22,7 @@
 SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
 SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
 SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
+SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8
 SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
 SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
 SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
diff -r 41bb11e7899a -r bd2681895f15 graphics/MesaLib/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-an Wed Sep 02 22:30:34 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.3 2009/09/02 22:30:34 wiz Exp $
+
+--- src/glx/x11/dri_common.c.orig      2009-06-17 17:31:54.000000000 +0000
++++ src/glx/x11/dri_common.c
+@@ -103,7 +103,11 @@ _X_HIDDEN void *driOpenDriver(const char
+    int len;
+ 
+    /* Attempt to make sure libGL symbols will be visible to the driver */
++#ifdef __NetBSD__
++   glhandle = dlopen("libGL.so", RTLD_NOW | RTLD_GLOBAL);
++#else
+    glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);
++#endif
+ 
+    libPaths = NULL;
+    if (geteuid() == getuid()) {