- Update to 3.10.2.

Thanks to:	Thomas Crimi <tcrimi@procida.us>

9 files changed, 216 insertions, 415 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index a5dcfa93c16b..a170e7d86216 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ocaml
-PORTVERSION=	3.09.3
-PORTREVISION=	1
+PORTVERSION=	3.10.2
+PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -89,7 +89,7 @@ post-configure:
 	@${REINPLACE_CMD} -E \
 		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
 		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
-		-e 's|(PTHREAD_LINK[ \t]*=).*|\1 ${THR_LD}|' \
+		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
 		-e 's|gcc|${CC}|g'	\
 		${WRKSRC}/config/Makefile
 
@@ -114,9 +114,9 @@ post-install:
 		"! -name .cvsignore")
 .endif
 
-.for prog in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
+.for PROG in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
 		ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
-	@${STRIP_CMD} ${PREFIX}/bin/${prog}
+	@${STRIP_CMD} ${PREFIX}/bin/${PROG}
 .endfor
 
 # Fix permissions for ld.conf
diff --git a/lang/ocaml/bsd.ocaml.mk b/lang/ocaml/bsd.ocaml.mk
deleted file mode 100644
index b1d48900f33d..000000000000
--- a/lang/ocaml/bsd.ocaml.mk
+++ /dev/null
@@ -1,195 +0,0 @@
-# ex:ts=4
-#
-# $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
-# $FreeBSD$
-#
-# bsd.ocaml.mk - Support for the Objective Caml language packages
-#
-# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
-# Feel free to send any comments and suggestions to maintainer.
-#
-# Currently recognised variables are:
-#
-# USE_OCAML		-	Set if your port uses OCaml to build/install.
-# NO_OCAML_BUILDDEPENDS	-	Don't add ocamlc to BUILD|EXTRACT|PATCH_DEPENDS.
-# NO_OCAML_RUNDEPENDS	-	Don't add ocamlc to RUN_DEPENDS.
-# USE_OCAML_FINDLIB	-	Set if your port uses ocamlfind to install
-#				packages. Package direcories will be
-#				automatically deleted.
-# USE_OCAML_LDCONFIG	-	Set if your port installs shared libraries
-#				into ocaml site-lib dir. OCaml ld.conf file
-#				will be automatically processed.
-# USE_OCAML_WASH	-	Set if your port wants to automatically
-#				purge shared Ocaml dirs on uninstall. It's
-#				useful when installing to non-standard PREFIX
-# OCAML_PKGDIRS		-	Directories under site-lib to be processed
-#				if USE_OCAML_FINDLIB specified.
-#				Default: ${PORTNAME}
-# OCAML_LDLIBS		-	Directories under PREFIX to be automatically
-#				added/removed from ld.conf
-#				Default: ${OCAML_SITELIBDIR}/${PORTNAME}
-
-.if !defined(OCAML_include)
-
-OCAML_MAINTAINER=	ssedov@mbsd.msk.ru
-OCAML_include=		bsd.ocaml.mk
-
-#
-# OCaml programs location
-#
-OCAMLC?=		${LOCALBASE}/bin/ocamlc
-OCAMLC_OPT?=		${LOCALBASE}/bin/ocamlc.opt
-OCAMLCP?=		${LOCALBASE}/bin/ocamlcp
-OCAMLFIND?=		${LOCALBASE}/bin/ocamlfind
-
-#
-# OCaml library directory
-#
-OCAML_LIBDIR?=		lib/ocaml
-
-#
-# Where to install site libraries
-#
-OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
-
-#
-# OCaml compiler port dependency
-#
-OCAMLC_PORT?=		${PORTSDIR}/lang/ocaml
-OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
-
-#
-# OCaml package manager port dependency
-#
-OCAMLFIND_PORT?=	${PORTSDIR}/devel/ocaml-findlib
-OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
-
-#
-# Common OCaml examples and documents location
-#
-OCAML_DOCSDIR=		${PREFIX}/share/doc/ocaml
-OCAML_EXAMPLESDIR=	${PREFIX}/share/examples/ocaml
-
-#
-# Location of OCaml ld.conf file
-#
-OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
-
-OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
-OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
-
-.if defined(USE_OCAML)
-. if !defined(NO_OCAML_BUILDDEPENDS)
-EXTRACT_DEPENDS+=	${OCAMLC_DEPEND}
-PATCH_DEPENDS+=		${OCAMLC_DEPEND}
-BUILD_DEPENDS+=		${OCAMLC_DEPEND}
-. endif
-. if !defined(NO_OCAML_RUNDEPENDS)
-RUN_DEPENDS+=		${OCAMLC_DEPEND}
-. endif
-PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
-.endif
-
-.if defined(USE_OCAML_FINDLIB) || defined(USE_OCAML_LDCONFIG)
-. if !target(post-install-script)
-post-install-script: ocaml-findlib ocaml-ldconfig ocaml-wash
-. endif
-.endif
-
-.if defined(USE_OCAML_FINDLIB)
-#
-# We'll additionally add ocamlfind to RUN_DEPENDS, since
-# if the port requires ocamlfind to install - it requires
-# some ocaml libraries and these libraries RUN_DEPENDS on
-# ocamlfind
-#
-BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
-RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
-MAKE_ENV+=	OCAMLFIND_DESTDIR="${OCAMLFIND_DESTDIR}" \
-		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
-
-#
-# Directories under site-lib to process automatically
-#
-OCAML_PKGDIRS?=	${PORTNAME}
-. if !target(pre-install-script)
-pre-install-script:
-.if !exists(${OCAMLFIND_DESTDIR})
-	@${MKDIR} "${PREFIX}/${OCAML_SITELIBDIR}"
-.endif
-. endif
-. if !target(ocaml-findlib)
-ocaml-findlib:
-.  for DIR in ${OCAML_PKGDIRS}
-	@${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
-		>> ${TMPPLIST}
-.  endfor
-. endif
-.endif
-
-.if defined(USE_OCAML_LDCONFIG)
-#
-# Directories under PREFIX for appending to ld.conf
-#
-OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
-. if !target(ocaml-ldconfig)
-ocaml-ldconfig:
-.  for LIB in ${OCAML_LDLIBS}
-	@${ECHO_CMD} "${PREFIX}/${LIB}" >> "${PREFIX}/${OCAML_LDCONF}"
-	@${ECHO_CMD} "@exec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
-.  endfor
-. endif
-.endif
-
-.if defined(USE_OCAML_WASH)
-. if !target(ocaml-wash)
-ocaml-wash:
-	@${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR} 2>/dev/null || true"\
-		>> ${TMPPLIST}
-#	If ld.conf is empty
-	@${ECHO_CMD} "@unexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/${OCAML_LIBDIR} 2>/dev/null || true" \
-		>> ${TMPPLIST}
-. endif
-.endif
-
-.if !target(ocaml-findlib)
-ocaml-findlib:
-	@${DO_NADA}
-.endif
-
-.if !target(ocaml-ldconfig)
-ocaml-ldconfig:
-	@${DO_NADA}
-.endif
-
-.if !target(ocaml-wash)
-ocaml-wash:
-	@${DO_NADA}
-.endif
-
-#
-# XXX: temporary workaround for non-standard PREFIX
-#
-.if !target(add-plist-post)
-add-plist-post:
-. if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && \
-	${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
-	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
-. else
-	@${DO_NADA}
-. endif
-
-# If we are using PORTDOCS macro port cannot delete OCAML_DOCSDIR, so
-# we shoud try to accomodate it
-. if defined(PORTDOCS)
-	@${ECHO_CMD} "@unexec rmdir ${OCAML_DOCSDIR} 2>/dev/null || true" \
-		>> ${TMPPLIST}
-. endif
-.endif
-
-.endif #!defined(OCAML_include)
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index c03154e57a21..adbdc5c2364c 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,3 +1,3 @@
-MD5 (ocaml-3.09.3.tar.bz2) = 8b3744efd0d51b82d55b61d0e2bf0e2b
-SHA256 (ocaml-3.09.3.tar.bz2) = 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
-SIZE (ocaml-3.09.3.tar.bz2) = 2038617
+MD5 (ocaml-3.10.2.tar.bz2) = d86f8f8aa4574fa60dd6f89044580307
+SHA256 (ocaml-3.10.2.tar.bz2) = 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
+SIZE (ocaml-3.10.2.tar.bz2) = 2284860
diff --git a/lang/ocaml/files/man1 b/lang/ocaml/files/man1
index 1419b4b42ba4..c7dbf91d14bf 100644
--- a/lang/ocaml/files/man1
+++ b/lang/ocaml/files/man1
@@ -1,13 +1,13 @@
+ocaml.1
+ocamlbuild.1
+ocamlc.1
 ocamlcp.1
-ocamldep.1
 ocamldebug.1
+ocamldep.1
 ocamldoc.1
+ocamllex.1
+ocamlmktop.1
 ocamlopt.1
+ocamlprof.1
 ocamlrun.1
 ocamlyacc.1
-ocamlmktop.1
-ocaml.1
-ocamlc.1
-ocamllex.1
-ocamlprof.1
-camlp4.1
diff --git a/lang/ocaml/files/manlinks b/lang/ocaml/files/manlinks
index ffaf80f9d3fc..f2a700858794 100644
--- a/lang/ocaml/files/manlinks
+++ b/lang/ocaml/files/manlinks
@@ -2,15 +2,3 @@ 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
diff --git a/lang/ocaml/files/patch-camlp4_camlp4_Makefile b/lang/ocaml/files/patch-camlp4_camlp4_Makefile
index 7c8690c03eb3..e69de29bb2d1 100644
--- a/lang/ocaml/files/patch-camlp4_camlp4_Makefile
+++ b/lang/ocaml/files/patch-camlp4_camlp4_Makefile
@@ -1,14 +0,0 @@
---- camlp4/camlp4/Makefile.orig	Sat Sep 23 20:02:56 2006
-+++ camlp4/camlp4/Makefile	Sat Sep 23 20:13:00 2006
-@@ -75,7 +75,10 @@
- 	-$(MKDIR) "$(LIBDIR)/camlp4"
- 	cp $(CAMLP4) "$(BINDIR)/."
- 	for ext in mli cmi cmo cmx o; do for mod in $(EXPORTED); do \
--	  cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
-+	  if [ -e "$${mod}.$${ext}" ]; then \
-+		cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; \
-+	  fi; \
-+	done; done
- 	cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
- 	for f in argl.o argl.cmx; do \
- 	  if test -r $$f ; then \
diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure
index b3da3425d791..debe9ffa8913 100644
--- a/lang/ocaml/files/patch-configure
+++ b/lang/ocaml/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Mar 30 16:00:19 2006
-+++ configure	Sat Aug 19 10:34:48 2006
-@@ -78,6 +78,8 @@
+--- configure.orig	2008-01-04 16:26:38.000000000 +0300
++++ configure	2008-04-06 23:16:20.000000000 +0400
+@@ -79,6 +79,8 @@
          withcurses=no;;
      -no-shared-libs)
          withsharedlibs=no;;
@@ -9,15 +9,15 @@
      -x11include*|--x11include*)
          x11_include_dir=$2; shift;;
      -x11lib*|--x11lib*)
