o Update to 3.08.3

o Uphold both CFLAGS and INSTALL_* permission safeness
o Both sort and update PLIST
o Tested against net/mldonkey-devel for 24 hours

6 files changed, 288 insertions, 233 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 67b8c855e5fc..7798ec80a304 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.08.2
+PORTVERSION=	3.08.3
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -39,8 +39,10 @@ LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 .endif
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	world.opt
+STRIP=
 
 MAN1=		ocamlcp.1 ocamldep.1 ocamldebug.1 ocamldoc.1 ocamlopt.1 \
 		ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 \
@@ -92,6 +94,27 @@ PLIST_SUB+=	PROF=""
 BROKEN=		"Does not compile on sparc64"
 .endif
 
+post-configure:
+# CFLAGS safeness
+	@${REINPLACE_CMD} -E \
+		-e 's|(BYTECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \
+		-e 's|(NATIVECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \
+		${WRKSRC}/config/Makefile
+# INSTALL* safeness (which preserves the correct permissions despite
+# user's umask(1)
+	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
+		${XARGS} -0 -n 5 -x \
+		${REINPLACE_CMD} -E \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \3,' \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)\$$\(CP\)([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \3,' \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)\$$\(CP\)([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		-e 's,^([[:space:]]*(then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,' \
+		-e 's,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \2,' \
+		-e 's,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \2,' \
+		-e 's,([[:space:]]*(do|then)[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
+
 post-install:
 	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
 .if !defined(WITHOUT_TK)
@@ -108,5 +131,17 @@ post-install:
 		ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
 	@${STRIP_CMD} ${PREFIX}/bin/${prog}
 .endfor
+# XXX ugly hack to fix permissions. I could not find the proper
+# Makefile entry
 
+	@${FIND} ${EXAMPLESDIR} -type f -print0 | \
+		${XARGS} -0 -n 5 -x \
+		${CHMOD} ${SHAREMODE}
+	@${FIND} -d ${EXAMPLESDIR} -type d -print0 | \
+		${XARGS} -0 -n 5 -x \
+		${CHMOD} ${SHAREMODE}
+	@${FIND} -s ${EXAMPLESDIR} -type d -print0 | \
+		${XARGS} -0 -n 5 -x \
+		${CHMOD} a+x
+		
 .include <bsd.port.post.mk>
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 8992aa7b4174..8626d95e09ff 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,2 +1,2 @@
-MD5 (ocaml-3.08.2.tar.bz2) = 608319707707cf4ac3f7a13eb63260ad
-SIZE (ocaml-3.08.2.tar.bz2) = 2052501
+MD5 (ocaml-3.08.3.tar.bz2) = 8277bb1537051fe5151dc31c350d64cd
+SIZE (ocaml-3.08.3.tar.bz2) = 2055260
diff --git a/lang/ocaml/files/patch-camlp4::lib::Makefile b/lang/ocaml/files/patch-camlp4::lib::Makefile
new file mode 100644
index 000000000000..3b948cab8da5
--- /dev/null
+++ b/lang/ocaml/files/patch-camlp4::lib::Makefile
@@ -0,0 +1,12 @@
+--- camlp4/lib/Makefile.orig	Fri Apr 22 05:28:15 2005
++++ camlp4/lib/Makefile	Fri Apr 22 05:28:41 2005
+@@ -49,7 +49,8 @@
+ 
+ installopt:
+ 	for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \
+-		test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
++		test -f $$f && \
++		cp $$f "$(LIBDIR)/camlp4/." || true ; \
+ 	done
+ 	# Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) 
+ 	target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \
diff --git a/lang/ocaml/files/patch-man::Makefile b/lang/ocaml/files/patch-man::Makefile
deleted file mode 100644
index 6bde352d81f6..000000000000
--- a/lang/ocaml/files/patch-man::Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- man/Makefile.orig	Thu Aug  1 21:43:47 2002
-+++ man/Makefile	Thu Aug  1 21:44:03 2002
-@@ -18,5 +18,3 @@
- 
- install:
- 	for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done
--	echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT)
--	echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT)
diff --git a/lang/ocaml/files/patch-stdlib::Makefile b/lang/ocaml/files/patch-stdlib::Makefile
new file mode 100644
index 000000000000..9ed197b03123
--- /dev/null
+++ b/lang/ocaml/files/patch-stdlib::Makefile
@@ -0,0 +1,12 @@
+--- stdlib/Makefile.bak	Fri Apr 22 05:04:24 2005
++++ stdlib/Makefile	Fri Apr 22 05:13:40 2005
+@@ -47,8 +47,7 @@
+ 	rm -f std_exit.p.cmi
+ 
+ install:
+-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+-           $(LIBDIR)
++	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
+ 
+ installopt: installopt-default installopt-$(PROFILING)
+ 
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index e562111d6733..50ef163ce9f8 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -25,6 +25,45 @@ bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
 bin/ocpp
