- Add support for threaded Tk by passing PTHREAD_LIBS to configure in -tklibs

  swith. This allows build with threaded Tk (otherwise configure fails to use
  Tk). Also depend on threaded Tk by default in case of THREADS support - with
  non-pthread tk library it will not be stable enough
- Add OPTIONS
- Enable builds of non-threaded targets
- Depend on X in case if X is installed, since configure does this by default.
- Rename patchfiles to make portlint happy
- Eliminate the number of reinplace patterns (remove duplicates, optimize)
- Move manpage list in the separate files
- Pass pthread flags to compiler (PTHREAD_CFLAGS/LIBS safety)
- Remove some ugly hacks on setting permissions etc (eliminated by setting
  correct permission in COPY_TREE macros)
- Eliminate duplicate entries in PLIST in case of unstalling optimized binaries,
  also optimize this part
- Remove unused PLIST_SUB variable
- Miscelanios cleanups in Makefile
- Pass maintainership to submitter

The following files was added:
- files/man1
- files/manlinks
- files/mann
- files/patch-camlp4-man_Makefile
- files/patch-camlp4_lib_Makefile
- files/patch-ocamldoc_Makefile
- files/patch-stdlib_Makefile

I removed the following files:
- files/patch-camlp4-man::Makefile
- files/patch-camlp4::lib::Makefile
- files/patch-ocamldoc::Makefile
- files/patch-stdlib::Makefile

Also add bsd.ocaml.mk until it will be included in Mk/

PR:		ports/101122
Submitted by:	Stanislav Sedov

10 files changed, 419 insertions, 178 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index b4b3455ebc32..451ff79af5bd 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ocaml
 PORTVERSION=	3.09.2
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 		ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \
@@ -15,152 +16,138 @@ MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME:R}/ \
 MASTER_SITE_SUBDIR=	distfiles
 PKGNAMESUFFIX=	${SFX}
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	ssedov@mbsd.msk.ru
 COMMENT?=	The Objective Caml compiler and programming environment
 
-.if defined(WITHOUT_X11)
-PLIST_SUB+=	X11="@comment " TK="@comment "
-WITHOUT_TK=	yes
-SFX=		-nox11
-CONFLICTS+=	ocaml-[0-9]* ocaml-notk-[0-9]*
+USE_BZIP2=	yes
+REINPLACE_ARGS=	-i ""
+HAS_CONFIGURE=	yes
+ALL_TARGET=	world.opt
+STRIP=
+
+CONFIGURE_ARGS=	-prefix ${PREFIX}
+OPTIONS=	X11	"Build with X11 support" on \
+		TK	"Build LablTk library (requires X11 support)" on \
+		THREADS	"Build with Posix threads support" on \
+		CMP_LIB	"Install compiler's libraries" off \
+		OPT_DEF	"Use system-optimized binaries by default" off
+
+MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
+PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]
+
+# 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>
+
+MAN1!=	${CAT} ${FILESDIR}/man1
+MANN!=	${CAT} ${FILESDIR}/mann
+MLINKS!=${CAT} ${FILESDIR}/manlinks
+
+.if !defined(WITHOUT_THREADS)
+DEPENDS_ARGS+=	WITH_THREADS=yes
+CONFIGURE_ARGS+=-with-pthread
+THR_CPP=	${PTHREAD_CFLAGS}
+THR_LD=		${PTHREAD_LIBS}
 .else
+THR_CPP=	#empty
+THR_LD=		#empty
+CONFIGURE_ARGS+=-no-pthread
+.endif
+
+.if !defined(WITHOUT_X11) || exists(${X11BASE}/lib/libX11.a)
 PLIST_SUB+=	X11=""
 USE_XLIB=	yes
+CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
+.else
+PLIST_SUB+=	X11="@comment "
+WITHOUT_TK=	yes
+SFX=		-nox11
+CONFLICTS+=	ocaml-[0-9]* ocaml-notk-[0-9]*
+.endif
+
 .if defined(WITHOUT_TK)
 PLIST_SUB+=	TK="@comment "
 SFX=		-notk
 CONFLICTS+=	ocaml-[0-9]* ocaml-nox11-[0-9]*
+CONFIGURE_ARGS+=-no-tk
 .else
 PLIST_SUB+=	TK=""
 CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