-@@ -667,6 +669,7 @@
-   i386,*,linux_elf) profiling='prof';;
+@@ -686,6 +688,7 @@
    i386,*,gnu) profiling='prof';;
    i386,*,bsd_elf) profiling='prof';;
+   i386,*,macosx) profiling='prof';;
 +  *,*,freebsd) profiling='prof';;
    sparc,*,solaris)
      profiling='prof'
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
-@@ -1107,122 +1110,24 @@
+@@ -1132,124 +1135,24 @@
  x11_include="not found"
  x11_link="not found"
  
@@ -109,6 +109,7 @@
 -    /usr/x386/lib         \
 -    /usr/XFree86/lib/X11  \
 -                          \
+-    /usr/lib64            \
 -    /usr/lib              \
 -    /usr/local/lib        \
 -    /usr/unsupported/lib  \
@@ -123,6 +124,7 @@
 -  if test -f $dir/libX11.a || \
 -     test -f $dir/libX11.so || \
 -     test -f $dir/libX11.dll.a || \
+-     test -f $dir/libX11.dylib || \
 -     test -f $dir/libX11.sa; then
 -    if test $dir = /usr/lib; then
 -      x11_link="-lX11"
diff --git a/lang/ocaml/files/patch-ocamldoc_Makefile b/lang/ocaml/files/patch-ocamldoc_Makefile
index f5517373077e..bede4738dbbb 100644
--- a/lang/ocaml/files/patch-ocamldoc_Makefile
+++ b/lang/ocaml/files/patch-ocamldoc_Makefile
@@ -1,5 +1,5 @@
---- ./ocamldoc/Makefile.orig	Thu Nov 10 17:44:36 2005
-+++ ./ocamldoc/Makefile	Sun May 21 14:02:41 2006
+--- ocamldoc/Makefile.orig	2007-12-21 00:32:44.000000000 +0300
++++ ocamldoc/Makefile	2007-12-21 00:33:26.000000000 +0300
 @@ -40,7 +40,7 @@
  INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
  INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
