Update to 3.04

PR:		33820
Submitted by:	Ronald Kuehn <rk@ronald.org>
Approved by:	maintainer

5 files changed, 559 insertions, 219 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 6e6c60fd30ae..a6f72ef9623a 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.02
+PORTVERSION=	3.04
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/ \
 		ftp://ftp.inria.fr/lang/caml-light/ \
@@ -16,15 +16,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-refman.html${EXTRACT_SUFX}
 
 MAINTAINER=	patrick@watson.org
 
-WITH_TK=        yes
-
-.if defined(WITH_TK)
+.if defined(WITHOUT_TK)
+PLIST_SUB+=	LABLTK:="@comment "
+.else
 PLIST_SUB+=	LABLTK:=""
 BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.3:${PORTSDIR}/lang/tcl83
 BUILD_DEPENDS+=	${LOCALBASE}/include/tk8.3:${PORTSDIR}/x11-toolkits/tk83
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
-.else
-PLIST_SUB+=	LABLTK:="@comment "
 .endif
 
 USE_XLIB=	yes
@@ -37,35 +35,44 @@ PLIST_SUB+=	PROF:="@comment "
 PLIST_SUB+=	PROF:=""
 .endif
 
-MAN1=		ocamlcp.1 ocamldep.1 ocamldebug.1 ocamlopt.1 ocamlc.opt.1 \
-		ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocamlopt.opt.1 \
-		ocaml.1 ocamlc.1 ocamllex.1 ocamlprof.1
+MAN1=		ocamlcp.1 ocamldep.1 ocamldebug.1 ocamlopt.1 ocamlrun.1 \
+		ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 ocamllex.1 \
+		ocamlprof.1 camlp4.1
+MLINKS=		ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1 \
+		camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \
+		camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \
+		camlp4.1 ocpp.1
 
 CONFIGURE_ARGS=	-prefix ${PREFIX} \
 		-x11include ${X11BASE}/include \
 		-x11lib ${X11BASE}/lib \
 		-with-pthread
 
-.if defined(WITH_TK)
-CONFIGURE_ARGS+=	-tkdefs "-I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3"
+.if !defined(WITHOUT_TK)
+CONFIGURE_ARGS+=-tkdefs "-I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3"
 .endif
 
 .if !defined(NOPORTDOCS)
-DOCFILES=	${DISTNAME}-refman.html.tar.gz ${DISTNAME}-refman.ps.gz
+DOCFILES=	${DISTNAME}-refman.html.tar.gz ${DISTNAME}-refman.ps.gz \
+		${DISTNAME}-refman.pdf
 .endif
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/html
-	@cd ${WRKDIR}/htmlman; ${INSTALL_DATA} * ${DOCSDIR}/html
-	@${CP} ${DISTDIR}/${DISTNAME}-refman.ps.gz ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html/libref
+	@cd ${WRKDIR}/htmlman/libref; ${INSTALL_DATA} * ${DOCSDIR}/html/libref
+	@cd ${WRKDIR}/htmlman; ${INSTALL_DATA} [a-km-z]* libg* ${DOCSDIR}/html
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-refman.ps.gz ${DOCSDIR}
+	@${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-refman.pdf ${DOCSDIR}
 .endif
-.if defined(WITH_TK)
-	@${MKDIR} ${PREFIX}/share/examples/ocaml
-	@${MKDIR} ${PREFIX}/share/examples/ocaml/labltk
-	@cd ${WRKSRC}/otherlibs/labltk/example; ${INSTALL_DATA} * ${PREFIX}/share/examples/ocaml/labltk
+.if !defined(WITHOUT_TK)
+	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}/labltk
+	@cd ${WRKSRC}/otherlibs/labltk/example; \
+		${INSTALL_DATA} * ${EXAMPLESDIR}/labltk
 .endif
 	@strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index decb44e96297..95667401804a 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,3 +1,4 @@
-MD5 (ocaml-3.02.tar.gz) = 2184258b41d3975648a4ebbb615c5046
-MD5 (ocaml-3.02-refman.html.tar.gz) = b2aeaa11f3ba48d59deb3fe1693606d4
-MD5 (ocaml-3.02-refman.ps.gz) = 6dc24a8b1f98b91e7ab8ecd34a90d59c
+MD5 (ocaml-3.04.tar.gz) = 7f2fbb849fccb33308188aa19aa9b0ee
+MD5 (ocaml-3.04-refman.html.tar.gz) = 30538e4a76c8c7d540a9391d8c8967c7
+MD5 (ocaml-3.04-refman.ps.gz) = 0127244af1014c1db9a192247b686dc9
+MD5 (ocaml-3.04-refman.pdf) = 48487d35597cc02893efcdc2210d32b7
diff --git a/lang/ocaml/files/patch-camlp4-man::Makefile b/lang/ocaml/files/patch-camlp4-man::Makefile
new file mode 100644
index 000000000000..f7fbac15fb67
--- /dev/null
+++ b/lang/ocaml/files/patch-camlp4-man::Makefile
@@ -0,0 +1,15 @@
+--- camlp4/man/Makefile.orig	Wed Sep 26 10:32:50 2001
++++ camlp4/man/Makefile	Sun Feb 10 23:45:36 2002
+@@ -16,12 +16,6 @@
+ install:
+ 	-$(MKDIR) $(MANDIR)
+ 	-cp $(TARGET) $(MANDIR)/.
+-	-cd $(MANDIR); rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1
+-	-cd $(MANDIR); rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1
+-	-cd $(MANDIR); rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1
+-	-cd $(MANDIR); rm -f ocpp.1; ln -s $(TARGET) ocpp.1
+-	-cd $(MANDIR); rm -f camlp4o.opt.1; ln -s $(TARGET) camlp4o.opt.1
+-	-cd $(MANDIR); rm -f camlp4r.opt.1; ln -s $(TARGET) camlp4r.opt.1
+ 
+ camlp4.1: camlp4.1.tpl
+ 	sed -e "s'LIBDIR'$(LIBDIR)'g" camlp4.1.tpl > camlp4.1
diff --git a/lang/ocaml/files/patch-man::Makefile b/lang/ocaml/files/patch-man::Makefile
new file mode 100644
index 000000000000..a78dc5e21e71
--- /dev/null
+++ b/lang/ocaml/files/patch-man::Makefile
@@ -0,0 +1,8 @@
+--- man/Makefile.orig	Wed Nov 17 13:57:40 1999
++++ man/Makefile	Sun Feb 10 23:44:43 2002
+@@ -16,5 +16,3 @@
+ 
+ install:
+ 	for i in *.m; do cp $$i $(MANDIR)/`basename $$i .m`.$(MANEXT); done
+-	echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(MANDIR)/ocamlc.opt.$(MANEXT)
+-	echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(MANDIR)/ocamlopt.opt.$(MANEXT)
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index 425495973dbf..2fd8194ab626 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -7,30 +7,43 @@ bin/ocamldep
 bin/ocamlprof
 bin/ocamlcp
 bin/ocamlmktop
