From eac5997828984f331d20cecc546405ad193866df Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Mon, 23 Dec 2013 06:28:53 +0000
Subject: [PATCH] mesa: Fix reversed header symlink

---
 sys-libs/mesa/mesa-10.0.1.recipe | 26 +++++++++++++-------------
 sys-libs/mesa/mesa-7.9.2.recipe  | 16 ++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe
index 51e5dcfe0..c6de0d81b 100644
--- a/sys-libs/mesa/mesa-10.0.1.recipe
+++ b/sys-libs/mesa/mesa-10.0.1.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2"
 CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -75,20 +75,20 @@ INSTALL()
 	cp $(find $mesaBuildDir -name 'libswpipe.so') \
 		"$addOnsDir/opengl/Software Pipe"
 
-    # OpenGL Kit
-    mkdir -p $includeDir/os/opengl/GL
-    cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/
-    cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/
-    cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/
+	# OpenGL Kit
+	mkdir -p $includeDir/os/opengl
+	cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/
+	cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/
+	cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/
 
-    # Standard GL headers
-    cp ./include/GL/gl.h $includeDir/os/opengl/GL/
-    cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/
-    cp ./include/GL/glext.h $includeDir/os/opengl/GL/
+	# Standard GL headers
+	mkdir -p $includeDir/GL
+	cp ./include/GL/gl.h $includeDir/GL/
+	cp ./include/GL/gl_mangle.h $includeDir/GL/
+	cp ./include/GL/glext.h $includeDir/GL/
 
-    # Symlink GL in kit to system GL directory
-    cd $includeDir
-    ln -snf os/opengl/GL GL
+	# Create GL symlink in opengl kit
+	symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL
 
 	# devel package
 	packageEntries devel \
diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe
index 4ce2b3d50..2d0e30d24 100644
--- a/sys-libs/mesa/mesa-7.9.2.recipe
+++ b/sys-libs/mesa/mesa-7.9.2.recipe
@@ -10,7 +10,7 @@ LICENSE="MIT"
 # remember to update SOURCE_DIR as well for the -X revision
 SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz"
 CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2"
 if [ $effectiveTargetArchitecture != x86 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -68,19 +68,19 @@ INSTALL()
 		"$addOnsDir/opengl/Legacy Software Rasterizer"
 
 	# OpenGL Kit
-	mkdir -p $includeDir/os/opengl/GL
+	mkdir -p $includeDir/os/opengl
 	cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/
 	cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/
 	cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/
 
 	# Standard GL headers
-	cp ./include/GL/gl.h $includeDir/os/opengl/GL/
-	cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/
-	cp ./include/GL/glext.h $includeDir/os/opengl/GL/
+	mkdir -p $includeDir/GL
+	cp ./include/GL/gl.h $includeDir/GL/
+	cp ./include/GL/gl_mangle.h $includeDir/GL/
+	cp ./include/GL/glext.h $includeDir/GL/
 
-	# Symlink GL in kit to system GL directory
-	cd $includeDir
-	ln -snf os/opengl/GL GL
+	# Create GL symlink in opengl kit
+	symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL
 
 	# devel package
 	packageEntries devel \