pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/ocaml



Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jan 14 19:53:35 UTC 2020

Modified Files:
        pkgsrc/lang/ocaml: Makefile Makefile.common PLIST buildlink3.mk
            distinfo hacks.mk options.mk
        pkgsrc/lang/ocaml/patches: patch-Makefile patch-Makefile.common.in
            patch-asmcomp_amd64_emit.mlp patch-asmrun_amd64.S patch-configure
            patch-lex_Makefile patch-ocamldoc_Makefile
            patch-otherlibs_Makefile.otherlibs.common
            patch-otherlibs_systhreads_Makefile patch-runtime_Makefile
            patch-tools_Makefile patch-tools_ocamlmklib patch-yacc_Makefile
Removed Files:
        pkgsrc/lang/ocaml/patches: patch-asmcomp_asmlink.ml
            patch-driver_compenv.ml patch-driver_main.ml
            patch-driver_main_args.ml patch-driver_main_args.mli
            patch-driver_optmain.ml patch-otherlibs_systhreads_st__stubs.c
            patch-otherlibs_threads_Makefile patch-tools_ocamlcp.ml
            patch-tools_ocamloptp.ml patch-utils_clflags.ml
            patch-utils_clflags.mli

Log Message:
Updated lang/ocaml to version 4.09.0.

Highlights of this release are:
* new optimisations, in particular for affine functions in matches;
* the graphics library was moved out of the main distribution;
* the vmthread library was removed;
* support for compiler plugins was removed;
* many bug fixes.

For more details see the Changes file in the distribution.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/lang/ocaml/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/ocaml/Makefile.common
cvs rdiff -u -r1.51 -r1.52 pkgsrc/lang/ocaml/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/lang/ocaml/buildlink3.mk
cvs rdiff -u -r1.133 -r1.134 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ocaml/hacks.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ocaml/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/ocaml/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-Makefile.common.in \
    pkgsrc/lang/ocaml/patches/patch-lex_Makefile \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common \
    pkgsrc/lang/ocaml/patches/patch-runtime_Makefile \
    pkgsrc/lang/ocaml/patches/patch-tools_Makefile
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp \
    pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/ocaml/patches/patch-asmcomp_asmlink.ml \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/ocaml/patches/patch-configure
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml \
    pkgsrc/lang/ocaml/patches/patch-utils_clflags.mli
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/ocaml/patches/patch-driver_main.ml \
    pkgsrc/lang/ocaml/patches/patch-driver_optmain.ml
cvs rdiff -u -r1.5 -r0 pkgsrc/lang/ocaml/patches/patch-driver_main_args.ml \
    pkgsrc/lang/ocaml/patches/patch-driver_main_args.mli \
    pkgsrc/lang/ocaml/patches/patch-tools_ocamlcp.ml \
    pkgsrc/lang/ocaml/patches/patch-tools_ocamloptp.ml \
    pkgsrc/lang/ocaml/patches/patch-utils_clflags.ml
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
cvs rdiff -u -r1.13 -r0 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/Makefile
diff -u pkgsrc/lang/ocaml/Makefile:1.131 pkgsrc/lang/ocaml/Makefile:1.132
--- pkgsrc/lang/ocaml/Makefile:1.131    Sun Nov 24 09:23:13 2019
+++ pkgsrc/lang/ocaml/Makefile  Tue Jan 14 19:53:35 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.131 2019/11/24 09:23:13 adam Exp $
+# $NetBSD: Makefile,v 1.132 2020/01/14 19:53:35 jaapb Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=           2
+#CONFIGURE_ENV+=               disable_x11=yes
 
 BUILD_TARGET=          world
 MAKE_JOBS_SAFE=                no
@@ -13,6 +13,8 @@ USE_LANGUAGES+=               c
 USE_LIBTOOL=           yes
 USE_GNU_CONFIGURE_HOST=        no
 
+#USE_GCC_RUNTIME=      yes
+
 PLIST_VARS+=   ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
                instrumented_runtime
 
@@ -38,7 +40,7 @@ PLIST.ocaml-stub=     yes
 BUILD_TARGET+=         opt opt.opt
 PLIST.ocaml-opt=       yes
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
-      empty(MACHINE_PLATFORM:MSunOS-*-*) && \
+      empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
       (${MACHINE_ARCH} != "aarch64")
 PLIST.ocaml-prof=      yes
 .  endif
@@ -97,15 +99,12 @@ REPLACE_AWK+=               tools/ocaml-instr-report
 do-test:
        cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
 