+bin/ocamlmklib
+%%LABLTK:%%%%LABLTK:%%bin/labltk
+%%LABLTK:%%bin/ocamlbrowser
 bin/ocamlopt
+bin/odyl
 bin/ocamlc.opt
 bin/ocamlopt.opt
 bin/ocamllex.opt
+bin/camlp4
+bin/camlp4r
+bin/camlp4r.opt
+bin/camlp4o
+bin/ocpp
+bin/camlp4o.opt
+bin/mkcamlp4
 bin/ocamldebug
-%%LABLTK:%%bin/labltk
-%%LABLTK:%%bin/ocamlbrowser
 lib/ocaml/libcamlrun.a
+lib/ocaml/caml/callback.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/fail.h
-lib/ocaml/caml/callback.h
+lib/ocaml/caml/intext.h
 lib/ocaml/caml/misc.h
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/memory.h
 lib/ocaml/caml/bigarray.h
+lib/ocaml/ld.conf
 lib/ocaml/stdlib.cma
 lib/ocaml/camlheader
 lib/ocaml/weak.ml
 lib/ocaml/sys.ml
+lib/ocaml/stringLabels.ml
 lib/ocaml/string.ml
 lib/ocaml/stream.ml
 lib/ocaml/std_exit.ml
+lib/ocaml/stdLabels.ml
 lib/ocaml/stack.ml
 lib/ocaml/sort.ml
 lib/ocaml/set.ml
@@ -43,8 +56,10 @@ lib/ocaml/parsing.ml
 lib/ocaml/oo.ml
 lib/ocaml/obj.ml
 lib/ocaml/nativeint.ml
+lib/ocaml/moreLabels.ml
 lib/ocaml/marshal.ml
 lib/ocaml/map.ml
+lib/ocaml/listLabels.ml
 lib/ocaml/list.ml
 lib/ocaml/lexing.ml
 lib/ocaml/lazy.ml
@@ -59,12 +74,15 @@ lib/ocaml/digest.ml
 lib/ocaml/char.ml
 lib/ocaml/callback.ml
 lib/ocaml/buffer.ml
+lib/ocaml/arrayLabels.ml
 lib/ocaml/array.ml
 lib/ocaml/arg.ml
 lib/ocaml/weak.mli
 lib/ocaml/sys.mli
+lib/ocaml/stringLabels.mli
 lib/ocaml/string.mli
 lib/ocaml/stream.mli
+lib/ocaml/stdLabels.mli
 lib/ocaml/stack.mli
 lib/ocaml/sort.mli
 lib/ocaml/set.mli
@@ -77,8 +95,10 @@ lib/ocaml/parsing.mli
 lib/ocaml/oo.mli
 lib/ocaml/obj.mli
 lib/ocaml/nativeint.mli
+lib/ocaml/moreLabels.mli
 lib/ocaml/marshal.mli
 lib/ocaml/map.mli
+lib/ocaml/listLabels.mli
 lib/ocaml/list.mli
 lib/ocaml/lexing.mli
 lib/ocaml/lazy.mli
@@ -93,13 +113,16 @@ lib/ocaml/digest.mli
 lib/ocaml/char.mli
 lib/ocaml/callback.mli
 lib/ocaml/buffer.mli
+lib/ocaml/arrayLabels.mli
 lib/ocaml/array.mli
 lib/ocaml/arg.mli
 lib/ocaml/weak.cmi
 lib/ocaml/sys.cmi
+lib/ocaml/stringLabels.cmi
 lib/ocaml/string.cmi
 lib/ocaml/stream.cmi
 lib/ocaml/std_exit.cmi
+lib/ocaml/stdLabels.cmi
 lib/ocaml/stack.cmi
 lib/ocaml/sort.cmi
 lib/ocaml/set.cmi
@@ -112,8 +135,10 @@ lib/ocaml/parsing.cmi
 lib/ocaml/oo.cmi
 lib/ocaml/obj.cmi
 lib/ocaml/nativeint.cmi
+lib/ocaml/moreLabels.cmi
 lib/ocaml/marshal.cmi
 lib/ocaml/map.cmi
+lib/ocaml/listLabels.cmi
 lib/ocaml/list.cmi
 lib/ocaml/lexing.cmi
 lib/ocaml/lazy.cmi
@@ -128,25 +153,35 @@ lib/ocaml/digest.cmi
 lib/ocaml/char.cmi
 lib/ocaml/callback.cmi
 lib/ocaml/buffer.cmi
+lib/ocaml/arrayLabels.cmi
 lib/ocaml/array.cmi
 lib/ocaml/arg.cmi
 lib/ocaml/std_exit.cmo
 lib/ocaml/camlheader_ur
 lib/ocaml/toplevellib.cma
 lib/ocaml/expunge
+lib/ocaml/outcometree.mli
+lib/ocaml/outcometree.cmi
 lib/ocaml/topmain.cmo
 lib/ocaml/topdirs.cmi
 lib/ocaml/toploop.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/profiling.cmi
+lib/ocaml/scrapelabels
+lib/ocaml/addlabels
+lib/ocaml/dllunix.so
 lib/ocaml/libunix.a
+lib/ocaml/unixLabels.mli
 lib/ocaml/unix.mli
-lib/ocaml/unix.cma
+lib/ocaml/unixLabels.cmi
 lib/ocaml/unix.cmi
+lib/ocaml/unix.cma
+lib/ocaml/dllstr.so
 lib/ocaml/libstr.a
 lib/ocaml/str.mli
 lib/ocaml/str.cmi
 lib/ocaml/str.cma
