Hi Anil, that sound great! I’m very happy that you’re still able to work on the
ocaml world on OpenBSD!
Let me do the commit to 4.12 for now and leave 4.13 and further to you.
On dune, getting it from 2.7.0 to latest would also be awesome.
Thanks!
> On Dec 6, 2021, at 2:52 AM, Anil Madhavapeddy <a...@recoil.org> wrote:
>
> Thanks Daniel. I've coincidentally unslacked in order to refresh OCaml ports
> in preparation for supporting OpenBSD for OCaml 5.0 (which has multicore).
>
> A few quick questions:
>
> - why not bump straight to 4.13.1? Is anything incompatible there?
> - I have local diffs for dune to go 2.9.1, which requires adding some
> multipackages
> for the dune libraries (now separate from the dune binary)
> - riscv should also be a native arch now in case that's missing.
>
> otherwise looks good to me. I'm happy to remain maintainer, but also can
> drop it if you would prefer to take it over. Best not to make it totally
> unmaintained
> though...
>
> Anil
>
>> On 5 Dec 2021, at 04:36, Daniel Dickman <didick...@gmail.com> wrote:
>>
>> See below for a diff for ocaml to the 4.12.x series. Only a few changes
>> were needed for this update and they're already in the tree:
>> - mldonkey and unison 2.4.x needed a small diff
>> - dune needed to be updated to 2.7.0
>>
>> All ocaml ports were built successfully on amd64 (except coccinelle which
>> is still broken).
>>
>> As usual the ocaml update requires an update to a matching camlp4 which is
>> included in the diff below.
>>
>> All consumer ports will also be bumped when this goes in.
>>
>> ok for the update?
>>
>> p.s. Anil, not sure if you want to stay as maintainer of ocaml or not. I'm
>> dropping you in the proposed diff. But if you want to stay as maintainer
>> please let me know.
>>
>>
>> Index: lang/ocaml/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml/Makefile,v
>> retrieving revision 1.89
>> diff -u -p -u -r1.89 Makefile
>> --- lang/ocaml/Makefile 4 Dec 2021 21:17:10 -0000 1.89
>> +++ lang/ocaml/Makefile 5 Dec 2021 04:29:23 -0000
>> @@ -4,8 +4,7 @@ COMMENT = ML language with complete c
>>
>> # XXX Don't even think of updating ocaml alone.
>> # Do check that the ports that depend on it still work, or repair them.
>> -VERSION= 4.11.2
>> -REVISION = 0
>> +VERSION= 4.12.1
>>
>> PKGNAME = ocaml-${VERSION:C/\+//}
>>
>> @@ -20,7 +19,6 @@ DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES
>> DISTNAME = ocaml-${VERSION}
>>
>> HOMEPAGE= https://ocaml.org/
>> -MAINTAINER= Anil Madhavapeddy <a...@openbsd.org>
>>
>> # QPL/LGPL
>> PERMIT_PACKAGE= Yes
>> Index: lang/ocaml/distinfo
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml/distinfo,v
>> retrieving revision 1.28
>> diff -u -p -u -r1.28 distinfo
>> --- lang/ocaml/distinfo 2 Dec 2021 03:59:20 -0000 1.28
>> +++ lang/ocaml/distinfo 5 Dec 2021 04:29:23 -0000
>> @@ -1,4 +1,4 @@
>> -SHA256 (ocaml-4.11-refman-html.tar.gz) =
>> 88vAwTLfHhI2oWJpAI32Vk6fuLh0XCLGyWjK0TStUHY=
>> -SHA256 (ocaml-4.11.2.tar.gz) = T1UdfLDAhdxXJW0ZbKUdMvqqywKYyE0JBSuETecCCSE=
>> -SIZE (ocaml-4.11-refman-html.tar.gz) = 1762039
>> -SIZE (ocaml-4.11.2.tar.gz) = 4969981
>> +SHA256 (ocaml-4.12-refman-html.tar.gz) =
>> eLtzsc6LiAUty+m1n97k/amUzCl46ll4gx8if3fagvs=
>> +SHA256 (ocaml-4.12.1.tar.gz) = bWHsE6fRtS7uc1r6xhZVK1btEt2hmBxNRBBX5S2RD9c=
>> +SIZE (ocaml-4.12-refman-html.tar.gz) = 1444139
>> +SIZE (ocaml-4.12.1.tar.gz) = 5181551
>> Index: lang/ocaml/patches/patch-configure_ac
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
>> retrieving revision 1.5
>> diff -u -p -u -r1.5 patch-configure_ac
>> --- lang/ocaml/patches/patch-configure_ac 4 Dec 2021 21:17:10 -0000 1.5
>> +++ lang/ocaml/patches/patch-configure_ac 5 Dec 2021 04:29:23 -0000
>> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2021/
>> Index: configure.ac
>> --- configure.ac.orig
>> +++ configure.ac
>> -@@ -700,6 +700,11 @@ AS_CASE([$CC,$host],
>> +@@ -735,6 +735,11 @@ AS_CASE([$CC,$host],
>> )
>>
>>
>> @@ -15,13 +15,16 @@ Index: configure.ac
>> ## Program to use to install files
>> AC_PROG_INSTALL
>>
>> -@@ -824,8 +829,8 @@ AS_IF([test x"$enable_shared" != "xno"],
>> +@@ -867,10 +872,10 @@ AS_IF([test x"$enable_shared" != "xno"],
>> [[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
>> |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
>> [sharedlib_cflags="-fPIC"
>> -- mksharedlib="$CC -shared"
>> - oc_ldflags="$oc_ldflags -Wl,-E"
>> -+ mksharedlib="$CC -shared $oc_ldflags"
>> ++ oc_ldflags="$oc_ldflags -Wl,-E"
>> + AS_CASE([$CC,$host],
>> + [gcc*,powerpc-*-linux*], [mksharedlib="$CC -shared -mbss-plt"],
>> +- [mksharedlib="$CC -shared"])
>> +- oc_ldflags="$oc_ldflags -Wl,-E"
>> ++ [mksharedlib="$CC -shared $oc_ldflags"])
>> rpath="-Wl,-rpath,"
>> mksharedlibrpath="-Wl,-rpath,"
>> natdynlinkopts="-Wl,-E"
>> Index: lang/ocaml/pkg/PFRAG.native
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
>> retrieving revision 1.19
>> diff -u -p -u -r1.19 PFRAG.native
>> --- lang/ocaml/pkg/PFRAG.native 2 Dec 2021 03:59:20 -0000 1.19
>> +++ lang/ocaml/pkg/PFRAG.native 5 Dec 2021 04:29:23 -0000
>> @@ -16,6 +16,7 @@ bin/ocamlopt.byte
>> lib/ocaml/bigarray.a
>> lib/ocaml/bigarray.cmx
>> lib/ocaml/bigarray.cmxa
>> +lib/ocaml/camlinternalAtomic.cmx
>> lib/ocaml/camlinternalFormat.cmx
>> lib/ocaml/camlinternalFormatBasics.cmx
>> lib/ocaml/camlinternalLazy.cmx
>> @@ -91,6 +92,7 @@ lib/ocaml/compiler-libs/backend_var.cmt
>> lib/ocaml/compiler-libs/backend_var.cmti
>> lib/ocaml/compiler-libs/backend_var.cmx
>> lib/ocaml/compiler-libs/backend_var.mli
>> +lib/ocaml/compiler-libs/binutils.cmx
>> lib/ocaml/compiler-libs/branch_relaxation.cmi
>> lib/ocaml/compiler-libs/branch_relaxation.cmt
>> lib/ocaml/compiler-libs/branch_relaxation.cmti
>> @@ -425,6 +427,7 @@ lib/ocaml/compiler-libs/linear.cmt
>> lib/ocaml/compiler-libs/linear.cmti
>> lib/ocaml/compiler-libs/linear.cmx
>> lib/ocaml/compiler-libs/linear.mli
>> +lib/ocaml/compiler-libs/linear_format.cmx
>> lib/ocaml/compiler-libs/linearize.cmi
>> lib/ocaml/compiler-libs/linearize.cmt
>> lib/ocaml/compiler-libs/linearize.cmti
>> @@ -446,6 +449,7 @@ lib/ocaml/compiler-libs/liveness.cmti
>> lib/ocaml/compiler-libs/liveness.cmx
>> lib/ocaml/compiler-libs/liveness.mli
>> lib/ocaml/compiler-libs/load_path.cmx
>> +lib/ocaml/compiler-libs/local_store.cmx
>> lib/ocaml/compiler-libs/location.cmx
>> lib/ocaml/compiler-libs/longident.cmx
>> lib/ocaml/compiler-libs/mach.cmi
>> @@ -456,6 +460,7 @@ lib/ocaml/compiler-libs/mach.mli
>> lib/ocaml/compiler-libs/main.cmx
>> lib/ocaml/compiler-libs/main.o
>> lib/ocaml/compiler-libs/main_args.cmx
>> +lib/ocaml/compiler-libs/maindriver.cmx
>> lib/ocaml/compiler-libs/makedepend.cmx
>> lib/ocaml/compiler-libs/matching.cmx
>> lib/ocaml/compiler-libs/meta.cmx
>> @@ -489,9 +494,9 @@ lib/ocaml/compiler-libs/opterrors.cmx
>> lib/ocaml/compiler-libs/optmain.cmi
>> lib/ocaml/compiler-libs/optmain.cmo
>> lib/ocaml/compiler-libs/optmain.cmt
>> -lib/ocaml/compiler-libs/optmain.cmti
>> lib/ocaml/compiler-libs/optmain.cmx
>> lib/ocaml/compiler-libs/optmain.o
>> +lib/ocaml/compiler-libs/optmaindriver.cmx
>> lib/ocaml/compiler-libs/parameter.cmi
>> lib/ocaml/compiler-libs/parameter.cmt
>> lib/ocaml/compiler-libs/parameter.cmti
>> @@ -506,6 +511,7 @@ lib/ocaml/compiler-libs/pass_wrapper.cmt
>> lib/ocaml/compiler-libs/pass_wrapper.cmx
>> lib/ocaml/compiler-libs/pass_wrapper.mli
>> lib/ocaml/compiler-libs/path.cmx
>> +lib/ocaml/compiler-libs/patterns.cmx
>> lib/ocaml/compiler-libs/persistent_env.cmx
>> lib/ocaml/compiler-libs/pparse.cmx
>> lib/ocaml/compiler-libs/pprintast.cmx
>> @@ -669,11 +675,6 @@ lib/ocaml/compiler-libs/simplify_primiti
>> lib/ocaml/compiler-libs/simplify_primitives.cmti
>> lib/ocaml/compiler-libs/simplify_primitives.cmx
>> lib/ocaml/compiler-libs/simplify_primitives.mli
>> -lib/ocaml/compiler-libs/spacetime_profiling.cmi
>> -lib/ocaml/compiler-libs/spacetime_profiling.cmt
>> -lib/ocaml/compiler-libs/spacetime_profiling.cmti
>> -lib/ocaml/compiler-libs/spacetime_profiling.cmx
>> -lib/ocaml/compiler-libs/spacetime_profiling.mli
>> lib/ocaml/compiler-libs/spill.cmi
>> lib/ocaml/compiler-libs/spill.cmt
>> lib/ocaml/compiler-libs/spill.cmti
>> @@ -863,6 +864,7 @@ lib/ocaml/stdlib.cmxa
>> lib/ocaml/stdlib__arg.cmx
>> lib/ocaml/stdlib__array.cmx
>> lib/ocaml/stdlib__arrayLabels.cmx
>> +lib/ocaml/stdlib__atomic.cmx
>> lib/ocaml/stdlib__bigarray.cmx
>> lib/ocaml/stdlib__bool.cmx
>> lib/ocaml/stdlib__buffer.cmx
>> @@ -872,6 +874,7 @@ lib/ocaml/stdlib__callback.cmx
>> lib/ocaml/stdlib__char.cmx
>> lib/ocaml/stdlib__complex.cmx
>> lib/ocaml/stdlib__digest.cmx
>> +lib/ocaml/stdlib__either.cmx
>> lib/ocaml/stdlib__ephemeron.cmx
>> lib/ocaml/stdlib__filename.cmx
>> lib/ocaml/stdlib__float.cmx
>> @@ -904,7 +907,6 @@ lib/ocaml/stdlib__result.cmx
>> lib/ocaml/stdlib__scanf.cmx
>> lib/ocaml/stdlib__seq.cmx
>> lib/ocaml/stdlib__set.cmx
>> -lib/ocaml/stdlib__spacetime.cmx
>> lib/ocaml/stdlib__stack.cmx
>> lib/ocaml/stdlib__stdLabels.cmx
>> lib/ocaml/stdlib__stream.cmx
>> @@ -920,6 +922,7 @@ lib/ocaml/str.cmxa
>> lib/ocaml/threads/condition.cmx
>> lib/ocaml/threads/event.cmx
>> lib/ocaml/threads/mutex.cmx
>> +lib/ocaml/threads/semaphore.cmx
>> lib/ocaml/threads/thread.cmx
>> lib/ocaml/threads/threadUnix.cmx
>> lib/ocaml/threads/threads.a
>> Index: lang/ocaml/pkg/PLIST
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v
>> retrieving revision 1.28
>> diff -u -p -u -r1.28 PLIST
>> --- lang/ocaml/pkg/PLIST 2 Dec 2021 03:59:20 -0000 1.28
>> +++ lang/ocaml/pkg/PLIST 5 Dec 2021 04:29:23 -0000
>> @@ -29,13 +29,14 @@ bin/ocamlprof.byte
>> @bin bin/ocamlyacc
>> lib/ocaml/
>> lib/ocaml/Makefile.config
>> -lib/ocaml/VERSION
>> lib/ocaml/arg.ml
>> lib/ocaml/arg.mli
>> lib/ocaml/array.ml
>> lib/ocaml/array.mli
>> lib/ocaml/arrayLabels.ml
>> lib/ocaml/arrayLabels.mli
>> +lib/ocaml/atomic.ml
>> +lib/ocaml/atomic.mli
>> lib/ocaml/bigarray.cma
>> lib/ocaml/bigarray.cmi
>> lib/ocaml/bigarray.cmti
>> @@ -105,7 +106,6 @@ lib/ocaml/caml/signals.h
>> lib/ocaml/caml/signals_machdep.h
>> lib/ocaml/caml/skiplist.h
>> lib/ocaml/caml/socketaddr.h
>> -lib/ocaml/caml/spacetime.h
>> lib/ocaml/caml/stack.h
>> lib/ocaml/caml/stacks.h
>> lib/ocaml/caml/startup.h
>> @@ -120,6 +120,11 @@ lib/ocaml/camlheader
>> lib/ocaml/camlheader_ur
>> lib/ocaml/camlheaderd
>> lib/ocaml/camlheaderi
>> +lib/ocaml/camlinternalAtomic.cmi
>> +lib/ocaml/camlinternalAtomic.cmt
>> +lib/ocaml/camlinternalAtomic.cmti
>> +lib/ocaml/camlinternalAtomic.ml
>> +lib/ocaml/camlinternalAtomic.mli
>> lib/ocaml/camlinternalFormat.cmi
>> lib/ocaml/camlinternalFormat.cmt
>> lib/ocaml/camlinternalFormat.cmti
>> @@ -178,6 +183,10 @@ lib/ocaml/compiler-libs/attr_helper.cmi
>> lib/ocaml/compiler-libs/attr_helper.cmt
>> lib/ocaml/compiler-libs/attr_helper.cmti
>> lib/ocaml/compiler-libs/attr_helper.mli
>> +lib/ocaml/compiler-libs/binutils.cmi
>> +lib/ocaml/compiler-libs/binutils.cmt
>> +lib/ocaml/compiler-libs/binutils.cmti
>> +lib/ocaml/compiler-libs/binutils.mli
>> lib/ocaml/compiler-libs/btype.cmi
>> lib/ocaml/compiler-libs/btype.cmt
>> lib/ocaml/compiler-libs/btype.cmti
>> @@ -351,10 +360,18 @@ lib/ocaml/compiler-libs/lexer.cmi
>> lib/ocaml/compiler-libs/lexer.cmt
>> lib/ocaml/compiler-libs/lexer.cmti
>> lib/ocaml/compiler-libs/lexer.mli
>> +lib/ocaml/compiler-libs/linear_format.cmi
>> +lib/ocaml/compiler-libs/linear_format.cmt
>> +lib/ocaml/compiler-libs/linear_format.cmti
>> +lib/ocaml/compiler-libs/linear_format.mli
>> lib/ocaml/compiler-libs/load_path.cmi
>> lib/ocaml/compiler-libs/load_path.cmt
>> lib/ocaml/compiler-libs/load_path.cmti
>> lib/ocaml/compiler-libs/load_path.mli
>> +lib/ocaml/compiler-libs/local_store.cmi
>> +lib/ocaml/compiler-libs/local_store.cmt
>> +lib/ocaml/compiler-libs/local_store.cmti
>> +lib/ocaml/compiler-libs/local_store.mli
>> lib/ocaml/compiler-libs/location.cmi
>> lib/ocaml/compiler-libs/location.cmt
>> lib/ocaml/compiler-libs/location.cmti
>> @@ -366,12 +383,14 @@ lib/ocaml/compiler-libs/longident.mli
>> lib/ocaml/compiler-libs/main.cmi
>> lib/ocaml/compiler-libs/main.cmo
>> lib/ocaml/compiler-libs/main.cmt
>> -lib/ocaml/compiler-libs/main.cmti
>> -lib/ocaml/compiler-libs/main.mli
>> lib/ocaml/compiler-libs/main_args.cmi
>> lib/ocaml/compiler-libs/main_args.cmt
>> lib/ocaml/compiler-libs/main_args.cmti
>> lib/ocaml/compiler-libs/main_args.mli
>> +lib/ocaml/compiler-libs/maindriver.cmi
>> +lib/ocaml/compiler-libs/maindriver.cmt
>> +lib/ocaml/compiler-libs/maindriver.cmti
>> +lib/ocaml/compiler-libs/maindriver.mli
>> lib/ocaml/compiler-libs/makedepend.cmi
>> lib/ocaml/compiler-libs/makedepend.cmt
>> lib/ocaml/compiler-libs/makedepend.cmti
>> @@ -410,7 +429,10 @@ lib/ocaml/compiler-libs/oprint.cmti
>> lib/ocaml/compiler-libs/oprint.mli
>> lib/ocaml/compiler-libs/optcompile.mli
>> lib/ocaml/compiler-libs/opterrors.mli
>> -lib/ocaml/compiler-libs/optmain.mli
>> +lib/ocaml/compiler-libs/optmaindriver.cmi
>> +lib/ocaml/compiler-libs/optmaindriver.cmt
>> +lib/ocaml/compiler-libs/optmaindriver.cmti
>> +lib/ocaml/compiler-libs/optmaindriver.mli
>> lib/ocaml/compiler-libs/opttopdirs.mli
>> lib/ocaml/compiler-libs/opttoploop.mli
>> lib/ocaml/compiler-libs/opttopmain.mli
>> @@ -436,6 +458,10 @@ lib/ocaml/compiler-libs/path.cmi
>> lib/ocaml/compiler-libs/path.cmt
>> lib/ocaml/compiler-libs/path.cmti
>> lib/ocaml/compiler-libs/path.mli
>> +lib/ocaml/compiler-libs/patterns.cmi
>> +lib/ocaml/compiler-libs/patterns.cmt
>> +lib/ocaml/compiler-libs/patterns.cmti
>> +lib/ocaml/compiler-libs/patterns.mli
>> lib/ocaml/compiler-libs/persistent_env.cmi
>> lib/ocaml/compiler-libs/persistent_env.cmt
>> lib/ocaml/compiler-libs/persistent_env.cmti
>> @@ -651,6 +677,8 @@ lib/ocaml/dynlink.cma
>> lib/ocaml/dynlink.cmi
>> lib/ocaml/dynlink.cmti
>> lib/ocaml/dynlink.mli
>> +lib/ocaml/either.ml
>> +lib/ocaml/either.mli
>> lib/ocaml/ephemeron.ml
>> lib/ocaml/ephemeron.mli
>> lib/ocaml/eventlog_metadata
>> @@ -687,8 +715,6 @@ lib/ocaml/lexing.mli
>> @static-lib lib/ocaml/libcamlrund.a
>> @static-lib lib/ocaml/libcamlruni.a
>> @static-lib lib/ocaml/libcamlstr.a
>> -@comment raw_spacetime is not built on all archs
>> -@comment lib/ocaml/libraw_spacetime_lib.a
>> @static-lib lib/ocaml/libthreads.a
>> @static-lib lib/ocaml/libunix.a
>> lib/ocaml/list.ml
>> @@ -705,7 +731,6 @@ lib/ocaml/nativeint.ml
>> lib/ocaml/nativeint.mli
>> lib/ocaml/obj.ml
>> lib/ocaml/obj.mli
>> -@bin lib/ocaml/objinfo_helper
>> lib/ocaml/ocamldoc/
>> lib/ocaml/ocamldoc/ocamldoc.hva
>> lib/ocaml/ocamldoc/odoc.cmi
>> @@ -779,15 +804,6 @@ lib/ocaml/queue.ml
>> lib/ocaml/queue.mli
>> lib/ocaml/random.ml
>> lib/ocaml/random.mli
>> -@comment raw_spacetime is not built on all archs
>> -@comment lib/ocaml/raw_spacetime_lib.a
>> -@comment lib/ocaml/raw_spacetime_lib.cma
>> -@comment lib/ocaml/raw_spacetime_lib.cmi
>> -@comment lib/ocaml/raw_spacetime_lib.cmti
>> -@comment lib/ocaml/raw_spacetime_lib.cmx
>> -@comment lib/ocaml/raw_spacetime_lib.cmxa
>> -@comment @bin lib/ocaml/raw_spacetime_lib.cmxs
>> -@comment lib/ocaml/raw_spacetime_lib.mli
>> lib/ocaml/result.ml
>> lib/ocaml/result.mli
>> lib/ocaml/scanf.ml
>> @@ -796,8 +812,6 @@ lib/ocaml/seq.ml
>> lib/ocaml/seq.mli
>> lib/ocaml/set.ml
>> lib/ocaml/set.mli
>> -lib/ocaml/spacetime.ml
>> -lib/ocaml/spacetime.mli
>> lib/ocaml/stack.ml
>> lib/ocaml/stack.mli
>> lib/ocaml/stdLabels.ml
>> @@ -821,6 +835,9 @@ lib/ocaml/stdlib__array.cmti
>> lib/ocaml/stdlib__arrayLabels.cmi
>> lib/ocaml/stdlib__arrayLabels.cmt
>> lib/ocaml/stdlib__arrayLabels.cmti
>> +lib/ocaml/stdlib__atomic.cmi
>> +lib/ocaml/stdlib__atomic.cmt
>> +lib/ocaml/stdlib__atomic.cmti
>> lib/ocaml/stdlib__bigarray.cmi
>> lib/ocaml/stdlib__bigarray.cmt
>> lib/ocaml/stdlib__bigarray.cmti
>> @@ -848,6 +865,9 @@ lib/ocaml/stdlib__complex.cmti
>> lib/ocaml/stdlib__digest.cmi
>> lib/ocaml/stdlib__digest.cmt
>> lib/ocaml/stdlib__digest.cmti
>> +lib/ocaml/stdlib__either.cmi
>> +lib/ocaml/stdlib__either.cmt
>> +lib/ocaml/stdlib__either.cmti
>> lib/ocaml/stdlib__ephemeron.cmi
>> lib/ocaml/stdlib__ephemeron.cmt
>> lib/ocaml/stdlib__ephemeron.cmti
>> @@ -943,9 +963,6 @@ lib/ocaml/stdlib__seq.cmti
>> lib/ocaml/stdlib__set.cmi
>> lib/ocaml/stdlib__set.cmt
>> lib/ocaml/stdlib__set.cmti
>> -lib/ocaml/stdlib__spacetime.cmi
>> -lib/ocaml/stdlib__spacetime.cmt
>> -lib/ocaml/stdlib__spacetime.cmti
>> lib/ocaml/stdlib__stack.cmi
>> lib/ocaml/stdlib__stack.cmt
>> lib/ocaml/stdlib__stack.cmti
>> @@ -985,8 +1002,6 @@ lib/ocaml/stringLabels.ml
>> lib/ocaml/stringLabels.mli
>> lib/ocaml/stublibs/
>> @so lib/ocaml/stublibs/dllcamlstr.so
>> -@comment raw_spacetime is not built on all archs
>> -@comment lib/ocaml/stublibs/dllraw_spacetime_lib.so
>> @so lib/ocaml/stublibs/dllthreads.so
>> @so lib/ocaml/stublibs/dllunix.so
>> lib/ocaml/sys.ml
>> @@ -1001,6 +1016,9 @@ lib/ocaml/threads/event.mli
>> lib/ocaml/threads/mutex.cmi
>> lib/ocaml/threads/mutex.cmti
>> lib/ocaml/threads/mutex.mli
>> +lib/ocaml/threads/semaphore.cmi
>> +lib/ocaml/threads/semaphore.cmti
>> +lib/ocaml/threads/semaphore.mli
>> lib/ocaml/threads/thread.cmi
>> lib/ocaml/threads/thread.cmti
>> lib/ocaml/threads/thread.mli
>> @@ -1078,6 +1096,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Ast_iterator.3o
>> @man man/man3/Ast_mapper.3o
>> @man man/man3/Asttypes.3o
>> +@man man/man3/Atomic.3o
>> @man man/man3/Attr_helper.3o
>> @man man/man3/Bigarray.3o
>> @man man/man3/Bigarray.Array0.3o
>> @@ -1085,6 +1104,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Bigarray.Array2.3o
>> @man man/man3/Bigarray.Array3.3o
>> @man man/man3/Bigarray.Genarray.3o
>> +@man man/man3/Binutils.3o
>> @man man/man3/Bool.3o
>> @man man/man3/Buffer.3o
>> @man man/man3/Build_path_prefix_map.3o
>> @@ -1092,6 +1112,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Bytes.3o
>> @man man/man3/BytesLabels.3o
>> @man man/man3/Callback.3o
>> +@man man/man3/CamlinternalAtomic.3o
>> @man man/man3/CamlinternalFormat.3o
>> @man man/man3/CamlinternalFormatBasics.3o
>> @man man/man3/CamlinternalLazy.3o
>> @@ -1150,6 +1171,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Docstrings.WithMenhir.3o
>> @man man/man3/Domainstate.3o
>> @man man/man3/Dynlink.3o
>> +@man man/man3/Either.3o
>> @man man/man3/Ephemeron.3o
>> @man man/man3/Ephemeron.GenHashTable.3o
>> @man man/man3/Ephemeron.GenHashTable.MakeSeeded.3o
>> @@ -1207,6 +1229,7 @@ lib/ocaml/weak.mli
>> @man man/man3/ListLabels.3o
>> @man man/man3/Load_path.3o
>> @man man/man3/Load_path.Dir.3o
>> +@man man/man3/Local_store.3o
>> @man man/man3/Location.3o
>> @man man/man3/Longident.3o
>> @man man/man3/Map.3o
>> @@ -1253,6 +1276,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Numbers.Int16.3o
>> @man man/man3/Numbers.Int8.3o
>> @man man/man3/Obj.3o
>> +@man man/man3/Obj.Closure.3o
>> @man man/man3/Obj.Ephemeron.3o
>> @man man/man3/Obj.Extension_constructor.3o
>> @man man/man3/Ocaml_operators.3o
>> @@ -1277,14 +1301,14 @@ lib/ocaml/weak.mli
>> @man man/man3/Result.3o
>> @man man/man3/Scanf.3o
>> @man man/man3/Scanf.Scanning.3o
>> +@man man/man3/Semaphore.3o
>> +@man man/man3/Semaphore.Binary.3o
>> +@man man/man3/Semaphore.Counting.3o
>> @man man/man3/Seq.3o
>> @man man/man3/Set.3o
>> @man man/man3/Set.Make.3o
>> @man man/man3/Set.OrderedType.3o
>> @man man/man3/Set.S.3o
>> -@man man/man3/Spacetime.3o
>> -@man man/man3/Spacetime.Series.3o
>> -@man man/man3/Spacetime.Snapshot.3o
>> @man man/man3/Stack.3o
>> @man man/man3/StdLabels.3o
>> @man man/man3/StdLabels.Array.3o
>> @@ -1295,6 +1319,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Stdlib.Arg.3o
>> @man man/man3/Stdlib.Array.3o
>> @man man/man3/Stdlib.ArrayLabels.3o
>> +@man man/man3/Stdlib.Atomic.3o
>> @man man/man3/Stdlib.Bigarray.3o
>> @man man/man3/Stdlib.Bool.3o
>> @man man/man3/Stdlib.Buffer.3o
>> @@ -1304,6 +1329,7 @@ lib/ocaml/weak.mli
>> @man man/man3/Stdlib.Char.3o
>> @man man/man3/Stdlib.Complex.3o
>> @man man/man3/Stdlib.Digest.3o
>> +@man man/man3/Stdlib.Either.3o
>> @man man/man3/Stdlib.Ephemeron.3o
>> @man man/man3/Stdlib.Filename.3o
>> @man man/man3/Stdlib.Float.3o
>> @@ -1337,7 +1363,6 @@ lib/ocaml/weak.mli
>> @man man/man3/Stdlib.Scanf.3o
>> @man man/man3/Stdlib.Seq.3o
>> @man man/man3/Stdlib.Set.3o
>> -@man man/man3/Stdlib.Spacetime.3o
>> @man man/man3/Stdlib.Stack.3o
>> @man man/man3/Stdlib.StdLabels.3o
>> @man man/man3/Stdlib.Stream.3o
>> @@ -1385,7 +1410,6 @@ share/doc/ocaml/html/alerts.html
>> share/doc/ocaml/html/attributes.html
>> share/doc/ocaml/html/bigarray.html
>> share/doc/ocaml/html/bindingops.html
>> -share/doc/ocaml/html/browser.html
>> share/doc/ocaml/html/classes.html
>> share/doc/ocaml/html/comp.html
>> share/doc/ocaml/html/compunit.html
>> @@ -1418,15 +1442,13 @@ share/doc/ocaml/html/language.html
>> share/doc/ocaml/html/letrecvalues.html
>> share/doc/ocaml/html/lex.html
>> share/doc/ocaml/html/lexyacc.html
>> -share/doc/ocaml/html/libbigarray.html
>> share/doc/ocaml/html/libdynlink.html
>> share/doc/ocaml/html/libgraph.gif
>> -share/doc/ocaml/html/libgraph.html
>> -share/doc/ocaml/html/libnum.html
>> share/doc/ocaml/html/libref/
>> share/doc/ocaml/html/libref/Arg.html
>> share/doc/ocaml/html/libref/Array.html
>> share/doc/ocaml/html/libref/ArrayLabels.html
>> +share/doc/ocaml/html/libref/Atomic.html
>> share/doc/ocaml/html/libref/Bigarray.Array0.html
>> share/doc/ocaml/html/libref/Bigarray.Array1.html
>> share/doc/ocaml/html/libref/Bigarray.Array2.html
>> @@ -1438,6 +1460,7 @@ share/doc/ocaml/html/libref/Buffer.html
>> share/doc/ocaml/html/libref/Bytes.html
>> share/doc/ocaml/html/libref/BytesLabels.html
>> share/doc/ocaml/html/libref/Callback.html
>> +share/doc/ocaml/html/libref/CamlinternalAtomic.html
>> share/doc/ocaml/html/libref/CamlinternalFormat.html
>> share/doc/ocaml/html/libref/CamlinternalFormatBasics.html
>> share/doc/ocaml/html/libref/CamlinternalLazy.html
>> @@ -1448,6 +1471,7 @@ share/doc/ocaml/html/libref/Complex.html
>> share/doc/ocaml/html/libref/Condition.html
>> share/doc/ocaml/html/libref/Digest.html
>> share/doc/ocaml/html/libref/Dynlink.html
>> +share/doc/ocaml/html/libref/Either.html
>> share/doc/ocaml/html/libref/Ephemeron.GenHashTable.MakeSeeded.html
>> share/doc/ocaml/html/libref/Ephemeron.GenHashTable.html
>> share/doc/ocaml/html/libref/Ephemeron.K1.Make.html
>> @@ -1509,6 +1533,7 @@ share/doc/ocaml/html/libref/MoreLabels.S
>> share/doc/ocaml/html/libref/MoreLabels.html
>> share/doc/ocaml/html/libref/Mutex.html
>> share/doc/ocaml/html/libref/Nativeint.html
>> +share/doc/ocaml/html/libref/Obj.Closure.html
>> share/doc/ocaml/html/libref/Obj.Ephemeron.html
>> share/doc/ocaml/html/libref/Obj.Extension_constructor.html
>> share/doc/ocaml/html/libref/Obj.html
>> @@ -1525,14 +1550,14 @@ share/doc/ocaml/html/libref/Random.html
>> share/doc/ocaml/html/libref/Result.html
>> share/doc/ocaml/html/libref/Scanf.Scanning.html
>> share/doc/ocaml/html/libref/Scanf.html
>> +share/doc/ocaml/html/libref/Semaphore.Binary.html
>> +share/doc/ocaml/html/libref/Semaphore.Counting.html
>> +share/doc/ocaml/html/libref/Semaphore.html
>> share/doc/ocaml/html/libref/Seq.html
>> share/doc/ocaml/html/libref/Set.Make.html
>> share/doc/ocaml/html/libref/Set.OrderedType.html
>> share/doc/ocaml/html/libref/Set.S.html
>> share/doc/ocaml/html/libref/Set.html
>> -share/doc/ocaml/html/libref/Spacetime.Series.html
>> -share/doc/ocaml/html/libref/Spacetime.Snapshot.html
>> -share/doc/ocaml/html/libref/Spacetime.html
>> share/doc/ocaml/html/libref/Stack.html
>> share/doc/ocaml/html/libref/StdLabels.Array.html
>> share/doc/ocaml/html/libref/StdLabels.Bytes.html
>> @@ -1542,6 +1567,7 @@ share/doc/ocaml/html/libref/StdLabels.ht
>> share/doc/ocaml/html/libref/Stdlib.Arg.html
>> share/doc/ocaml/html/libref/Stdlib.Array.html
>> share/doc/ocaml/html/libref/Stdlib.ArrayLabels.html
>> +share/doc/ocaml/html/libref/Stdlib.Atomic.html
>> share/doc/ocaml/html/libref/Stdlib.Bigarray.html
>> share/doc/ocaml/html/libref/Stdlib.Bool.html
>> share/doc/ocaml/html/libref/Stdlib.Buffer.html
>> @@ -1551,6 +1577,7 @@ share/doc/ocaml/html/libref/Stdlib.Callb
>> share/doc/ocaml/html/libref/Stdlib.Char.html
>> share/doc/ocaml/html/libref/Stdlib.Complex.html
>> share/doc/ocaml/html/libref/Stdlib.Digest.html
>> +share/doc/ocaml/html/libref/Stdlib.Either.html
>> share/doc/ocaml/html/libref/Stdlib.Ephemeron.html
>> share/doc/ocaml/html/libref/Stdlib.Filename.html
>> share/doc/ocaml/html/libref/Stdlib.Float.html
>> @@ -1584,7 +1611,6 @@ share/doc/ocaml/html/libref/Stdlib.Resul
>> share/doc/ocaml/html/libref/Stdlib.Scanf.html
>> share/doc/ocaml/html/libref/Stdlib.Seq.html
>> share/doc/ocaml/html/libref/Stdlib.Set.html
>> -share/doc/ocaml/html/libref/Stdlib.Spacetime.html
>> share/doc/ocaml/html/libref/Stdlib.Stack.html
>> share/doc/ocaml/html/libref/Stdlib.StdLabels.html
>> share/doc/ocaml/html/libref/Stdlib.Stream.html
>> @@ -1630,6 +1656,7 @@ share/doc/ocaml/html/libref/style.css
>> share/doc/ocaml/html/libref/type_Arg.html
>> share/doc/ocaml/html/libref/type_Array.html
>> share/doc/ocaml/html/libref/type_ArrayLabels.html
>> +share/doc/ocaml/html/libref/type_Atomic.html
>> share/doc/ocaml/html/libref/type_Bigarray.Array0.html
>> share/doc/ocaml/html/libref/type_Bigarray.Array1.html
>> share/doc/ocaml/html/libref/type_Bigarray.Array2.html
>> @@ -1641,6 +1668,7 @@ share/doc/ocaml/html/libref/type_Buffer.
>> share/doc/ocaml/html/libref/type_Bytes.html
>> share/doc/ocaml/html/libref/type_BytesLabels.html
>> share/doc/ocaml/html/libref/type_Callback.html
>> +share/doc/ocaml/html/libref/type_CamlinternalAtomic.html
>> share/doc/ocaml/html/libref/type_CamlinternalFormat.html
>> share/doc/ocaml/html/libref/type_CamlinternalFormatBasics.html
>> share/doc/ocaml/html/libref/type_CamlinternalLazy.html
>> @@ -1651,6 +1679,7 @@ share/doc/ocaml/html/libref/type_Complex
>> share/doc/ocaml/html/libref/type_Condition.html
>> share/doc/ocaml/html/libref/type_Digest.html
>> share/doc/ocaml/html/libref/type_Dynlink.html
>> +share/doc/ocaml/html/libref/type_Either.html
>> share/doc/ocaml/html/libref/type_Ephemeron.GenHashTable.MakeSeeded.html
>> share/doc/ocaml/html/libref/type_Ephemeron.GenHashTable.html
>> share/doc/ocaml/html/libref/type_Ephemeron.K1.Make.html
>> @@ -1712,6 +1741,7 @@ share/doc/ocaml/html/libref/type_MoreLab
>> share/doc/ocaml/html/libref/type_MoreLabels.html
>> share/doc/ocaml/html/libref/type_Mutex.html
>> share/doc/ocaml/html/libref/type_Nativeint.html
>> +share/doc/ocaml/html/libref/type_Obj.Closure.html
>> share/doc/ocaml/html/libref/type_Obj.Ephemeron.html
>> share/doc/ocaml/html/libref/type_Obj.Extension_constructor.html
>> share/doc/ocaml/html/libref/type_Obj.html
>> @@ -1728,14 +1758,14 @@ share/doc/ocaml/html/libref/type_Random.
>> share/doc/ocaml/html/libref/type_Result.html
>> share/doc/ocaml/html/libref/type_Scanf.Scanning.html
>> share/doc/ocaml/html/libref/type_Scanf.html
>> +share/doc/ocaml/html/libref/type_Semaphore.Binary.html
>> +share/doc/ocaml/html/libref/type_Semaphore.Counting.html
>> +share/doc/ocaml/html/libref/type_Semaphore.html
>> share/doc/ocaml/html/libref/type_Seq.html
>> share/doc/ocaml/html/libref/type_Set.Make.html
>> share/doc/ocaml/html/libref/type_Set.OrderedType.html
>> share/doc/ocaml/html/libref/type_Set.S.html
>> share/doc/ocaml/html/libref/type_Set.html
>> -share/doc/ocaml/html/libref/type_Spacetime.Series.html
>> -share/doc/ocaml/html/libref/type_Spacetime.Snapshot.html
>> -share/doc/ocaml/html/libref/type_Spacetime.html
>> share/doc/ocaml/html/libref/type_Stack.html
>> share/doc/ocaml/html/libref/type_StdLabels.Array.html
>> share/doc/ocaml/html/libref/type_StdLabels.Bytes.html
>> @@ -1745,6 +1775,7 @@ share/doc/ocaml/html/libref/type_StdLabe
>> share/doc/ocaml/html/libref/type_Stdlib.Arg.html
>> share/doc/ocaml/html/libref/type_Stdlib.Array.html
>> share/doc/ocaml/html/libref/type_Stdlib.ArrayLabels.html
>> +share/doc/ocaml/html/libref/type_Stdlib.Atomic.html
>> share/doc/ocaml/html/libref/type_Stdlib.Bigarray.html
>> share/doc/ocaml/html/libref/type_Stdlib.Bool.html
>> share/doc/ocaml/html/libref/type_Stdlib.Buffer.html
>> @@ -1754,6 +1785,7 @@ share/doc/ocaml/html/libref/type_Stdlib.
>> share/doc/ocaml/html/libref/type_Stdlib.Char.html
>> share/doc/ocaml/html/libref/type_Stdlib.Complex.html
>> share/doc/ocaml/html/libref/type_Stdlib.Digest.html
>> +share/doc/ocaml/html/libref/type_Stdlib.Either.html
>> share/doc/ocaml/html/libref/type_Stdlib.Ephemeron.html
>> share/doc/ocaml/html/libref/type_Stdlib.Filename.html
>> share/doc/ocaml/html/libref/type_Stdlib.Float.html
>> @@ -1787,7 +1819,6 @@ share/doc/ocaml/html/libref/type_Stdlib.
>> share/doc/ocaml/html/libref/type_Stdlib.Scanf.html
>> share/doc/ocaml/html/libref/type_Stdlib.Seq.html
>> share/doc/ocaml/html/libref/type_Stdlib.Set.html
>> -share/doc/ocaml/html/libref/type_Stdlib.Spacetime.html
>> share/doc/ocaml/html/libref/type_Stdlib.Stack.html
>> share/doc/ocaml/html/libref/type_Stdlib.StdLabels.html
>> share/doc/ocaml/html/libref/type_Stdlib.Stream.html
>> @@ -1823,11 +1854,9 @@ share/doc/ocaml/html/libthreads.html
>> share/doc/ocaml/html/libunix.html
>> share/doc/ocaml/html/locallyabstract.html
>> share/doc/ocaml/html/manual.css
>> -share/doc/ocaml/html/manual.html
>> share/doc/ocaml/html/manual001.html
>> share/doc/ocaml/html/manual024.html
>> -share/doc/ocaml/html/manual056.html
>> -share/doc/ocaml/html/manual072.html
>> +share/doc/ocaml/html/manual067.html
>> share/doc/ocaml/html/modtypes.html
>> share/doc/ocaml/html/modulealias.html
>> share/doc/ocaml/html/moduleexamples.html
>> @@ -1838,6 +1867,7 @@ share/doc/ocaml/html/native.html
>> share/doc/ocaml/html/next_motif.gif
>> share/doc/ocaml/html/objectexamples.html
>> share/doc/ocaml/html/ocamldoc.html
>> +share/doc/ocaml/html/old.html
>> share/doc/ocaml/html/overridingopen.html
>> share/doc/ocaml/html/parsing.html
>> share/doc/ocaml/html/patterns.html
>> @@ -1847,7 +1877,6 @@ share/doc/ocaml/html/privatetypes.html
>> share/doc/ocaml/html/profil.html
>> share/doc/ocaml/html/runtime.html
>> share/doc/ocaml/html/signaturesubstitution.html
>> -share/doc/ocaml/html/spacetime.html
>> share/doc/ocaml/html/stdlib.html
>> share/doc/ocaml/html/toplevel.html
>> share/doc/ocaml/html/typedecl.html
>> Index: lang/ocaml-camlp4/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml-camlp4/Makefile,v
>> retrieving revision 1.18
>> diff -u -p -u -r1.18 Makefile
>> --- lang/ocaml-camlp4/Makefile 2 Dec 2021 03:59:20 -0000 1.18
>> +++ lang/ocaml-camlp4/Makefile 5 Dec 2021 04:29:23 -0000
>> @@ -4,7 +4,7 @@ COMMENT = OCaml Preprocessor and Pretty-
>> CATEGORIES = lang
>>
>> EPOCH = 0
>> -V = 4.11+1
>> +V = 4.12+1
>> GH_ACCOUNT = ocaml
>> GH_PROJECT = camlp4
>> GH_TAGNAME = ${V}
>> Index: lang/ocaml-camlp4/distinfo
>> ===================================================================
>> RCS file: /cvs/ports/lang/ocaml-camlp4/distinfo,v
>> retrieving revision 1.10
>> diff -u -p -u -r1.10 distinfo
>> --- lang/ocaml-camlp4/distinfo 2 Dec 2021 03:59:20 -0000 1.10
>> +++ lang/ocaml-camlp4/distinfo 5 Dec 2021 04:29:23 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (camlp4-4.11+1.tar.gz) = pQHBno4eUFfzgnYfZGWPkhuO/tRg/0K43g4VRfVhMXI=
>> -SIZE (camlp4-4.11+1.tar.gz) = 650280
>> +SHA256 (camlp4-4.12+1.tar.gz) = hKUxldkW8gi4/XYcvTTOx4goY7lNnfLOQxmNcnc5zaM=
>> +SIZE (camlp4-4.12+1.tar.gz) = 650487
>>
>