+lib/ocaml/addlabels
+lib/ocaml/arg.cmi
+lib/ocaml/arg.cmx
+lib/ocaml/arg.ml
+lib/ocaml/arg.mli
+%%PROF%%lib/ocaml/arg.p.cmx
+lib/ocaml/arith_flags.cmx
+lib/ocaml/arith_status.cmi
+lib/ocaml/arith_status.cmx
+lib/ocaml/arith_status.mli
+lib/ocaml/array.cmi
+lib/ocaml/array.cmx
+lib/ocaml/array.ml
+lib/ocaml/array.mli
+%%PROF%%lib/ocaml/array.p.cmx
+lib/ocaml/arrayLabels.cmi
+lib/ocaml/arrayLabels.cmx
+lib/ocaml/arrayLabels.ml
+lib/ocaml/arrayLabels.mli
+%%PROF%%lib/ocaml/arrayLabels.p.cmx
+lib/ocaml/big_int.cmi
+lib/ocaml/big_int.cmx
+lib/ocaml/big_int.mli
+lib/ocaml/bigarray.a
+lib/ocaml/bigarray.cma
+lib/ocaml/bigarray.cmi
+lib/ocaml/bigarray.cmx
+lib/ocaml/bigarray.cmxa
+lib/ocaml/bigarray.mli
+lib/ocaml/buffer.cmi
+lib/ocaml/buffer.cmx
+lib/ocaml/buffer.ml
+lib/ocaml/buffer.mli
+%%PROF%%lib/ocaml/buffer.p.cmx
+lib/ocaml/callback.cmi
+lib/ocaml/callback.cmx
+lib/ocaml/callback.ml
+lib/ocaml/callback.mli
+%%PROF%%lib/ocaml/callback.p.cmx
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
@@ -38,6 +77,17 @@ lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/printexc.h
 lib/ocaml/caml/signals.h
+lib/ocaml/camlheader
+lib/ocaml/camlheader_ur
+lib/ocaml/camlinternalOO.cmi
+lib/ocaml/camlinternalOO.cmx
+lib/ocaml/camlinternalOO.ml
+lib/ocaml/camlinternalOO.mli
+%%PROF%%lib/ocaml/camlinternalOO.p.cmx
+lib/ocaml/camlp4/argl.cmi
+lib/ocaml/camlp4/argl.cmo
+lib/ocaml/camlp4/argl.cmx
+lib/ocaml/camlp4/argl.o
 lib/ocaml/camlp4/ast2pt.cmi
 lib/ocaml/camlp4/ast2pt.mli
 lib/ocaml/camlp4/camlp4.a
@@ -70,8 +120,8 @@ lib/ocaml/camlp4/ocpp.cmo
 lib/ocaml/camlp4/odyl.a
 lib/ocaml/camlp4/odyl.cma
 lib/ocaml/camlp4/odyl.cmo
-lib/ocaml/camlp4/odyl.cmxa
 lib/ocaml/camlp4/odyl.cmx
+lib/ocaml/camlp4/odyl.cmxa
 lib/ocaml/camlp4/odyl.o
 lib/ocaml/camlp4/odyl_main.cmi
 lib/ocaml/camlp4/pa_extend.cmi