-
+CONFIGURE_ARGS+=-tkdefs \
+	"-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 ${THR_CPP}"\
+	-tklibs "-L${LOCALBASE}/lib ${THR_LD}"
 BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \
 		${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84
 LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 .endif
-.endif
-
-USE_BZIP2=	yes
-REINPLACE_ARGS=	-i ""
-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 \
-		ocamllex.1 ocamlprof.1 camlp4.1
-MANN=		Arg.n Array.n ArrayLabels.n Bigarray.Array1.n \
-		Bigarray.Array2.n Bigarray.Array3.n Bigarray.Genarray.n \
-		Bigarray.n Buffer.n Callback.n CamlinternalOO.n Char.n \
-		Complex.n Digest.n Filename.n Format.n Gc.n Genlex.n \
-		Hashtbl.HashedType.n Hashtbl.Make.n Hashtbl.S.n Hashtbl.n \
-		Int32.n Int64.n Lazy.n Lexing.n List.n ListLabels.n \
-		Map.Make.n Map.OrderedType.n Map.S.n Map.n Marshal.n \
-		MoreLabels.Hashtbl.HashedType.n MoreLabels.Hashtbl.Make.n \
-		MoreLabels.Hashtbl.S.n MoreLabels.Hashtbl.n \
-		MoreLabels.Map.Make.n MoreLabels.Map.OrderedType.n \
-		MoreLabels.Map.S.n MoreLabels.Map.n MoreLabels.Set.Make.n \
-		MoreLabels.Set.OrderedType.n MoreLabels.Set.S.n \
-		MoreLabels.Set.n MoreLabels.n Nativeint.n Num.n Obj.n Oo.n \
-		Parsing.n Pervasives.LargeFile.n Pervasives.n Printexc.n \
-		Printf.n Queue.n Random.n Random.State.n Scanf.Scanning.n \
-		Scanf.n Set.Make.n Set.OrderedType.n Set.S.n Set.n Sort.n \
-		Stack.n StdLabels.Array.n StdLabels.List.n StdLabels.String.n \
-		StdLabels.n Str.n Stream.n String.n StringLabels.n Sys.n \
-		Unix.LargeFile.n Unix.n Weak.Make.n Weak.S.n Weak.n \
-		CamlinternalMod.n
-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} -with-pthread
-
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
-.if defined(WITHOUT_TK)
-CONFIGURE_ARGS+=	-no-tk
-.else
-CONFIGURE_ARGS+=	-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4"
-.endif
-.endif
-
-MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
-
-.include <bsd.port.pre.mk>
 
 .if ${ARCH} == sparc64 || ${ARCH} == ia64
 BROKEN=	ocamlc.opt seg-faults on ${ARCH}, please try to fix
 .endif
-PLIST_SUB+=	PROF=""
 
 post-configure:
 # CFLAGS safeness
 	@${REINPLACE_CMD} -E \
