diff -urN /usr/ports/graphics/gauche-gl/Makefile graphics/gauche-gl/Makefile
--- /usr/ports/graphics/gauche-gl/Makefile	2014-07-30 07:30:33.000000000 +0900
+++ graphics/gauche-gl/Makefile	2014-09-19 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
 # $FreeBSD: head/graphics/gauche-gl/Makefile 363383 2014-07-29 19:59:58Z antoine $
 
 PORTNAME=	gl
-PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTVERSION=	0.6
 CATEGORIES=	graphics scheme
 MASTER_SITES=	SF/gauche/Gauche-gl
 PKGNAMEPREFIX=	gauche-
@@ -12,40 +11,51 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL binding for Gauche
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		tar:tgz
-USE_XORG=	ice sm
+USES=		makeinfo tar:tgz
+USE_XORG=	ice sm x11 xext xmu xi
 USE_GL=		glut
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-EXAMPLESDIR=	${PREFIX}/share/examples/gauche/${PORTNAME}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 DOCSDIR=	${PREFIX}/share/doc/gauche/${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/gauche/${PORTNAME}
+
 PLIST_SUB=	TARGET="${CONFIGURE_TARGET}"
 
-.if !defined(NOPORTDOCS)
-USES+=		makeinfo
 INFO=		gauche-gl-refe gauche-gl-refj
-.endif
 
-NO_STAGE=	yes
-do-install:
-	cd ${WRKSRC}/src; ${MAKE} ${INSTALL_TARGET}
-	cd ${WRKSRC}/lib; ${MAKE} ${INSTALL_TARGET}
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+post-patch:
+.for i in configure src/gauche-gl.c src/gauche-gl.h src/glut-lib.stub
+	@${REINPLACE_CMD} -e '/glut.h/s|GLUT|GL|' ${WRKSRC}/${i}
+.endfor
 
-post-install:
-.if !defined(NOPORTDOCS)
-.for i in gauche-gl-refe.info gauche-gl-refj.info
-	${GZCAT} ${WRKSRC}/doc/${i}.gz >${PREFIX}/info/${i}
+do-install:
+.for i in src lib
+	@(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
+.for i in ${INFO}
+	${GZCAT} ${WRKSRC}/doc/${i}.info.gz \
+		> ${STAGEDIR}${PREFIX}/${INFO_PATH}/${i}.info
 .endfor
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
+	@(cd ${STAGEDIR}${PREFIX}/lib/gauche-0.9/site/${CONFIGURE_TARGET} && \
+		${STRIP_CMD} libgauche-*.so)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/gauche-gl/distinfo graphics/gauche-gl/distinfo
--- /usr/ports/graphics/gauche-gl/distinfo	2014-06-21 17:44:37.000000000 +0900
+++ graphics/gauche-gl/distinfo	2014-09-19 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (Gauche-gl-0.5.1.tgz) = 7f17f1d31afba83d374f31e49f025149dcec271b4d56279cd0f871b814176c68
-SIZE (Gauche-gl-0.5.1.tgz) = 1161233
+SHA256 (Gauche-gl-0.6.tgz) = cea07a8ff82056a980f6f626f43ab36dbf05ed8057f570bb3a4c6abf5ba6d297
+SIZE (Gauche-gl-0.6.tgz) = 1369790
diff -urN /usr/ports/graphics/gauche-gl/pkg-descr graphics/gauche-gl/pkg-descr
--- /usr/ports/graphics/gauche-gl/pkg-descr	2014-06-21 17:44:37.000000000 +0900
+++ graphics/gauche-gl/pkg-descr	2014-09-19 00:00:00.000000000 +0900
@@ -1,3 +1,3 @@
 This is a Gauche extension module to use OpenGL.
 
-WWW:	http://practical-scheme.net/gauche/
+WWW: http://practical-scheme.net/gauche/
diff -urN /usr/ports/graphics/gauche-gl/pkg-plist graphics/gauche-gl/pkg-plist
--- /usr/ports/graphics/gauche-gl/pkg-plist	2014-06-21 17:44:37.000000000 +0900
+++ graphics/gauche-gl/pkg-plist	2014-09-19 00:00:00.000000000 +0900
@@ -2,12 +2,6 @@
 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
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.cg
@@ -66,6 +60,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/noturn.rgb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot.scm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/minimum-viewer.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple/minimum-viewer-2d.scm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/3Dlabs-License.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2brick/README.txt
@@ -79,6 +74,16 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.frag
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.vert
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh
+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
+@dirrm share/gauche-0.9/site/lib/gl/simple
+@dirrm share/gauche-0.9/site/lib/gl
+@dirrmtry share/gauche-0.9/site/lib
+@dirrmtry share/gauche-0.9/site
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2particle
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook/ogl2brick
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/slbook
@@ -90,7 +95,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @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