4 files changed, 97 insertions, 43 deletions

diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index 1c944eb95133..d25e26b9935e 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lablgl
-PORTVERSION=	0.99
-PORTREVISION=	1
+PORTVERSION=	1.00
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
 		ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
@@ -19,24 +18,40 @@ COMMENT=	OpenGL interface for Objective Caml
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-BROKEN=		"Does not compile"
-
-USE_MESA=	yes
+USE_GL=		yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/lablGL-${PORTVERSION}
+WRKSRC=		${WRKDIR}/lablgl-${PORTVERSION}
 ALL_TARGET=	all opt
-EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
+#EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
+#DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
 post-extract:
-	@${CP} ${WRKSRC}/Makefile.config.ex ${WRKSRC}/Makefile.config
+	@${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config
 
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}/LablGlut/caml-images \
+	    ${EXAMPLESDIR}/LablGlut/etc \
+	    ${EXAMPLESDIR}/LablGlut/etc/in-progress \
+	    ${EXAMPLESDIR}/LablGlut/lablGL \
+	    ${EXAMPLESDIR}/LablGlut/nehe \
+	    ${EXAMPLESDIR}/Togl
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/README \
+	    ${EXAMPLESDIR}/LablGlut
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/caml-images/* \
+	    ${EXAMPLESDIR}/LablGlut/caml-images
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/etc/d* \
+	    ${EXAMPLESDIR}/LablGlut/etc
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/etc/in-progress/* \
+	    ${EXAMPLESDIR}/LablGlut/etc/in-progress
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/lablGL/* \
+	    ${EXAMPLESDIR}/LablGlut/lablGL
+	${INSTALL_DATA} ${WRKSRC}/LablGlut/examples/nehe/* \
+	    ${EXAMPLESDIR}/LablGlut/nehe
+	${INSTALL_DATA} ${WRKSRC}/Togl/examples/* \
+	    ${EXAMPLESDIR}/Togl
 .if !defined(NO_PORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/ocaml-lablgl/distinfo b/graphics/ocaml-lablgl/distinfo
index e564d2cea23e..73aed52e0004 100644
--- a/graphics/ocaml-lablgl/distinfo
+++ b/graphics/ocaml-lablgl/distinfo
@@ -1 +1,2 @@
-MD5 (lablgl-0.99.tar.gz) = 5b5ea7889536246c58a5e747d61d6d14
+MD5 (lablgl-1.00.tar.gz) = 92bcfe3121650c43e5bc4c018778405b
+SIZE (lablgl-1.00.tar.gz) = 390570
diff --git a/graphics/ocaml-lablgl/files/patch-ab b/graphics/ocaml-lablgl/files/patch-ab
index d6a7f3b34c41..4363cf4315b6 100644
--- a/graphics/ocaml-lablgl/files/patch-ab
+++ b/graphics/ocaml-lablgl/files/patch-ab
@@ -1,7 +1,7 @@
---- Makefile.config.orig	Sun Aug 17 09:16:13 2003
-+++ Makefile.config	Sun Aug 17 09:15:43 2003
-@@ -11,28 +11,28 @@
- #CAMLOPT = ocamlopt.opt
+--- Makefile.config.orig	Sun Feb 22 23:03:48 2004
++++ Makefile.config	Sun Feb 22 23:06:44 2004
+@@ -9,18 +9,18 @@
+ ##### Adjust these always
  
  # Where to put the lablgl script
 -BINDIR = /usr/local/bin
@@ -11,24 +11,23 @@
 -XINCLUDES = -I/usr/X11R6/include
 +XINCLUDES = -I${X11BASE}/include
  # X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
- #XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11
+-XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11
++XLIBS = -L${X11BASE}/lib -lXext -lXmu -lX11
  
  # Where to find Tcl/Tk headers
  # This must the same version as for LablTk
--TKINCLUDES = -I/usr/local/include
-+TKINCLUDES = -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3
+-TKINCLUDES = -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3
++TKINCLUDES = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4
  # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
--#TKLIBS = -L/usr/local/lib -ltk83 -ltcl83
-+TKLIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83
+-TKLIBS = -L/usr/local/lib -ltk83 -ltcl83
++TKLIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84
  
  # Where to find OpenGL/Mesa headers and libraries
  GLINCLUDES =
--GLLIBS = -lGL -lGLU
-+GLLIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lGL -lGLU -lXmu -lXext
+@@ -29,8 +29,8 @@
  # The following libraries may be required (try to add them one at a time)
- #GLLIBS = -lGL -lGLU -lXmu -lXext -lpthread
  
- # How to index a library after installing (ranlib required on MacOSX)
+ # How to index a library after installing (required on MacOSX)
 -RANLIB = :
 -#RANLIB = ranlib
 +#RANLIB = :
@@ -36,7 +35,7 @@
  
  ##### Uncomment these for windows
  #TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib
-@@ -59,4 +59,4 @@
+@@ -57,4 +57,4 @@
  #TOGLDIR = Togl
  
  # C Compiler options
diff --git a/graphics/ocaml-lablgl/pkg-plist b/graphics/ocaml-lablgl/pkg-plist
index 87dc5b632b9c..20c2823639c7 100644
--- a/graphics/ocaml-lablgl/pkg-plist
+++ b/graphics/ocaml-lablgl/pkg-plist
@@ -1,8 +1,12 @@
 @comment $FreeBSD$
 bin/lablgl
+bin/lablglut
 lib/ocaml/lablGL/gl.cmi
 lib/ocaml/lablGL/gl.cmx
 lib/ocaml/lablGL/gl.mli
+lib/ocaml/lablGL/glArray.cmi
+lib/ocaml/lablGL/glArray.cmx
+lib/ocaml/lablGL/glArray.mli
 lib/ocaml/lablGL/glClear.cmi
 lib/ocaml/lablGL/glClear.cmx
 lib/ocaml/lablGL/glClear.mli
@@ -48,11 +52,17 @@ lib/ocaml/lablGL/gluQuadric.mli
 lib/ocaml/lablGL/gluTess.cmi
 lib/ocaml/lablGL/gluTess.cmx
 lib/ocaml/lablGL/gluTess.mli
+lib/ocaml/lablGL/glut.cmi
+lib/ocaml/lablGL/glut.cmx
+lib/ocaml/lablGL/glut.mli
 lib/ocaml/lablGL/lablgl.a
 lib/ocaml/lablGL/lablgl.cma
 lib/ocaml/lablGL/lablgl.cmxa
-lib/ocaml/lablGL/lablgltop
+lib/ocaml/lablGL/lablglut.a
+lib/ocaml/lablGL/lablglut.cma
+lib/ocaml/lablGL/lablglut.cmxa
 lib/ocaml/lablGL/liblablgl.a
+lib/ocaml/lablGL/liblablglut.a
 lib/ocaml/lablGL/libtogl.a
 lib/ocaml/lablGL/raw.cmi
 lib/ocaml/lablGL/raw.cmx
@@ -65,18 +75,47 @@ lib/ocaml/lablGL/togl.cmxa
 lib/ocaml/lablGL/togl.mli
 lib/ocaml/stublibs/dlllablgl.so
 lib/ocaml/stublibs/dlltogl.so
-%%PORTDOCS%%share/doc/ocaml/lablgl/README
-share/examples/ocaml/lablgl/Makefile
-share/examples/ocaml/lablgl/README
-share/examples/ocaml/lablgl/checker.ml
-share/examples/ocaml/lablgl/double.ml
-share/examples/ocaml/lablgl/gears.ml
-share/examples/ocaml/lablgl/morph3d.ml
-share/examples/ocaml/lablgl/planet.ml
-share/examples/ocaml/lablgl/scene.ml
-share/examples/ocaml/lablgl/simple.ml
-share/examples/ocaml/lablgl/tennis.ml
-share/examples/ocaml/lablgl/texturesurf.ml
+lib/ocaml/stublibs/dlllablglut.so
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%EXAMPLESDIR%%/LablGlut/caml-images/ChangeLog
+%%EXAMPLESDIR%%/LablGlut/caml-images/Makefile
+%%EXAMPLESDIR%%/LablGlut/caml-images/OCamlMakefile
+%%EXAMPLESDIR%%/LablGlut/caml-images/main.ml
+%%EXAMPLESDIR%%/LablGlut/caml-images/ppm.ppm
+%%EXAMPLESDIR%%/LablGlut/etc/in-progress/scene_graph.ml
+%%EXAMPLESDIR%%/LablGlut/etc/draw2d.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/README
+%%EXAMPLESDIR%%/LablGlut/lablGL/checker.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/gears.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/morph3d.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/planet.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/scene.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/simple.ml
+%%EXAMPLESDIR%%/LablGlut/lablGL/texturesurf.ml
+%%EXAMPLESDIR%%/LablGlut/nehe/lesson2.ml
+%%EXAMPLESDIR%%/LablGlut/nehe/lesson3.ml
+%%EXAMPLESDIR%%/LablGlut/nehe/lesson4.ml
+%%EXAMPLESDIR%%/LablGlut/nehe/lesson5.ml
+%%EXAMPLESDIR%%/LablGlut/README
+%%EXAMPLESDIR%%/Togl/Makefile
+%%EXAMPLESDIR%%/Togl/README
+%%EXAMPLESDIR%%/Togl/checker.ml
+%%EXAMPLESDIR%%/Togl/double.ml
+%%EXAMPLESDIR%%/Togl/gears.ml
+%%EXAMPLESDIR%%/Togl/gears_a.ml
+%%EXAMPLESDIR%%/Togl/morph3d.ml
+%%EXAMPLESDIR%%/Togl/planet.ml
+%%EXAMPLESDIR%%/Togl/scene.ml
+%%EXAMPLESDIR%%/Togl/simple.ml
+%%EXAMPLESDIR%%/Togl/tennis.ml
+%%EXAMPLESDIR%%/Togl/texturesurf.ml
 @dirrm lib/ocaml/lablGL
-@dirrm share/examples/ocaml/lablgl
-%%PORTDOCS%%@dirrm share/doc/ocaml/lablgl
+@dirrm %%EXAMPLESDIR%%/LablGlut/caml-images
+@dirrm %%EXAMPLESDIR%%/LablGlut/etc/in-progress
+@dirrm %%EXAMPLESDIR%%/LablGlut/etc
+@dirrm %%EXAMPLESDIR%%/LablGlut/lablGL
+@dirrm %%EXAMPLESDIR%%/LablGlut/nehe
+@dirrm %%EXAMPLESDIR%%/LablGlut
+@dirrm %%EXAMPLESDIR%%/Togl
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%