Update with bsd.ruby.mk.

Fix for Ruby 1.6. (patch-aa)

3 files changed, 80 insertions, 81 deletions

diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index 5cea2e8e159e..11bb90853b7a 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -9,40 +9,31 @@ PORTNAME=	opengl
 PORTVERSION=	0.31
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	rbogl
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 USE_MESA=	yes
 
 WRKSRC=		${WRKDIR}/oglmodule
 CONFIGURE_ARGS=	--with-ruby-dir="${LOCALBASE}" --with-x11-dir="${X11BASE}"
-
 INSTALL_TARGET=	site-install
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/opengl
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/opengl/
-	${MKDIR} ${PREFIX}/share/doc/ruby/opengl/ja
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/ruby/opengl/
-	${INSTALL_DATA} ${WRKSRC}/README.EUC ${PREFIX}/share/doc/ruby/opengl/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/opengl
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/opengl/
+	${MKDIR} ${RUBY_DOCDIR}/opengl/ja
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${RUBY_DOCDIR}/opengl/
+	${INSTALL_DATA} ${WRKSRC}/README.EUC ${RUBY_DOCDIR}/opengl/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/ruby-opengl/files/patch-aa b/graphics/ruby-opengl/files/patch-aa
index e5f598e98e95..32d727eec6cf 100644
--- a/graphics/ruby-opengl/files/patch-aa
+++ b/graphics/ruby-opengl/files/patch-aa
@@ -1,5 +1,5 @@
 --- extconf.rb.orig	Wed Feb 16 01:31:59 2000
-+++ extconf.rb	Thu Aug 24 21:18:28 2000
++++ extconf.rb	Fri Sep  8 12:36:47 2000
 @@ -26,8 +26,8 @@
    glu_libname = "glu32"
    glut_libname = "glut"
@@ -11,7 +11,7 @@
    $libs = append_library($libs, "Xmu")
    $libs = append_library($libs, "X11")
    gl_libname = "GL"
-@@ -47,7 +47,7 @@
+@@ -47,13 +47,15 @@
          }
      }
      File.unlink("Makefile")
@@ -20,7 +20,15 @@
      ogl_flg = true
  else
      p "can't create OpenGL module!"
-@@ -67,7 +67,7 @@
+     exit 1
+ end
+ 
++$libs.sub!(/-L\. -l\$\(RUBY_INSTALL_NAME\) /, '')
++
+ $objs = ["glut.o"]
+ have_library("Xi", "XAllowDeviceEvents") &&
+ have_library("Xext", "XMITMiscGetBugMode") &&
+@@ -67,7 +69,7 @@
          }
      }
      File.unlink("Makefile")
@@ -29,7 +37,7 @@
      glut_flg = true
  end
  
-@@ -76,11 +76,11 @@
+@@ -76,11 +78,11 @@
  SHELL = /bin/sh
  all: #{modules}
  
@@ -43,7 +51,7 @@
  	@echo Now Making glut extend module
  	@$(MAKE) -f Makefile.glut
  
-@@ -94,6 +94,10 @@
+@@ -94,6 +96,10 @@
  install: #{modules}
  #{"\t@$(MAKE) -f Makefile.ogl install" if (ogl_flg)}
  #{"\t@$(MAKE) -f Makefile.glut install" if (glut_flg)}
diff --git a/graphics/ruby-opengl/pkg-plist b/graphics/ruby-opengl/pkg-plist
index 4aa6a7f25485..4c7ae5700b8d 100644
--- a/graphics/ruby-opengl/pkg-plist
+++ b/graphics/ruby-opengl/pkg-plist
@@ -1,56 +1,56 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/glut.so
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/opengl.so
-share/examples/ruby/opengl/aaindex.rb
-share/examples/ruby/opengl/aapoly.rb
-share/examples/ruby/opengl/aargb.rb
-share/examples/ruby/opengl/accanti.rb
-share/examples/ruby/opengl/accpersp.rb
-share/examples/ruby/opengl/alpha.rb
-share/examples/ruby/opengl/alpha3D.rb
-share/examples/ruby/opengl/bezcurve.rb
-share/examples/ruby/opengl/bezmesh.rb
-share/examples/ruby/opengl/checker.rb
-share/examples/ruby/opengl/clip.rb
-share/examples/ruby/opengl/colormat.rb
-share/examples/ruby/opengl/cube.rb
-share/examples/ruby/opengl/depthcue.rb
-share/examples/ruby/opengl/dof.rb
-share/examples/ruby/opengl/double.rb
-share/examples/ruby/opengl/drawf.rb
-share/examples/ruby/opengl/feedback.rb
-share/examples/ruby/opengl/fog.rb
-share/examples/ruby/opengl/font.rb
-share/examples/ruby/opengl/hello.rb
-share/examples/ruby/opengl/image.rb
-share/examples/ruby/opengl/jitter.rb
-share/examples/ruby/opengl/lines.rb
-share/examples/ruby/opengl/list.rb
-share/examples/ruby/opengl/material.rb
-share/examples/ruby/opengl/mipmap.rb
-share/examples/ruby/opengl/model.rb
-share/examples/ruby/opengl/movelight.rb
-share/examples/ruby/opengl/nurbs.rb
-share/examples/ruby/opengl/pickdepth.rb
-share/examples/ruby/opengl/plane.rb
-share/examples/ruby/opengl/planet.rb
-share/examples/ruby/opengl/quadric.rb
-share/examples/ruby/opengl/robot.rb
-share/examples/ruby/opengl/select.rb
-share/examples/ruby/opengl/smooth.rb
-share/examples/ruby/opengl/stencil.rb
-share/examples/ruby/opengl/stroke.rb
-share/examples/ruby/opengl/surface.rb
-share/examples/ruby/opengl/teaambient.rb
-share/examples/ruby/opengl/teapots.rb
-share/examples/ruby/opengl/tess.rb
-share/examples/ruby/opengl/test.rb
-share/examples/ruby/opengl/texbind.rb
-share/examples/ruby/opengl/texgen.rb
-share/examples/ruby/opengl/texturesurf.rb
-share/examples/ruby/opengl/varray.rb
-share/examples/ruby/opengl/wrap.rb
-@dirrm share/examples/ruby/opengl
-share/doc/ruby/opengl/ChangeLog
-share/doc/ruby/opengl/ja/README.EUC
-@dirrm share/doc/ruby/opengl/ja
-@dirrm share/doc/ruby/opengl
+%%RUBY_SITEARCHLIBDIR%%/glut.so
+%%RUBY_SITEARCHLIBDIR%%/opengl.so
+%%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/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/nurbs.rb
+%%RUBY_EXAMPLESDIR%%/opengl/pickdepth.rb
+%%RUBY_EXAMPLESDIR%%/opengl/plane.rb
+%%RUBY_EXAMPLESDIR%%/opengl/planet.rb
+%%RUBY_EXAMPLESDIR%%/opengl/quadric.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/test.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
+@dirrm %%RUBY_EXAMPLESDIR%%/opengl
+%%RUBY_DOCDIR%%/opengl/ChangeLog
+%%RUBY_DOCDIR%%/opengl/ja/README.EUC
+@dirrm %%RUBY_DOCDIR%%/opengl/ja
+@dirrm %%RUBY_DOCDIR%%/opengl