@@ -9,14 +9,16 @@
  
  INSTALL_MLIS=odoc_info.mli
  INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
-@@ -261,7 +261,9 @@
+@@ -265,7 +265,11 @@
  	$(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
  	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
  	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
--	$(CP) stdlib_man/* $(INSTALL_MANODIR)
-+	for f in stdlib_man/*; do \
-+		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
-+	done
+-	if test -d stdlib_man; then $(CP) stdlib_man/* $(INSTALL_MANODIR); else : ; fi
++	if test -d stdlib_man; then \
++		for f in stdlib_man/*; do \
++			$(BSD_INSTALL_MAN) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
++		done; \
++	fi
  
  installopt:
  	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index fa9b77707569..ee26a1ed5069 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -1,12 +1,25 @@
 bin/camlp4
+bin/camlp4boot
 bin/camlp4o
 bin/camlp4o.opt
+bin/camlp4of
+bin/camlp4of.opt
+bin/camlp4oof
+bin/camlp4oof.opt
+bin/camlp4orf
+bin/camlp4orf.opt
+bin/camlp4prof
 bin/camlp4r
 bin/camlp4r.opt
+bin/camlp4rf
+bin/camlp4rf.opt
 %%TK%%bin/labltk
 bin/mkcamlp4
 bin/ocaml
 %%TK%%bin/ocamlbrowser
+bin/ocamlbuild
+bin/ocamlbuild.byte
+bin/ocamlbuild.native
 bin/ocamlc
 bin/ocamlc.opt
 bin/ocamlcp
@@ -24,7 +37,6 @@ bin/ocamlopt.opt
 bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
-bin/ocpp
 lib/ocaml/Makefile.config
 lib/ocaml/addlabels
 lib/ocaml/arg.cmi
@@ -78,6 +90,7 @@ lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/printexc.h
 lib/ocaml/caml/signals.h
+lib/ocaml/caml/unixsupport.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalMod.cmi
@@ -90,172 +103,155 @@ lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
 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.cmo
-lib/ocaml/camlp4/ast2pt.cmx
-lib/ocaml/camlp4/ast2pt.mli
-lib/ocaml/camlp4/ast2pt.o
-lib/ocaml/camlp4/camlp4.a
-lib/ocaml/camlp4/camlp4.cma
-lib/ocaml/camlp4/camlp4.cmxa
-lib/ocaml/camlp4/camlp4_top.cma
+lib/ocaml/camlp4/Camlp4.cmi
+lib/ocaml/camlp4/Camlp4Bin.cmi
+lib/ocaml/camlp4/Camlp4Bin.cmo
+lib/ocaml/camlp4/Camlp4Bin.cmx
+lib/ocaml/camlp4/Camlp4Bin.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4Tracer.o
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
+lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx
+lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx
+lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o
+lib/ocaml/camlp4/Camlp4Top.cmi
+lib/ocaml/camlp4/Camlp4Top.cmo
+lib/ocaml/camlp4/Camlp4Top/Rprint.cmi
+lib/ocaml/camlp4/Camlp4Top/Rprint.cmo
+lib/ocaml/camlp4/Camlp4Top/Rprint.cmx
+lib/ocaml/camlp4/Camlp4Top/Rprint.o
+lib/ocaml/camlp4/Camlp4Top/Top.cmi
+lib/ocaml/camlp4/Camlp4Top/Top.cmo
+lib/ocaml/camlp4/Camlp4Top/Top.cmx
+lib/ocaml/camlp4/Camlp4Top/Top.o
+lib/ocaml/camlp4/Camlp4_config.cmi
+lib/ocaml/camlp4/Camlp4_import.cmi
+lib/ocaml/camlp4/camlp4fulllib.a
+lib/ocaml/camlp4/camlp4fulllib.cma
+lib/ocaml/camlp4/camlp4fulllib.cmxa
+lib/ocaml/camlp4/camlp4lib.a
+lib/ocaml/camlp4/camlp4lib.cma
+lib/ocaml/camlp4/camlp4lib.cmxa
 lib/ocaml/camlp4/camlp4o.cma
+lib/ocaml/camlp4/camlp4of.cma
+lib/ocaml/camlp4/camlp4oof.cma
+lib/ocaml/camlp4/camlp4orf.cma
+lib/ocaml/camlp4/camlp4prof.cmi
+lib/ocaml/camlp4/camlp4prof.cmo
+lib/ocaml/camlp4/camlp4prof.cmx
+lib/ocaml/camlp4/camlp4prof.o
 lib/ocaml/camlp4/camlp4r.cma
-lib/ocaml/camlp4/extfold.cmi
-lib/ocaml/camlp4/extfold.cmo
-lib/ocaml/camlp4/extfold.cmx
-lib/ocaml/camlp4/extfold.mli
-lib/ocaml/camlp4/extfold.o
-lib/ocaml/camlp4/extfun.cmi
-lib/ocaml/camlp4/extfun.cmo
-lib/ocaml/camlp4/extfun.cmx
-lib/ocaml/camlp4/extfun.mli
-lib/ocaml/camlp4/extfun.o
-lib/ocaml/camlp4/fstream.cmi
-lib/ocaml/camlp4/fstream.cmo
-lib/ocaml/camlp4/fstream.cmx
-lib/ocaml/camlp4/fstream.mli
-lib/ocaml/camlp4/fstream.o
-lib/ocaml/camlp4/gramext.cmi
-lib/ocaml/camlp4/gramext.cmo
-lib/ocaml/camlp4/gramext.cmx
-lib/ocaml/camlp4/gramext.mli
-lib/ocaml/camlp4/gramext.o
-lib/ocaml/camlp4/gramlib.a
-lib/ocaml/camlp4/gramlib.cma
-lib/ocaml/camlp4/gramlib.cmxa
-lib/ocaml/camlp4/grammar.cmi
-lib/ocaml/camlp4/grammar.cmo
-lib/ocaml/camlp4/grammar.cmx
-lib/ocaml/camlp4/grammar.mli
-lib/ocaml/camlp4/grammar.o
-lib/ocaml/camlp4/mLast.cmi
-lib/ocaml/camlp4/mLast.mli
-lib/ocaml/camlp4/ocpp.cmo
-lib/ocaml/camlp4/odyl.a
-lib/ocaml/camlp4/odyl.cma
-lib/ocaml/camlp4/odyl.cmo
-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
-lib/ocaml/camlp4/pa_extend.cmo
-lib/ocaml/camlp4/pa_extend.cmx
-lib/ocaml/camlp4/pa_extend.o
-lib/ocaml/camlp4/pa_extend_m.cmo
-lib/ocaml/camlp4/pa_extend_m.cmx
-lib/ocaml/camlp4/pa_extend_m.o
-lib/ocaml/camlp4/pa_extfold.cmo
-lib/ocaml/camlp4/pa_extfold.cmx
-lib/ocaml/camlp4/pa_extfold.o
-lib/ocaml/camlp4/pa_extfun.cmo
-lib/ocaml/camlp4/pa_extfun.cmx
-lib/ocaml/camlp4/pa_extfun.o
-lib/ocaml/camlp4/pa_fstream.cmo
-lib/ocaml/camlp4/pa_fstream.cmx
-lib/ocaml/camlp4/pa_fstream.o
-lib/ocaml/camlp4/pa_ifdef.cmo
-lib/ocaml/camlp4/pa_ifdef.cmx
-lib/ocaml/camlp4/pa_ifdef.o
-lib/ocaml/camlp4/pa_macro.cmi
-lib/ocaml/camlp4/pa_macro.cmo
-lib/ocaml/camlp4/pa_macro.cmx
-lib/ocaml/camlp4/pa_macro.o
-lib/ocaml/camlp4/pa_o.cmi
-lib/ocaml/camlp4/pa_o.cmo
-lib/ocaml/camlp4/pa_o.cmx
-lib/ocaml/camlp4/pa_o.o
-lib/ocaml/camlp4/pa_o_fast.cmi
-lib/ocaml/camlp4/pa_o_fast.cmx
-lib/ocaml/camlp4/pa_o_fast.o
-lib/ocaml/camlp4/pa_oop.cmo
-lib/ocaml/camlp4/pa_oop.cmx
-lib/ocaml/camlp4/pa_oop.o
-lib/ocaml/camlp4/pa_op.cmo
-lib/ocaml/camlp4/pa_op.cmx
-lib/ocaml/camlp4/pa_op.o
-lib/ocaml/camlp4/pa_r.cmo
-lib/ocaml/camlp4/pa_r.cmx
-lib/ocaml/camlp4/pa_r.o
-lib/ocaml/camlp4/pa_rp.cmo
-lib/ocaml/camlp4/pa_rp.cmx
-lib/ocaml/camlp4/pa_rp.o
-lib/ocaml/camlp4/pa_ru.cmo
-lib/ocaml/camlp4/pa_ru.cmx
-lib/ocaml/camlp4/pa_ru.o
-lib/ocaml/camlp4/pcaml.cmi
-lib/ocaml/camlp4/pcaml.cmo
-lib/ocaml/camlp4/pcaml.cmx
-lib/ocaml/camlp4/pcaml.mli
-lib/ocaml/camlp4/pcaml.o
-lib/ocaml/camlp4/plexer.cmi
-lib/ocaml/camlp4/plexer.cmo
-lib/ocaml/camlp4/plexer.cmx
-lib/ocaml/camlp4/plexer.mli
-lib/ocaml/camlp4/plexer.o
-lib/ocaml/camlp4/pr_depend.cmo
-lib/ocaml/camlp4/pr_depend.cmx
-lib/ocaml/camlp4/pr_depend.o
-lib/ocaml/camlp4/pr_dump.cmo
-lib/ocaml/camlp4/pr_dump.cmx
-lib/ocaml/camlp4/pr_dump.o
-lib/ocaml/camlp4/pr_extend.cmo
-lib/ocaml/camlp4/pr_extend.cmx
-lib/ocaml/camlp4/pr_extend.o
-lib/ocaml/camlp4/pr_extfun.cmo
-lib/ocaml/camlp4/pr_extfun.cmx
-lib/ocaml/camlp4/pr_extfun.o
-lib/ocaml/camlp4/pr_null.cmo
-lib/ocaml/camlp4/pr_null.cmx
-lib/ocaml/camlp4/pr_null.o
-lib/ocaml/camlp4/pr_o.cmo
-lib/ocaml/camlp4/pr_o.cmx
-lib/ocaml/camlp4/pr_o.o
-lib/ocaml/camlp4/pr_op.cmo
-lib/ocaml/camlp4/pr_op.cmx
-lib/ocaml/camlp4/pr_op.o
-lib/ocaml/camlp4/pr_r.cmo
-lib/ocaml/camlp4/pr_r.cmx
-lib/ocaml/camlp4/pr_r.o
-lib/ocaml/camlp4/pr_rp.cmo
-lib/ocaml/camlp4/pr_rp.cmx
-lib/ocaml/camlp4/pr_rp.o
-lib/ocaml/camlp4/q_MLast.cmo
-lib/ocaml/camlp4/q_MLast.cmx
-lib/ocaml/camlp4/q_MLast.o
-lib/ocaml/camlp4/q_phony.cmo
-lib/ocaml/camlp4/q_phony.cmx
-lib/ocaml/camlp4/q_phony.o
-lib/ocaml/camlp4/quotation.cmi
-lib/ocaml/camlp4/quotation.cmo
-lib/ocaml/camlp4/quotation.cmx
-lib/ocaml/camlp4/quotation.mli
-lib/ocaml/camlp4/quotation.o
-lib/ocaml/camlp4/reloc.cmi
-lib/ocaml/camlp4/reloc.cmo
-lib/ocaml/camlp4/reloc.cmx
-lib/ocaml/camlp4/reloc.mli
-lib/ocaml/camlp4/reloc.o
-lib/ocaml/camlp4/spretty.cmi
-lib/ocaml/camlp4/spretty.cmo
-lib/ocaml/camlp4/spretty.cmx
-lib/ocaml/camlp4/spretty.mli
-lib/ocaml/camlp4/spretty.o
-lib/ocaml/camlp4/stdpp.cmi
-lib/ocaml/camlp4/stdpp.cmo
-lib/ocaml/camlp4/stdpp.cmx
-lib/ocaml/camlp4/stdpp.mli
-lib/ocaml/camlp4/stdpp.o
-lib/ocaml/camlp4/token.cmi
-lib/ocaml/camlp4/token.cmo
-lib/ocaml/camlp4/token.cmx
-lib/ocaml/camlp4/token.mli
-lib/ocaml/camlp4/token.o
+lib/ocaml/camlp4/camlp4rf.cma
 lib/ocaml/char.cmi
 lib/ocaml/char.cmx
 lib/ocaml/char.ml
@@ -632,6 +628,7 @@ lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/tkcompiler
 %%TK%%lib/ocaml/labltk/tkthread.cmi
 %%TK%%lib/ocaml/labltk/tkthread.cmo
+%%TK%%lib/ocaml/labltk/tkthread.cmx
 %%TK%%lib/ocaml/labltk/tkthread.mli
 %%TK%%lib/ocaml/labltk/tkthread.o
 %%TK%%lib/ocaml/labltk/tkvars.cmi
@@ -719,6 +716,22 @@ lib/ocaml/obj.cmx
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
 lib/ocaml/obj.p.cmx
+lib/ocaml/ocamlbuild/ocamlbuild.cmo
+lib/ocaml/ocamlbuild/ocamlbuild.cmx
+lib/ocaml/ocamlbuild/ocamlbuild.o
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_executor.o
+lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
+lib/ocaml/ocamlbuild/ocamlbuildlib.a
+lib/ocaml/ocamlbuild/ocamlbuildlib.cma
+lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
 lib/ocaml/ocamldoc/custom/.keep
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc.cmi
@@ -975,7 +988,12 @@ lib/ocaml/weak.p.cmx
 @dirrm lib/ocaml/stublibs
 @dirrm lib/ocaml/ocamldoc/custom
 @dirrm lib/ocaml/ocamldoc
-%%TK%%@dirrm lib/ocaml/labltk
+@dirrm lib/ocaml/ocamlbuild
+%%TK%%@dirrmtry lib/ocaml/labltk
+@dirrm lib/ocaml/camlp4/Camlp4Top
+@dirrm lib/ocaml/camlp4/Camlp4Printers
+@dirrm lib/ocaml/camlp4/Camlp4Parsers
+@dirrm lib/ocaml/camlp4/Camlp4Filters
 @dirrm lib/ocaml/camlp4
 @dirrm lib/ocaml/caml
 @comment lib/ocaml will be added by Makefile