+lib/ocaml/dllnums.so
 lib/ocaml/libnums.a
 lib/ocaml/nums.cma
 lib/ocaml/ratio.mli
@@ -163,10 +198,19 @@ lib/ocaml/extract_crc
 lib/ocaml/dynlink.mli
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
+lib/ocaml/dllbigarray.so
 lib/ocaml/bigarray.cma
 lib/ocaml/libbigarray.a
 lib/ocaml/bigarray.mli
 lib/ocaml/bigarray.cmi
+lib/ocaml/dllthreads.so
+lib/ocaml/libthreads.a
+lib/ocaml/threads/threads.cma
+lib/ocaml/threads/threadUnix.cmi
+lib/ocaml/threads/event.cmi
+lib/ocaml/threads/condition.cmi
+lib/ocaml/threads/mutex.cmi
+lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/event.cmx
 lib/ocaml/threads/threads.cmxa
 lib/ocaml/threads/threadUnix.cmx
@@ -174,41 +218,137 @@ lib/ocaml/threads/threads.a
 lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/mutex.cmx
 lib/ocaml/threads/thread.cmx
-lib/ocaml/libthreadsnat.a
-lib/ocaml/libthreads.a
-lib/ocaml/threads/event.cmi
-lib/ocaml/threads/threads.cma
-lib/ocaml/threads/threadUnix.cmi
-lib/ocaml/threads/condition.cmi
-lib/ocaml/threads/mutex.cmi
-lib/ocaml/threads/thread.cmi
 lib/ocaml/threadUnix.mli
 lib/ocaml/event.mli
 lib/ocaml/condition.mli
 lib/ocaml/mutex.mli
 lib/ocaml/thread.mli
+lib/ocaml/dllgraphics.so
 lib/ocaml/libgraphics.a
 lib/ocaml/graphicsX11.mli
 lib/ocaml/graphics.mli
 lib/ocaml/graphicsX11.cmi
 lib/ocaml/graphics.cmi
 lib/ocaml/graphics.cma
+lib/ocaml/dllmldbm.so
 lib/ocaml/libmldbm.a
 lib/ocaml/dbm.mli
 lib/ocaml/dbm.cmi
 lib/ocaml/dbm.cma
+%%LABLTK:%%lib/ocaml/labltk/place.cmi
+%%LABLTK:%%lib/ocaml/labltk/bell.cmi
+%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/grid.cmi
+%%LABLTK:%%lib/ocaml/labltk/winfo.cmi
+%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmi
+%%LABLTK:%%lib/ocaml/labltk/scale.cmi
+%%LABLTK:%%lib/ocaml/labltk/selection.cmi
+%%LABLTK:%%lib/ocaml/labltk/grab.cmi
+%%LABLTK:%%lib/ocaml/labltk/tkwait.cmi
+%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/clipboard.cmi
+%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmi
+%%LABLTK:%%lib/ocaml/labltk/dialog.cmi
+%%LABLTK:%%lib/ocaml/labltk/frame.cmi
+%%LABLTK:%%lib/ocaml/labltk/toplevel.cmi
+%%LABLTK:%%lib/ocaml/labltk/option.cmi
+%%LABLTK:%%lib/ocaml/labltk/pack.cmi
+%%LABLTK:%%lib/ocaml/labltk/menubutton.cmi
+%%LABLTK:%%lib/ocaml/labltk/focus.cmi
+%%LABLTK:%%lib/ocaml/labltk/listbox.cmi
+%%LABLTK:%%lib/ocaml/labltk/entry.cmi
+%%LABLTK:%%lib/ocaml/labltk/wm.cmi
+%%LABLTK:%%lib/ocaml/labltk/menu.cmi
+%%LABLTK:%%lib/ocaml/labltk/message.cmi
+%%LABLTK:%%lib/ocaml/labltk/palette.cmi
+%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmi
+%%LABLTK:%%lib/ocaml/labltk/label.cmi
+%%LABLTK:%%lib/ocaml/labltk/text.cmi
+%%LABLTK:%%lib/ocaml/labltk/button.cmi
+%%LABLTK:%%lib/ocaml/labltk/canvas.cmi
+%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmi
+%%LABLTK:%%lib/ocaml/labltk/tk.cmi
+%%LABLTK:%%lib/ocaml/labltk/labltktop
+%%LABLTK:%%lib/ocaml/labltk/labltk.cma
+%%LABLTK:%%lib/ocaml/labltk/fileevent.cmi
+%%LABLTK:%%lib/ocaml/labltk/widget.mli
+%%LABLTK:%%lib/ocaml/labltk/widget.cmi
+%%LABLTK:%%lib/ocaml/labltk/timer.mli
+%%LABLTK:%%lib/ocaml/labltk/timer.cmi
+%%LABLTK:%%lib/ocaml/labltk/textvariable.mli
+%%LABLTK:%%lib/ocaml/labltk/textvariable.cmi
+%%LABLTK:%%lib/ocaml/labltk/protocol.mli
+%%LABLTK:%%lib/ocaml/labltk/protocol.cmi
+%%LABLTK:%%lib/ocaml/labltk/fileevent.mli
+%%LABLTK:%%lib/ocaml/labltk/liblabltk41.a
+%%LABLTK:%%lib/ocaml/labltk/dlllabltk41.so
+%%LABLTK:%%lib/ocaml/labltk/tkcompiler
+%%LABLTK:%%lib/ocaml/labltk/libjpf.cma
+%%LABLTK:%%lib/ocaml/labltk/balloon.mli
+%%LABLTK:%%lib/ocaml/labltk/fileselect.mli
+%%LABLTK:%%lib/ocaml/labltk/balloon.cmi
+%%LABLTK:%%lib/ocaml/labltk/fileselect.cmi
+%%LABLTK:%%lib/ocaml/labltk/support.cmx
+%%LABLTK:%%lib/ocaml/labltk/bell.cmx
+%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/grid.cmx
+%%LABLTK:%%lib/ocaml/labltk/winfo.cmx
+%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmx
+%%LABLTK:%%lib/ocaml/labltk/scale.cmx
+%%LABLTK:%%lib/ocaml/labltk/selection.cmx
+%%LABLTK:%%lib/ocaml/labltk/grab.cmx
+%%LABLTK:%%lib/ocaml/labltk/tkwait.cmx
+%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/clipboard.cmx
+%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmx
+%%LABLTK:%%lib/ocaml/labltk/dialog.cmx
+%%LABLTK:%%lib/ocaml/labltk/frame.cmx
+%%LABLTK:%%lib/ocaml/labltk/toplevel.cmx
+%%LABLTK:%%lib/ocaml/labltk/option.cmx
+%%LABLTK:%%lib/ocaml/labltk/pack.cmx
+%%LABLTK:%%lib/ocaml/labltk/menubutton.cmx
+%%LABLTK:%%lib/ocaml/labltk/focus.cmx
+%%LABLTK:%%lib/ocaml/labltk/listbox.cmx
+%%LABLTK:%%lib/ocaml/labltk/entry.cmx
+%%LABLTK:%%lib/ocaml/labltk/menu.cmx
+%%LABLTK:%%lib/ocaml/labltk/message.cmx
+%%LABLTK:%%lib/ocaml/labltk/palette.cmx
+%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmx
+%%LABLTK:%%lib/ocaml/labltk/label.cmx
+%%LABLTK:%%lib/ocaml/labltk/text.cmx
+%%LABLTK:%%lib/ocaml/labltk/button.cmx
+%%LABLTK:%%lib/ocaml/labltk/canvas.cmx
+%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmx
+%%LABLTK:%%lib/ocaml/labltk/wm.cmx
+%%LABLTK:%%lib/ocaml/labltk/place.cmx
+%%LABLTK:%%lib/ocaml/labltk/fileevent.cmx
+%%LABLTK:%%lib/ocaml/labltk/timer.cmx
+%%LABLTK:%%lib/ocaml/labltk/textvariable.cmx
+%%LABLTK:%%lib/ocaml/labltk/protocol.cmx
+%%LABLTK:%%lib/ocaml/labltk/widget.cmx
+%%LABLTK:%%lib/ocaml/labltk/tk.cmx
+%%LABLTK:%%lib/ocaml/labltk/labltk.a
+%%LABLTK:%%lib/ocaml/labltk/labltk.cmxa
+%%LABLTK:%%lib/ocaml/labltk/balloon.cmx
+%%LABLTK:%%lib/ocaml/labltk/fileselect.cmx
+%%LABLTK:%%lib/ocaml/labltk/libjpf.a
+%%LABLTK:%%lib/ocaml/labltk/libjpf.cmxa
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/stdlib.cmxa
 lib/ocaml/weak.cmx
 %%PROF:%%lib/ocaml/sys.p.cmx
 lib/ocaml/sys.cmx
