4 files changed, 122 insertions, 117 deletions

diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index c6f1d1cde3a7..1541b3abf85e 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -6,54 +6,83 @@
 #
 
 PORTNAME=	lablgl
-PORTVERSION=	1.00
-PORTREVISION=	1
+PORTVERSION=	1.02
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
 		ftp://ftp.inria.fr/lang/caml-light/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	rk@ronald.org
+MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	OpenGL interface for Objective Caml
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 USE_GL=		yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/lablgl-${PORTVERSION}
+USE_OCAML=	yes
+USE_OCAML_WASH=	yes
 ALL_TARGET=	all opt
-#EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
-#DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
+DEPENDS_ARGS+=	WITH_TK=yes
+
+MASTERPORT=	${PORTSDIR}/devel/ocaml-camlidl
+PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
+
+DOCSDIR=	${PREFIX}/share/doc/ocaml/lablgl
+EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/lablgl
+
+# XXX: exists untill it will be committed to bsd.port.mk
+COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+		2>&1) && \
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+		${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
 
 post-extract:
 	@${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config
 
+	@${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" \
+		-e "s,/usr/local,${LOCALBASE},g" \
+		-e "s,^\(BINDIR[ \t]*=\).*,\1${PREFIX}/bin,g" \
+		-e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \
+		-e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \
+		-e "s,^#\(DLLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/stublibs,g" \
+		${WRKSRC}/Makefile.config
+
+	@${REINPLACE_CMD} \
+		-e "s,^\(INSTALLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/lablGL,g" \
+		-e "s,^\(COPTS[ \t]*=\).*,\1-c ${CFLAGS},g" \
+		${WRKSRC}/Makefile.common ${WRKSRC}/Makefile
+
+	@${REINPLACE_CMD} -E \
+		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \
+		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		${WRKSRC}/src/Makefile ${WRKSRC}/LablGlut/src/Makefile \
+		${WRKSRC}/Togl/src/Makefile
+
+pre-install:
+#
+# XXX: for incorrect PREFIX. Really should be done in bsd.ocaml.mk...
+#
+.if !exists(${PREFIX}/lib/ocaml/stublibs)
+	${MKDIR} ${PREFIX}/lib/ocaml/stublibs
+.endif
+
 post-install:
-	${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
+	${MKDIR} ${EXAMPLESDIR}/lablglut
+	${MKDIR} ${EXAMPLESDIR}/togl
+	@(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} \* \
+		${EXAMPLESDIR}/lablglut '! -name Makefile')
+	@(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} \* \
+		${EXAMPLESDIR}/togl '! -name Makefile')
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/ocaml-lablgl/distinfo b/graphics/ocaml-lablgl/distinfo
index 15ddca21fea0..1a0b1f11b345 100644
--- a/graphics/ocaml-lablgl/distinfo
+++ b/graphics/ocaml-lablgl/distinfo
@@ -1,3 +1,3 @@
-MD5 (lablgl-1.00.tar.gz) = 92bcfe3121650c43e5bc4c018778405b
-SHA256 (lablgl-1.00.tar.gz) = f52558487b545776f29658f2c2d12c58c3915760818a6acb9847cb3b0d060a71
-SIZE (lablgl-1.00.tar.gz) = 390570
+MD5 (lablgl-1.02.tar.gz) = b50e4e7d856c26bc4449151e4307b37b
+SHA256 (lablgl-1.02.tar.gz) = 364d81533b32b31820142107b49c3413e96541c5a6d3fb57ec406fb5fcc9849e
+SIZE (lablgl-1.02.tar.gz) = 388662
diff --git a/graphics/ocaml-lablgl/files/patch-ab b/graphics/ocaml-lablgl/files/patch-ab
deleted file mode 100644
index 4363cf4315b6..000000000000
--- a/graphics/ocaml-lablgl/files/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
-+BINDIR = ${PREFIX}/bin
- 
- # Where to find X headers
--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${X11BASE}/lib -lXext -lXmu -lX11
- 
- # Where to find Tcl/Tk headers
- # This must the same version as for LablTk
--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 -ltk84 -ltcl84
- 
- # Where to find OpenGL/Mesa headers and libraries
- GLINCLUDES =
-@@ -29,8 +29,8 @@
- # The following libraries may be required (try to add them one at a time)
- 
- # How to index a library after installing (required on MacOSX)
--RANLIB = :
--#RANLIB = ranlib
-+#RANLIB = :
-+RANLIB = ranlib
- 
- ##### Uncomment these for windows
- #TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib
-@@ -57,4 +57,4 @@
- #TOGLDIR = Togl
- 
- # C Compiler options
--#COPTS = -c -O
-+COPTS = -c ${CFLAGS}
diff --git a/graphics/ocaml-lablgl/pkg-plist b/graphics/ocaml-lablgl/pkg-plist
index 20c2823639c7..936ed1c171ce 100644
--- a/graphics/ocaml-lablgl/pkg-plist
+++ b/graphics/ocaml-lablgl/pkg-plist
@@ -1,59 +1,77 @@
-@comment $FreeBSD$
 bin/lablgl
 bin/lablglut
+lib/ocaml/lablGL/build.ml
 lib/ocaml/lablGL/gl.cmi
 lib/ocaml/lablGL/gl.cmx
+lib/ocaml/lablGL/gl.ml
 lib/ocaml/lablGL/gl.mli
 lib/ocaml/lablGL/glArray.cmi
 lib/ocaml/lablGL/glArray.cmx
+lib/ocaml/lablGL/glArray.ml
 lib/ocaml/lablGL/glArray.mli
 lib/ocaml/lablGL/glClear.cmi
 lib/ocaml/lablGL/glClear.cmx
+lib/ocaml/lablGL/glClear.ml
 lib/ocaml/lablGL/glClear.mli
 lib/ocaml/lablGL/glDraw.cmi
 lib/ocaml/lablGL/glDraw.cmx
+lib/ocaml/lablGL/glDraw.ml
 lib/ocaml/lablGL/glDraw.mli
 lib/ocaml/lablGL/glFunc.cmi
 lib/ocaml/lablGL/glFunc.cmx
+lib/ocaml/lablGL/glFunc.ml
 lib/ocaml/lablGL/glFunc.mli
 lib/ocaml/lablGL/glLight.cmi
 lib/ocaml/lablGL/glLight.cmx
+lib/ocaml/lablGL/glLight.ml
 lib/ocaml/lablGL/glLight.mli
 lib/ocaml/lablGL/glList.cmi
 lib/ocaml/lablGL/glList.cmx
+lib/ocaml/lablGL/glList.ml
 lib/ocaml/lablGL/glList.mli
 lib/ocaml/lablGL/glMap.cmi
 lib/ocaml/lablGL/glMap.cmx
+lib/ocaml/lablGL/glMap.ml
 lib/ocaml/lablGL/glMap.mli
 lib/ocaml/lablGL/glMat.cmi
 lib/ocaml/lablGL/glMat.cmx
+lib/ocaml/lablGL/glMat.ml
 lib/ocaml/lablGL/glMat.mli
 lib/ocaml/lablGL/glMisc.cmi
 lib/ocaml/lablGL/glMisc.cmx
+lib/ocaml/lablGL/glMisc.ml
 lib/ocaml/lablGL/glMisc.mli
 lib/ocaml/lablGL/glPix.cmi
 lib/ocaml/lablGL/glPix.cmx
+lib/ocaml/lablGL/glPix.ml
 lib/ocaml/lablGL/glPix.mli
 lib/ocaml/lablGL/glTex.cmi
 lib/ocaml/lablGL/glTex.cmx
+lib/ocaml/lablGL/glTex.ml
 lib/ocaml/lablGL/glTex.mli
 lib/ocaml/lablGL/gluMat.cmi
 lib/ocaml/lablGL/gluMat.cmx
+lib/ocaml/lablGL/gluMat.ml
 lib/ocaml/lablGL/gluMat.mli
 lib/ocaml/lablGL/gluMisc.cmi
 lib/ocaml/lablGL/gluMisc.cmx
+lib/ocaml/lablGL/gluMisc.ml
 lib/ocaml/lablGL/gluMisc.mli
 lib/ocaml/lablGL/gluNurbs.cmi
 lib/ocaml/lablGL/gluNurbs.cmx
+lib/ocaml/lablGL/gluNurbs.ml
 lib/ocaml/lablGL/gluNurbs.mli
 lib/ocaml/lablGL/gluQuadric.cmi
 lib/ocaml/lablGL/gluQuadric.cmx
+lib/ocaml/lablGL/gluQuadric.ml
 lib/ocaml/lablGL/gluQuadric.mli
 lib/ocaml/lablGL/gluTess.cmi
 lib/ocaml/lablGL/gluTess.cmx
+lib/ocaml/lablGL/gluTess.ml
 lib/ocaml/lablGL/gluTess.mli
 lib/ocaml/lablGL/glut.cmi
 lib/ocaml/lablGL/glut.cmx
+lib/ocaml/lablGL/glut.ml
 lib/ocaml/lablGL/glut.mli
 lib/ocaml/lablGL/lablgl.a
 lib/ocaml/lablGL/lablgl.cma
@@ -66,56 +84,57 @@ lib/ocaml/lablGL/liblablglut.a
 lib/ocaml/lablGL/libtogl.a
 lib/ocaml/lablGL/raw.cmi
 lib/ocaml/lablGL/raw.cmx
+lib/ocaml/lablGL/raw.ml
 lib/ocaml/lablGL/raw.mli
 lib/ocaml/lablGL/togl.a
 lib/ocaml/lablGL/togl.cma
 lib/ocaml/lablGL/togl.cmi
 lib/ocaml/lablGL/togl.cmx
 lib/ocaml/lablGL/togl.cmxa
+lib/ocaml/lablGL/togl.ml
 lib/ocaml/lablGL/togl.mli
 lib/ocaml/stublibs/dlllablgl.so
-lib/ocaml/stublibs/dlltogl.so
 lib/ocaml/stublibs/dlllablglut.so
+lib/ocaml/stublibs/dlltogl.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 %%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
+%%EXAMPLESDIR%%/lablglut/caml-images/ChangeLog
+%%EXAMPLESDIR%%/lablglut/caml-images/OCamlMakefile
+%%EXAMPLESDIR%%/lablglut/caml-images/main.ml
+%%EXAMPLESDIR%%/lablglut/caml-images/ppm.ppm
+%%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%%/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/tesselate.ml
+%%EXAMPLESDIR%%/togl/texturesurf.ml
+@dirrm %%EXAMPLESDIR%%/togl
+@dirrm %%EXAMPLESDIR%%/lablglut/nehe
+@dirrm %%EXAMPLESDIR%%/lablglut/lablGL
+@dirrm %%EXAMPLESDIR%%/lablglut/caml-images
+@dirrm %%EXAMPLESDIR%%/lablglut
 @dirrm %%EXAMPLESDIR%%
+@dirrmtry share/examples/ocaml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/ocaml
+@dirrmtry lib/ocaml/stublibs
+@dirrm lib/ocaml/lablGL
+@dirrmtry lib/ocaml
+