@@ -166,6 +216,78 @@ lib/ocaml/camlp4/stdpp.mli
 lib/ocaml/camlp4/token.cmi
 lib/ocaml/camlp4/token.cmx
 lib/ocaml/camlp4/token.mli
+lib/ocaml/char.cmi
+lib/ocaml/char.cmx
+lib/ocaml/char.ml
+lib/ocaml/char.mli
+%%PROF%%lib/ocaml/char.p.cmx
+lib/ocaml/complex.cmi
+lib/ocaml/complex.cmx
+lib/ocaml/complex.ml
+lib/ocaml/complex.mli
+%%PROF%%lib/ocaml/complex.p.cmx
+lib/ocaml/condition.mli
+lib/ocaml/dbm.a
+lib/ocaml/dbm.cma
+lib/ocaml/dbm.cmi
+lib/ocaml/dbm.cmx
+lib/ocaml/dbm.cmxa
+lib/ocaml/dbm.mli
+lib/ocaml/digest.cmi
+lib/ocaml/digest.cmx
+lib/ocaml/digest.ml
+lib/ocaml/digest.mli
+%%PROF%%lib/ocaml/digest.p.cmx
+lib/ocaml/dynlink.cma
+lib/ocaml/dynlink.cmi
+lib/ocaml/dynlink.mli
+lib/ocaml/event.mli
+lib/ocaml/expunge
+lib/ocaml/extract_crc
+lib/ocaml/filename.cmi
+lib/ocaml/filename.cmx
+lib/ocaml/filename.ml
+lib/ocaml/filename.mli
+%%PROF%%lib/ocaml/filename.p.cmx
+lib/ocaml/format.cmi
+lib/ocaml/format.cmx
+lib/ocaml/format.ml
+lib/ocaml/format.mli
+%%PROF%%lib/ocaml/format.p.cmx
+lib/ocaml/gc.cmi
+lib/ocaml/gc.cmx
+lib/ocaml/gc.ml
+lib/ocaml/gc.mli
+%%PROF%%lib/ocaml/gc.p.cmx
+lib/ocaml/genlex.cmi
+lib/ocaml/genlex.cmx
+lib/ocaml/genlex.ml
+lib/ocaml/genlex.mli
+%%PROF%%lib/ocaml/genlex.p.cmx
+%%X11%%lib/ocaml/graphics.a
+%%X11%%lib/ocaml/graphics.cma
+%%X11%%lib/ocaml/graphics.cmi
+%%X11%%lib/ocaml/graphics.cmx
+%%X11%%lib/ocaml/graphics.cmxa
+%%X11%%lib/ocaml/graphics.mli
+%%X11%%lib/ocaml/graphicsX11.cmi
+%%X11%%lib/ocaml/graphicsX11.mli
+lib/ocaml/hashtbl.cmi
+lib/ocaml/hashtbl.cmx
+lib/ocaml/hashtbl.ml
+lib/ocaml/hashtbl.mli
+%%PROF%%lib/ocaml/hashtbl.p.cmx
+lib/ocaml/int32.cmi
+lib/ocaml/int32.cmx
+lib/ocaml/int32.ml
+lib/ocaml/int32.mli
+%%PROF%%lib/ocaml/int32.p.cmx
+lib/ocaml/int64.cmi
+lib/ocaml/int64.cmx
+lib/ocaml/int64.ml
+lib/ocaml/int64.mli
+%%PROF%%lib/ocaml/int64.p.cmx
+lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/balloon.cmi
 %%TK%%lib/ocaml/labltk/balloon.cmx
 %%TK%%lib/ocaml/labltk/balloon.mli
@@ -480,214 +602,6 @@ lib/ocaml/camlp4/token.mli
 %%TK%%lib/ocaml/labltk/wm.cmi
 %%TK%%lib/ocaml/labltk/wm.cmx
 %%TK%%lib/ocaml/labltk/wm.mli