-.if ${OPSYS} == "Darwin"
-.PHONY: fix-darwin-install-name
-post-install: fix-darwin-install-name
-fix-darwin-install-name:
-       for f in ${DESTDIR}${PREFIX}/lib/ocaml/*.so \
-               ${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
-               install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
-       done
-.endif
+#post-install:
+#      set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1;    \
+#      for m in *; do                                                  \
+#        ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m              \
+#              ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m;              \
+#      done
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"

Index: pkgsrc/lang/ocaml/Makefile.common
diff -u pkgsrc/lang/ocaml/Makefile.common:1.57 pkgsrc/lang/ocaml/Makefile.common:1.58
--- pkgsrc/lang/ocaml/Makefile.common:1.57      Sun Nov 24 09:23:13 2019
+++ pkgsrc/lang/ocaml/Makefile.common   Tue Jan 14 19:53:35 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.57 2019/11/24 09:23:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.58 2020/01/14 19:53:35 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=      ocaml-4.08.1
+DISTNAME=      ocaml-4.09.0
 CATEGORIES=    lang
-MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.08/
+MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.09/
 #EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
@@ -33,6 +33,14 @@ CONFIGURE_ARGS+=     --without-x
 INSTALL_UNSTRIPPED=    yes
 .endif
 
+#.if ${OPSYS} == "Darwin"
+#CONFIGURE_ENV+=       CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
+#CONFIGURE_ENV+=       ASPP="${CC} -arch ${MACHINE_ARCH} -c"
+#CONFIGURE_ENV+=       AS="as -arch ${MACHINE_ARCH}"
+#.else
+#CONFIGURE_ENV+=       CC="${CC} ${CFLAGS}"
+#.endif
+
 .include "../../mk/bdb.buildlink3.mk"
 
 #BDB_LINK=     ${BDB_LIBS}

Index: pkgsrc/lang/ocaml/PLIST
diff -u pkgsrc/lang/ocaml/PLIST:1.51 pkgsrc/lang/ocaml/PLIST:1.52
--- pkgsrc/lang/ocaml/PLIST:1.51        Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/PLIST     Tue Jan 14 19:53:35 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2019/08/24 10:54:23 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.52 2020/01/14 19:53:35 jaapb Exp $
 bin/ocaml
 ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
 ${PLIST.instrumented_runtime}bin/ocaml-instr-report
@@ -30,9 +30,9 @@ ${PLIST.ocaml-opt}bin/ocamlobjinfo.opt
 ${PLIST.ocaml-opt}bin/ocamlopt
 ${PLIST.ocaml-opt}bin/ocamlopt.byte
 ${PLIST.ocaml-opt}bin/ocamlopt.opt
-bin/ocamloptp
-bin/ocamloptp.byte
-${PLIST.ocaml-opt}bin/ocamloptp.opt
+@comment 4.09 bin/ocamloptp
+@comment 4.09 bin/ocamloptp.byte
+@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
 ${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -92,9 +92,9 @@ lib/ocaml/caml/hash.h
 lib/ocaml/caml/hooks.h
 lib/ocaml/caml/instrtrace.h
 lib/ocaml/caml/instruct.h
-lib/ocaml/caml/int64_emul.h
-lib/ocaml/caml/int64_format.h
-lib/ocaml/caml/int64_native.h
+@comment 4.09 lib/ocaml/caml/int64_emul.h
+@comment 4.09 lib/ocaml/caml/int64_format.h
+@comment 4.09 lib/ocaml/caml/int64_native.h
 lib/ocaml/caml/interp.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/io.h
@@ -129,46 +129,48 @@ lib/ocaml/caml/version.h
 lib/ocaml/caml/weak.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlheaderd
+lib/ocaml/camlheaderi
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
 lib/ocaml/camlinternalFormatBasics.cmi
 lib/ocaml/camlinternalFormatBasics.cmt
 lib/ocaml/camlinternalFormatBasics.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalLazy.cmi
 lib/ocaml/camlinternalLazy.cmt
 lib/ocaml/camlinternalLazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmt
 lib/ocaml/camlinternalMod.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmt
 lib/ocaml/camlinternalOO.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
@@ -258,6 +260,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.mli
@@ -334,6 +341,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.mli
 lib/ocaml/compiler-libs/clflags.cmi
 lib/ocaml/compiler-libs/clflags.cmt
 lib/ocaml/compiler-libs/clflags.cmti
@@ -389,6 +401,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmo_format.mli
@@ -400,6 +417,9 @@ lib/ocaml/compiler-libs/cmt_format.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmti
@@ -410,26 +430,26 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.mli
-lib/ocaml/compiler-libs/compdynlink.cmi
-lib/ocaml/compiler-libs/compdynlink.cmt
-lib/ocaml/compiler-libs/compdynlink.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
-lib/ocaml/compiler-libs/compdynlink.mli
-lib/ocaml/compiler-libs/compdynlink_common.cmi
-lib/ocaml/compiler-libs/compdynlink_common.cmt
-lib/ocaml/compiler-libs/compdynlink_common.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
-lib/ocaml/compiler-libs/compdynlink_common.mli
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
-lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
-lib/ocaml/compiler-libs/compdynlink_types.cmi
-lib/ocaml/compiler-libs/compdynlink_types.cmt
-lib/ocaml/compiler-libs/compdynlink_types.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
-lib/ocaml/compiler-libs/compdynlink_types.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.mli
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmt
 lib/ocaml/compiler-libs/compenv.cmti
@@ -460,11 +480,14 @@ lib/ocaml/compiler-libs/compmisc.cmt
 lib/ocaml/compiler-libs/compmisc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
 lib/ocaml/compiler-libs/compmisc.mli
-lib/ocaml/compiler-libs/compplugin.cmi
-lib/ocaml/compiler-libs/compplugin.cmt
-lib/ocaml/compiler-libs/compplugin.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compplugin.cmx
-lib/ocaml/compiler-libs/compplugin.mli
+lib/ocaml/compiler-libs/compute_ranges.cmi
+lib/ocaml/compiler-libs/compute_ranges.cmt
+lib/ocaml/compiler-libs/compute_ranges.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmx
+lib/ocaml/compiler-libs/compute_ranges.mli
+lib/ocaml/compiler-libs/compute_ranges_intf.cmi
+lib/ocaml/compiler-libs/compute_ranges_intf.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges_intf.cmx
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/config.cmt
 lib/ocaml/compiler-libs/config.cmti
@@ -475,6 +498,11 @@ lib/ocaml/compiler-libs/consistbl.cmt
 lib/ocaml/compiler-libs/consistbl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/consistbl.cmx
 lib/ocaml/compiler-libs/consistbl.mli
+lib/ocaml/compiler-libs/convert_primitives.cmi
+lib/ocaml/compiler-libs/convert_primitives.cmt
+lib/ocaml/compiler-libs/convert_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmx
+lib/ocaml/compiler-libs/convert_primitives.mli
 lib/ocaml/compiler-libs/ctype.cmi
 lib/ocaml/compiler-libs/ctype.cmt
 lib/ocaml/compiler-libs/ctype.cmti
@@ -587,6 +615,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmti
@@ -811,11 +844,6 @@ lib/ocaml/compiler-libs/meta.cmt
 lib/ocaml/compiler-libs/meta.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/meta.cmx
 lib/ocaml/compiler-libs/meta.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.mli
 lib/ocaml/compiler-libs/misc.cmi
 lib/ocaml/compiler-libs/misc.cmt
 lib/ocaml/compiler-libs/misc.cmti
@@ -848,7 +876,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 lib/ocaml/compiler-libs/ocamltoplevel.cma
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/opcodes.cmt
+lib/ocaml/compiler-libs/opcodes.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opcodes.cmx
+lib/ocaml/compiler-libs/opcodes.mli
 lib/ocaml/compiler-libs/oprint.cmi
 lib/ocaml/compiler-libs/oprint.cmt
 lib/ocaml/compiler-libs/oprint.cmti
@@ -910,6 +940,11 @@ lib/ocaml/compiler-libs/path.cmt
 lib/ocaml/compiler-libs/path.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/path.mli
+lib/ocaml/compiler-libs/persistent_env.cmi
+lib/ocaml/compiler-libs/persistent_env.cmt
+lib/ocaml/compiler-libs/persistent_env.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/persistent_env.cmx
+lib/ocaml/compiler-libs/persistent_env.mli
 lib/ocaml/compiler-libs/pparse.cmi
 lib/ocaml/compiler-libs/pparse.cmt
 lib/ocaml/compiler-libs/pparse.cmti
@@ -940,6 +975,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmti
@@ -1010,6 +1050,16 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmti
@@ -1183,6 +1233,11 @@ lib/ocaml/compiler-libs/targetint.cmt
 lib/ocaml/compiler-libs/targetint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/targetint.cmx
 lib/ocaml/compiler-libs/targetint.mli
+lib/ocaml/compiler-libs/tast_iterator.cmi
+lib/ocaml/compiler-libs/tast_iterator.cmt
+lib/ocaml/compiler-libs/tast_iterator.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_iterator.cmx
+lib/ocaml/compiler-libs/tast_iterator.mli
 lib/ocaml/compiler-libs/tast_mapper.cmi
 lib/ocaml/compiler-libs/tast_mapper.cmt
 lib/ocaml/compiler-libs/tast_mapper.cmti
@@ -1287,11 +1342,6 @@ lib/ocaml/compiler-libs/typedtree.cmt
 lib/ocaml/compiler-libs/typedtree.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtree.cmx
 lib/ocaml/compiler-libs/typedtree.mli
-lib/ocaml/compiler-libs/typedtreeIter.cmi
-lib/ocaml/compiler-libs/typedtreeIter.cmt
-lib/ocaml/compiler-libs/typedtreeIter.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeIter.cmx
-lib/ocaml/compiler-libs/typedtreeIter.mli
 lib/ocaml/compiler-libs/typemod.cmi
 lib/ocaml/compiler-libs/typemod.cmt
 lib/ocaml/compiler-libs/typemod.cmti
@@ -1387,6 +1437,7 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
 lib/ocaml/dynlink.mli
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_compilerlibs.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
 lib/ocaml/ephemeron.ml
@@ -1423,7 +1474,7 @@ ${PLIST.ocaml-opt}lib/ocaml/libasmrun_pi
 ${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
 ${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
 ${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
@@ -1600,9 +1651,9 @@ lib/ocaml/std_exit.cmt
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.o
-${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmi
@@ -1612,334 +1663,334 @@ ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
-${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
 lib/ocaml/stdlib__arg.cmi
 lib/ocaml/stdlib__arg.cmt
 lib/ocaml/stdlib__arg.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
 lib/ocaml/stdlib__array.cmi
 lib/ocaml/stdlib__array.cmt
 lib/ocaml/stdlib__array.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__array.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
 lib/ocaml/stdlib__arrayLabels.cmi
 lib/ocaml/stdlib__arrayLabels.cmt
 lib/ocaml/stdlib__arrayLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
 lib/ocaml/stdlib__bigarray.cmi
 lib/ocaml/stdlib__bigarray.cmt
 lib/ocaml/stdlib__bigarray.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
 lib/ocaml/stdlib__bool.cmi
 lib/ocaml/stdlib__bool.cmt
 lib/ocaml/stdlib__bool.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
 lib/ocaml/stdlib__buffer.cmi
 lib/ocaml/stdlib__buffer.cmt
 lib/ocaml/stdlib__buffer.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
 lib/ocaml/stdlib__bytes.cmi
 lib/ocaml/stdlib__bytes.cmt
 lib/ocaml/stdlib__bytes.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
 lib/ocaml/stdlib__bytesLabels.cmi
 lib/ocaml/stdlib__bytesLabels.cmt
 lib/ocaml/stdlib__bytesLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
 lib/ocaml/stdlib__callback.cmi
 lib/ocaml/stdlib__callback.cmt
 lib/ocaml/stdlib__callback.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
 lib/ocaml/stdlib__char.cmi
 lib/ocaml/stdlib__char.cmt
 lib/ocaml/stdlib__char.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__char.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
 lib/ocaml/stdlib__complex.cmi
 lib/ocaml/stdlib__complex.cmt
 lib/ocaml/stdlib__complex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
 lib/ocaml/stdlib__digest.cmi
 lib/ocaml/stdlib__digest.cmt
 lib/ocaml/stdlib__digest.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
 lib/ocaml/stdlib__ephemeron.cmi
 lib/ocaml/stdlib__ephemeron.cmt
 lib/ocaml/stdlib__ephemeron.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
 lib/ocaml/stdlib__filename.cmi
 lib/ocaml/stdlib__filename.cmt
 lib/ocaml/stdlib__filename.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
 lib/ocaml/stdlib__float.cmi
 lib/ocaml/stdlib__float.cmt
 lib/ocaml/stdlib__float.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__float.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
 lib/ocaml/stdlib__format.cmi
 lib/ocaml/stdlib__format.cmt
 lib/ocaml/stdlib__format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
 lib/ocaml/stdlib__fun.cmi
 lib/ocaml/stdlib__fun.cmt
 lib/ocaml/stdlib__fun.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
 lib/ocaml/stdlib__gc.cmi
 lib/ocaml/stdlib__gc.cmt
 lib/ocaml/stdlib__gc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
 lib/ocaml/stdlib__genlex.cmi
 lib/ocaml/stdlib__genlex.cmt
 lib/ocaml/stdlib__genlex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
 lib/ocaml/stdlib__hashtbl.cmi
 lib/ocaml/stdlib__hashtbl.cmt
 lib/ocaml/stdlib__hashtbl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
 lib/ocaml/stdlib__int.cmi
 lib/ocaml/stdlib__int.cmt
 lib/ocaml/stdlib__int.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
 lib/ocaml/stdlib__int32.cmi
 lib/ocaml/stdlib__int32.cmt
 lib/ocaml/stdlib__int32.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
 lib/ocaml/stdlib__int64.cmi
 lib/ocaml/stdlib__int64.cmt
 lib/ocaml/stdlib__int64.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
 lib/ocaml/stdlib__lazy.cmi
 lib/ocaml/stdlib__lazy.cmt
 lib/ocaml/stdlib__lazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
 lib/ocaml/stdlib__lexing.cmi
 lib/ocaml/stdlib__lexing.cmt
 lib/ocaml/stdlib__lexing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
 lib/ocaml/stdlib__list.cmi
 lib/ocaml/stdlib__list.cmt
 lib/ocaml/stdlib__list.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__list.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
 lib/ocaml/stdlib__listLabels.cmi
 lib/ocaml/stdlib__listLabels.cmt
 lib/ocaml/stdlib__listLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
 lib/ocaml/stdlib__map.cmi
 lib/ocaml/stdlib__map.cmt
 lib/ocaml/stdlib__map.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__map.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
 lib/ocaml/stdlib__marshal.cmi
 lib/ocaml/stdlib__marshal.cmt
 lib/ocaml/stdlib__marshal.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
 lib/ocaml/stdlib__moreLabels.cmi
 lib/ocaml/stdlib__moreLabels.cmt
 lib/ocaml/stdlib__moreLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
 lib/ocaml/stdlib__nativeint.cmi
 lib/ocaml/stdlib__nativeint.cmt
 lib/ocaml/stdlib__nativeint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
 lib/ocaml/stdlib__obj.cmi
 lib/ocaml/stdlib__obj.cmt
 lib/ocaml/stdlib__obj.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
 lib/ocaml/stdlib__oo.cmi
 lib/ocaml/stdlib__oo.cmt
 lib/ocaml/stdlib__oo.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
 lib/ocaml/stdlib__option.cmi
 lib/ocaml/stdlib__option.cmt
 lib/ocaml/stdlib__option.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__option.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
 lib/ocaml/stdlib__parsing.cmi
 lib/ocaml/stdlib__parsing.cmt
 lib/ocaml/stdlib__parsing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
 lib/ocaml/stdlib__pervasives.cmi
 lib/ocaml/stdlib__pervasives.cmt
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
-${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
 lib/ocaml/stdlib__printexc.cmi
 lib/ocaml/stdlib__printexc.cmt
 lib/ocaml/stdlib__printexc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
 lib/ocaml/stdlib__printf.cmi
 lib/ocaml/stdlib__printf.cmt
 lib/ocaml/stdlib__printf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
 lib/ocaml/stdlib__queue.cmi
 lib/ocaml/stdlib__queue.cmt
 lib/ocaml/stdlib__queue.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
 lib/ocaml/stdlib__random.cmi
 lib/ocaml/stdlib__random.cmt
 lib/ocaml/stdlib__random.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
 lib/ocaml/stdlib__result.cmi
 lib/ocaml/stdlib__result.cmt
 lib/ocaml/stdlib__result.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__result.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
 lib/ocaml/stdlib__scanf.cmi
 lib/ocaml/stdlib__scanf.cmt
 lib/ocaml/stdlib__scanf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
 lib/ocaml/stdlib__seq.cmi
 lib/ocaml/stdlib__seq.cmt
 lib/ocaml/stdlib__seq.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
 lib/ocaml/stdlib__set.cmi
 lib/ocaml/stdlib__set.cmt
 lib/ocaml/stdlib__set.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
 lib/ocaml/stdlib__spacetime.cmi
 lib/ocaml/stdlib__spacetime.cmt
 lib/ocaml/stdlib__spacetime.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
 lib/ocaml/stdlib__stack.cmi
 lib/ocaml/stdlib__stack.cmt
 lib/ocaml/stdlib__stack.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
 lib/ocaml/stdlib__stdLabels.cmi
 lib/ocaml/stdlib__stdLabels.cmt
 lib/ocaml/stdlib__stdLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
 lib/ocaml/stdlib__stream.cmi
 lib/ocaml/stdlib__stream.cmt
 lib/ocaml/stdlib__stream.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
 lib/ocaml/stdlib__string.cmi
 lib/ocaml/stdlib__string.cmt
 lib/ocaml/stdlib__string.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__string.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
 lib/ocaml/stdlib__stringLabels.cmi
 lib/ocaml/stdlib__stringLabels.cmt
 lib/ocaml/stdlib__stringLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
 lib/ocaml/stdlib__sys.cmi
 lib/ocaml/stdlib__sys.cmt
 lib/ocaml/stdlib__sys.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
 lib/ocaml/stdlib__uchar.cmi
 lib/ocaml/stdlib__uchar.cmt
 lib/ocaml/stdlib__uchar.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
 lib/ocaml/stdlib__unit.cmi
 lib/ocaml/stdlib__unit.cmt
 lib/ocaml/stdlib__unit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
 lib/ocaml/stdlib__weak.cmi
 lib/ocaml/stdlib__weak.cmt
 lib/ocaml/stdlib__weak.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
 ${PLIST.ocaml-opt}lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
@@ -1958,11 +2009,9 @@ lib/ocaml/stublibs/dllcamlstr.so
 ${PLIST.ocaml-spacetime}lib/ocaml/stublibs/dllraw_spacetime_lib.so
 lib/ocaml/stublibs/dllthreads.so
 lib/ocaml/stublibs/dllunix.so
-lib/ocaml/stublibs/dllvmthreads.so
+@comment 4.09 lib/ocaml/stublibs/dllvmthreads.so
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
-lib/ocaml/target_camlheaderd
-${PLIST.instrumented_runtime}lib/ocaml/target_camlheaderi
 lib/ocaml/threads/condition.cmi
 lib/ocaml/threads/condition.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
@@ -2006,25 +2055,6 @@ lib/ocaml/unixLabels.cmi
 lib/ocaml/unixLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
-lib/ocaml/vmthreads/condition.cmi
-lib/ocaml/vmthreads/condition.cmti
-lib/ocaml/vmthreads/condition.mli
-lib/ocaml/vmthreads/event.cmi
-lib/ocaml/vmthreads/event.cmti
-lib/ocaml/vmthreads/event.mli
-lib/ocaml/vmthreads/libvmthreads.a
-lib/ocaml/vmthreads/mutex.cmi
-lib/ocaml/vmthreads/mutex.cmti
-lib/ocaml/vmthreads/mutex.mli
-lib/ocaml/vmthreads/stdlib.cma
-lib/ocaml/vmthreads/thread.cmi
-lib/ocaml/vmthreads/thread.cmti
-lib/ocaml/vmthreads/thread.mli
-lib/ocaml/vmthreads/threadUnix.cmi
-lib/ocaml/vmthreads/threadUnix.cmti
-lib/ocaml/vmthreads/threadUnix.mli
-lib/ocaml/vmthreads/threads.cma
-lib/ocaml/vmthreads/unix.cma
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 man/man1/ocaml.1
@@ -2144,6 +2174,7 @@ man/man3/Complex.3
 man/man3/Condition.3
 man/man3/Config.3
 man/man3/Consistbl.3
+man/man3/Consistbl.Make.3
 man/man3/Depend.3
 man/man3/Depend.String.3
 man/man3/Digest.3
@@ -2173,8 +2204,6 @@ man/man3/Format.3
 man/man3/Fun.3
 man/man3/Gc.3
 man/man3/Genlex.3
-man/man3/Graphics.3
-man/man3/GraphicsX11.3
 man/man3/Hashtbl.3
 man/man3/Hashtbl.HashedType.3
 man/man3/Hashtbl.Make.3
@@ -2200,6 +2229,7 @@ man/man3/Identifiable.Thing.3
 man/man3/Int.3
 man/man3/Int32.3
 man/man3/Int64.3
+man/man3/Int_replace_polymorphic_compare.3
 man/man3/Lazy.3
 man/man3/Lexer.3
 man/man3/Lexing.3
@@ -2216,11 +2246,10 @@ man/man3/Map.S.3
 man/man3/Marshal.3
 man/man3/Misc.3
 man/man3/Misc.Color.3
+man/man3/Misc.EnvLazy.3
 man/man3/Misc.Error_style.3
-man/man3/Misc.HookSig.3
 man/man3/Misc.Int_literal_converter.3
 man/man3/Misc.LongString.3
-man/man3/Misc.MakeHooks.3
 man/man3/Misc.Stdlib.3
 man/man3/Misc.Stdlib.Array.3
 man/man3/Misc.Stdlib.List.3
@@ -2267,8 +2296,6 @@ man/man3/Parsing.3
 man/man3/Pervasives.3
 man/man3/Pervasives.LargeFile.3
 man/man3/Pparse.3
-man/man3/Pparse.ImplementationHooks.3
-man/man3/Pparse.InterfaceHooks.3
 man/man3/Pprintast.3
 man/man3/Printast.3
 man/man3/Printexc.3
@@ -2286,8 +2313,6 @@ man/man3/Set.3
 man/man3/Set.Make.3
 man/man3/Set.OrderedType.3
 man/man3/Set.S.3
-man/man3/Simplif.3
-man/man3/Simplif.Hooks.3
 man/man3/Spacetime.3
 man/man3/Spacetime.Series.3
 man/man3/Spacetime.Snapshot.3
@@ -2367,11 +2392,6 @@ man/man3/Targetint.3
 man/man3/Terminfo.3
 man/man3/Thread.3
 man/man3/ThreadUnix.3
-man/man3/Typemod.3
-man/man3/Typemod.ImplementationHooks.3
-man/man3/Typemod.InterfaceHooks.3
-man/man3/Typemod.Sig_component_kind.3
-man/man3/Typemod.Signature_names.3
 man/man3/Uchar.3
 man/man3/Unit.3
 man/man3/Unix.3

Index: pkgsrc/lang/ocaml/buildlink3.mk
diff -u pkgsrc/lang/ocaml/buildlink3.mk:1.53 pkgsrc/lang/ocaml/buildlink3.mk:1.54
--- pkgsrc/lang/ocaml/buildlink3.mk:1.53        Tue Aug 27 05:37:38 2019
+++ pkgsrc/lang/ocaml/buildlink3.mk     Tue Jan 14 19:53:35 2020
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.53 2019/08/27 05:37:38 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.54 2020/01/14 19:53:35 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.08.0
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.08.1nb1
+BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.09.0
+BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.09.0
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=   build
 

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.133 pkgsrc/lang/ocaml/distinfo:1.134
--- pkgsrc/lang/ocaml/distinfo:1.133    Sun Nov 24 09:23:13 2019
+++ pkgsrc/lang/ocaml/distinfo  Tue Jan 14 19:53:35 2020
@@ -1,33 +1,21 @@
-$NetBSD: distinfo,v 1.133 2019/11/24 09:23:13 adam Exp $
+$NetBSD: distinfo,v 1.134 2020/01/14 19:53:35 jaapb Exp $
 
-SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2
-RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6
-SHA512 (ocaml-4.08.1.tar.gz) = 8239c1879926e59c3d9611ad0d97618ce21b0528f1bd59db3df9c24287ad180ffa74f34e52e1fab39e71cbf8113a9a4ee5037cc33ae64ca6a9a109fe4ada0256
-Size (ocaml-4.08.1.tar.gz) = 4897908 bytes
-SHA1 (patch-Makefile) = 3c1410ba28d7d25ffd8fd4b1ffeef7f0206ec58d
-SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a
-SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851
-SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
-SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222
-SHA1 (patch-configure) = c2c03a3e6706b71f12b16f28c751ca3a0e4d4dd5
-SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3
-SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
-SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
-SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
-SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
-SHA1 (patch-lex_Makefile) = 9c3de0a77dbea117b5587cfd77bbdcb3e2db26b6
+SHA1 (ocaml-4.09.0.tar.gz) = 981f15617d90ed990919c031c8c1f39b45f62002
+RMD160 (ocaml-4.09.0.tar.gz) = a6c7b137ada913531092e111dabccd8c4248313d
+SHA512 (ocaml-4.09.0.tar.gz) = c1b666839960c157868fc32a96fe4137280a4b99464ba2c6616700b962d802ed86467ec21c341abbefdf684b8314b90fd6a5018c6de58dc29152af851eebea88
+Size (ocaml-4.09.0.tar.gz) = 4829882 bytes
+SHA1 (patch-Makefile) = 132a1cf1187dc05ec5338b496757d89047e91130
+SHA1 (patch-Makefile.common.in) = fbf3dc0614073ed5ac9b220211a837f69a4ffcaf
+SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
+SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
+SHA1 (patch-configure) = 311b18383bcc88f2a67d83d4b0c6e35344bd2d0d
+SHA1 (patch-lex_Makefile) = 18d1b8272ffb3e3a58c26d8a2494aaae6942426a
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
-SHA1 (patch-ocamldoc_Makefile) = 7f0a90ca7849447b93ae4b3fcbc58901de1e996f
+SHA1 (patch-ocamldoc_Makefile) = ca4997636f7a6a382bbcb7be365526e94be4534a
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 2eb71de7bd659c763fb7efdf10af1812e135c904
-SHA1 (patch-otherlibs_systhreads_Makefile) = d6f7818487c156b101b6a78f0dc2824d57453e50
-SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 99fd5e74e1e885b5288419a3499463d252b1b5f4
-SHA1 (patch-otherlibs_threads_Makefile) = 3ccc89021d808967bc958d295515ceca1c39c81d
-SHA1 (patch-runtime_Makefile) = 37b8e9b8d121b9066ccd38ce18a31f8d25369152
-SHA1 (patch-tools_Makefile) = e891408b43672b164a28f213713b7b211227a4af
-SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 98211e0a220d360560c2b3f8d7e1fad4c83f2726
+SHA1 (patch-otherlibs_systhreads_Makefile) = a713371cf16e79ee3e5d0f9f8d128476d4c9bee9
+SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
+SHA1 (patch-tools_Makefile) = 871d40893d0300d80b9322631321803348a154cf
 SHA1 (patch-tools_ocamlmklib) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
-SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
-SHA1 (patch-utils_clflags.ml) = 1c8223caac3c81b134b470d9bb2fb5ce62576c53
-SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
-SHA1 (patch-yacc_Makefile) = d3a2f606e05f6a58170cf4bad4f3321e54b4324b
+SHA1 (patch-yacc_Makefile) = c416081421f5e09273ea8b04062402cbfeba7497

Index: pkgsrc/lang/ocaml/hacks.mk
diff -u pkgsrc/lang/ocaml/hacks.mk:1.7 pkgsrc/lang/ocaml/hacks.mk:1.8
--- pkgsrc/lang/ocaml/hacks.mk:1.7      Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/hacks.mk  Tue Jan 14 19:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.7 2019/08/24 10:54:23 jaapb Exp $
+# $NetBSD: hacks.mk,v 1.8 2020/01/14 19:53:35 jaapb Exp $
 
 .if !defined(OCAML_HACKS_MK)
 OCAML_HACKS_MK=        defined

Index: pkgsrc/lang/ocaml/options.mk
diff -u pkgsrc/lang/ocaml/options.mk:1.3 pkgsrc/lang/ocaml/options.mk:1.4
--- pkgsrc/lang/ocaml/options.mk:1.3    Sun Nov 24 09:23:13 2019
+++ pkgsrc/lang/ocaml/options.mk        Tue Jan 14 19:53:35 2020
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.3 2019/11/24 09:23:13 adam Exp $
+# $NetBSD: options.mk,v 1.4 2020/01/14 19:53:35 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml
 PKG_SUPPORTED_OPTIONS= pic flambda spacetime
 PKG_SUGGESTED_OPTIONS= pic
 
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpic)

Index: pkgsrc/lang/ocaml/patches/patch-Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile:1.14 pkgsrc/lang/ocaml/patches/patch-Makefile:1.15
--- pkgsrc/lang/ocaml/patches/patch-Makefile:1.14       Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-Makefile    Tue Jan 14 19:53:35 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile,v 1.14 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.15 2020/01/14 19:53:35 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir
 Honor LDFLAGS
+
 --- Makefile.orig      2019-04-18 10:10:54.000000000 +0000
 +++ Makefile
 @@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing -

Index: pkgsrc/lang/ocaml/patches/patch-Makefile.common.in
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.1 pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.2
--- pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.1      Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-Makefile.common.in  Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-Makefile.common.in,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-Makefile.common.in,v 1.2 2020/01/14 19:53:35 jaapb Exp $
 
 Use BSD_INSTALL_*
+
 --- Makefile.common.in.orig    2019-03-01 15:13:45.000000000 +0000
 +++ Makefile.common.in
 @@ -16,9 +16,9 @@
Index: pkgsrc/lang/ocaml/patches/patch-lex_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.1 pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.2
--- pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.1    Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-lex_Makefile        Tue Jan 14 19:53:35 2020
@@ -1,9 +1,10 @@
-$NetBSD: patch-lex_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-lex_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS.
---- lex/Makefile.orig  2019-03-01 15:13:45.000000000 +0000
+
+--- lex/Makefile.orig  2019-09-11 14:40:30.000000000 +0000
 +++ lex/Makefile
-@@ -28,7 +28,7 @@ CAMLC = $(CAMLRUN) $(ROOTDIR)/boot/ocaml
+@@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
  CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
  COMPFLAGS = $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
              -safe-string -strict-sequence -strict-formats -bin-annot
@@ -11,8 +12,8 @@ Honor LDFLAGS.
 +LINKFLAGS = -cclib "$(LDFLAGS)"
  YACCFLAGS = -v
  CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
- CAMLDEP = $(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
-@@ -47,7 +47,7 @@ ocamllex: $(OBJS)
+ CAMLDEP = $(BOOT_OCAMLC) -depend
+@@ -46,7 +46,7 @@ ocamllex: $(OBJS)
        $(CAMLC) $(LINKFLAGS) -compat-32 -o ocamllex $(OBJS)
  
  ocamllex.opt: $(OBJS:.cmo=.cmx)
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.1 pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.2
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.1     Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.2 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS.
+
 --- otherlibs/Makefile.otherlibs.common.orig   2019-02-08 14:34:10.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
 @@ -48,6 +48,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm
Index: pkgsrc/lang/ocaml/patches/patch-runtime_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.1 pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.2
--- pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.1        Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-runtime_Makefile    Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-runtime_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-runtime_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS.
+
 --- runtime/Makefile.orig      2019-04-18 10:10:54.000000000 +0000
 +++ runtime/Makefile
 @@ -182,11 +182,11 @@ LIBS = $(BYTECCLIBS) $(EXTRALIBS)
Index: pkgsrc/lang/ocaml/patches/patch-tools_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.1 pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.2
--- pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.1  Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-tools_Makefile      Tue Jan 14 19:53:35 2020
@@ -1,10 +1,11 @@
-$NetBSD: patch-tools_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-tools_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS.
---- tools/Makefile.orig        2019-03-01 15:13:46.000000000 +0000
+
+--- tools/Makefile.orig        2019-09-11 14:40:30.000000000 +0000
 +++ tools/Makefile
-@@ -81,7 +81,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
-                        middle_end middle_end/base_types driver toplevel)
+@@ -82,7 +82,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
+                        file_formats lambda)
  COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \
   -safe-string -strict-formats -bin-annot $(INCLUDES)
 -LINKFLAGS = $(INCLUDES)

Index: pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
diff -u pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.4 pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.5
--- pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.4  Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp      Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.4 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.5 2020/01/14 19:53:35 jaapb Exp $
+
+Fix attributes and entry size or the .rodata mergable constant section
 
-Fix attributes and entry size for the .rodata mergable constant section
 --- asmcomp/amd64/emit.mlp.orig        2018-07-17 21:17:05.536787953 +0000
 +++ asmcomp/amd64/emit.mlp
 @@ -986,7 +986,7 @@ let begin_assembly() =
Index: pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.4 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.5
--- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.4   Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile       Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-yacc_Makefile,v 1.4 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-yacc_Makefile,v 1.5 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS when building ocamlyacc.
+
 --- yacc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
 +++ yacc/Makefile
 @@ -36,7 +36,7 @@ MKEXE_ANSI=$(MKEXE)

Index: pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
diff -u pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.2 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.3
--- pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.2  Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S      Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-asmrun_amd64.S,v 1.2 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-asmrun_amd64.S,v 1.3 2020/01/14 19:53:35 jaapb Exp $
 
 Fix attributes and entry size for the .rodata mergable constant section
+
 --- runtime/amd64.S.orig       2018-07-17 21:24:20.027817665 +0000
 +++ runtime/amd64.S
 @@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes):

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.40 pkgsrc/lang/ocaml/patches/patch-configure:1.41
--- pkgsrc/lang/ocaml/patches/patch-configure:1.40      Sun Nov 24 09:23:13 2019
+++ pkgsrc/lang/ocaml/patches/patch-configure   Tue Jan 14 19:53:35 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.40 2019/11/24 09:23:13 adam Exp $
+$NetBSD: patch-configure,v 1.41 2020/01/14 19:53:35 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
@@ -7,62 +7,36 @@ Add SunOS -lnsl -lsocket
 Recognise SunOS/amd64 as amd64
 Recognise SunOS as having shared libraries
 
---- configure.orig     2019-08-05 17:32:44.000000000 +0000
+--- configure.orig     2019-09-11 14:40:30.000000000 +0000
 +++ configure
-@@ -13311,7 +13317,7 @@ sharedlib_cflags=''
+@@ -13281,7 +13281,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
 -natdynlinkopts=""
-+natdynlinkopts="-L/usr/lib -R/usr/lib -R$(PREFIX)/lib"
++natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13347,9 +13353,14 @@ esac ;; #(
-       rpath="-Wl,-rpath,"
-       mksharedlibrpath="-Wl,-rpath,"
-       natdynlinkopts="-Wl,-E"
--      shared_libraries_supported=true ;; #(
-+      shared_libraries_supported=true
-+    *-*-solaris* ;; #(
-   *) :
--     ;;
-+    sharedlib_cflags="-fPIC"
-+      mksharedlib="$CC -shared"
-+      rpath="-Wl,-rpath,"
-+      mksharedlibrpath="-Wl,-rpath,"
-+      shared_libraries_supported=true ;;
- esac
- fi
- 
-@@ -13403,6 +13414,8 @@ fi ;; #(
-     natdynlink=true ;; #(
-   x86_64-*-netbsd*) :
-     natdynlink=true ;; #(
-+  x86_64-*-solaris*) :
-+    natdynlink=true ;; #(
-   i386-*-gnu0.3) :
+@@ -13383,6 +13383,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
-   i[3456]86-*-haiku*) :
-@@ -13415,6 +13428,8 @@ fi ;; #(
-     natdynlink=true ;; #(
-   aarch64-*-linux*) :
+   aarch64-*-freebsd*) :
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
 +    natdynlink=true ;; #(
    *) :
       ;;
  esac
-@@ -13466,6 +13481,8 @@ case $host in #(
+@@ -13434,6 +13436,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
-+      i[3456]86-*-interix3) :
-+              arch=i386; system=interix3 ;; #(
-   i[3456]86-*-darwin*) :
-     if $arch64; then :
-   arch=amd64
-@@ -13510,6 +13527,10 @@ fi; system=elf ;; #(
++  i[3456]86-*-interix3) :
++    arch=i386; system=interix3 ;; #(
+   i[3456]86-*-gnu*) :
+     arch=i386; system=gnu ;; #(
+   i[3456]86-*-mingw32) :
+@@ -13468,6 +13472,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -73,21 +47,16 @@ Recognise SunOS as having shared librari
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13544,8 +13565,12 @@ fi; system=elf ;; #(
-     arch=amd64; system=mingw64 ;; #(
-   aarch64-*-linux*) :
+@@ -13504,6 +13512,8 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
+   aarch64-*-freebsd*) :
+     arch=arm64; system=freebsd ;; #(
 +  aarch64-*-netbsd*) :
 +    arch=arm64; system=netbsd ;; #(
    x86_64-*-cygwin*) :
--    arch=amd64; system=cygwin
-+    arch=amd64; system=cygwin ;; #(
-+  x86_64-*-solaris*) :
-+    arch=amd64; system=solaris
+     arch=amd64; system=cygwin
   ;; #(
-   *) :
-      ;;
-@@ -13884,7 +13909,7 @@ fi
+@@ -13788,7 +13798,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
@@ -96,13 +65,3 @@ Recognise SunOS as having shared librari
       ;; #(
    *) :
      has_c99_float_ops=true
-@@ -14085,6 +14110,9 @@ case $host in #(
-   *-*-mingw32|*-pc-windows) :
-     cclibs="$cclibs -lws2_32"
-     sockets=true ;; #(
-+  *-*-solaris*) :
-+    cclibs="$cclibs -lnsl -lsocket"
-+    sockets=true ;; #(
-   *) :
- 
-     ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"

Index: pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.7 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.8
--- pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.7       Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile   Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.7 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-ocamldoc_Makefile,v 1.8 2020/01/14 19:53:35 jaapb Exp $
 
 Honor LDFLAGS.
+
 --- ocamldoc/Makefile.orig     2019-03-01 15:13:46.000000000 +0000
 +++ ocamldoc/Makefile
 @@ -104,7 +104,7 @@ DEPINCLUDES=$(INCLUDES_DEP)

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.10 pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.11
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.10  Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile       Tue Jan 14 19:53:35 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.10 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.11 2020/01/14 19:53:35 jaapb Exp $
+
+Honor LFLAGS.
 
-Honor LDFLAGS.
 --- otherlibs/systhreads/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
 +++ otherlibs/systhreads/Makefile
 @@ -21,6 +21,7 @@ include $(ROOTDIR)/Makefile.common

Index: pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib
diff -u pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.8 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.9
--- pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.8        Sat Aug 24 10:54:23 2019
+++ pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib    Tue Jan 14 19:53:35 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_ocamlmklib,v 1.8 2019/08/24 10:54:23 jaapb Exp $
+$NetBSD: patch-tools_ocamlmklib,v 1.9 2020/01/14 19:53:35 jaapb Exp $
 
 Add ELF mode support to ocamlmklib
 



Home | Main Index | Thread Index | Old Index