diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 2e4057d3bf78..55ee5c672e82 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gl
-PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTVERSION=	0.5.1
 CATEGORIES=	graphics scheme
-MASTER_SITES=	SF/gauche/Gauche-gl/${PORTVERSION}
+MASTER_SITES=	SF/gauche/Gauche-gl
 PKGNAMEPREFIX=	gauche-
 DISTNAME=	Gauche-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -20,24 +19,18 @@ COMMENT=	OpenGL binding for Gauche
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-BROKEN=		does not build
-
 USE_GL=		glut
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/gauche/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/gauche/${PORTNAME}
-PLIST_SUB=	VERSION="`gauche-config -V`" \
-		TARGET="${CONFIGURE_TARGET}"
+PLIST_SUB=	TARGET="${CONFIGURE_TARGET}"
 
 .if !defined(NOPORTDOCS)
 INFO=		gauche-gl-refe gauche-gl-refj
 .endif
 
-post-patch:
-	${REINPLACE_CMD} s/VESRION/VERSION/ ${WRKSRC}/src/gen-ptrs.scm
-
 do-install:
 	cd ${WRKSRC}/src; ${MAKE} ${INSTALL_TARGET}
 	cd ${WRKSRC}/lib; ${MAKE} ${INSTALL_TARGET}
@@ -47,10 +40,12 @@ post-install:
 .for i in gauche-gl-refe.info gauche-gl-refj.info
 	${GZCAT} ${WRKSRC}/doc/${i}.gz >${PREFIX}/info/${i}
 .endfor
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gauche-gl/distinfo b/graphics/gauche-gl/distinfo
index 05107daa405f..cb4c47746fc6 100644
--- a/graphics/gauche-gl/distinfo
+++ b/graphics/gauche-gl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Gauche-gl-0.4.4.tgz) = 553f8e864ce41743c439867aa360de35aa3c2265ec6c6df6f2f0f7f0de73af5b
-SIZE (Gauche-gl-0.4.4.tgz) = 943819
+SHA256 (Gauche-gl-0.5.1.tgz) = 7f17f1d31afba83d374f31e49f025149dcec271b4d56279cd0f871b814176c68
+SIZE (Gauche-gl-0.5.1.tgz) = 1161233
diff --git a/graphics/gauche-gl/files/patch-src_gauche-gl.c b/graphics/gauche-gl/files/patch-src_gauche-gl.c
deleted file mode 100644
index b3805fc4206b..000000000000
--- a/graphics/gauche-gl/files/patch-src_gauche-gl.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-descr b/graphics/gauche-gl/pkg-descr
index dc33e9671752..a57d10080d27 100644
--- a/graphics/gauche-gl/pkg-descr
+++ b/graphics/gauche-gl/pkg-descr
@@ -1,3 +1,3 @@
 This is a Gauche extension module to use OpenGL.
 
-WWW: http://www.shiro.dreamhost.com/scheme/gauche/index.html
+WWW:	http://practical-scheme.net/gauche/
diff --git a/graphics/gauche-gl/pkg-plist b/graphics/gauche-gl/pkg-plist
index 2f752bd1ea3c..4a2108b4293e 100644
--- a/graphics/gauche-gl/pkg-plist
+++ b/graphics/gauche-gl/pkg-plist
@@ -1,87 +1,96 @@
-lib/gauche/%%VERSION%%/%%TARGET%%/libgauche-gl.so
-lib/gauche/%%VERSION%%/%%TARGET%%/libgauche-glut.so
-lib/gauche/%%VERSION%%/%%TARGET%%/libgauche-math3d.so
-lib/gauche/%%VERSION%%/include/gauche/math3d.h
-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
+lib/gauche-0.9/site/%%TARGET%%/libgauche-gl.so
+lib/gauche-0.9/site/%%TARGET%%/libgauche-glut.so
+lib/gauche-0.9/site/%%TARGET%%/libgauche-math3d.so
+lib/gauche-0.9/site/include/gauche/math3d.h
+share/gauche-0.9/site/lib/gl.scm
+share/gauche-0.9/site/lib/gl/glut.scm
+share/gauche-0.9/site/lib/gl/math3d.scm
+share/gauche-0.9/site/lib/gl/simple-image.scm
+share/gauche-0.9/site/lib/gl/simple/image.scm
+share/gauche-0.9/site/lib/gl/simple/viewer.scm
 %%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
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example13-7.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example2-5.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example2-6.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example2-9.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-2.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-5.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-6.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-7.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example3-8.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example4-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example5-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example5-6.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example5-8.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example5-9.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-2.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-3.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-4.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-5.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example6-7.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example7-1.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example7-2.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example7-5.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
-%%PORTDOCS%%%%EXAMPLESDIR%%/glbook/example9-5.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/ogl2particle/3Dlabs-License.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/README.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/ogl2particle.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.frag
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.vert
-%%PORTDOCS%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2particle
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2brick
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/slbook
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/glbook
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cg
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.cg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/checkered-sphere-cg.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/run
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gl-plot.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example1-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example1-3.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example10-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example10-3.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example10-4.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example10-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example13-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example13-3.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example13-6.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example13-7.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example2-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example2-6.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example2-9.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-6.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-7.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example3-8.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example4-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example5-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example5-6.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example5-8.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example5-9.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-3.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-4.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example6-7.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example7-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example7-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example7-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example8-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example8-2.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example8-4.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example8-6.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example8-8.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-1.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-3.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-4.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-5.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-7.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/example9-8.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glbook/run
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/flower.rgb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/noturn.rgb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/minimum-viewer.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/3Dlabs-License.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/brick.frag
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/brick.vert
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/ogl2brick.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/run.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/3Dlabs-License.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/ogl2particle.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.frag
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.vert
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2particle
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2brick
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simple
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/glbook
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cg
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/gauche/%%VERSION%%/lib/gl
+@dirrmtry lib/gauche-0.9/site/include/gauche
+@dirrmtry lib/gauche-0.9/site/include
+@dirrmtry share/gauche-0.9/site/lib/gl/simple
+@dirrmtry share/gauche-0.9/site/lib/gl
+@dirrmtry share/gauche-0.9/site/lib
+@dirrmtry share/gauche-0.9/site