-lib/ocaml/ocamldoc/custom/.keep
-lib/ocaml/ocamldoc/ocamldoc.hva
-lib/ocaml/ocamldoc/odoc.cmi
-lib/ocaml/ocamldoc/odoc_analyse.cmi
-lib/ocaml/ocamldoc/odoc_args.cmi
-lib/ocaml/ocamldoc/odoc_ast.cmi
-lib/ocaml/ocamldoc/odoc_class.cmi
-lib/ocaml/ocamldoc/odoc_comments.cmi
-lib/ocaml/ocamldoc/odoc_comments_global.cmi
-lib/ocaml/ocamldoc/odoc_config.cmi
-lib/ocaml/ocamldoc/odoc_control.cmi
-lib/ocaml/ocamldoc/odoc_cross.cmi
-lib/ocaml/ocamldoc/odoc_dag2html.cmi
-lib/ocaml/ocamldoc/odoc_dep.cmi
-lib/ocaml/ocamldoc/odoc_dot.cmi
-lib/ocaml/ocamldoc/odoc_env.cmi
-lib/ocaml/ocamldoc/odoc_exception.cmi
-lib/ocaml/ocamldoc/odoc_global.cmi
-lib/ocaml/ocamldoc/odoc_html.cmi
-lib/ocaml/ocamldoc/odoc_info.a
-lib/ocaml/ocamldoc/odoc_info.cma
-lib/ocaml/ocamldoc/odoc_info.cmi
-lib/ocaml/ocamldoc/odoc_info.cmxa
-lib/ocaml/ocamldoc/odoc_info.mli
-lib/ocaml/ocamldoc/odoc_inherit.cmi
-lib/ocaml/ocamldoc/odoc_latex.cmi
-lib/ocaml/ocamldoc/odoc_latex_style.cmi
-lib/ocaml/ocamldoc/odoc_lexer.cmi
-lib/ocaml/ocamldoc/odoc_man.cmi
-lib/ocaml/ocamldoc/odoc_merge.cmi
-lib/ocaml/ocamldoc/odoc_messages.cmi
-lib/ocaml/ocamldoc/odoc_misc.cmi
-lib/ocaml/ocamldoc/odoc_module.cmi
-lib/ocaml/ocamldoc/odoc_name.cmi
-lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
-lib/ocaml/ocamldoc/odoc_opt.cmi
-lib/ocaml/ocamldoc/odoc_parameter.cmi
-lib/ocaml/ocamldoc/odoc_parser.cmi
-lib/ocaml/ocamldoc/odoc_print.cmi
-lib/ocaml/ocamldoc/odoc_scan.cmi
-lib/ocaml/ocamldoc/odoc_search.cmi
-lib/ocaml/ocamldoc/odoc_see_lexer.cmi
-lib/ocaml/ocamldoc/odoc_sig.cmi
-lib/ocaml/ocamldoc/odoc_str.cmi
-lib/ocaml/ocamldoc/odoc_test.cmi
-lib/ocaml/ocamldoc/odoc_texi.cmi
-lib/ocaml/ocamldoc/odoc_text.cmi
-lib/ocaml/ocamldoc/odoc_text_lexer.cmi
-lib/ocaml/ocamldoc/odoc_text_parser.cmi
-lib/ocaml/ocamldoc/odoc_to_text.cmi
-lib/ocaml/ocamldoc/odoc_type.cmi
-lib/ocaml/ocamldoc/odoc_types.cmi
-lib/ocaml/ocamldoc/odoc_value.cmi
-lib/ocaml/stublibs/dllbigarray.so
-%%X11%%lib/ocaml/stublibs/dllgraphics.so
-%%TK%%lib/ocaml/stublibs/dlllabltk.so
-lib/ocaml/stublibs/dllmldbm.so
-lib/ocaml/stublibs/dllnums.so
-lib/ocaml/stublibs/dllstr.so
-lib/ocaml/stublibs/dllthreads.so
-%%TK%%lib/ocaml/stublibs/dlltkanim.so
-lib/ocaml/stublibs/dllunix.so
-lib/ocaml/stublibs/dllvmthreads.so
-lib/ocaml/threads/condition.cmi
-lib/ocaml/threads/condition.cmx
-lib/ocaml/threads/event.cmi
-lib/ocaml/threads/event.cmx
-lib/ocaml/threads/mutex.cmi
-lib/ocaml/threads/mutex.cmx
-lib/ocaml/threads/thread.cmi
-lib/ocaml/threads/thread.cmx
-lib/ocaml/threads/threadUnix.cmi
-lib/ocaml/threads/threadUnix.cmx
-lib/ocaml/threads/threads.a
-lib/ocaml/threads/threads.cma
-lib/ocaml/threads/threads.cmxa
-lib/ocaml/vmthreads/condition.cmi
-lib/ocaml/vmthreads/condition.mli
-lib/ocaml/vmthreads/event.cmi
-lib/ocaml/vmthreads/event.mli
-lib/ocaml/vmthreads/libvmthreads.a
-lib/ocaml/vmthreads/mutex.cmi
-lib/ocaml/vmthreads/mutex.mli
-lib/ocaml/vmthreads/stdlib.cma
-lib/ocaml/vmthreads/thread.cmi
-lib/ocaml/vmthreads/thread.mli
-lib/ocaml/vmthreads/threadUnix.cmi
-lib/ocaml/vmthreads/threadUnix.mli
-lib/ocaml/vmthreads/threads.cma
-lib/ocaml/vmthreads/unix.cma
-lib/ocaml/addlabels
-lib/ocaml/arg.cmi
-lib/ocaml/arg.cmx
-lib/ocaml/arg.ml
-lib/ocaml/arg.mli
-%%PROF%%lib/ocaml/arg.p.cmx
-lib/ocaml/arith_flags.cmx
-lib/ocaml/arith_status.cmi
-lib/ocaml/arith_status.cmx
-lib/ocaml/arith_status.mli
-lib/ocaml/array.cmi
-lib/ocaml/array.cmx
-lib/ocaml/array.ml
-lib/ocaml/array.mli
-%%PROF%%lib/ocaml/array.p.cmx
-lib/ocaml/arrayLabels.cmi
-lib/ocaml/arrayLabels.cmx
-lib/ocaml/arrayLabels.ml
-lib/ocaml/arrayLabels.mli
-%%PROF%%lib/ocaml/arrayLabels.p.cmx
-lib/ocaml/big_int.cmi
-lib/ocaml/big_int.cmx
-lib/ocaml/big_int.mli
-lib/ocaml/bigarray.a
-lib/ocaml/bigarray.cma
-lib/ocaml/bigarray.cmi
-lib/ocaml/bigarray.cmx
-lib/ocaml/bigarray.cmxa
-lib/ocaml/bigarray.mli
-lib/ocaml/buffer.cmi
-lib/ocaml/buffer.cmx
-lib/ocaml/buffer.ml
-lib/ocaml/buffer.mli
-%%PROF%%lib/ocaml/buffer.p.cmx
-lib/ocaml/callback.cmi
-lib/ocaml/callback.cmx
-lib/ocaml/callback.ml
-lib/ocaml/callback.mli
-%%PROF%%lib/ocaml/callback.p.cmx
-lib/ocaml/camlheader
-lib/ocaml/camlheader_ur
-lib/ocaml/camlinternalOO.cmi
-lib/ocaml/camlinternalOO.cmx
-lib/ocaml/camlinternalOO.ml
-lib/ocaml/camlinternalOO.mli
-%%PROF%%lib/ocaml/camlinternalOO.p.cmx
-lib/ocaml/char.cmi
-lib/ocaml/char.cmx
-lib/ocaml/char.ml
-lib/ocaml/char.mli
-%%PROF%%lib/ocaml/char.p.cmx
-lib/ocaml/complex.cmi
-lib/ocaml/complex.cmx
-lib/ocaml/complex.ml
-lib/ocaml/complex.mli
-%%PROF%%lib/ocaml/complex.p.cmx
-lib/ocaml/condition.mli
-lib/ocaml/dbm.a
-lib/ocaml/dbm.cma
-lib/ocaml/dbm.cmi
-lib/ocaml/dbm.cmx
-lib/ocaml/dbm.cmxa
-lib/ocaml/dbm.mli
-lib/ocaml/digest.cmi
-lib/ocaml/digest.cmx
-lib/ocaml/digest.ml
-lib/ocaml/digest.mli
-%%PROF%%lib/ocaml/digest.p.cmx
-lib/ocaml/dynlink.cma
-lib/ocaml/dynlink.cmi
-lib/ocaml/dynlink.mli
-lib/ocaml/event.mli
-lib/ocaml/expunge
-lib/ocaml/extract_crc
-lib/ocaml/filename.cmi
-lib/ocaml/filename.cmx
-lib/ocaml/filename.ml
-lib/ocaml/filename.mli
-%%PROF%%lib/ocaml/filename.p.cmx
-lib/ocaml/format.cmi
-lib/ocaml/format.cmx
-lib/ocaml/format.ml
-lib/ocaml/format.mli
-%%PROF%%lib/ocaml/format.p.cmx
-lib/ocaml/gc.cmi
-lib/ocaml/gc.cmx
-lib/ocaml/gc.ml
-lib/ocaml/gc.mli
-%%PROF%%lib/ocaml/gc.p.cmx
-lib/ocaml/genlex.cmi
-lib/ocaml/genlex.cmx
-lib/ocaml/genlex.ml
-lib/ocaml/genlex.mli
-%%PROF%%lib/ocaml/genlex.p.cmx
-%%X11%%lib/ocaml/graphics.a
-%%X11%%lib/ocaml/graphics.cma
-%%X11%%lib/ocaml/graphics.cmi
-%%X11%%lib/ocaml/graphics.cmx
-%%X11%%lib/ocaml/graphics.cmxa
-%%X11%%lib/ocaml/graphics.mli
-%%X11%%lib/ocaml/graphicsX11.cmi
-%%X11%%lib/ocaml/graphicsX11.mli
-lib/ocaml/hashtbl.cmi
-lib/ocaml/hashtbl.cmx
-lib/ocaml/hashtbl.ml
-lib/ocaml/hashtbl.mli
-%%PROF%%lib/ocaml/hashtbl.p.cmx
-lib/ocaml/int32.cmi
-lib/ocaml/int32.cmx
-lib/ocaml/int32.ml
-lib/ocaml/int32.mli
-%%PROF%%lib/ocaml/int32.p.cmx
-lib/ocaml/int64.cmi
-lib/ocaml/int64.cmx
-lib/ocaml/int64.ml
-lib/ocaml/int64.mli
-%%PROF%%lib/ocaml/int64.p.cmx
-lib/ocaml/int_misc.cmx
 lib/ocaml/lazy.cmi
 lib/ocaml/lazy.cmx
 lib/ocaml/lazy.ml