+%%PROF:%%lib/ocaml/stringLabels.p.cmx
+lib/ocaml/stringLabels.cmx
 %%PROF:%%lib/ocaml/string.p.cmx
 lib/ocaml/string.cmx
 %%PROF:%%lib/ocaml/stream.p.cmx
 lib/ocaml/stream.cmx
 %%PROF:%%lib/ocaml/std_exit.p.cmx
 lib/ocaml/std_exit.cmx
+%%PROF:%%lib/ocaml/stdLabels.p.cmx
+lib/ocaml/stdLabels.cmx
 %%PROF:%%lib/ocaml/stack.p.cmx
 lib/ocaml/stack.cmx
 %%PROF:%%lib/ocaml/sort.p.cmx
@@ -233,16 +373,22 @@ lib/ocaml/oo.cmx
 lib/ocaml/obj.cmx
 %%PROF:%%lib/ocaml/nativeint.p.cmx
 lib/ocaml/nativeint.cmx
+%%PROF:%%lib/ocaml/moreLabels.p.cmx
+lib/ocaml/moreLabels.cmx
 %%PROF:%%lib/ocaml/marshal.p.cmx
 lib/ocaml/marshal.cmx
 %%PROF:%%lib/ocaml/map.p.cmx
 lib/ocaml/map.cmx
+%%PROF:%%lib/ocaml/listLabels.p.cmx
+lib/ocaml/listLabels.cmx
 %%PROF:%%lib/ocaml/list.p.cmx
 lib/ocaml/list.cmx
 %%PROF:%%lib/ocaml/lexing.p.cmx
 lib/ocaml/lexing.cmx
 %%PROF:%%lib/ocaml/lazy.p.cmx
 lib/ocaml/lazy.cmx
+%%PROF:%%lib/ocaml/labelled.p.cmx
+lib/ocaml/labelled.cmx
 %%PROF:%%lib/ocaml/int64.p.cmx
 lib/ocaml/int64.cmx
 %%PROF:%%lib/ocaml/int32.p.cmx
@@ -265,6 +411,8 @@ lib/ocaml/char.cmx
 lib/ocaml/callback.cmx
 %%PROF:%%lib/ocaml/buffer.p.cmx
 lib/ocaml/buffer.cmx
+%%PROF:%%lib/ocaml/arrayLabels.p.cmx
+lib/ocaml/arrayLabels.cmx
 %%PROF:%%lib/ocaml/array.p.cmx
 lib/ocaml/array.cmx
 %%PROF:%%lib/ocaml/arg.p.cmx
@@ -277,6 +425,7 @@ lib/ocaml/stdlib.a
 %%PROF:%%lib/ocaml/stdlib.p.cmxa
 lib/ocaml/unix.a
 lib/ocaml/unix.cmxa
+lib/ocaml/unixLabels.cmx
 lib/ocaml/unix.cmx
 lib/ocaml/str.a
 lib/ocaml/str.cmxa
@@ -294,108 +443,350 @@ lib/ocaml/nums.a
 lib/ocaml/bigarray.cmxa
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.a
+lib/ocaml/libthreadsnat.a
 lib/ocaml/graphics.a
 lib/ocaml/graphics.cmxa
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cmxa
 lib/ocaml/dbm.cmx
