Diff below updates ocaml to 4.11.2.
As usual, camlp4 and camlp5 require updates that are in sync with the
ocaml update.
All consumers were compile tested on amd64 and everything built fine.
(this was tested with the coccinelle diff on ports@ to fix the breakage in
that port)
ok?
Index: lang/ocaml/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.87
diff -u -p -u -r1.87 Makefile
--- lang/ocaml/Makefile 15 Mar 2021 20:47:22 -0000 1.87
+++ lang/ocaml/Makefile 29 Nov 2021 19:41:47 -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.10.0
-REVISION= 0
+VERSION= 4.11.2
PKGNAME = ocaml-${VERSION:C/\+//}
@@ -13,8 +12,7 @@ PKGNAME = ocaml-${VERSION:C/\+//}
PKGSPEC = ocaml-=${VERSION:C/\+//}
CATEGORIES= lang
-# Remove last version component ocaml-X.XX.X -> ocaml-X.XX
-BASENAME = ${DISTNAME:C/\.[^.]*$//}
+BASENAME = ${DISTNAME:R}
MASTER_SITES= https://caml.inria.fr/pub/distrib/${BASENAME}/
DOCFILES= ${BASENAME}-refman-html.tar.gz
DISTFILES= ${DISTNAME}.tar.gz ${DOCFILES}
Index: lang/ocaml/distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml/distinfo,v
retrieving revision 1.27
diff -u -p -u -r1.27 distinfo
--- lang/ocaml/distinfo 9 Jun 2020 17:34:14 -0000 1.27
+++ lang/ocaml/distinfo 29 Nov 2021 19:41:47 -0000
@@ -1,4 +1,4 @@
-SHA256 (ocaml-4.10-refman-html.tar.gz) =
/r+sdsa1SDErm5CodiPVv/fiAAhigelOKfdMQeGOn+0=
-SHA256 (ocaml-4.10.0.tar.gz) = WNQx3eZvV1Dr6bFdWhxIcvgNKD3sI0SGibDRpJi35Mc=
-SIZE (ocaml-4.10-refman-html.tar.gz) = 1737359
-SIZE (ocaml-4.10.0.tar.gz) = 4922813
+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
Index: lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
===================================================================
RCS file: lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
diff -N lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp
--- lang/ocaml/patches/patch-asmcomp_amd64_emit_mlp 15 Mar 2021 20:47:23
-0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-asmcomp_amd64_emit_mlp,v 1.6 2021/03/15 20:47:23 naddy Exp $
-
-Fix mergeable section flags and use .rodata.cst16 where appropriate
-https://github.com/ocaml/ocaml/commit/8a46d76bf9359b5cc505b3f2f9c81eb624c631fa
-
-Index: asmcomp/amd64/emit.mlp
---- asmcomp/amd64/emit.mlp.orig
-+++ asmcomp/amd64/emit.mlp
-@@ -1034,7 +1034,7 @@ let begin_assembly() =
- | S_macosx -> D.section ["__TEXT";"__literal16"] None ["16byte_literals"]
- | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
- | S_win64 -> D.data ()
-- | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+ | _ -> D.section [".rodata.cst16"] (Some "aM") ["@progbits";"16"]
- end;
- D.align 16;
- _label (emit_symbol "caml_negf_mask");
-@@ -1094,8 +1094,9 @@ let end_assembly() =
- | S_macosx -> D.section ["__TEXT";"__literal8"] None ["8byte_literals"]
- | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
- | S_win64 -> D.data ()
-- | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+ | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits";"8"]
- end;
-+ D.align 8;
- List.iter (fun (cst,lbl) -> emit_float_constant cst lbl) !float_constants
- end;
-
Index: lang/ocaml/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-configure_ac
--- lang/ocaml/patches/patch-configure_ac 9 Jun 2020 17:34:14 -0000
1.3
+++ lang/ocaml/patches/patch-configure_ac 29 Nov 2021 19:41:47 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2020/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -681,6 +681,11 @@ AS_CASE([$CC,$host],
+@@ -700,6 +700,11 @@ AS_CASE([$CC,$host],
)
@@ -15,7 +15,7 @@ Index: configure.ac
## Program to use to install files
AC_PROG_INSTALL
-@@ -797,8 +802,8 @@ AS_IF([test x"$enable_shared" != "xno"],
+@@ -824,8 +829,8 @@ AS_IF([test x"$enable_shared" != "xno"],
[[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
|*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
[sharedlib_cflags="-fPIC"
Index: lang/ocaml/patches/patch-runtime_amd64_S
===================================================================
RCS file: lang/ocaml/patches/patch-runtime_amd64_S
diff -N lang/ocaml/patches/patch-runtime_amd64_S
--- lang/ocaml/patches/patch-runtime_amd64_S 15 Mar 2021 20:47:23 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-runtime_amd64_S,v 1.1 2021/03/15 20:47:23 naddy Exp $
-
-Fix mergeable section flags and use .rodata.cst16 where appropriate
-https://github.com/ocaml/ocaml/commit/8a46d76bf9359b5cc505b3f2f9c81eb624c631fa
-
-Index: runtime/amd64.S
---- runtime/amd64.S.orig
-+++ runtime/amd64.S
-@@ -809,7 +809,7 @@ G(caml_system__spacetime_shapes):
- #elif defined(SYS_mingw64) || defined(SYS_cygwin)
- .section .rdata,"dr"
- #else
-- .section .rodata.cst8,"a",@progbits
-+ .section .rodata.cst16,"aM",@progbits,16
- #endif
- .globl G(caml_negf_mask)
- .align SIXTEEN_ALIGN
Index: lang/ocaml/pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
retrieving revision 1.18
diff -u -p -u -r1.18 PFRAG.native
--- lang/ocaml/pkg/PFRAG.native 9 Jun 2020 17:34:14 -0000 1.18
+++ lang/ocaml/pkg/PFRAG.native 29 Nov 2021 19:41:47 -0000
@@ -11,6 +11,7 @@
bin/ocamlopt
bin/ocamlopt.byte
@bin bin/ocamlopt.opt
+@bin bin/ocamloptp.opt
@bin bin/ocamlprof.opt
lib/ocaml/bigarray.a
lib/ocaml/bigarray.cmx
@@ -20,18 +21,6 @@ lib/ocaml/camlinternalFormatBasics.cmx
lib/ocaml/camlinternalLazy.cmx
lib/ocaml/camlinternalMod.cmx
lib/ocaml/camlinternalOO.cmx
-lib/ocaml/compiler-libs/closure_middle_end.cmi
-lib/ocaml/compiler-libs/closure_middle_end.cmt
-lib/ocaml/compiler-libs/closure_middle_end.cmti
-lib/ocaml/compiler-libs/closure_middle_end.mli
-lib/ocaml/compiler-libs/cmm_helpers.cmi
-lib/ocaml/compiler-libs/cmm_helpers.cmt
-lib/ocaml/compiler-libs/cmm_helpers.cmti
-lib/ocaml/compiler-libs/cmm_helpers.mli
-lib/ocaml/compiler-libs/linear.cmi
-lib/ocaml/compiler-libs/linear.cmt
-lib/ocaml/compiler-libs/linear.cmti
-lib/ocaml/compiler-libs/linear.mli
lib/ocaml/compiler-libs/CSE.cmi
lib/ocaml/compiler-libs/CSE.cmt
lib/ocaml/compiler-libs/CSE.cmx
@@ -161,7 +150,11 @@ lib/ocaml/compiler-libs/closure_id.cmt
lib/ocaml/compiler-libs/closure_id.cmti
lib/ocaml/compiler-libs/closure_id.cmx
lib/ocaml/compiler-libs/closure_id.mli
+lib/ocaml/compiler-libs/closure_middle_end.cmi
+lib/ocaml/compiler-libs/closure_middle_end.cmt
+lib/ocaml/compiler-libs/closure_middle_end.cmti
lib/ocaml/compiler-libs/closure_middle_end.cmx
+lib/ocaml/compiler-libs/closure_middle_end.mli
lib/ocaml/compiler-libs/closure_offsets.cmi
lib/ocaml/compiler-libs/closure_offsets.cmt
lib/ocaml/compiler-libs/closure_offsets.cmti
@@ -178,7 +171,11 @@ lib/ocaml/compiler-libs/cmm.cmt
lib/ocaml/compiler-libs/cmm.cmti
lib/ocaml/compiler-libs/cmm.cmx
lib/ocaml/compiler-libs/cmm.mli
+lib/ocaml/compiler-libs/cmm_helpers.cmi
+lib/ocaml/compiler-libs/cmm_helpers.cmt
+lib/ocaml/compiler-libs/cmm_helpers.cmti
lib/ocaml/compiler-libs/cmm_helpers.cmx
+lib/ocaml/compiler-libs/cmm_helpers.mli
lib/ocaml/compiler-libs/cmmgen.cmi
lib/ocaml/compiler-libs/cmmgen.cmt
lib/ocaml/compiler-libs/cmmgen.cmti
@@ -189,6 +186,7 @@ lib/ocaml/compiler-libs/cmmgen_state.cmt
lib/ocaml/compiler-libs/cmmgen_state.cmti
lib/ocaml/compiler-libs/cmmgen_state.cmx
lib/ocaml/compiler-libs/cmmgen_state.mli
+lib/ocaml/compiler-libs/cmt2annot.cmx
lib/ocaml/compiler-libs/cmt_format.cmx
lib/ocaml/compiler-libs/coloring.cmi
lib/ocaml/compiler-libs/coloring.cmt
@@ -422,7 +420,11 @@ lib/ocaml/compiler-libs/lift_let_to_init
lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
+lib/ocaml/compiler-libs/linear.cmi
+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/linearize.cmi
lib/ocaml/compiler-libs/linearize.cmt
lib/ocaml/compiler-libs/linearize.cmti
@@ -729,6 +731,7 @@ lib/ocaml/compiler-libs/typecore.cmx
lib/ocaml/compiler-libs/typedecl.cmx
lib/ocaml/compiler-libs/typedecl_immediacy.cmx
lib/ocaml/compiler-libs/typedecl_properties.cmx
+lib/ocaml/compiler-libs/typedecl_separability.cmx
lib/ocaml/compiler-libs/typedecl_unboxed.cmx
lib/ocaml/compiler-libs/typedecl_variance.cmx
lib/ocaml/compiler-libs/typedtree.cmx
Index: lang/ocaml/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -u -r1.27 PLIST
--- lang/ocaml/pkg/PLIST 9 Jun 2020 17:34:14 -0000 1.27
+++ lang/ocaml/pkg/PLIST 29 Nov 2021 19:41:47 -0000
@@ -2,8 +2,6 @@
@pkgpath lang/ocaml,-main
%%native%%
bin/ocaml
-bin/ocaml-instr-graph
-bin/ocaml-instr-report
bin/ocamlc
bin/ocamlc.byte
bin/ocamlcmt
@@ -60,6 +58,7 @@ lib/ocaml/caml/backtrace.h
lib/ocaml/caml/backtrace_prim.h
lib/ocaml/caml/bigarray.h
lib/ocaml/caml/callback.h
+lib/ocaml/caml/codefrag.h
lib/ocaml/caml/compact.h
lib/ocaml/caml/compare.h
lib/ocaml/caml/compatibility.h
@@ -70,6 +69,7 @@ lib/ocaml/caml/domain.h
lib/ocaml/caml/domain_state.h
lib/ocaml/caml/domain_state.tbl
lib/ocaml/caml/dynlink.h
+lib/ocaml/caml/eventlog.h
lib/ocaml/caml/exec.h
lib/ocaml/caml/fail.h
lib/ocaml/caml/finalise.h
@@ -103,6 +103,7 @@ lib/ocaml/caml/roots.h
lib/ocaml/caml/s.h
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
@@ -228,6 +229,8 @@ lib/ocaml/compiler-libs/cmi_format.mli
lib/ocaml/compiler-libs/cmo_format.cmi
lib/ocaml/compiler-libs/cmo_format.cmti
lib/ocaml/compiler-libs/cmo_format.mli
+lib/ocaml/compiler-libs/cmt2annot.cmi
+lib/ocaml/compiler-libs/cmt2annot.cmt
lib/ocaml/compiler-libs/cmt_format.cmi
lib/ocaml/compiler-libs/cmt_format.cmt
lib/ocaml/compiler-libs/cmt_format.cmti
@@ -600,6 +603,10 @@ lib/ocaml/compiler-libs/typedecl_propert
lib/ocaml/compiler-libs/typedecl_properties.cmt
lib/ocaml/compiler-libs/typedecl_properties.cmti
lib/ocaml/compiler-libs/typedecl_properties.mli
+lib/ocaml/compiler-libs/typedecl_separability.cmi
+lib/ocaml/compiler-libs/typedecl_separability.cmt
+lib/ocaml/compiler-libs/typedecl_separability.cmti
+lib/ocaml/compiler-libs/typedecl_separability.mli
lib/ocaml/compiler-libs/typedecl_unboxed.cmi
lib/ocaml/compiler-libs/typedecl_unboxed.cmt
lib/ocaml/compiler-libs/typedecl_unboxed.cmti
@@ -646,6 +653,7 @@ lib/ocaml/dynlink.cmti
lib/ocaml/dynlink.mli
lib/ocaml/ephemeron.ml
lib/ocaml/ephemeron.mli
+lib/ocaml/eventlog_metadata
lib/ocaml/expunge
lib/ocaml/extract_crc
lib/ocaml/filename.ml
@@ -1164,6 +1172,7 @@ lib/ocaml/weak.mli
@man man/man3/Format.3o
@man man/man3/Fun.3o
@man man/man3/Gc.3o
+@man man/man3/Gc.Memprof.3o
@man man/man3/Genlex.3o
@man man/man3/Hashtbl.3o
@man man/man3/Hashtbl.HashedType.3o
@@ -1211,6 +1220,7 @@ lib/ocaml/weak.mli
@man man/man3/Misc.Error_style.3o
@man man/man3/Misc.Int_literal_converter.3o
@man man/man3/Misc.LongString.3o
+@man man/man3/Misc.Magic_number.3o
@man man/man3/Misc.Stdlib.3o
@man man/man3/Misc.Stdlib.Array.3o
@man man/man3/Misc.Stdlib.List.3o
@@ -1254,8 +1264,6 @@ lib/ocaml/weak.mli
@man man/man3/Parser.MenhirInterpreter.3o
@man man/man3/Parsetree.3o
@man man/man3/Parsing.3o
-@man man/man3/Pervasives.3o
-@man man/man3/Pervasives.LargeFile.3o
@man man/man3/Pparse.3o
@man man/man3/Pprintast.3o
@man man/man3/Printast.3o
@@ -1403,6 +1411,7 @@ share/doc/ocaml/html/generativefunctors.
share/doc/ocaml/html/index.html
share/doc/ocaml/html/indexops.html
share/doc/ocaml/html/inlinerecords.html
+share/doc/ocaml/html/instrumented-runtime.html
share/doc/ocaml/html/intfc.html
share/doc/ocaml/html/lablexamples.html
share/doc/ocaml/html/language.html
@@ -1460,6 +1469,7 @@ share/doc/ocaml/html/libref/Float.ArrayL
share/doc/ocaml/html/libref/Float.html
share/doc/ocaml/html/libref/Format.html
share/doc/ocaml/html/libref/Fun.html
+share/doc/ocaml/html/libref/Gc.Memprof.html
share/doc/ocaml/html/libref/Gc.html
share/doc/ocaml/html/libref/Genlex.html
share/doc/ocaml/html/libref/Hashtbl.HashedType.html
@@ -1506,8 +1516,6 @@ share/doc/ocaml/html/libref/Ocaml_operat
share/doc/ocaml/html/libref/Oo.html
share/doc/ocaml/html/libref/Option.html
share/doc/ocaml/html/libref/Parsing.html
-share/doc/ocaml/html/libref/Pervasives.LargeFile.html
-share/doc/ocaml/html/libref/Pervasives.html
share/doc/ocaml/html/libref/Printexc.Slot.html
share/doc/ocaml/html/libref/Printexc.html
share/doc/ocaml/html/libref/Printf.html
@@ -1664,6 +1672,7 @@ share/doc/ocaml/html/libref/type_Float.A
share/doc/ocaml/html/libref/type_Float.html
share/doc/ocaml/html/libref/type_Format.html
share/doc/ocaml/html/libref/type_Fun.html
+share/doc/ocaml/html/libref/type_Gc.Memprof.html
share/doc/ocaml/html/libref/type_Gc.html
share/doc/ocaml/html/libref/type_Genlex.html
share/doc/ocaml/html/libref/type_Hashtbl.HashedType.html
@@ -1710,8 +1719,6 @@ share/doc/ocaml/html/libref/type_Ocaml_o
share/doc/ocaml/html/libref/type_Oo.html
share/doc/ocaml/html/libref/type_Option.html
share/doc/ocaml/html/libref/type_Parsing.html
-share/doc/ocaml/html/libref/type_Pervasives.LargeFile.html
-share/doc/ocaml/html/libref/type_Pervasives.html
share/doc/ocaml/html/libref/type_Printexc.Slot.html
share/doc/ocaml/html/libref/type_Printexc.html
share/doc/ocaml/html/libref/type_Printf.html
@@ -1820,7 +1827,7 @@ 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/manual071.html
+share/doc/ocaml/html/manual072.html
share/doc/ocaml/html/modtypes.html
share/doc/ocaml/html/modulealias.html
share/doc/ocaml/html/moduleexamples.html
Index: lang/ocaml-camlp4/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml-camlp4/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- lang/ocaml-camlp4/Makefile 10 Jun 2020 19:41:58 -0000 1.17
+++ lang/ocaml-camlp4/Makefile 29 Nov 2021 19:41:47 -0000
@@ -4,7 +4,7 @@ COMMENT = OCaml Preprocessor and Pretty-
CATEGORIES = lang
EPOCH = 0
-V = 4.10+1
+V = 4.11+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.9
diff -u -p -u -r1.9 distinfo
--- lang/ocaml-camlp4/distinfo 9 Jun 2020 17:34:15 -0000 1.9
+++ lang/ocaml-camlp4/distinfo 29 Nov 2021 19:41:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (camlp4-4.10+1.tar.gz) = nZsYgQ6DTuEeYnNqaAMTz5DBVR4iwITKK3DGgzju8p4=
-SIZE (camlp4-4.10+1.tar.gz) = 650092
+SHA256 (camlp4-4.11+1.tar.gz) = pQHBno4eUFfzgnYfZGWPkhuO/tRg/0K43g4VRfVhMXI=
+SIZE (camlp4-4.11+1.tar.gz) = 650280
Index: lang/ocaml-camlp5/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml-camlp5/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- lang/ocaml-camlp5/Makefile 7 Oct 2020 12:35:21 -0000 1.10
+++ lang/ocaml-camlp5/Makefile 29 Nov 2021 19:41:47 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.10 2020/10/07 12:35:21 daniel Exp $
-V = 7.13
+V = 7.14
COMMENT = OCaml Preprocessor and Pretty-Printer
DISTFILES = camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX}
PKGNAME = ocaml-camlp5-${V}
Index: lang/ocaml-camlp5/distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml-camlp5/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- lang/ocaml-camlp5/distinfo 7 Oct 2020 12:35:21 -0000 1.6
+++ lang/ocaml-camlp5/distinfo 29 Nov 2021 19:41:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (camlp5-rel7.13.tar.gz) = vHOogQVS+9DJBTZKujTbpG48ra5IP4nn45+n99O+cgw=
-SIZE (camlp5-rel7.13.tar.gz) = 1031832
+SHA256 (camlp5-rel7.14.tar.gz) = boS5vATgOwW9HsFVAPC49O9OqBV2oapwN+8ByEz3baU=
+SIZE (camlp5-rel7.14.tar.gz) = 1044110