@@ -755,6 +669,59 @@ lib/ocaml/obj.cmx
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
 %%PROF%%lib/ocaml/obj.p.cmx
+lib/ocaml/ocamldoc/custom/.keep
+lib/ocaml/ocamldoc/ocamldoc.hva
+lib/ocaml/ocamldoc/odoc.cmi
+lib/ocaml/ocamldoc/odoc_analyse.cmi
+lib/ocaml/ocamldoc/odoc_args.cmi
+lib/ocaml/ocamldoc/odoc_ast.cmi
+lib/ocaml/ocamldoc/odoc_class.cmi
+lib/ocaml/ocamldoc/odoc_comments.cmi
+lib/ocaml/ocamldoc/odoc_comments_global.cmi
+lib/ocaml/ocamldoc/odoc_config.cmi
+lib/ocaml/ocamldoc/odoc_control.cmi
+lib/ocaml/ocamldoc/odoc_cross.cmi
+lib/ocaml/ocamldoc/odoc_dag2html.cmi
+lib/ocaml/ocamldoc/odoc_dep.cmi
+lib/ocaml/ocamldoc/odoc_dot.cmi
+lib/ocaml/ocamldoc/odoc_env.cmi
+lib/ocaml/ocamldoc/odoc_exception.cmi
+lib/ocaml/ocamldoc/odoc_global.cmi
+lib/ocaml/ocamldoc/odoc_html.cmi
+lib/ocaml/ocamldoc/odoc_info.a
+lib/ocaml/ocamldoc/odoc_info.cma
+lib/ocaml/ocamldoc/odoc_info.cmi
+lib/ocaml/ocamldoc/odoc_info.cmxa
+lib/ocaml/ocamldoc/odoc_info.mli
+lib/ocaml/ocamldoc/odoc_inherit.cmi
+lib/ocaml/ocamldoc/odoc_latex.cmi
+lib/ocaml/ocamldoc/odoc_latex_style.cmi
+lib/ocaml/ocamldoc/odoc_lexer.cmi
+lib/ocaml/ocamldoc/odoc_man.cmi
+lib/ocaml/ocamldoc/odoc_merge.cmi
+lib/ocaml/ocamldoc/odoc_messages.cmi
+lib/ocaml/ocamldoc/odoc_misc.cmi
+lib/ocaml/ocamldoc/odoc_module.cmi
+lib/ocaml/ocamldoc/odoc_name.cmi
+lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
+lib/ocaml/ocamldoc/odoc_opt.cmi
+lib/ocaml/ocamldoc/odoc_parameter.cmi
+lib/ocaml/ocamldoc/odoc_parser.cmi
+lib/ocaml/ocamldoc/odoc_print.cmi
+lib/ocaml/ocamldoc/odoc_scan.cmi
+lib/ocaml/ocamldoc/odoc_search.cmi
+lib/ocaml/ocamldoc/odoc_see_lexer.cmi
+lib/ocaml/ocamldoc/odoc_sig.cmi
+lib/ocaml/ocamldoc/odoc_str.cmi
+lib/ocaml/ocamldoc/odoc_test.cmi
+lib/ocaml/ocamldoc/odoc_texi.cmi
+lib/ocaml/ocamldoc/odoc_text.cmi
+lib/ocaml/ocamldoc/odoc_text_lexer.cmi
+lib/ocaml/ocamldoc/odoc_text_parser.cmi
+lib/ocaml/ocamldoc/odoc_to_text.cmi
+lib/ocaml/ocamldoc/odoc_type.cmi
+lib/ocaml/ocamldoc/odoc_types.cmi
+lib/ocaml/ocamldoc/odoc_value.cmi
 lib/ocaml/oo.cmi
 lib/ocaml/oo.cmx
 lib/ocaml/oo.ml