-%%LABLTK:%%lib/ocaml/labltk/scale.cmi
-%%LABLTK:%%lib/ocaml/labltk/menu.cmi
-%%LABLTK:%%lib/ocaml/labltk/place.cmi
-%%LABLTK:%%lib/ocaml/labltk/label.cmi
-%%LABLTK:%%lib/ocaml/labltk/menubutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/clipboard.cmi
-%%LABLTK:%%lib/ocaml/labltk/option.cmi
-%%LABLTK:%%lib/ocaml/labltk/message.cmi
-%%LABLTK:%%lib/ocaml/labltk/text.cmi
-%%LABLTK:%%lib/ocaml/labltk/entry.cmi
-%%LABLTK:%%lib/ocaml/labltk/wm.cmi
-%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmi
-%%LABLTK:%%lib/ocaml/labltk/focus.cmi
-%%LABLTK:%%lib/ocaml/labltk/palette.cmi
-%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmi
-%%LABLTK:%%lib/ocaml/labltk/tkwait.cmi
-%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmi
-%%LABLTK:%%lib/ocaml/labltk/winfo.cmi
-%%LABLTK:%%lib/ocaml/labltk/bell.cmi
-%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmi
-%%LABLTK:%%lib/ocaml/labltk/grid.cmi
-%%LABLTK:%%lib/ocaml/labltk/button.cmi
-%%LABLTK:%%lib/ocaml/labltk/grab.cmi
-%%LABLTK:%%lib/ocaml/labltk/listbox.cmi
-%%LABLTK:%%lib/ocaml/labltk/pack.cmi
-%%LABLTK:%%lib/ocaml/labltk/canvas.cmi
-%%LABLTK:%%lib/ocaml/labltk/frame.cmi
-%%LABLTK:%%lib/ocaml/labltk/toplevel.cmi
-%%LABLTK:%%lib/ocaml/labltk/selection.cmi
-%%LABLTK:%%lib/ocaml/labltk/dialog.cmi
-%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmi
-%%LABLTK:%%lib/ocaml/labltk/tk.cmi
-%%LABLTK:%%lib/ocaml/labltk/labltktop
-%%LABLTK:%%lib/ocaml/labltk/labltk.cma
-%%LABLTK:%%lib/ocaml/labltk/fileevent.cmi
-%%LABLTK:%%lib/ocaml/labltk/widget.mli
-%%LABLTK:%%lib/ocaml/labltk/widget.cmi
-%%LABLTK:%%lib/ocaml/labltk/timer.mli
-%%LABLTK:%%lib/ocaml/labltk/timer.cmi
-%%LABLTK:%%lib/ocaml/labltk/textvariable.mli
-%%LABLTK:%%lib/ocaml/labltk/textvariable.cmi
-%%LABLTK:%%lib/ocaml/labltk/protocol.mli
-%%LABLTK:%%lib/ocaml/labltk/protocol.cmi
-%%LABLTK:%%lib/ocaml/labltk/fileevent.mli
-%%LABLTK:%%lib/ocaml/labltk/liblabltk41.a
-%%LABLTK:%%lib/ocaml/labltk/tkcompiler
-%%LABLTK:%%lib/ocaml/labltk/libjpf.cma
-%%LABLTK:%%lib/ocaml/labltk/balloon.mli
-%%LABLTK:%%lib/ocaml/labltk/fileselect.mli
-%%LABLTK:%%lib/ocaml/labltk/balloon.cmi
-%%LABLTK:%%lib/ocaml/labltk/fileselect.cmi
-%%LABLTK:%%lib/ocaml/labltk/support.cmx
-%%LABLTK:%%lib/ocaml/labltk/menu.cmx
-%%LABLTK:%%lib/ocaml/labltk/place.cmx
-%%LABLTK:%%lib/ocaml/labltk/label.cmx
-%%LABLTK:%%lib/ocaml/labltk/menubutton.cmx
-%%LABLTK:%%lib/ocaml/labltk/clipboard.cmx
-%%LABLTK:%%lib/ocaml/labltk/option.cmx
-%%LABLTK:%%lib/ocaml/labltk/message.cmx
-%%LABLTK:%%lib/ocaml/labltk/text.cmx
-%%LABLTK:%%lib/ocaml/labltk/entry.cmx
-%%LABLTK:%%lib/ocaml/labltk/wm.cmx
-%%LABLTK:%%lib/ocaml/labltk/optionmenu.cmx
-%%LABLTK:%%lib/ocaml/labltk/focus.cmx
-%%LABLTK:%%lib/ocaml/labltk/palette.cmx
-%%LABLTK:%%lib/ocaml/labltk/checkbutton.cmx
-%%LABLTK:%%lib/ocaml/labltk/scrollbar.cmx
-%%LABLTK:%%lib/ocaml/labltk/tkwait.cmx
-%%LABLTK:%%lib/ocaml/labltk/imagebitmap.cmx
-%%LABLTK:%%lib/ocaml/labltk/winfo.cmx
-%%LABLTK:%%lib/ocaml/labltk/bell.cmx
-%%LABLTK:%%lib/ocaml/labltk/imagephoto.cmx
-%%LABLTK:%%lib/ocaml/labltk/grid.cmx
-%%LABLTK:%%lib/ocaml/labltk/button.cmx
-%%LABLTK:%%lib/ocaml/labltk/grab.cmx
-%%LABLTK:%%lib/ocaml/labltk/listbox.cmx
-%%LABLTK:%%lib/ocaml/labltk/pack.cmx
-%%LABLTK:%%lib/ocaml/labltk/canvas.cmx
-%%LABLTK:%%lib/ocaml/labltk/frame.cmx
-%%LABLTK:%%lib/ocaml/labltk/toplevel.cmx
-%%LABLTK:%%lib/ocaml/labltk/selection.cmx
-%%LABLTK:%%lib/ocaml/labltk/dialog.cmx
-%%LABLTK:%%lib/ocaml/labltk/radiobutton.cmx
-%%LABLTK:%%lib/ocaml/labltk/scale.cmx
-%%LABLTK:%%lib/ocaml/labltk/fileevent.cmx
-%%LABLTK:%%lib/ocaml/labltk/timer.cmx
-%%LABLTK:%%lib/ocaml/labltk/textvariable.cmx
-%%LABLTK:%%lib/ocaml/labltk/protocol.cmx
-%%LABLTK:%%lib/ocaml/labltk/widget.cmx
-%%LABLTK:%%lib/ocaml/labltk/tk.cmx
-%%LABLTK:%%lib/ocaml/labltk/labltk.a
-%%LABLTK:%%lib/ocaml/labltk/labltk.cmxa
-%%LABLTK:%%lib/ocaml/labltk/balloon.cmx
-%%LABLTK:%%lib/ocaml/labltk/fileselect.cmx
-%%LABLTK:%%lib/ocaml/labltk/libjpf.a
-%%LABLTK:%%lib/ocaml/labltk/libjpf.cmxa
+lib/ocaml/camlp4/odyl.cma
+lib/ocaml/camlp4/odyl.cmo
+lib/ocaml/camlp4/spretty.mli
+lib/ocaml/camlp4/pcaml.mli
+lib/ocaml/camlp4/quotation.mli
+lib/ocaml/camlp4/mLast.mli
+lib/ocaml/camlp4/spretty.cmi
+lib/ocaml/camlp4/pcaml.cmi
+lib/ocaml/camlp4/ast2pt.cmi
+lib/ocaml/camlp4/quotation.cmi
+lib/ocaml/camlp4/mLast.cmi
+lib/ocaml/camlp4/camlp4.cma
+lib/ocaml/camlp4/pa_extend.cmo
+lib/ocaml/camlp4/pa_ifdef.cmo
+lib/ocaml/camlp4/pa_extend_m.cmo
+lib/ocaml/camlp4/pr_dump.cmo
+lib/ocaml/camlp4/pa_rp.cmo
+lib/ocaml/camlp4/pa_r.cmo
+lib/ocaml/camlp4/q_MLast.cmo
+lib/ocaml/camlp4/pa_ifdef.cmi
+lib/ocaml/camlp4/q_phony.cmo
+lib/ocaml/camlp4/pr_null.cmo
+lib/ocaml/camlp4/pr_extfun.cmo
+lib/ocaml/camlp4/pr_extend.cmo
+lib/ocaml/camlp4/pr_op.cmo
+lib/ocaml/camlp4/pr_o.cmo
+lib/ocaml/camlp4/pr_rp.cmo
+lib/ocaml/camlp4/pr_r.cmo
+lib/ocaml/camlp4/pa_fstream.cmo
+lib/ocaml/camlp4/pa_extfun.cmo
+lib/ocaml/camlp4/pa_lisp.cmo
+lib/ocaml/camlp4/pa_sml.cmo
+lib/ocaml/camlp4/pa_olabl.cmo
+lib/ocaml/camlp4/pa_format.cmo
+lib/ocaml/camlp4/pa_ru.cmo
+lib/ocaml/camlp4/pa_oop.cmo
+lib/ocaml/camlp4/pa_op.cmo
+lib/ocaml/camlp4/pa_o.cmo
+lib/ocaml/camlp4/pr_depend.cmo
+lib/ocaml/camlp4/pa_o.cmi
+lib/ocaml/camlp4/lib.sml
+lib/ocaml/camlp4/camlp4_top.cma
+lib/ocaml/camlp4/camlp4r.cma
+lib/ocaml/camlp4/camlp4o.cma
+lib/ocaml/camlp4/ocpp.cmo
+lib/ocaml/camlp4/crc.cmo
+lib/ocaml/camlp4/gramlib.cma
+lib/ocaml/camlp4/stdpp.mli
+lib/ocaml/camlp4/plexer.mli
+lib/ocaml/camlp4/grammar.mli
+lib/ocaml/camlp4/gramext.mli
+lib/ocaml/camlp4/fstream.mli
+lib/ocaml/camlp4/extfun.mli
+lib/ocaml/camlp4/token.mli
+lib/ocaml/camlp4/grammar.cmi
+lib/ocaml/camlp4/stdpp.cmi
+lib/ocaml/camlp4/plexer.cmi
+lib/ocaml/camlp4/token.cmi
+lib/ocaml/camlp4/gramext.cmi
+lib/ocaml/camlp4/fstream.cmi
+lib/ocaml/camlp4/extfun.cmi
+lib/ocaml/camlp4/gramlib.cmxa
+lib/ocaml/camlp4/stdpp.cmx
+lib/ocaml/camlp4/plexer.cmx
+lib/ocaml/camlp4/grammar.cmx
+lib/ocaml/camlp4/gramext.cmx
+lib/ocaml/camlp4/fstream.cmx
+lib/ocaml/camlp4/extfun.cmx
+lib/ocaml/camlp4/token.cmx
+lib/ocaml/camlp4/gramlib.a
+share/doc/ocaml/LICENSE
+%%PORTDOCS%%share/doc/ocaml/html/libref/Arg.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Arith_status.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Array.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/ArrayLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Big_int.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Bigarray.Array1.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Bigarray.Array2.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Bigarray.Array3.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Bigarray.Genarray.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Bigarray.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Buffer.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Callback.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Char.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Condition.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Dbm.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Digest.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Dynlink.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Event.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Filename.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Format.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Gc.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Genlex.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Graphics.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/GraphicsX11.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Hashtbl.HashedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Hashtbl.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Hashtbl.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Hashtbl.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Int32.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Int64.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Lazy.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Lexing.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/List.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/ListLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Map.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Map.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Map.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Map.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Marshal.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Hashtbl.HashedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Map.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Hashtbl.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Hashtbl.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Hashtbl.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Map.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Map.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Map.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Set.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Set.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Set.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.Set.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/MoreLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Mutex.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Nativeint.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Num.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Obj.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Oo.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Parsing.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Pervasives.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Printexc.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Printf.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Queue.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Random.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Set.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Set.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Set.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Set.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Sort.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Stack.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/StdLabels.Array.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/StdLabels.List.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/StdLabels.String.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/StdLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Str.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Stream.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/String.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/StringLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Sys.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Thread.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/ThreadUnix.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Tk.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Unix.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/UnixLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/Weak.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_attributes.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_class_types.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_classes.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_exceptions.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_methods.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_module_types.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_modules.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_types.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/index_values.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/style.css
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Arg.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Arith_status.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Array.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_ArrayLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Big_int.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Bigarray.Array1.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Bigarray.Array2.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Bigarray.Array3.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Bigarray.Genarray.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Bigarray.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Buffer.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Callback.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Char.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Condition.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Dbm.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Digest.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Dynlink.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Event.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Filename.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Format.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Gc.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Genlex.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Graphics.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_GraphicsX11.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Hashtbl.HashedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Hashtbl.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Hashtbl.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Hashtbl.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Int32.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Int64.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Lazy.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Lexing.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_List.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_ListLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Map.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Map.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Map.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Map.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Marshal.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.HashedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Map.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Map.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Map.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Map.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Set.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Set.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Set.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.Set.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_MoreLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Mutex.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Nativeint.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Num.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Obj.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Oo.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Parsing.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Pervasives.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Printexc.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Printf.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Queue.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Random.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Set.Make.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Set.OrderedType.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Set.S.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Set.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Sort.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Stack.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_StdLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_StdLabels.Array.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_StdLabels.List.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_StdLabels.String.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Str.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Stream.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_String.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_StringLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Sys.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Thread.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_ThreadUnix.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Tk.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Unix.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_UnixLabels.html
+%%PORTDOCS%%share/doc/ocaml/html/libref/type_Weak.html
+%%PORTDOCS%%share/doc/ocaml/html/contents_motif.gif
+%%PORTDOCS%%share/doc/ocaml/html/index.html
+%%PORTDOCS%%share/doc/ocaml/html/libgraph.gif
+%%PORTDOCS%%share/doc/ocaml/html/manual.haux
+%%PORTDOCS%%share/doc/ocaml/html/manual.hmanual
+%%PORTDOCS%%share/doc/ocaml/html/manual.hmanual.hind
+%%PORTDOCS%%share/doc/ocaml/html/manual.hmanual.kwd.hind
+%%PORTDOCS%%share/doc/ocaml/html/manual.htoc
+%%PORTDOCS%%share/doc/ocaml/html/manual001.html
+%%PORTDOCS%%share/doc/ocaml/html/manual002.html
+%%PORTDOCS%%share/doc/ocaml/html/manual003.html
+%%PORTDOCS%%share/doc/ocaml/html/manual004.html
+%%PORTDOCS%%share/doc/ocaml/html/manual005.html
+%%PORTDOCS%%share/doc/ocaml/html/manual006.html
+%%PORTDOCS%%share/doc/ocaml/html/manual007.html
+%%PORTDOCS%%share/doc/ocaml/html/manual008.html
+%%PORTDOCS%%share/doc/ocaml/html/manual009.html
+%%PORTDOCS%%share/doc/ocaml/html/manual010.html
+%%PORTDOCS%%share/doc/ocaml/html/manual011.html
+%%PORTDOCS%%share/doc/ocaml/html/manual012.html
+%%PORTDOCS%%share/doc/ocaml/html/manual013.html
+%%PORTDOCS%%share/doc/ocaml/html/manual014.html
+%%PORTDOCS%%share/doc/ocaml/html/manual015.html
+%%PORTDOCS%%share/doc/ocaml/html/manual016.html
+%%PORTDOCS%%share/doc/ocaml/html/manual017.html
+%%PORTDOCS%%share/doc/ocaml/html/manual018.html
+%%PORTDOCS%%share/doc/ocaml/html/manual019.html
+%%PORTDOCS%%share/doc/ocaml/html/manual020.html
+%%PORTDOCS%%share/doc/ocaml/html/manual021.html
+%%PORTDOCS%%share/doc/ocaml/html/manual022.html
+%%PORTDOCS%%share/doc/ocaml/html/manual023.html
+%%PORTDOCS%%share/doc/ocaml/html/manual024.html
+%%PORTDOCS%%share/doc/ocaml/html/manual025.html
+%%PORTDOCS%%share/doc/ocaml/html/manual026.html
+%%PORTDOCS%%share/doc/ocaml/html/manual027.html
+%%PORTDOCS%%share/doc/ocaml/html/manual028.html
+%%PORTDOCS%%share/doc/ocaml/html/manual029.html
+%%PORTDOCS%%share/doc/ocaml/html/manual030.html
+%%PORTDOCS%%share/doc/ocaml/html/manual031.html
+%%PORTDOCS%%share/doc/ocaml/html/manual032.html
+%%PORTDOCS%%share/doc/ocaml/html/manual033.html
+%%PORTDOCS%%share/doc/ocaml/html/manual034.html
+%%PORTDOCS%%share/doc/ocaml/html/manual035.html
+%%PORTDOCS%%share/doc/ocaml/html/manual036.html
+%%PORTDOCS%%share/doc/ocaml/html/manual037.html
+%%PORTDOCS%%share/doc/ocaml/html/manual038.html
+%%PORTDOCS%%share/doc/ocaml/html/manual039.html
+%%PORTDOCS%%share/doc/ocaml/html/manual040.html
+%%PORTDOCS%%share/doc/ocaml/html/manual041.html
+%%PORTDOCS%%share/doc/ocaml/html/manual042.html
+%%PORTDOCS%%share/doc/ocaml/html/manual043.html
+%%PORTDOCS%%share/doc/ocaml/html/manual044.html
+%%PORTDOCS%%share/doc/ocaml/html/manual045.html
+%%PORTDOCS%%share/doc/ocaml/html/manual046.html
+%%PORTDOCS%%share/doc/ocaml/html/manual047.html
+%%PORTDOCS%%share/doc/ocaml/html/manual048.html
+%%PORTDOCS%%share/doc/ocaml/html/manual049.html
+%%PORTDOCS%%share/doc/ocaml/html/manual050.html
+%%PORTDOCS%%share/doc/ocaml/html/manual051.html
+%%PORTDOCS%%share/doc/ocaml/html/manual052.html
+%%PORTDOCS%%share/doc/ocaml/html/manual053.html
+%%PORTDOCS%%share/doc/ocaml/html/manual054.html
+%%PORTDOCS%%share/doc/ocaml/html/manual055.html
+%%PORTDOCS%%share/doc/ocaml/html/manual056.html
+%%PORTDOCS%%share/doc/ocaml/html/manual057.html
+%%PORTDOCS%%share/doc/ocaml/html/manual058.html
+%%PORTDOCS%%share/doc/ocaml/html/manual059.html
+%%PORTDOCS%%share/doc/ocaml/html/manual060.html
+%%PORTDOCS%%share/doc/ocaml/html/manual061.html
+%%PORTDOCS%%share/doc/ocaml/html/manual062.html
+%%PORTDOCS%%share/doc/ocaml/html/manual063.html
+%%PORTDOCS%%share/doc/ocaml/html/manual064.html
+%%PORTDOCS%%share/doc/ocaml/html/manual065.html
+%%PORTDOCS%%share/doc/ocaml/html/manual066.html
+%%PORTDOCS%%share/doc/ocaml/html/manual067.html
+%%PORTDOCS%%share/doc/ocaml/html/manual068.html
+%%PORTDOCS%%share/doc/ocaml/html/manual069.html
+%%PORTDOCS%%share/doc/ocaml/html/manual070.html
+%%PORTDOCS%%share/doc/ocaml/html/manual071.html
+%%PORTDOCS%%share/doc/ocaml/html/manual072.html
+%%PORTDOCS%%share/doc/ocaml/html/manual073.html
+%%PORTDOCS%%share/doc/ocaml/html/manual074.html
+%%PORTDOCS%%share/doc/ocaml/html/manual075.html
+%%PORTDOCS%%share/doc/ocaml/html/manual076.html
+%%PORTDOCS%%share/doc/ocaml/html/next_motif.gif
+%%PORTDOCS%%share/doc/ocaml/html/previous_motif.gif
+%%PORTDOCS%%share/doc/ocaml/ocaml-3.04-refman.ps.gz
+%%PORTDOCS%%share/doc/ocaml/ocaml-3.04-refman.pdf
 %%LABLTK:%%share/examples/ocaml/labltk/Lambda2.back.gif
 %%LABLTK:%%share/examples/ocaml/labltk/Makefile
 %%LABLTK:%%share/examples/ocaml/labltk/README