-		-e 's|(BYTECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \
-		-e 's|(NATIVECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \
+		-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 's|gcc|${CC}|g'	\
 		${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 \
+		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
 		-e 's,\$$\(ARCH\),${ARCH:sparc64=sparc},g'	\
-		-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,'
+		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
+		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
+		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
+		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
 
 post-install:
 	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
 .if !defined(WITHOUT_TK)
 	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${EXAMPLESDIR}/labltk
-	@${MKDIR} ${EXAMPLESDIR}/camltk
-	@${MKDIR} ${EXAMPLESDIR}/camltk/images
-	@cd ${WRKSRC}/otherlibs/labltk/examples_labltk; \
-		${INSTALL_DATA} * ${EXAMPLESDIR}/labltk
-	@${CP} -r ${WRKSRC}/otherlibs/labltk/examples_camltk/* \
-		${EXAMPLESDIR}/camltk
+	@(cd ${WRKSRC}/otherlibs/labltk && \
+		${COPYTREE_SHARE} examples_labltk ${EXAMPLESDIR} \
+		"! -name .cvsignore" && \
+		${COPYTREE_SHARE} examples_camltk ${EXAMPLESDIR} \
+		"! -name .cvsignore")
 .endif
+
 .for prog in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \
 		ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc
 	@${STRIP_CMD} ${PREFIX}/bin/${prog}
 .endfor
-# XXX ugly hack to fix permissions.
-	@${FIND} ${EXAMPLESDIR} -type f -print0 | \
-		${XARGS} -0 -n 5 -x \
-		${CHMOD} ${SHAREMODE}
-	@${CHMOD} u+w ${PREFIX}/lib/ocaml/ld.conf
+
+# Fix permissions for ld.conf
+	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf
+
 # Do we want .opt version of tools to be the default ?
-.if defined(WITH_OPT_DEFAULT)
+.if defined(WITH_OPT_DEF)
 . for module in ${MODOPT}
-# First, we save bytecode version
+#	First, we save bytecode version
 	@${MV} ${PREFIX}/bin/${module} ${PREFIX}/bin/${module}.byte
-# Next make .opt version be the default one (as link)
+
+#	Next make .opt version be the default one (via link)
 	@${LN} ${PREFIX}/bin/${module}.opt ${PREFIX}/bin/${module}
-	@${ECHO_CMD} "bin/${module}.opt" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ln %D/%F %B/${module}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rm %B/${module}" >> ${TMPPLIST}
+	@${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST}
 . endfor
-# Add files to the PLIST
-	@${FIND} ${PREFIX}/bin/ -type f -name \?caml\*.byte -or -name camlp4\?.byte \
-		| ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-.else
-. for module in ${MODOPT}
-	@${ECHO_CMD} ${module:S|^|bin/|} >> ${TMPPLIST}
-. endfor
-	@${FIND} ${PREFIX}/bin/ -type f -name \?caml\*.opt -or -name camlp4\?.opt \
-		| ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
 .endif
+
+.for module in ${MODOPT}
+	@${ECHO_CMD} "${module:S|^|bin/|}" >> ${TMPPLIST}
+	@${ECHO_CMD} "${module:S|^|bin/|}.opt" >> ${TMPPLIST}
+.endfor
+
 # Add compiler's libs if required
-.if !defined(WITHOUT_COMPILER_LIB)
+.if defined(WITH_CMP_LIB)
 	@${MKDIR}  ${PREFIX}/lib/ocaml/compiler-lib
 	@${INSTALL_DATA} ${WRKSRC}/utils/*.cm* ${PREFIX}/lib/ocaml/compiler-lib
 	@${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib
diff --git a/lang/ocaml/bsd.ocaml.mk b/lang/ocaml/bsd.ocaml.mk
new file mode 100644
index 000000000000..dec336a997e7
--- /dev/null
+++ b/lang/ocaml/bsd.ocaml.mk
@@ -0,0 +1,144 @@
+# ex:ts=4
+#
+# $MBSDlabs: portmk/bsd.ocaml.mk,v 1.14 2006/07/29 18:54:54 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.
+# 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
+
+#
+# Where to install site libraries
+#
+OCAML_SITELIBDIR?=	lib/ocaml/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}
+
+#
+# Location of OCaml ld.conf file
+#
+OCAML_LDCONF?=		lib/ocaml/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
+. 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 !target(ocaml-findlib)
+ocaml-findlib:
+	@${DO_NADA}
+.endif
+
+.if !target(ocaml-ldconfig)
+ocaml-ldconfig:
+	@${DO_NADA}
+.endif
+
+.endif
diff --git a/lang/ocaml/files/man1 b/lang/ocaml/files/man1
new file mode 100644
index 000000000000..1419b4b42ba4
--- /dev/null
+++ b/lang/ocaml/files/man1
@@ -0,0 +1,13 @@
+ocamlcp.1
+ocamldep.1
+ocamldebug.1
+ocamldoc.1
+ocamlopt.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
new file mode 100644
index 000000000000..ffaf80f9d3fc
--- /dev/null
+++ b/lang/ocaml/files/manlinks
@@ -0,0 +1,16 @@
+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/mann b/lang/ocaml/files/mann
new file mode 100644
index 000000000000..f2f57930f306
--- /dev/null
+++ b/lang/ocaml/files/mann
@@ -0,0 +1,81 @@
+Arg.n
+Array.n
+ArrayLabels.n
+Bigarray.Array1.n
+Bigarray.Array2.n
+Bigarray.Array3.n
+Bigarray.Genarray.n
+Bigarray.n
+Buffer.n
+Callback.n
+CamlinternalOO.n
+Char.n
+Complex.n
+Digest.n
+Filename.n
+Format.n
+Gc.n
+Genlex.n
+Hashtbl.HashedType.n
+Hashtbl.Make.n
+Hashtbl.S.n
+Hashtbl.n
+Int32.n
+Int64.n
+Lazy.n
+Lexing.n
+List.n
+ListLabels.n
+Map.Make.n
+Map.OrderedType.n
+Map.S.n
+Map.n
+Marshal.n
+MoreLabels.Hashtbl.HashedType.n
+MoreLabels.Hashtbl.Make.n
+MoreLabels.Hashtbl.S.n
+MoreLabels.Hashtbl.n
+MoreLabels.Map.Make.n
+MoreLabels.Map.OrderedType.n
+MoreLabels.Map.S.n
+MoreLabels.Map.n
+MoreLabels.Set.Make.n
+MoreLabels.Set.OrderedType.n
+MoreLabels.Set.S.n
+MoreLabels.Set.n
+MoreLabels.n
+Nativeint.n
+Num.n
+Obj.n
+Oo.n
+Parsing.n
+Pervasives.LargeFile.n
+Pervasives.n
+Printexc.n
+Printf.n
+Queue.n
+Random.n
+Random.State.n
+Scanf.Scanning.n
+Scanf.n
+Set.Make.n
+Set.OrderedType.n
+Set.S.n
+Set.n
+Sort.n
+Stack.n
+StdLabels.Array.n
+StdLabels.List.n
+StdLabels.String.n
+StdLabels.n
+Str.n
+Stream.n
+String.n
+StringLabels.n
+Sys.n
+Unix.LargeFile.n
+Unix.n
+Weak.Make.n
+Weak.S.n
+Weak.n
+CamlinternalMod.n
diff --git a/lang/ocaml/files/patch-camlp4-man::Makefile b/lang/ocaml/files/patch-camlp4-man_Makefile
index 2626d2574ce6..2626d2574ce6 100644
--- a/lang/ocaml/files/patch-camlp4-man::Makefile
+++ b/lang/ocaml/files/patch-camlp4-man_Makefile
diff --git a/lang/ocaml/files/patch-camlp4::lib::Makefile b/lang/ocaml/files/patch-camlp4_lib_Makefile
index 174a410b3b4e..174a410b3b4e 100644
--- a/lang/ocaml/files/patch-camlp4::lib::Makefile
+++ b/lang/ocaml/files/patch-camlp4_lib_Makefile
diff --git a/lang/ocaml/files/patch-ocamldoc::Makefile b/lang/ocaml/files/patch-ocamldoc_Makefile
index f5517373077e..f5517373077e 100644
--- a/lang/ocaml/files/patch-ocamldoc::Makefile
+++ b/lang/ocaml/files/patch-ocamldoc_Makefile
diff --git a/lang/ocaml/files/patch-stdlib::Makefile b/lang/ocaml/files/patch-stdlib_Makefile
index 9bd92e1c2566..9bd92e1c2566 100644
--- a/lang/ocaml/files/patch-stdlib::Makefile
+++ b/lang/ocaml/files/patch-stdlib_Makefile
diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist
index a12ab7f144e2..ec40ecce0141 100644
--- a/lang/ocaml/pkg-plist
+++ b/lang/ocaml/pkg-plist
@@ -17,7 +17,7 @@ lib/ocaml/arg.cmi
 lib/ocaml/arg.cmx
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
-%%PROF%%lib/ocaml/arg.p.cmx
+lib/ocaml/arg.p.cmx
 lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmi
 lib/ocaml/arith_status.cmx
@@ -26,12 +26,12 @@ lib/ocaml/array.cmi
 lib/ocaml/array.cmx
 lib/ocaml/array.ml
 lib/ocaml/array.mli
-%%PROF%%lib/ocaml/array.p.cmx
+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/arrayLabels.p.cmx
 lib/ocaml/big_int.cmi
 lib/ocaml/big_int.cmx
 lib/ocaml/big_int.mli
@@ -45,12 +45,12 @@ lib/ocaml/buffer.cmi
 lib/ocaml/buffer.cmx
 lib/ocaml/buffer.ml
 lib/ocaml/buffer.mli
-%%PROF%%lib/ocaml/buffer.p.cmx
+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/callback.p.cmx
 lib/ocaml/caml/alloc.h
 lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
@@ -75,7 +75,7 @@ lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
-%%PROF%%lib/ocaml/camlinternalOO.p.cmx
+lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/camlp4/argl.cmi
 lib/ocaml/camlp4/argl.cmo
 lib/ocaml/camlp4/argl.cmx
@@ -212,12 +212,12 @@ lib/ocaml/char.cmi
 lib/ocaml/char.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
-%%PROF%%lib/ocaml/char.p.cmx
+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/complex.p.cmx
 lib/ocaml/condition.mli
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cma
@@ -229,7 +229,7 @@ lib/ocaml/digest.cmi
 lib/ocaml/digest.cmx
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
-%%PROF%%lib/ocaml/digest.p.cmx
+lib/ocaml/digest.p.cmx
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
 lib/ocaml/dynlink.mli
@@ -240,22 +240,22 @@ lib/ocaml/filename.cmi
 lib/ocaml/filename.cmx
 lib/ocaml/filename.ml
 lib/ocaml/filename.mli
-%%PROF%%lib/ocaml/filename.p.cmx
+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/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/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
+lib/ocaml/genlex.p.cmx
 %%X11%%lib/ocaml/graphics.a
 %%X11%%lib/ocaml/graphics.cma
 %%X11%%lib/ocaml/graphics.cmi
@@ -268,17 +268,17 @@ lib/ocaml/hashtbl.cmi
 lib/ocaml/hashtbl.cmx
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
-%%PROF%%lib/ocaml/hashtbl.p.cmx
+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/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/int64.p.cmx
 lib/ocaml/int_misc.cmx
 %%TK%%lib/ocaml/labltk/balloon.cmi
 %%TK%%lib/ocaml/labltk/balloon.cmx
@@ -608,13 +608,13 @@ lib/ocaml/lazy.cmi
 lib/ocaml/lazy.cmx
 lib/ocaml/lazy.ml
 lib/ocaml/lazy.mli
-%%PROF%%lib/ocaml/lazy.p.cmx
+lib/ocaml/lazy.p.cmx
 lib/ocaml/ld.conf
 lib/ocaml/lexing.cmi
 lib/ocaml/lexing.cmx
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
-%%PROF%%lib/ocaml/lexing.p.cmx
+lib/ocaml/lexing.p.cmx
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/libbigarray.a
@@ -630,27 +630,27 @@ lib/ocaml/list.cmi
 lib/ocaml/list.cmx
 lib/ocaml/list.ml
 lib/ocaml/list.mli
-%%PROF%%lib/ocaml/list.p.cmx
+lib/ocaml/list.p.cmx
 lib/ocaml/listLabels.cmi
 lib/ocaml/listLabels.cmx
 lib/ocaml/listLabels.ml
 lib/ocaml/listLabels.mli
-%%PROF%%lib/ocaml/listLabels.p.cmx
+lib/ocaml/listLabels.p.cmx
 lib/ocaml/map.cmi
 lib/ocaml/map.cmx
 lib/ocaml/map.ml
 lib/ocaml/map.mli
-%%PROF%%lib/ocaml/map.p.cmx
+lib/ocaml/map.p.cmx
 lib/ocaml/marshal.cmi
 lib/ocaml/marshal.cmx
 lib/ocaml/marshal.ml
 lib/ocaml/marshal.mli
-%%PROF%%lib/ocaml/marshal.p.cmx
+lib/ocaml/marshal.p.cmx
 lib/ocaml/moreLabels.cmi
 lib/ocaml/moreLabels.cmx
 lib/ocaml/moreLabels.ml
 lib/ocaml/moreLabels.mli
-%%PROF%%lib/ocaml/moreLabels.p.cmx
+lib/ocaml/moreLabels.p.cmx
 lib/ocaml/mutex.mli
 lib/ocaml/nat.cmi
 lib/ocaml/nat.cmx
@@ -659,7 +659,7 @@ lib/ocaml/nativeint.cmi
 lib/ocaml/nativeint.cmx
 lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
-%%PROF%%lib/ocaml/nativeint.p.cmx
+lib/ocaml/nativeint.p.cmx
 lib/ocaml/num.cmi
 lib/ocaml/num.cmx
 lib/ocaml/num.mli
@@ -670,7 +670,7 @@ lib/ocaml/obj.cmi
 lib/ocaml/obj.cmx
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
-%%PROF%%lib/ocaml/obj.p.cmx
+lib/ocaml/obj.p.cmx
 lib/ocaml/ocamldoc/custom/.keep
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc.cmi
@@ -728,41 +728,41 @@ lib/ocaml/oo.cmi
 lib/ocaml/oo.cmx
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
-%%PROF%%lib/ocaml/oo.p.cmx
+lib/ocaml/oo.p.cmx
 lib/ocaml/outcometree.cmi
 lib/ocaml/outcometree.mli
 lib/ocaml/parsing.cmi
 lib/ocaml/parsing.cmx
 lib/ocaml/parsing.ml
 lib/ocaml/parsing.mli
-%%PROF%%lib/ocaml/parsing.p.cmx
+lib/ocaml/parsing.p.cmx
 lib/ocaml/pervasives.cmi
 lib/ocaml/pervasives.cmx
 lib/ocaml/pervasives.ml
 lib/ocaml/pervasives.mli
-%%PROF%%lib/ocaml/pervasives.p.cmx
+lib/ocaml/pervasives.p.cmx
 lib/ocaml/printexc.cmi
 lib/ocaml/printexc.cmx
 lib/ocaml/printexc.ml
 lib/ocaml/printexc.mli
-%%PROF%%lib/ocaml/printexc.p.cmx
+lib/ocaml/printexc.p.cmx
 lib/ocaml/printf.cmi
 lib/ocaml/printf.cmx
 lib/ocaml/printf.ml
 lib/ocaml/printf.mli
-%%PROF%%lib/ocaml/printf.p.cmx
+lib/ocaml/printf.p.cmx
 lib/ocaml/profiling.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/queue.cmi
 lib/ocaml/queue.cmx
 lib/ocaml/queue.ml
 lib/ocaml/queue.mli
-%%PROF%%lib/ocaml/queue.p.cmx
+lib/ocaml/queue.p.cmx
 lib/ocaml/random.cmi
 lib/ocaml/random.cmx
 lib/ocaml/random.ml
 lib/ocaml/random.mli
-%%PROF%%lib/ocaml/random.p.cmx
+lib/ocaml/random.p.cmx
 lib/ocaml/ratio.cmi
 lib/ocaml/ratio.cmx
 lib/ocaml/ratio.mli
@@ -770,40 +770,40 @@ lib/ocaml/scanf.cmi
 lib/ocaml/scanf.cmx
 lib/ocaml/scanf.ml
 lib/ocaml/scanf.mli
-%%PROF%%lib/ocaml/scanf.p.cmx
+lib/ocaml/scanf.p.cmx
 lib/ocaml/scrapelabels
 lib/ocaml/set.cmi
 lib/ocaml/set.cmx
 lib/ocaml/set.ml
 lib/ocaml/set.mli
-%%PROF%%lib/ocaml/set.p.cmx
+lib/ocaml/set.p.cmx
 lib/ocaml/sort.cmi
 lib/ocaml/sort.cmx
 lib/ocaml/sort.ml
 lib/ocaml/sort.mli
-%%PROF%%lib/ocaml/sort.p.cmx
+lib/ocaml/sort.p.cmx
 lib/ocaml/stack.cmi
 lib/ocaml/stack.cmx
 lib/ocaml/stack.ml
 lib/ocaml/stack.mli
-%%PROF%%lib/ocaml/stack.p.cmx
+lib/ocaml/stack.p.cmx
 lib/ocaml/stdLabels.cmi
 lib/ocaml/stdLabels.cmx
 lib/ocaml/stdLabels.ml
 lib/ocaml/stdLabels.mli
-%%PROF%%lib/ocaml/stdLabels.p.cmx
+lib/ocaml/stdLabels.p.cmx
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 lib/ocaml/std_exit.o
-%%PROF%%lib/ocaml/std_exit.p.cmx
-%%PROF%%lib/ocaml/std_exit.p.o
+lib/ocaml/std_exit.p.cmx
+lib/ocaml/std_exit.p.o
 lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmxa
-%%PROF%%lib/ocaml/stdlib.p.a
-%%PROF%%lib/ocaml/stdlib.p.cmxa
+lib/ocaml/stdlib.p.a
+lib/ocaml/stdlib.p.cmxa
 lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
@@ -814,17 +814,17 @@ lib/ocaml/stream.cmi
 lib/ocaml/stream.cmx
 lib/ocaml/stream.ml
 lib/ocaml/stream.mli
-%%PROF%%lib/ocaml/stream.p.cmx
+lib/ocaml/stream.p.cmx
 lib/ocaml/string.cmi
 lib/ocaml/string.cmx
 lib/ocaml/string.ml
 lib/ocaml/string.mli
-%%PROF%%lib/ocaml/string.p.cmx
+lib/ocaml/string.p.cmx
 lib/ocaml/stringLabels.cmi
 lib/ocaml/stringLabels.cmx
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
-%%PROF%%lib/ocaml/stringLabels.p.cmx
+lib/ocaml/stringLabels.p.cmx
 lib/ocaml/stublibs/dllbigarray.so
 %%X11%%lib/ocaml/stublibs/dllgraphics.so
 %%TK%%lib/ocaml/stublibs/dlllabltk.so
@@ -839,7 +839,7 @@ lib/ocaml/sys.cmi
 lib/ocaml/sys.cmx
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
-%%PROF%%lib/ocaml/sys.p.cmx
+lib/ocaml/sys.p.cmx
 lib/ocaml/thread.mli
 lib/ocaml/threadUnix.mli
 lib/ocaml/threads/condition.cmi
@@ -887,40 +887,40 @@ lib/ocaml/weak.cmi
 lib/ocaml/weak.cmx
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
-%%PROF%%lib/ocaml/weak.p.cmx
-%%TK%%%%EXAMPLESDIR%%/camltk/Makefile
-%%TK%%%%EXAMPLESDIR%%/camltk/Makefile.nt
-%%TK%%%%EXAMPLESDIR%%/camltk/addition.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/eyes.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/fileinput.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/fileopen.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/helloworld.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/images/CamlBook.gif
-%%TK%%%%EXAMPLESDIR%%/camltk/images/Lambda2.back.gif
-%%TK%%%%EXAMPLESDIR%%/camltk/images/dojoji.back.gif
-%%TK%%%%EXAMPLESDIR%%/camltk/jptest.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/mytext.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/socketinput.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/taddition.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/tetris.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/text.ml
-%%TK%%%%EXAMPLESDIR%%/camltk/winskel.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/Lambda2.back.gif
-%%TK%%%%EXAMPLESDIR%%/labltk/Makefile
-%%TK%%%%EXAMPLESDIR%%/labltk/Makefile.nt
-%%TK%%%%EXAMPLESDIR%%/labltk/README
-%%TK%%%%EXAMPLESDIR%%/labltk/calc.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/clock.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/demo.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/eyes.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/hello.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/hello.tcl
-%%TK%%%%EXAMPLESDIR%%/labltk/lang.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/taquin.ml
-%%TK%%%%EXAMPLESDIR%%/labltk/tetris.ml
-%%TK%%@dirrm %%EXAMPLESDIR%%/labltk
-%%TK%%@dirrm %%EXAMPLESDIR%%/camltk/images
-%%TK%%@dirrm %%EXAMPLESDIR%%/camltk
+lib/ocaml/weak.p.cmx
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/eyes.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileinput.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileopen.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/helloworld.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/CamlBook.gif
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/Lambda2.back.gif
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/dojoji.back.gif
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/jptest.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/mytext.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/socketinput.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/taddition.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml
+%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/README
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/calc.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/clock.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/demo.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/eyes.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.tcl
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/lang.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/taquin.ml
+%%TK%%%%EXAMPLESDIR%%/examples_labltk/tetris.ml
+%%TK%%@dirrm %%EXAMPLESDIR%%/examples_labltk
+%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk/images
+%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk
 %%TK%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/ocaml/vmthreads
 @dirrm lib/ocaml/threads