Update ruby-opengl to version 0.60.0. Changes from version 0.32g

include:

    + Install as a Ruby gem.

    * Support for Ruby 1.9.0+ (requires mkrf 0.2.3)
    * Added support for many more OpenGL extensions
    * GLU and GLUT cleanup, bugfixes, some missing functions added -
      version 3.7 of GLUT API is now requirement (previously 3.0)
    * Support for OpenGL 2.1 (that includes pixelpack/unpack buffer)
    * Lots of bugfixes.

6 files changed, 164 insertions, 119 deletions

diff --git a/graphics/ruby-opengl/DESCR b/graphics/ruby-opengl/DESCR
index 697be6196e9..98c6668d2f5 100644
--- a/graphics/ruby-opengl/DESCR
+++ b/graphics/ruby-opengl/DESCR
@@ -1 +1,3 @@
-These are OpenGL/GLU/GLUT interface modules for Ruby.
+ruby-opengl consists of Ruby extension modules that are bindings for
+the OpenGL, GLU, and GLUT libraries.  It is intended to be a replacement
+for -- and uses the code from -- Yoshi's ruby-opengl.
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index 24a43720d4b..ec9e7845298 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -1,30 +1,17 @@
-# $NetBSD: Makefile,v 1.26 2007/02/04 22:03:01 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2008/04/04 15:19:23 jlam Exp $
 
-DISTNAME=	rbogl-${VERSION}
-PKGNAME=	${RUBY_PKGPREFIX}-opengl-${VERSION}
-PKGREVISION=	2
-CATEGORIES=	graphics ruby
-MASTER_SITES=	http://www2.giganet.net/~yoshi/
+DISTNAME=	ruby-opengl-0.60.0
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
+CATEGORIES=	graphics
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www2.giganet.net/~yoshi/
-COMMENT=	OpenGL/GLU/GLUT interface modules for Ruby
+HOMEPAGE=	http://ruby-opengl.rubyforge.org/
+COMMENT=	Ruby bindings for OpenGL, GLU and GLUT
 
-RUBY_HAS_ARCHLIB=	yes
-USE_RUBY_EXTCONF=	yes
-WRKSRC=			${WRKDIR}/opengl-${VERSION}
-VERSION=		0.32g
-INSTALL_TARGET=		site-install
-CONFIGURE_ARGS+=	--with-ruby-dir=${LOCALBASE:Q} \
-			--with-x11-dir=${X11BASE:Q}
+DEPENDS+=	rake>=0.8.1:../../devel/rake
+DEPENDS+=	${RUBY_PKGPREFIX}-mkrf>=0.2.0:../../devel/ruby-mkrf
 
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/opengl
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/opengl
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/opengl
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}/opengl
-	${INSTALL_DATA} ${WRKSRC}/README.EUC ${RUBY_DOCDIR}/opengl/README.ja
+.include "../../misc/rubygems/rubygem.mk"
 
 .include "../../graphics/Mesa/buildlink3.mk"
