- Update to 0.4.2

PR:		ports/107693
Submitted by:	Erik Greenwald <erik@smluc.org> (maintainer)

4 files changed, 41 insertions, 25 deletions

diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index de26416c400b..3fe20a963a02 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gl
-PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTVERSION=	0.4.2
 CATEGORIES=	graphics scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gauche
@@ -24,7 +23,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GL=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
+USE_GCC=	3.4+
+CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
 
 EXAMPLESDIR=	${PREFIX}/share/examples/gauche/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/gauche/${PORTNAME}
diff --git a/graphics/gauche-gl/distinfo b/graphics/gauche-gl/distinfo
index 4826bacf2210..ba2e0497e14c 100644
--- a/graphics/gauche-gl/distinfo
+++ b/graphics/gauche-gl/distinfo
@@ -1,3 +1,3 @@
-MD5 (Gauche-gl-0.4.1.tgz) = a51b19a0f16f88ed6cd85c6e49cc6e75
-SHA256 (Gauche-gl-0.4.1.tgz) = e4350d5d0e53374306e84af772724ebbaa34ec2d47950f16dbe069c4fa1d4d04
-SIZE (Gauche-gl-0.4.1.tgz) = 940134
+MD5 (Gauche-gl-0.4.2.tgz) = 32e0670225a983e9df99f856825e1f63
+SHA256 (Gauche-gl-0.4.2.tgz) = 947dd946c7e6837f5825214e89e69f3c2e1ef5b49ad3a27974aa7df7c937cb97
+SIZE (Gauche-gl-0.4.2.tgz) = 942251
diff --git a/graphics/gauche-gl/files/patch-src_gauche-gl.c b/graphics/gauche-gl/files/patch-src_gauche-gl.c
new file mode 100644
index 000000000000..b3805fc4206b
--- /dev/null
+++ b/graphics/gauche-gl/files/patch-src_gauche-gl.c
@@ -0,0 +1,15 @@
+--- src/gauche-gl.c.orig	Mon Jan  8 14:47:05 2007
++++ src/gauche-gl.c	Mon Jan  8 14:55:21 2007
+@@ -139,11 +139,7 @@
+ */
+ void *Scm_GLGetProcAddress(const char *name)
+ {
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
++#if defined(GLX_VERSION_1_4)
+     if (glXGetProcAddress != NULL) {
+         return glXGetProcAddress(name);
+     }
diff --git a/graphics/gauche-gl/pkg-plist b/graphics/gauche-gl/pkg-plist
index dfe1cdaf6f5f..2f752bd1ea3c 100644
--- a/graphics/gauche-gl/pkg-plist
+++ b/graphics/gauche-gl/pkg-plist
@@ -6,11 +6,21 @@ share/gauche/%%VERSION%%/lib/gl.scm
 share/gauche/%%VERSION%%/lib/gl/glut.scm
 share/gauche/%%VERSION%%/lib/gl/math3d.scm
 share/gauche/%%VERSION%%/lib/gl/simple-image.scm
-@dirrm share/gauche/%%VERSION%%/lib/gl
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cg/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.cg
+%%PORTDOCS%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/cg/checkered-sphere-cg.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/cg/run
 %%PORTDOCS%%%%EXAMPLESDIR%%/gears.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/gl-plot.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example1-2.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example1-3.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-1.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-3.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-4.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-5.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example13-2.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example13-3.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example13-6.scm
@@ -41,6 +51,8 @@ share/gauche/%%VERSION%%/lib/gl/simple-image.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-1.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-2.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-4.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-6.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-8.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-1.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-3.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-4.scm
@@ -48,34 +60,22 @@ share/gauche/%%VERSION%%/lib/gl/simple-image.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-7.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-8.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/glbook/run
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/flower.rgb
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/noturn.rgb
 %%PORTDOCS%%%%EXAMPLESDIR%%/mandelbrot.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/3Dlabs-License.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/README.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/brick.frag
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/brick.vert
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/ogl2brick.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/run.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2brick/README.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/3Dlabs-License.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/README.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/ogl2particle.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.frag
 %%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.vert
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/README.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/images/noturn.rgb
-%%PORTDOCS%%%%EXAMPLESDIR%%/images/flower.rgb
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-6.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-3.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example8-8.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-5.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example10-4.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.cg
-%%PORTDOCS%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/cg/checkered-sphere-cg.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/cg/run
-%%PORTDOCS%%%%EXAMPLESDIR%%/cg/README
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2particle
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2brick
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook
@@ -84,3 +84,4 @@ share/gauche/%%VERSION%%/lib/gl/simple-image.scm
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cg
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/gauche/%%VERSION%%/lib/gl