@@ -857,6 +824,16 @@ lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
 %%PROF%%lib/ocaml/stringLabels.p.cmx
 lib/ocaml/string_misc.cmx
+lib/ocaml/stublibs/dllbigarray.so
+%%X11%%lib/ocaml/stublibs/dllgraphics.so
+%%TK%%lib/ocaml/stublibs/dlllabltk.so
+lib/ocaml/stublibs/dllmldbm.so
+lib/ocaml/stublibs/dllnums.so
+lib/ocaml/stublibs/dllstr.so
+lib/ocaml/stublibs/dllthreads.so
+%%TK%%lib/ocaml/stublibs/dlltkanim.so
+lib/ocaml/stublibs/dllunix.so
+lib/ocaml/stublibs/dllvmthreads.so
 lib/ocaml/sys.cmi
 lib/ocaml/sys.cmx
 lib/ocaml/sys.ml
@@ -864,6 +841,19 @@ lib/ocaml/sys.mli
 %%PROF%%lib/ocaml/sys.p.cmx
 lib/ocaml/thread.mli
 lib/ocaml/threadUnix.mli
+lib/ocaml/threads/condition.cmi
+lib/ocaml/threads/condition.cmx
+lib/ocaml/threads/event.cmi
+lib/ocaml/threads/event.cmx
+lib/ocaml/threads/mutex.cmi
+lib/ocaml/threads/mutex.cmx
+lib/ocaml/threads/thread.cmi
+lib/ocaml/threads/thread.cmx
+lib/ocaml/threads/threadUnix.cmi
+lib/ocaml/threads/threadUnix.cmx
+lib/ocaml/threads/threads.a
+lib/ocaml/threads/threads.cma
+lib/ocaml/threads/threads.cmxa
 lib/ocaml/topdirs.cmi
 lib/ocaml/toplevellib.cma
 lib/ocaml/toploop.cmi
