[46422] trunk/dports/x11/mesa

[jeremyhu at macports.org]

Revision: 46422
          http://trac.macports.org/changeset/46422
Author:   jeremyhu at macports.org
Date:     2009-02-04 11:08:36 -0800 (Wed, 04 Feb 2009)
Log Message:
-----------
mesa: Fix a hard-coded instance of /usr/X11 in the Makefile to use X11_DIR

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Added Paths:
-----------
    trunk/dports/x11/mesa/files/asglx-x11dir.patch

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-02-04 18:52:19 UTC (rev 46421)
+++ trunk/dports/x11/mesa/Portfile	2009-02-04 19:08:36 UTC (rev 46422)
@@ -75,6 +75,9 @@
 }
 
 variant hw_render conflicts system_x11 description {Install a libGL.dylib that} {
+	post-patch {
+		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && patch -p0 < ${filespath}/asglx-x11dir.patch"
+	}
 	post-build {
 		system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && ${build.cmd} ${build.args}"
 	}

Added: trunk/dports/x11/mesa/files/asglx-x11dir.patch
===================================================================
--- trunk/dports/x11/mesa/files/asglx-x11dir.patch	                        (rev 0)
+++ trunk/dports/x11/mesa/files/asglx-x11dir.patch	2009-02-04 19:08:36 UTC (rev 46422)
@@ -0,0 +1,13 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 89)
++++ Makefile	(working copy)
+@@ -69,7 +69,7 @@
+ 	$(COMPILE) glxhash.c
+ 
+ appledri.o: appledri.h appledristr.h appledri.c
+-	$(COMPILE) -I/usr/X11/include/X11 appledri.c
++	$(COMPILE) -I$(X11_DIR)/include/X11 appledri.c
+ 
+ apple_glx_context.o: apple_glx_context.c apple_glx_context.h apple_glx_context.h
+ 	$(COMPILE) apple_glx_context.c -F/System/Library/Frameworks/OpenGL.framework
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090204/f66883b1/attachment.html>