Update to version 0.93.0314 and unbreak.

PR:		52047
Submitted by:	Ports Fury

6 files changed, 911 insertions, 100 deletions

diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 33edf364aea2..ec74f29e925b 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -6,24 +6,27 @@
 #
 
 PORTNAME=	esdl
-PORTVERSION=	0.93.0131
+PORTVERSION=	0.93.0314
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	esdl
-DISTNAME=	esdl-${PORTVERSION}.src
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A library for accessing SDL and OpenGL through Erlang
 
-BROKEN=		"Does not install"
-
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-ALL_TARGET=	target
+USE_MESA=	yes
 USE_GMAKE=	yes
+MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+ALL_TARGET=	target
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>
diff --git a/devel/esdl/distinfo b/devel/esdl/distinfo
index cceb2d8824d3..1702bc3385a7 100644
--- a/devel/esdl/distinfo
+++ b/devel/esdl/distinfo
@@ -1 +1 @@
-MD5 (erlang/esdl-0.93.0131.src.tar.gz) = 0bd099c94c476bbbb9ecbd6e329a1000
+MD5 (erlang/esdl-0.93.0314.src.tar.gz) = 9a89add6d7cceae8aaf5149f86fc73b6
diff --git a/devel/esdl/files/patch-Makefile b/devel/esdl/files/patch-Makefile
index 714a5a7ea567..53829128a152 100644
--- a/devel/esdl/files/patch-Makefile
+++ b/devel/esdl/files/patch-Makefile
@@ -1,13 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.orig	Wed Mar  5 21:44:29 2003
-+++ Makefile	Wed Mar  5 21:44:49 2003
-@@ -51,6 +51,7 @@
+--- Makefile.orig	Fri Mar 14 18:29:43 2003
++++ Makefile	Fri May  9 08:21:40 2003
+@@ -50,7 +50,7 @@
+ 	mkdir $(INSTALLDIR)/doc
  	mkdir $(INSTALLDIR)/ebin
  	mkdir $(INSTALLDIR)/priv