@@ -878,14 +868,25 @@ lib/ocaml/unix.mli
 lib/ocaml/unixLabels.cmi
 lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
+lib/ocaml/vmthreads/condition.cmi
+lib/ocaml/vmthreads/condition.mli
+lib/ocaml/vmthreads/event.cmi
+lib/ocaml/vmthreads/event.mli
+lib/ocaml/vmthreads/libvmthreads.a
+lib/ocaml/vmthreads/mutex.cmi
+lib/ocaml/vmthreads/mutex.mli
+lib/ocaml/vmthreads/stdlib.cma
+lib/ocaml/vmthreads/thread.cmi
+lib/ocaml/vmthreads/thread.mli
+lib/ocaml/vmthreads/threadUnix.cmi
+lib/ocaml/vmthreads/threadUnix.mli
+lib/ocaml/vmthreads/threads.cma
+lib/ocaml/vmthreads/unix.cma
 lib/ocaml/weak.cmi
 lib/ocaml/weak.cmx
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 %%PROF%%lib/ocaml/weak.p.cmx
-%%TK%%share/examples/ocaml/camltk/images/CamlBook.gif
-%%TK%%share/examples/ocaml/camltk/images/Lambda2.back.gif
-%%TK%%share/examples/ocaml/camltk/images/dojoji.back.gif
 %%TK%%share/examples/ocaml/camltk/Makefile
 %%TK%%share/examples/ocaml/camltk/Makefile.nt
 %%TK%%share/examples/ocaml/camltk/addition.ml