-.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-opengl/PLIST b/graphics/ruby-opengl/PLIST
index b2f461020cb..b61356184bd 100644
--- a/graphics/ruby-opengl/PLIST
+++ b/graphics/ruby-opengl/PLIST
@@ -1,56 +1,148 @@
-@comment $NetBSD: PLIST,v 1.5 2006/09/07 15:53:48 taca Exp $
-${RUBY_SITEARCHLIBDIR}/glut.${RUBY_DLEXT}
-${RUBY_SITEARCHLIBDIR}/opengl.${RUBY_DLEXT}
-${RUBY_EXAMPLESDIR}/opengl/aaindex.rb
-${RUBY_EXAMPLESDIR}/opengl/aapoly.rb
-${RUBY_EXAMPLESDIR}/opengl/aargb.rb
-${RUBY_EXAMPLESDIR}/opengl/accanti.rb
-${RUBY_EXAMPLESDIR}/opengl/accpersp.rb
-${RUBY_EXAMPLESDIR}/opengl/alpha.rb
-${RUBY_EXAMPLESDIR}/opengl/alpha3D.rb
-${RUBY_EXAMPLESDIR}/opengl/bezcurve.rb
-${RUBY_EXAMPLESDIR}/opengl/bezmesh.rb
-${RUBY_EXAMPLESDIR}/opengl/checker.rb
-${RUBY_EXAMPLESDIR}/opengl/clip.rb
-${RUBY_EXAMPLESDIR}/opengl/colormat.rb
-${RUBY_EXAMPLESDIR}/opengl/cube.rb
-${RUBY_EXAMPLESDIR}/opengl/depthcue.rb
-${RUBY_EXAMPLESDIR}/opengl/dof.rb
-${RUBY_EXAMPLESDIR}/opengl/double.rb
-${RUBY_EXAMPLESDIR}/opengl/drawf.rb
-${RUBY_EXAMPLESDIR}/opengl/feedback.rb
-${RUBY_EXAMPLESDIR}/opengl/fog.rb
-${RUBY_EXAMPLESDIR}/opengl/font.rb
-${RUBY_EXAMPLESDIR}/opengl/font-glut.rb
-${RUBY_EXAMPLESDIR}/opengl/hello.rb
-${RUBY_EXAMPLESDIR}/opengl/image.rb
-${RUBY_EXAMPLESDIR}/opengl/jitter.rb
-${RUBY_EXAMPLESDIR}/opengl/lines.rb
-${RUBY_EXAMPLESDIR}/opengl/list.rb
-${RUBY_EXAMPLESDIR}/opengl/material.rb
-${RUBY_EXAMPLESDIR}/opengl/mipmap.rb
-${RUBY_EXAMPLESDIR}/opengl/model.rb
-${RUBY_EXAMPLESDIR}/opengl/movelight.rb
-${RUBY_EXAMPLESDIR}/opengl/pickdepth.rb
-${RUBY_EXAMPLESDIR}/opengl/plane.rb
-${RUBY_EXAMPLESDIR}/opengl/planet.rb
-${RUBY_EXAMPLESDIR}/opengl/quadric.rb
-${RUBY_EXAMPLESDIR}/opengl/readpixel.rb
-${RUBY_EXAMPLESDIR}/opengl/robot.rb
-${RUBY_EXAMPLESDIR}/opengl/select.rb
-${RUBY_EXAMPLESDIR}/opengl/smooth.rb
-${RUBY_EXAMPLESDIR}/opengl/stencil.rb
-${RUBY_EXAMPLESDIR}/opengl/stroke.rb
-${RUBY_EXAMPLESDIR}/opengl/surface.rb
-${RUBY_EXAMPLESDIR}/opengl/teaambient.rb
-${RUBY_EXAMPLESDIR}/opengl/teapots.rb
-${RUBY_EXAMPLESDIR}/opengl/tess.rb
-${RUBY_EXAMPLESDIR}/opengl/texbind.rb
-${RUBY_EXAMPLESDIR}/opengl/texgen.rb
-${RUBY_EXAMPLESDIR}/opengl/texturesurf.rb
-${RUBY_EXAMPLESDIR}/opengl/varray.rb
-${RUBY_EXAMPLESDIR}/opengl/wrap.rb
-${RUBY_DOCDIR}/opengl/ChangeLog
-${RUBY_DOCDIR}/opengl/README.ja
-@dirrm ${RUBY_EXAMPLESDIR}/opengl
-@dirrm ${RUBY_DOCDIR}/opengl
+@comment $NetBSD: PLIST,v 1.6 2008/04/04 15:19:23 jlam Exp $
+${GEM_HOME}/cache/ruby-opengl-${PKGVERSION}.gem
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/doc/build_install.txt
+${GEM_LIBDIR}/doc/extensions.txt.in
+${GEM_LIBDIR}/doc/history.txt
+${GEM_LIBDIR}/doc/requirements_and_design.txt
+${GEM_LIBDIR}/doc/roadmap.txt
+${GEM_LIBDIR}/doc/scientific_use.txt
+${GEM_LIBDIR}/doc/supplies/page_template.html
+${GEM_LIBDIR}/doc/thanks.txt
+${GEM_LIBDIR}/doc/tutorial.txt
+${GEM_LIBDIR}/examples/NeHe/nehe_lesson02.rb
+${GEM_LIBDIR}/examples/NeHe/nehe_lesson03.rb
+${GEM_LIBDIR}/examples/NeHe/nehe_lesson04.rb
+${GEM_LIBDIR}/examples/NeHe/nehe_lesson05.rb
+${GEM_LIBDIR}/examples/NeHe/nehe_lesson36.rb
+${GEM_LIBDIR}/examples/OrangeBook/3Dlabs-License.txt
+${GEM_LIBDIR}/examples/OrangeBook/brick.frag
+${GEM_LIBDIR}/examples/OrangeBook/brick.rb
+${GEM_LIBDIR}/examples/OrangeBook/brick.vert
+${GEM_LIBDIR}/examples/OrangeBook/particle.frag
+${GEM_LIBDIR}/examples/OrangeBook/particle.rb
+${GEM_LIBDIR}/examples/OrangeBook/particle.vert
+${GEM_LIBDIR}/examples/README
+${GEM_LIBDIR}/examples/RedBook/aapoly.rb
+${GEM_LIBDIR}/examples/RedBook/aargb.rb
+${GEM_LIBDIR}/examples/RedBook/accanti.rb
+${GEM_LIBDIR}/examples/RedBook/accpersp.rb
+${GEM_LIBDIR}/examples/RedBook/alpha.rb
+${GEM_LIBDIR}/examples/RedBook/alpha3D.rb
+${GEM_LIBDIR}/examples/RedBook/bezcurve.rb
+${GEM_LIBDIR}/examples/RedBook/bezmesh.rb
+${GEM_LIBDIR}/examples/RedBook/checker.rb
+${GEM_LIBDIR}/examples/RedBook/clip.rb
+${GEM_LIBDIR}/examples/RedBook/colormat.rb
+${GEM_LIBDIR}/examples/RedBook/cube.rb
+${GEM_LIBDIR}/examples/RedBook/depthcue.rb
+${GEM_LIBDIR}/examples/RedBook/dof.rb
+${GEM_LIBDIR}/examples/RedBook/double.rb
+${GEM_LIBDIR}/examples/RedBook/drawf.rb
+${GEM_LIBDIR}/examples/RedBook/feedback.rb
+${GEM_LIBDIR}/examples/RedBook/fog.rb
+${GEM_LIBDIR}/examples/RedBook/font.rb
+${GEM_LIBDIR}/examples/RedBook/hello.rb
+${GEM_LIBDIR}/examples/RedBook/image.rb
+${GEM_LIBDIR}/examples/RedBook/jitter.rb
+${GEM_LIBDIR}/examples/RedBook/lines.rb
+${GEM_LIBDIR}/examples/RedBook/list.rb
+${GEM_LIBDIR}/examples/RedBook/material.rb
+${GEM_LIBDIR}/examples/RedBook/mipmap.rb
+${GEM_LIBDIR}/examples/RedBook/model.rb
+${GEM_LIBDIR}/examples/RedBook/movelight.rb
+${GEM_LIBDIR}/examples/RedBook/pickdepth.rb
+${GEM_LIBDIR}/examples/RedBook/planet.rb
+${GEM_LIBDIR}/examples/RedBook/quadric.rb
+${GEM_LIBDIR}/examples/RedBook/robot.rb
+${GEM_LIBDIR}/examples/RedBook/select.rb
+${GEM_LIBDIR}/examples/RedBook/smooth.rb
+${GEM_LIBDIR}/examples/RedBook/stencil.rb
+${GEM_LIBDIR}/examples/RedBook/stroke.rb
+${GEM_LIBDIR}/examples/RedBook/surface.rb
+${GEM_LIBDIR}/examples/RedBook/teaambient.rb
+${GEM_LIBDIR}/examples/RedBook/teapots.rb
+${GEM_LIBDIR}/examples/RedBook/tess.rb
+${GEM_LIBDIR}/examples/RedBook/texbind.rb
+${GEM_LIBDIR}/examples/RedBook/texgen.rb
+${GEM_LIBDIR}/examples/RedBook/texturesurf.rb
+${GEM_LIBDIR}/examples/RedBook/varray.rb
+${GEM_LIBDIR}/examples/RedBook/wrap.rb
+${GEM_LIBDIR}/examples/misc/OGLBench.rb
+${GEM_LIBDIR}/examples/misc/anisotropic.rb
+${GEM_LIBDIR}/examples/misc/fbo_test.rb
+${GEM_LIBDIR}/examples/misc/font-glut.rb
+${GEM_LIBDIR}/examples/misc/glfwtest.rb
+${GEM_LIBDIR}/examples/misc/md2model.rb
+${GEM_LIBDIR}/examples/misc/plane.rb
+${GEM_LIBDIR}/examples/misc/readpixel.rb
+${GEM_LIBDIR}/examples/misc/sdltest.rb
+${GEM_LIBDIR}/examples/misc/trislam.rb
+${GEM_LIBDIR}/ext/common/common.h
+${GEM_LIBDIR}/ext/common/conv.h
+${GEM_LIBDIR}/ext/common/funcdef.h
+${GEM_LIBDIR}/ext/common/gl-enums.h
+${GEM_LIBDIR}/ext/common/gl-error.h
+${GEM_LIBDIR}/ext/common/gl-types.h
+${GEM_LIBDIR}/ext/common/glu-enums.h
+${GEM_LIBDIR}/ext/gl/gl-1.0-1.1.c
+${GEM_LIBDIR}/ext/gl/gl-1.2.c
+${GEM_LIBDIR}/ext/gl/gl-1.3.c
+${GEM_LIBDIR}/ext/gl/gl-1.4.c
+${GEM_LIBDIR}/ext/gl/gl-1.5.c
+${GEM_LIBDIR}/ext/gl/gl-2.0.c
+${GEM_LIBDIR}/ext/gl/gl-2.1.c
+${GEM_LIBDIR}/ext/gl/gl-enums.c
+${GEM_LIBDIR}/ext/gl/gl-error.c
+${GEM_LIBDIR}/ext/gl/gl-ext-3dfx.c
+${GEM_LIBDIR}/ext/gl/gl-ext-arb.c
+${GEM_LIBDIR}/ext/gl/gl-ext-ati.c
+${GEM_LIBDIR}/ext/gl/gl-ext-ext.c
+${GEM_LIBDIR}/ext/gl/gl-ext-gremedy.c
+${GEM_LIBDIR}/ext/gl/gl-ext-nv.c
+${GEM_LIBDIR}/ext/gl/gl.c
+${GEM_LIBDIR}/ext/gl/mkrf_conf.rb
+${GEM_LIBDIR}/ext/glu/glu-enums.c
+${GEM_LIBDIR}/ext/glu/glu.c
+${GEM_LIBDIR}/ext/glu/mkrf_conf.rb
+${GEM_LIBDIR}/ext/glut/glut.c
+${GEM_LIBDIR}/ext/glut/mkrf_conf.rb
+${GEM_LIBDIR}/lib/gl.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/glu.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/glut.${RUBY_DLEXT}
+${GEM_LIBDIR}/lib/opengl.rb
+${GEM_LIBDIR}/test/README
+${GEM_LIBDIR}/test/tc_common.rb
+${GEM_LIBDIR}/test/tc_ext_arb.rb
+${GEM_LIBDIR}/test/tc_ext_ati.rb
+${GEM_LIBDIR}/test/tc_ext_ext.rb
+${GEM_LIBDIR}/test/tc_ext_gremedy.rb
+${GEM_LIBDIR}/test/tc_ext_nv.rb
+${GEM_LIBDIR}/test/tc_func_10_11.rb
+${GEM_LIBDIR}/test/tc_func_12.rb
+${GEM_LIBDIR}/test/tc_func_13.rb
+${GEM_LIBDIR}/test/tc_func_14.rb
+${GEM_LIBDIR}/test/tc_func_15.rb
+${GEM_LIBDIR}/test/tc_func_20.rb
+${GEM_LIBDIR}/test/tc_func_21.rb
+${GEM_LIBDIR}/test/tc_glu.rb
+${GEM_LIBDIR}/test/tc_include_gl.rb
+${GEM_LIBDIR}/test/tc_misc.rb
+${GEM_LIBDIR}/test/tc_require_gl.rb
+${GEM_HOME}/specifications/ruby-opengl-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}/ext/glut
+@dirrm ${GEM_LIBDIR}/ext/glu
+@dirrm ${GEM_LIBDIR}/ext/gl
+@dirrm ${GEM_LIBDIR}/ext/common
+@dirrm ${GEM_LIBDIR}/ext
+@dirrm ${GEM_LIBDIR}/examples/misc
+@dirrm ${GEM_LIBDIR}/examples/RedBook
+@dirrm ${GEM_LIBDIR}/examples/OrangeBook
+@dirrm ${GEM_LIBDIR}/examples/NeHe
+@dirrm ${GEM_LIBDIR}/examples
+@dirrm ${GEM_LIBDIR}/doc/supplies
+@dirrm ${GEM_LIBDIR}/doc
+@dirrm ${GEM_LIBDIR}
+@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/graphics/ruby-opengl/distinfo b/graphics/ruby-opengl/distinfo
index 42a849b706c..711b6e76fa1 100644
--- a/graphics/ruby-opengl/distinfo
+++ b/graphics/ruby-opengl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/01/03 14:25:50 taca Exp $
+$NetBSD: distinfo,v 1.9 2008/04/04 15:19:23 jlam Exp $
 
