--- trunk/opengl-update/opengl-update.in	2012/11/15 12:59:19	1984
+++ trunk/opengl-update/opengl-update.in	2013/03/08 14:09:44	2069
@@ -241,15 +241,17 @@
 		mkdir -p ${DST_PREFIX}/${LIBDIR}
 		pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null
 			# First remove old symlinks
-			for file in lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
+			for file in lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
 			do
+				# exclude libGLU
+				[[ ${file} = libGLU.so ]] && continue
 				[[ -h ${file} ]] && rm -f ${file}
 			done
 
 			# Note that we don't do .so*, just .so on purpose.  The
 			# loader knows to look in the profile dir, and the
 			# linked just needs the .so
-			for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
+			for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
 			do
 				[[ -f ${file} ]] || continue
 				[[ -f ${file##*/} ]] && rm -f ${file##*/}
@@ -269,12 +271,14 @@
 			mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
 			pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
 				# First remove old symlinks
-				for file in lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
+				for file in lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
 				do
+					# exclude libGLU
+					[[ ${file} = libGLU.so ]] && continue
 					[[ -h ${file} ]] && rm -f ${file}
 				done
 
-				for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/lib{EGL,GL{,ESv{1,2}},OpenVG}{,core}.{so,dylib,a,la}
+				for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/lib{EGL,GL*,OpenVG}{,core}.{so,dylib,a,la}
 				do
 					[[ -f ${file} ]] || continue
 					[[ -f ${file##*/} ]] && rm -f ${file##*/}
@@ -329,10 +333,11 @@
 		headers[GL]="gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h"
 		headers[GLES]="egl.h gl_extensions.h glext.h gl.h glplatform.h"
 		headers[GLES2]="gl2ext.h gl2.h gl2platform.h"
-		headers[EGL]="eglext.h egl.h eglplatform.h"
+		headers[GLES3]="gl3ext.h gl3.h gl3platform.h"
+		headers[EGL]="eglext.h egl.h eglmesaext.h eglplatform.h"
 		headers[KHR]="khrplatform.h"
 		headers[VG]="openvg.h vgext.h vgplatform.h vgu.h"
-		for incl_dir in EGL GL GLES GLES2 KHR VG
+		for incl_dir in EGL GL GLES GLES2 GLES3 KHR VG
 		do
 			mkdir -p ${DST_PREFIX}/include/${incl_dir}
 			pushd ${DST_PREFIX}/include/${incl_dir} &> /dev/null