@@ -893,6 +894,9 @@ lib/ocaml/weak.mli
 %%TK%%share/examples/ocaml/camltk/fileinput.ml
 %%TK%%share/examples/ocaml/camltk/fileopen.ml
 %%TK%%share/examples/ocaml/camltk/helloworld.ml
+%%TK%%share/examples/ocaml/camltk/images/CamlBook.gif
+%%TK%%share/examples/ocaml/camltk/images/Lambda2.back.gif
+%%TK%%share/examples/ocaml/camltk/images/dojoji.back.gif
 %%TK%%share/examples/ocaml/camltk/jptest.ml
 %%TK%%share/examples/ocaml/camltk/mytext.ml
 %%TK%%share/examples/ocaml/camltk/socketinput.ml
@@ -913,16 +917,16 @@ lib/ocaml/weak.mli
 %%TK%%share/examples/ocaml/labltk/lang.ml
 %%TK%%share/examples/ocaml/labltk/taquin.ml
 %%TK%%share/examples/ocaml/labltk/tetris.ml
-@dirrm lib/ocaml/caml
-@dirrm lib/ocaml/camlp4
-%%TK%%@dirrm lib/ocaml/labltk
-@dirrm lib/ocaml/ocamldoc/custom
-@dirrm lib/ocaml/ocamldoc
-@dirrm lib/ocaml/stublibs
-@dirrm lib/ocaml/threads
-@dirrm lib/ocaml/vmthreads
-@dirrm lib/ocaml
+%%TK%%@dirrm share/examples/ocaml/labltk
 %%TK%%@dirrm share/examples/ocaml/camltk/images
 %%TK%%@dirrm share/examples/ocaml/camltk
-%%TK%%@dirrm share/examples/ocaml/labltk
 %%TK%%@dirrm share/examples/ocaml
+@dirrm lib/ocaml/vmthreads
+@dirrm lib/ocaml/threads
+@dirrm lib/ocaml/stublibs
+@dirrm lib/ocaml/ocamldoc/custom
+@dirrm lib/ocaml/ocamldoc
+%%TK%%@dirrm lib/ocaml/labltk
+@dirrm lib/ocaml/camlp4
+@dirrm lib/ocaml/caml
+@dirrm lib/ocaml