-SHA1 (rbogl-0.32g.tar.gz) = 684dfaeda9c2c5c8ee99b6950d0e5d832bea4536
-RMD160 (rbogl-0.32g.tar.gz) = 2c0817d8dcd54dba6414cb3977397f908f4f5f5c
-Size (rbogl-0.32g.tar.gz) = 153727 bytes
+SHA1 (ruby-opengl-0.60.0.gem) = 832758874e7acb4811540d44dc6c6bc7dedd01b2
+RMD160 (ruby-opengl-0.60.0.gem) = c157715f63804ac1d50c9b315ff684fde973b0eb
+Size (ruby-opengl-0.60.0.gem) = 237568 bytes
 SHA1 (patch-aa) = a1239bd409f4a39075330ab91b4f1e5d3a3e3e7a
 SHA1 (patch-ab) = cb0c3964ebd01b048942cafb91d259007f0e1910
diff --git a/graphics/ruby-opengl/patches/patch-aa b/graphics/ruby-opengl/patches/patch-aa
deleted file mode 100644
index d88bfbbf262..00000000000
--- a/graphics/ruby-opengl/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/10/06 16:17:02 taca Exp $
-
---- extconf.rb.orig	2003-08-17 12:04:32.000000000 +0900
-+++ extconf.rb
-@@ -32,8 +32,10 @@ elsif (/mswin32/ =~ PLATFORM)
-   glut_libname = "glut32"
- else
-   $CPPFLAGS += " -I."
-+  $LDFLAGS=ENV['LDFLAGS']
- 
-   idir, ldir = dir_config("x11", "/usr/X11R6")
-+  dir_config("ruby")
- 
-   have_library("Xi", "XAllowDeviceEvents")
-   have_library("Xext", "XMITMiscGetBugMode")
diff --git a/graphics/ruby-opengl/patches/patch-ab b/graphics/ruby-opengl/patches/patch-ab
deleted file mode 100644
index b93eb6680fa..00000000000
--- a/graphics/ruby-opengl/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/02 01:47:35 taca Exp $
-
---- ogl.c.orig	Sun Jul 18 00:26:38 2004
-+++ ogl.c
-@@ -2162,14 +2162,14 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-     int format;
-     int type;
-     VALUE pixels;
-+    int type_size;
-+    int format_size;
-     x = (GLint)NUM2INT(arg1);
-     y = (GLint)NUM2INT(arg2);
-     width = (GLsizei)NUM2INT(arg3);
-     height = (GLsizei)NUM2INT(arg4);
-     format = NUM2INT(arg5);
-     type = NUM2INT(arg6);
--    int type_size;
--    int format_size;
-     if (format != -1 && type != -1) {
- 	type_size = gltype_size(type) / 8;
- 	format_size = glformat_size(format);