@@ -406,96 +797,14 @@ lib/ocaml/dbm.cmx
 %%LABLTK:%%share/examples/ocaml/labltk/hello.ml
 %%LABLTK:%%share/examples/ocaml/labltk/hello.tcl
 %%LABLTK:%%share/examples/ocaml/labltk/tetris.ml
-share/doc/ocaml/LICENSE
-share/doc/ocaml/html/contents_motif.gif
-share/doc/ocaml/html/index.html
-share/doc/ocaml/html/libgraph.gif
-share/doc/ocaml/html/manual.haux
-share/doc/ocaml/html/manual.hmanual.hind
-share/doc/ocaml/html/manual.hmanual.kwd.hind
-share/doc/ocaml/html/manual001.html
-share/doc/ocaml/html/manual002.html
-share/doc/ocaml/html/manual003.html
-share/doc/ocaml/html/manual004.html
-share/doc/ocaml/html/manual005.html
-share/doc/ocaml/html/manual006.html
-share/doc/ocaml/html/manual007.html
-share/doc/ocaml/html/manual008.html
-share/doc/ocaml/html/manual009.html
-share/doc/ocaml/html/manual010.html
-share/doc/ocaml/html/manual011.html
-share/doc/ocaml/html/manual012.html
-share/doc/ocaml/html/manual013.html
-share/doc/ocaml/html/manual014.html
-share/doc/ocaml/html/manual015.html
-share/doc/ocaml/html/manual016.html
-share/doc/ocaml/html/manual017.html
-share/doc/ocaml/html/manual018.html
-share/doc/ocaml/html/manual019.html
-share/doc/ocaml/html/manual020.html
-share/doc/ocaml/html/manual021.html
-share/doc/ocaml/html/manual022.html
-share/doc/ocaml/html/manual023.html
-share/doc/ocaml/html/manual024.html
-share/doc/ocaml/html/manual025.html
-share/doc/ocaml/html/manual026.html
-share/doc/ocaml/html/manual027.html
-share/doc/ocaml/html/manual028.html
-share/doc/ocaml/html/manual029.html
-share/doc/ocaml/html/manual030.html
-share/doc/ocaml/html/manual031.html
-share/doc/ocaml/html/manual032.html
-share/doc/ocaml/html/manual033.html
-share/doc/ocaml/html/manual034.html
-share/doc/ocaml/html/manual035.html
-share/doc/ocaml/html/manual036.html
-share/doc/ocaml/html/manual037.html
-share/doc/ocaml/html/manual038.html
-share/doc/ocaml/html/manual039.html
-share/doc/ocaml/html/manual040.html
-share/doc/ocaml/html/manual041.html
-share/doc/ocaml/html/manual042.html
-share/doc/ocaml/html/manual043.html
-share/doc/ocaml/html/manual044.html
-share/doc/ocaml/html/manual045.html
-share/doc/ocaml/html/manual046.html
-share/doc/ocaml/html/manual047.html
-share/doc/ocaml/html/manual048.html
-share/doc/ocaml/html/manual049.html
-share/doc/ocaml/html/manual050.html
-share/doc/ocaml/html/manual051.html
-share/doc/ocaml/html/manual052.html
-share/doc/ocaml/html/manual053.html
-share/doc/ocaml/html/manual054.html
-share/doc/ocaml/html/manual055.html
-share/doc/ocaml/html/manual056.html
-share/doc/ocaml/html/manual057.html
-share/doc/ocaml/html/manual058.html
-share/doc/ocaml/html/manual059.html
-share/doc/ocaml/html/manual060.html
-share/doc/ocaml/html/manual061.html
-share/doc/ocaml/html/manual062.html
-share/doc/ocaml/html/manual063.html
-share/doc/ocaml/html/manual064.html
-share/doc/ocaml/html/manual065.html
-share/doc/ocaml/html/manual066.html
-share/doc/ocaml/html/manual067.html
-share/doc/ocaml/html/manual068.html
-share/doc/ocaml/html/manual069.html
-share/doc/ocaml/html/manual070.html
-share/doc/ocaml/html/manual071.html
-share/doc/ocaml/html/manual072.html
-share/doc/ocaml/html/manual073.html
-share/doc/ocaml/html/manual074.html
-share/doc/ocaml/html/manual075.html
-share/doc/ocaml/html/next_motif.gif
-share/doc/ocaml/html/previous_motif.gif
-share/doc/ocaml/ocaml-3.02-refman.ps.gz
-@dirrm share/doc/ocaml/html
-@dirrm share/doc/ocaml
+@dirrm lib/ocaml/shlibs
 @dirrm lib/ocaml/caml
 @dirrm lib/ocaml/threads
 %%LABLTK:%%@dirrm lib/ocaml/labltk
+@dirrm lib/ocaml/camlp4
+@dirrm lib/ocaml
+%%PORTDOCS%%@dirrm share/doc/ocaml/html/libref
+%%PORTDOCS%%@dirrm share/doc/ocaml/html
+@dirrm share/doc/ocaml
 %%LABLTK:%%@dirrm share/examples/ocaml/labltk
 %%LABLTK:%%@dirrm share/examples/ocaml
-@dirrm lib/ocaml