+-	cp vsn license.terms README-SDL.txt Readme* $(INSTALLDIR)
++	cp vsn license.terms Readme* $(INSTALLDIR)
  	cp src/*.?rl $(INSTALLDIR)/src
-+	cp include/*.hrl $(INSTALLDIR)/include
  	cp c_src/*.[ch] $(INSTALLDIR)/c_src
- 	cp doc/*.html $(INSTALLDIR)/doc
- 	cp ebin/*beam $(INSTALLDIR)/ebin
+ 	cp include/*.hrl $(INSTALLDIR)/include
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile
index 3c43478e87e8..7230bb2a2a8f 100644
--- a/devel/esdl/files/patch-c__src_Makefile
+++ b/devel/esdl/files/patch-c__src_Makefile
@@ -5,7 +5,7 @@
  #
  
 -OGLDIR  = /usr
-+OGLDIR  = /usr/X11R6
++OGLDIR  = ${X11BASE}
  
  # Uncomment these if your opengl header is located in another directory than
  # the usual $(OGLDIR)/include/GL/gl.h
@@ -14,14 +14,14 @@
  GL_INCS		= -I$(OGLDIR)/include/$(GL_INCLUDE_DIR)
  
 -SDL_LIBS	= $(shell sdl-config --libs)
-+SDL_LIBS	= $(shell sdl11-config --libs)
++SDL_LIBS	= $(shell $(SDL_CONFIG) --libs)
  LIBS		= $(GL_LIBS) $(SDL_LIBS) -lm 
  
 -SDLINCS		= $(shell sdl-config --cflags)
-+SDLINCS		= $(shell sdl11-config --cflags)
++SDLINCS		= $(shell $(SDL_CONFIG) --cflags)
  
 -CFLAGS	= -g -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
-+CFLAGS	+= -g -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
++CFLAGS	+= -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
              $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS)
  
  TARGETDIR = ../priv
diff --git a/devel/esdl/files/patch-c__src_esdl__glext.c b/devel/esdl/files/patch-c__src_esdl__glext.c
new file mode 100644
index 000000000000..2f6141ef1fc4
--- /dev/null
+++ b/devel/esdl/files/patch-c__src_esdl__glext.c
@@ -0,0 +1,803 @@
+--- c_src/esdl_glext.c.orig	Fri Mar 14 18:29:43 2003
++++ c_src/esdl_glext.c	Fri May  9 08:13:18 2003
+@@ -1987,7 +1987,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
++//typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+ PFNGLBLENDFUNCSEPARATEPROC esdl_glBlendFuncSeparate = NULL;
+ void egl_blendFuncSeparate(sdl_data *, int, char *);
+ sdl_fun esdl_load_glBlendFuncSeparate()
+@@ -2014,7 +2014,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLFOGCOORDFPROC)(GLfloat coord);
++//typedef void (APIENTRY * PFNGLFOGCOORDFPROC)(GLfloat coord);
+ PFNGLFOGCOORDFPROC esdl_glFogCoordf = NULL;
+ void egl_fogCoordf(sdl_data *, int, char *);
+ sdl_fun esdl_load_glFogCoordf()
+@@ -2035,7 +2035,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLFOGCOORDFVPROC)( const GLfloat * coord);
++//typedef void (APIENTRY * PFNGLFOGCOORDFVPROC)( const GLfloat * coord);
+ PFNGLFOGCOORDFVPROC esdl_glFogCoordfv = NULL;
+ void egl_fogCoordfv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glFogCoordfv()
+@@ -2056,7 +2056,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLFOGCOORDDPROC)(GLdouble coord);
++//typedef void (APIENTRY * PFNGLFOGCOORDDPROC)(GLdouble coord);
+ PFNGLFOGCOORDDPROC esdl_glFogCoordd = NULL;
+ void egl_fogCoordd(sdl_data *, int, char *);
+ sdl_fun esdl_load_glFogCoordd()
+@@ -2077,7 +2077,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLFOGCOORDDVPROC)( const GLdouble * coord);
++//typedef void (APIENTRY * PFNGLFOGCOORDDVPROC)( const GLdouble * coord);
+ PFNGLFOGCOORDDVPROC esdl_glFogCoorddv = NULL;
+ void egl_fogCoorddv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glFogCoorddv()
+@@ -2098,7 +2098,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLFOGCOORDPOINTERPROC)(GLenum type, GLsizei stride,  const GLvoid * pointer);
++//typedef void (APIENTRY * PFNGLFOGCOORDPOINTERPROC)(GLenum type, GLsizei stride,  const GLvoid * pointer);
+ PFNGLFOGCOORDPOINTERPROC esdl_glFogCoordPointer = NULL;
+ void egl_fogCoordPointer(sdl_data *, int, char *);
+ sdl_fun esdl_load_glFogCoordPointer()
+@@ -2130,7 +2130,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLMULTIDRAWARRAYSPROC)(GLenum mode,  const GLint * first,  const GLsizei * count, GLsizei primcount);
++//typedef void (APIENTRY * PFNGLMULTIDRAWARRAYSPROC)(GLenum mode,  const GLint * first,  const GLsizei * count, GLsizei primcount);
+ PFNGLMULTIDRAWARRAYSPROC esdl_glMultiDrawArrays = NULL;
+ void egl_multiDrawArrays(sdl_data *, int, char *);
+ sdl_fun esdl_load_glMultiDrawArrays()
+@@ -2159,7 +2159,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param);
++//typedef void (APIENTRY * PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param);
+ PFNGLPOINTPARAMETERFPROC esdl_glPointParameterf = NULL;
+ void egl_pointParameterf(sdl_data *, int, char *);
+ sdl_fun esdl_load_glPointParameterf()
+@@ -2182,7 +2182,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPOINTPARAMETERFVPROC)(GLenum pname,  const GLfloat * params);
++//typedef void (APIENTRY * PFNGLPOINTPARAMETERFVPROC)(GLenum pname,  const GLfloat * params);
+ PFNGLPOINTPARAMETERFVPROC esdl_glPointParameterfv = NULL;
+ void egl_pointParameterfv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glPointParameterfv()
+@@ -2205,7 +2205,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param);
++//typedef void (APIENTRY * PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param);
+ PFNGLPOINTPARAMETERIPROC esdl_glPointParameteri = NULL;
+ void egl_pointParameteri(sdl_data *, int, char *);
+ sdl_fun esdl_load_glPointParameteri()
+@@ -2228,7 +2228,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPOINTPARAMETERIVPROC)(GLenum pname,  const GLint * params);
++//typedef void (APIENTRY * PFNGLPOINTPARAMETERIVPROC)(GLenum pname,  const GLint * params);
+ PFNGLPOINTPARAMETERIVPROC esdl_glPointParameteriv = NULL;
+ void egl_pointParameteriv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glPointParameteriv()
+@@ -2251,7 +2251,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BVPROC)( const GLbyte * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BVPROC)( const GLbyte * v);
+ PFNGLSECONDARYCOLOR3BVPROC esdl_glSecondaryColor3bv = NULL;
+ void egl_secondaryColor3bv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3bv()
+@@ -2272,7 +2272,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DVPROC)( const GLdouble * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DVPROC)( const GLdouble * v);
+ PFNGLSECONDARYCOLOR3DVPROC esdl_glSecondaryColor3dv = NULL;
+ void egl_secondaryColor3dv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3dv()
+@@ -2293,7 +2293,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FVPROC)( const GLfloat * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FVPROC)( const GLfloat * v);
+ PFNGLSECONDARYCOLOR3FVPROC esdl_glSecondaryColor3fv = NULL;
+ void egl_secondaryColor3fv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3fv()
+@@ -2314,7 +2314,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IVPROC)( const GLint * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IVPROC)( const GLint * v);
+ PFNGLSECONDARYCOLOR3IVPROC esdl_glSecondaryColor3iv = NULL;
+ void egl_secondaryColor3iv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3iv()
+@@ -2335,7 +2335,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SVPROC)( const GLshort * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SVPROC)( const GLshort * v);
+ PFNGLSECONDARYCOLOR3SVPROC esdl_glSecondaryColor3sv = NULL;
+ void egl_secondaryColor3sv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3sv()
+@@ -2356,7 +2356,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBVPROC)( const GLubyte * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBVPROC)( const GLubyte * v);
+ PFNGLSECONDARYCOLOR3UBVPROC esdl_glSecondaryColor3ubv = NULL;
+ void egl_secondaryColor3ubv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3ubv()
+@@ -2377,7 +2377,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIVPROC)( const GLuint * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIVPROC)( const GLuint * v);
+ PFNGLSECONDARYCOLOR3UIVPROC esdl_glSecondaryColor3uiv = NULL;
+ void egl_secondaryColor3uiv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3uiv()
+@@ -2398,7 +2398,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USVPROC)( const GLushort * v);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USVPROC)( const GLushort * v);
+ PFNGLSECONDARYCOLOR3USVPROC esdl_glSecondaryColor3usv = NULL;
+ void egl_secondaryColor3usv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColor3usv()
+@@ -2419,7 +2419,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
++//typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
+ PFNGLSECONDARYCOLORPOINTERPROC esdl_glSecondaryColorPointer = NULL;
+ void egl_secondaryColorPointer(sdl_data *, int, char *);
+ sdl_fun esdl_load_glSecondaryColorPointer()
+@@ -2453,7 +2453,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS2DVPROC)( const GLdouble * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS2DVPROC)( const GLdouble * v);
+ PFNGLWINDOWPOS2DVPROC esdl_glWindowPos2dv = NULL;
+ void egl_windowPos2dv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos2dv()
+@@ -2474,7 +2474,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS2FVPROC)( const GLfloat * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS2FVPROC)( const GLfloat * v);
+ PFNGLWINDOWPOS2FVPROC esdl_glWindowPos2fv = NULL;
+ void egl_windowPos2fv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos2fv()
+@@ -2495,7 +2495,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS2IVPROC)( const GLint * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS2IVPROC)( const GLint * v);
+ PFNGLWINDOWPOS2IVPROC esdl_glWindowPos2iv = NULL;
+ void egl_windowPos2iv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos2iv()
+@@ -2516,7 +2516,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS2SVPROC)( const GLshort * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS2SVPROC)( const GLshort * v);
+ PFNGLWINDOWPOS2SVPROC esdl_glWindowPos2sv = NULL;
+ void egl_windowPos2sv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos2sv()
+@@ -2537,7 +2537,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS3DVPROC)( const GLdouble * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS3DVPROC)( const GLdouble * v);
+ PFNGLWINDOWPOS3DVPROC esdl_glWindowPos3dv = NULL;
+ void egl_windowPos3dv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos3dv()
+@@ -2558,7 +2558,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS3FVPROC)( const GLfloat * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS3FVPROC)( const GLfloat * v);
+ PFNGLWINDOWPOS3FVPROC esdl_glWindowPos3fv = NULL;
+ void egl_windowPos3fv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos3fv()
+@@ -2579,7 +2579,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS3IVPROC)( const GLint * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS3IVPROC)( const GLint * v);
+ PFNGLWINDOWPOS3IVPROC esdl_glWindowPos3iv = NULL;
+ void egl_windowPos3iv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos3iv()
+@@ -2600,7 +2600,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWINDOWPOS3SVPROC)( const GLshort * v);
++//typedef void (APIENTRY * PFNGLWINDOWPOS3SVPROC)( const GLshort * v);
+ PFNGLWINDOWPOS3SVPROC esdl_glWindowPos3sv = NULL;
+ void egl_windowPos3sv(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWindowPos3sv()
+@@ -2621,7 +2621,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTBVARBPROC)(GLint size,  const GLbyte * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTBVARBPROC)(GLint size,  const GLbyte * weights);
+ PFNGLWEIGHTBVARBPROC esdl_glWeightbvARB = NULL;
+ void egl_weightbvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightbvARB()
+@@ -2645,7 +2645,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTSVARBPROC)(GLint size,  const GLshort * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTSVARBPROC)(GLint size,  const GLshort * weights);
+ PFNGLWEIGHTSVARBPROC esdl_glWeightsvARB = NULL;
+ void egl_weightsvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightsvARB()
+@@ -2669,7 +2669,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTIVARBPROC)(GLint size,  const GLint * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTIVARBPROC)(GLint size,  const GLint * weights);
+ PFNGLWEIGHTIVARBPROC esdl_glWeightivARB = NULL;
+ void egl_weightivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightivARB()
+@@ -2693,7 +2693,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTFVARBPROC)(GLint size,  const GLfloat * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTFVARBPROC)(GLint size,  const GLfloat * weights);
+ PFNGLWEIGHTFVARBPROC esdl_glWeightfvARB = NULL;
+ void egl_weightfvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightfvARB()
+@@ -2717,7 +2717,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTDVARBPROC)(GLint size,  const GLdouble * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTDVARBPROC)(GLint size,  const GLdouble * weights);
+ PFNGLWEIGHTDVARBPROC esdl_glWeightdvARB = NULL;
+ void egl_weightdvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightdvARB()
+@@ -2744,7 +2744,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTUBVARBPROC)(GLint size,  const GLubyte * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTUBVARBPROC)(GLint size,  const GLubyte * weights);
+ PFNGLWEIGHTUBVARBPROC esdl_glWeightubvARB = NULL;
+ void egl_weightubvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightubvARB()
+@@ -2768,7 +2768,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTUSVARBPROC)(GLint size,  const GLushort * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTUSVARBPROC)(GLint size,  const GLushort * weights);
+ PFNGLWEIGHTUSVARBPROC esdl_glWeightusvARB = NULL;
+ void egl_weightusvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightusvARB()
+@@ -2792,7 +2792,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTUIVARBPROC)(GLint size,  const GLuint * weights);
++//typedef void (APIENTRY * PFNGLWEIGHTUIVARBPROC)(GLint size,  const GLuint * weights);
+ PFNGLWEIGHTUIVARBPROC esdl_glWeightuivARB = NULL;
+ void egl_weightuivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightuivARB()
+@@ -2816,7 +2816,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLWEIGHTPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
++//typedef void (APIENTRY * PFNGLWEIGHTPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
+ PFNGLWEIGHTPOINTERARBPROC esdl_glWeightPointerARB = NULL;
+ void egl_weightPointerARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glWeightPointerARB()
+@@ -2850,7 +2850,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXBLENDARBPROC)(GLint count);
++//typedef void (APIENTRY * PFNGLVERTEXBLENDARBPROC)(GLint count);
+ PFNGLVERTEXBLENDARBPROC esdl_glVertexBlendARB = NULL;
+ void egl_vertexBlendARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexBlendARB()
+@@ -2871,7 +2871,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC)(GLint index);
++//typedef void (APIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC)(GLint index);
+ PFNGLCURRENTPALETTEMATRIXARBPROC esdl_glCurrentPaletteMatrixARB = NULL;
+ void egl_currentPaletteMatrixARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glCurrentPaletteMatrixARB()
+@@ -2892,7 +2892,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLMATRIXINDEXUBVARBPROC)(GLint size,  const GLubyte * indices);
++//typedef void (APIENTRY * PFNGLMATRIXINDEXUBVARBPROC)(GLint size,  const GLubyte * indices);
+ PFNGLMATRIXINDEXUBVARBPROC esdl_glMatrixIndexubvARB = NULL;
+ void egl_matrixIndexubvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glMatrixIndexubvARB()
+@@ -2916,7 +2916,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLMATRIXINDEXUSVARBPROC)(GLint size,  const GLushort * indices);
++//typedef void (APIENTRY * PFNGLMATRIXINDEXUSVARBPROC)(GLint size,  const GLushort * indices);
+ PFNGLMATRIXINDEXUSVARBPROC esdl_glMatrixIndexusvARB = NULL;
+ void egl_matrixIndexusvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glMatrixIndexusvARB()
+@@ -2940,7 +2940,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLMATRIXINDEXUIVARBPROC)(GLint size,  const GLuint * indices);
++//typedef void (APIENTRY * PFNGLMATRIXINDEXUIVARBPROC)(GLint size,  const GLuint * indices);
+ PFNGLMATRIXINDEXUIVARBPROC esdl_glMatrixIndexuivARB = NULL;
+ void egl_matrixIndexuivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glMatrixIndexuivARB()
+@@ -2964,7 +2964,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
++//typedef void (APIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride,  const GLvoid * pointer);
+ PFNGLMATRIXINDEXPOINTERARBPROC esdl_glMatrixIndexPointerARB = NULL;
+ void egl_matrixIndexPointerARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glMatrixIndexPointerARB()
+@@ -2998,7 +2998,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVARBPROC)(GLuint index,  const GLdouble * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVARBPROC)(GLuint index,  const GLdouble * v);
+ PFNGLVERTEXATTRIB1DVARBPROC esdl_glVertexAttrib1dvARB = NULL;
+ void egl_vertexAttrib1dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib1dvARB()
+@@ -3021,7 +3021,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVARBPROC)(GLuint index,  const GLfloat * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVARBPROC)(GLuint index,  const GLfloat * v);
+ PFNGLVERTEXATTRIB1FVARBPROC esdl_glVertexAttrib1fvARB = NULL;
+ void egl_vertexAttrib1fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib1fvARB()
+@@ -3044,7 +3044,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVARBPROC)(GLuint index,  const GLshort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVARBPROC)(GLuint index,  const GLshort * v);
+ PFNGLVERTEXATTRIB1SVARBPROC esdl_glVertexAttrib1svARB = NULL;
+ void egl_vertexAttrib1svARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib1svARB()
+@@ -3067,7 +3067,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVARBPROC)(GLuint index,  const GLdouble * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVARBPROC)(GLuint index,  const GLdouble * v);
+ PFNGLVERTEXATTRIB2DVARBPROC esdl_glVertexAttrib2dvARB = NULL;
+ void egl_vertexAttrib2dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib2dvARB()
+@@ -3090,7 +3090,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVARBPROC)(GLuint index,  const GLfloat * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVARBPROC)(GLuint index,  const GLfloat * v);
+ PFNGLVERTEXATTRIB2FVARBPROC esdl_glVertexAttrib2fvARB = NULL;
+ void egl_vertexAttrib2fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib2fvARB()
+@@ -3113,7 +3113,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVARBPROC)(GLuint index,  const GLshort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVARBPROC)(GLuint index,  const GLshort * v);
+ PFNGLVERTEXATTRIB2SVARBPROC esdl_glVertexAttrib2svARB = NULL;
+ void egl_vertexAttrib2svARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib2svARB()
+@@ -3136,7 +3136,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVARBPROC)(GLuint index,  const GLdouble * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVARBPROC)(GLuint index,  const GLdouble * v);
+ PFNGLVERTEXATTRIB3DVARBPROC esdl_glVertexAttrib3dvARB = NULL;
+ void egl_vertexAttrib3dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib3dvARB()
+@@ -3159,7 +3159,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVARBPROC)(GLuint index,  const GLfloat * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVARBPROC)(GLuint index,  const GLfloat * v);
+ PFNGLVERTEXATTRIB3FVARBPROC esdl_glVertexAttrib3fvARB = NULL;
+ void egl_vertexAttrib3fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib3fvARB()
+@@ -3182,7 +3182,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVARBPROC)(GLuint index,  const GLshort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVARBPROC)(GLuint index,  const GLshort * v);
+ PFNGLVERTEXATTRIB3SVARBPROC esdl_glVertexAttrib3svARB = NULL;
+ void egl_vertexAttrib3svARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib3svARB()
+@@ -3205,7 +3205,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC)(GLuint index,  const GLbyte * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC)(GLuint index,  const GLbyte * v);
+ PFNGLVERTEXATTRIB4NBVARBPROC esdl_glVertexAttrib4NbvARB = NULL;
+ void egl_vertexAttrib4NbvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NbvARB()
+@@ -3228,7 +3228,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC)(GLuint index,  const GLint * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC)(GLuint index,  const GLint * v);
+ PFNGLVERTEXATTRIB4NIVARBPROC esdl_glVertexAttrib4NivARB = NULL;
+ void egl_vertexAttrib4NivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NivARB()
+@@ -3251,7 +3251,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC)(GLuint index,  const GLshort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC)(GLuint index,  const GLshort * v);
+ PFNGLVERTEXATTRIB4NSVARBPROC esdl_glVertexAttrib4NsvARB = NULL;
+ void egl_vertexAttrib4NsvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NsvARB()
+@@ -3274,7 +3274,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+ PFNGLVERTEXATTRIB4NUBARBPROC esdl_glVertexAttrib4NubARB = NULL;
+ void egl_vertexAttrib4NubARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NubARB()
+@@ -3303,7 +3303,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC)(GLuint index,  const GLubyte * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC)(GLuint index,  const GLubyte * v);
+ PFNGLVERTEXATTRIB4NUBVARBPROC esdl_glVertexAttrib4NubvARB = NULL;
+ void egl_vertexAttrib4NubvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NubvARB()
+@@ -3326,7 +3326,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC)(GLuint index,  const GLuint * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC)(GLuint index,  const GLuint * v);
+ PFNGLVERTEXATTRIB4NUIVARBPROC esdl_glVertexAttrib4NuivARB = NULL;
+ void egl_vertexAttrib4NuivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NuivARB()
+@@ -3349,7 +3349,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC)(GLuint index,  const GLushort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC)(GLuint index,  const GLushort * v);
+ PFNGLVERTEXATTRIB4NUSVARBPROC esdl_glVertexAttrib4NusvARB = NULL;
+ void egl_vertexAttrib4NusvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4NusvARB()
+@@ -3372,7 +3372,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4BVARBPROC)(GLuint index,  const GLbyte * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4BVARBPROC)(GLuint index,  const GLbyte * v);
+ PFNGLVERTEXATTRIB4BVARBPROC esdl_glVertexAttrib4bvARB = NULL;
+ void egl_vertexAttrib4bvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4bvARB()
+@@ -3395,7 +3395,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVARBPROC)(GLuint index,  const GLdouble * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVARBPROC)(GLuint index,  const GLdouble * v);
+ PFNGLVERTEXATTRIB4DVARBPROC esdl_glVertexAttrib4dvARB = NULL;
+ void egl_vertexAttrib4dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4dvARB()
+@@ -3418,7 +3418,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVARBPROC)(GLuint index,  const GLfloat * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVARBPROC)(GLuint index,  const GLfloat * v);
+ PFNGLVERTEXATTRIB4FVARBPROC esdl_glVertexAttrib4fvARB = NULL;
+ void egl_vertexAttrib4fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4fvARB()
+@@ -3441,7 +3441,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4IVARBPROC)(GLuint index,  const GLint * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4IVARBPROC)(GLuint index,  const GLint * v);
+ PFNGLVERTEXATTRIB4IVARBPROC esdl_glVertexAttrib4ivARB = NULL;
+ void egl_vertexAttrib4ivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4ivARB()
+@@ -3464,7 +3464,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVARBPROC)(GLuint index,  const GLshort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVARBPROC)(GLuint index,  const GLshort * v);
+ PFNGLVERTEXATTRIB4SVARBPROC esdl_glVertexAttrib4svARB = NULL;
+ void egl_vertexAttrib4svARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4svARB()
+@@ -3487,7 +3487,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC)(GLuint index,  const GLubyte * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC)(GLuint index,  const GLubyte * v);
+ PFNGLVERTEXATTRIB4UBVARBPROC esdl_glVertexAttrib4ubvARB = NULL;
+ void egl_vertexAttrib4ubvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4ubvARB()
+@@ -3510,7 +3510,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC)(GLuint index,  const GLuint * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC)(GLuint index,  const GLuint * v);
+ PFNGLVERTEXATTRIB4UIVARBPROC esdl_glVertexAttrib4uivARB = NULL;
+ void egl_vertexAttrib4uivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4uivARB()
+@@ -3533,7 +3533,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIB4USVARBPROC)(GLuint index,  const GLushort * v);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIB4USVARBPROC)(GLuint index,  const GLushort * v);
+ PFNGLVERTEXATTRIB4USVARBPROC esdl_glVertexAttrib4usvARB = NULL;
+ void egl_vertexAttrib4usvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttrib4usvARB()
+@@ -3556,7 +3556,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride,  const GLvoid * pointer);
++//typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride,  const GLvoid * pointer);
+ PFNGLVERTEXATTRIBPOINTERARBPROC esdl_glVertexAttribPointerARB = NULL;
+ void egl_vertexAttribPointerARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glVertexAttribPointerARB()
+@@ -3596,7 +3596,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC)(GLuint index);
++//typedef void (APIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC)(GLuint index);
+ PFNGLENABLEVERTEXATTRIBARRAYARBPROC esdl_glEnableVertexAttribArrayARB = NULL;
+ void egl_enableVertexAttribArrayARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glEnableVertexAttribArrayARB()
+@@ -3617,7 +3617,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)(GLuint index);
++//typedef void (APIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)(GLuint index);
+ PFNGLDISABLEVERTEXATTRIBARRAYARBPROC esdl_glDisableVertexAttribArrayARB = NULL;
+ void egl_disableVertexAttribArrayARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glDisableVertexAttribArrayARB()
+@@ -3638,7 +3638,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPROGRAMSTRINGARBPROC)(GLenum target, GLenum format, GLsizei len,  const GLvoid * string);
++//typedef void (APIENTRY * PFNGLPROGRAMSTRINGARBPROC)(GLenum target, GLenum format, GLsizei len,  const GLvoid * string);
+ PFNGLPROGRAMSTRINGARBPROC esdl_glProgramStringARB = NULL;
+ void egl_programStringARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glProgramStringARB()
+@@ -3672,7 +3672,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLBINDPROGRAMARBPROC)(GLenum target, GLuint program);
++//typedef void (APIENTRY * PFNGLBINDPROGRAMARBPROC)(GLenum target, GLuint program);
+ PFNGLBINDPROGRAMARBPROC esdl_glBindProgramARB = NULL;
+ void egl_bindProgramARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glBindProgramARB()
+@@ -3695,7 +3695,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLDELETEPROGRAMSARBPROC)(GLsizei n,  const GLuint * programs);
++//typedef void (APIENTRY * PFNGLDELETEPROGRAMSARBPROC)(GLsizei n,  const GLuint * programs);
+ PFNGLDELETEPROGRAMSARBPROC esdl_glDeleteProgramsARB = NULL;
+ void egl_deleteProgramsARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glDeleteProgramsARB()
+@@ -3719,7 +3719,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGENPROGRAMSARBPROC)(GLsizei n, GLuint * programs);
++//typedef void (APIENTRY * PFNGLGENPROGRAMSARBPROC)(GLsizei n, GLuint * programs);
+ PFNGLGENPROGRAMSARBPROC esdl_glGenProgramsARB = NULL;
+ void egl_genProgramsARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGenProgramsARB()
+@@ -3751,7 +3751,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC)(GLenum target, GLuint index,  const GLdouble * params);
++//typedef void (APIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC)(GLenum target, GLuint index,  const GLdouble * params);
+ PFNGLPROGRAMENVPARAMETER4DVARBPROC esdl_glProgramEnvParameter4dvARB = NULL;
+ void egl_programEnvParameter4dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glProgramEnvParameter4dvARB()
+@@ -3776,7 +3776,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC)(GLenum target, GLuint index,  const GLfloat * params);
++//typedef void (APIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC)(GLenum target, GLuint index,  const GLfloat * params);
+ PFNGLPROGRAMENVPARAMETER4FVARBPROC esdl_glProgramEnvParameter4fvARB = NULL;
+ void egl_programEnvParameter4fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glProgramEnvParameter4fvARB()
+@@ -3801,7 +3801,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)(GLenum target, GLuint index,  const GLdouble * params);
++//typedef void (APIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)(GLenum target, GLuint index,  const GLdouble * params);
+ PFNGLPROGRAMLOCALPARAMETER4DVARBPROC esdl_glProgramLocalParameter4dvARB = NULL;
+ void egl_programLocalParameter4dvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glProgramLocalParameter4dvARB()
+@@ -3826,7 +3826,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)(GLenum target, GLuint index,  const GLfloat * params);
++//typedef void (APIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)(GLenum target, GLuint index,  const GLfloat * params);
+ PFNGLPROGRAMLOCALPARAMETER4FVARBPROC esdl_glProgramLocalParameter4fvARB = NULL;
+ void egl_programLocalParameter4fvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glProgramLocalParameter4fvARB()
+@@ -3851,7 +3851,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble * params);
++//typedef void (APIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble * params);
+ PFNGLGETPROGRAMENVPARAMETERDVARBPROC esdl_glGetProgramEnvParameterdvARB = NULL;
+ void egl_getProgramEnvParameterdvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramEnvParameterdvARB()
+@@ -3882,7 +3882,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat * params);
++//typedef void (APIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat * params);
+ PFNGLGETPROGRAMENVPARAMETERFVARBPROC esdl_glGetProgramEnvParameterfvARB = NULL;
+ void egl_getProgramEnvParameterfvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramEnvParameterfvARB()
+@@ -3913,7 +3913,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble * params);
++//typedef void (APIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble * params);
+ PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC esdl_glGetProgramLocalParameterdvARB = NULL;
+ void egl_getProgramLocalParameterdvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramLocalParameterdvARB()
+@@ -3944,7 +3944,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat * params);
++//typedef void (APIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat * params);
+ PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC esdl_glGetProgramLocalParameterfvARB = NULL;
+ void egl_getProgramLocalParameterfvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramLocalParameterfvARB()
+@@ -3975,7 +3975,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMIVARBPROC)(GLenum target, GLenum pname, GLint * params);
++//typedef void (APIENTRY * PFNGLGETPROGRAMIVARBPROC)(GLenum target, GLenum pname, GLint * params);
+ PFNGLGETPROGRAMIVARBPROC esdl_glGetProgramivARB = NULL;
+ void egl_getProgramivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramivARB()
+@@ -4005,7 +4005,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGARBPROC)(GLenum target, GLenum pname, GLvoid * string);
++//typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGARBPROC)(GLenum target, GLenum pname, GLvoid * string);
+ PFNGLGETPROGRAMSTRINGARBPROC esdl_glGetProgramStringARB = NULL;
+ void egl_getProgramStringARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetProgramStringARB()
+@@ -4030,7 +4030,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC)(GLuint index, GLenum pname, GLdouble * params);
++//typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC)(GLuint index, GLenum pname, GLdouble * params);
+ PFNGLGETVERTEXATTRIBDVARBPROC esdl_glGetVertexAttribdvARB = NULL;
+ void egl_getVertexAttribdvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetVertexAttribdvARB()
+@@ -4061,7 +4061,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC)(GLuint index, GLenum pname, GLfloat * params);
++//typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC)(GLuint index, GLenum pname, GLfloat * params);
+ PFNGLGETVERTEXATTRIBFVARBPROC esdl_glGetVertexAttribfvARB = NULL;
+ void egl_getVertexAttribfvARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetVertexAttribfvARB()
+@@ -4092,7 +4092,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC)(GLuint index, GLenum pname, GLint * params);
++//typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC)(GLuint index, GLenum pname, GLint * params);
+ PFNGLGETVERTEXATTRIBIVARBPROC esdl_glGetVertexAttribivARB = NULL;
+ void egl_getVertexAttribivARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetVertexAttribivARB()
+@@ -4123,7 +4123,7 @@
+ 
+ }
+ 
+-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC)(GLuint index, GLenum pname,  GLvoid* *pointer);
++//typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC)(GLuint index, GLenum pname,  GLvoid* *pointer);
+ PFNGLGETVERTEXATTRIBPOINTERVARBPROC esdl_glGetVertexAttribPointervARB = NULL;
+ void egl_getVertexAttribPointervARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glGetVertexAttribPointervARB()
+@@ -4154,7 +4154,7 @@
+ 
+ }
+ 
+-typedef GLboolean (APIENTRY * PFNGLISPROGRAMARBPROC)(GLuint program);
++//typedef GLboolean (APIENTRY * PFNGLISPROGRAMARBPROC)(GLuint program);
+ PFNGLISPROGRAMARBPROC esdl_glIsProgramARB = NULL;
+ void egl_isProgramARB(sdl_data *, int, char *);
+ sdl_fun esdl_load_glIsProgramARB()
diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist
index deaedd5f0b97..4d88e5ac375d 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/esdl/pkg-plist
@@ -1,83 +1,87 @@
-lib/erlang/lib/esdl-0.93.0131/c_src/CPS.h
-lib/erlang/lib/esdl-0.93.0131/c_src/SDLMain.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_audio.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_audio.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_conv.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_conv.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_driver.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_events.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_events.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_gen.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_gl.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_gl.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_glext.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_glext.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_glu.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_glu.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_spec.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_util.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_util.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_video.c
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_video.h
-lib/erlang/lib/esdl-0.93.0131/c_src/esdl_wrapper.c
-lib/erlang/lib/esdl-0.93.0131/c_src/hexdump.c
-lib/erlang/lib/esdl-0.93.0131/doc/gl.html
-lib/erlang/lib/esdl-0.93.0131/doc/glu.html
-lib/erlang/lib/esdl-0.93.0131/doc/index.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_active.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_audio.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_events.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_joystick.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_keyboard.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_mouse.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_util.html
-lib/erlang/lib/esdl-0.93.0131/doc/sdl_video.html
-lib/erlang/lib/esdl-0.93.0131/ebin/gl.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/glu.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_active.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_audio.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_events.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_joystick.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_keyboard.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_mouse.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_util.beam
-lib/erlang/lib/esdl-0.93.0131/ebin/sdl_video.beam
-lib/erlang/lib/esdl-0.93.0131/include/gl.hrl
-lib/erlang/lib/esdl-0.93.0131/include/glu.hrl
-lib/erlang/lib/esdl-0.93.0131/include/old_gl.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_active.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_audio.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_events.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_joystick.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_keyboard.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_mouse.hrl
-lib/erlang/lib/esdl-0.93.0131/include/sdl_video.hrl
-lib/erlang/lib/esdl-0.93.0131/priv/sdl_driver.so
-lib/erlang/lib/esdl-0.93.0131/src/esdl.hrl
-lib/erlang/lib/esdl-0.93.0131/src/gl.erl
-lib/erlang/lib/esdl-0.93.0131/src/gl_funcs.hrl
-lib/erlang/lib/esdl-0.93.0131/src/glext_funcs.hrl
-lib/erlang/lib/esdl-0.93.0131/src/glu.erl
-lib/erlang/lib/esdl-0.93.0131/src/glu_funcs.hrl
-lib/erlang/lib/esdl-0.93.0131/src/sdl.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_active.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_audio.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_events.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_joystick.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_keyboard.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_mouse.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_util.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_util.hrl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_video.erl
-lib/erlang/lib/esdl-0.93.0131/src/sdl_video_funcs.hrl
-@dirrm lib/erlang/lib/esdl-0.93.0131/src
-@dirrm lib/erlang/lib/esdl-0.93.0131/priv
-@dirrm lib/erlang/lib/esdl-0.93.0131/include
-@dirrm lib/erlang/lib/esdl-0.93.0131/ebin
-@dirrm lib/erlang/lib/esdl-0.93.0131/doc
-@dirrm lib/erlang/lib/esdl-0.93.0131/c_src
-@dirrm lib/erlang/lib/esdl-0.93.0131
+lib/erlang/lib/esdl-%%VERSION%%/Readme
+lib/erlang/lib/esdl-%%VERSION%%/Readme.MacOSX-Cocoa
+lib/erlang/lib/esdl-%%VERSION%%/c_src/CPS.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/SDLMain.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_audio.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_conv.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_conv.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_driver.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gen.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_wrapper.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/hexdump.c
+lib/erlang/lib/esdl-%%VERSION%%/doc/gl.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/glu.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/index.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_util.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_video.html
+lib/erlang/lib/esdl-%%VERSION%%/ebin/gl.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/glu.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_util.beam
+lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_video.beam
+lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/glu.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/old_gl.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_active.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_audio.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_events.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_joystick.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl
+lib/erlang/lib/esdl-%%VERSION%%/license.terms
+lib/erlang/lib/esdl-%%VERSION%%/src/esdl.hrl
+lib/erlang/lib/esdl-%%VERSION%%/src/gl.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/gl_funcs.hrl
+lib/erlang/lib/esdl-%%VERSION%%/src/glext_funcs.hrl
+lib/erlang/lib/esdl-%%VERSION%%/src/glu.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/glu_funcs.hrl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_events.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_joystick.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_keyboard.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_mouse.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl
+lib/erlang/lib/esdl-%%VERSION%%/priv/sdl_driver.so
+lib/erlang/lib/esdl-%%VERSION%%/vsn
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/src
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/priv
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/include
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/doc
+@dirrm lib/erlang/lib/esdl-%%VERSION%%/c_src
+@dirrm lib/erlang/lib/esdl-%%VERSION%%