[pkgsrc/trunk]: pkgsrc/lang/ocaml Updated lang/ocaml to version 4.11.2.

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e11f10b26239
branches:  trunk
changeset: 448440:e11f10b26239
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Mar 08 08:08:43 2021 +0000

description:
Updated lang/ocaml to version 4.11.2.

This is a bugfix release from 4.11.1. The amd64 runtime patches have been
removed since they seem to have been incorporated by upstream.

diffstat:

 lang/ocaml/Makefile.common                      |   4 ++--
 lang/ocaml/PLIST                                |   4 +++-
 lang/ocaml/buildlink3.mk                        |   6 +++---
 lang/ocaml/distinfo                             |  12 +++++-------
 lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp |  24 ------------------------
 lang/ocaml/patches/patch-runtime_amd64.S        |  15 ---------------
 6 files changed, 13 insertions(+), 52 deletions(-)

diffs (133 lines):

diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Mon Mar 08 07:11:14 2021 +0000
+++ b/lang/ocaml/Makefile.common        Mon Mar 08 08:08:43 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.61 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.62 2021/03/08 08:08:43 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=      ocaml-4.11.1
+DISTNAME=      ocaml-4.11.2
 CATEGORIES=    lang
 MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.11/
 #EXTRACT_SUFX= .tar.bz2
diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Mon Mar 08 07:11:14 2021 +0000
+++ b/lang/ocaml/PLIST  Mon Mar 08 08:08:43 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2020/12/09 10:33:04 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.55 2021/03/08 08:08:43 jaapb Exp $
 bin/ocaml
 @comment ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
 @comment ${PLIST.instrumented_runtime}bin/ocaml-instr-report
@@ -73,6 +73,7 @@
 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
@@ -120,6 +121,7 @@
 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
diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk  Mon Mar 08 07:11:14 2021 +0000
+++ b/lang/ocaml/buildlink3.mk  Mon Mar 08 08:08:43 2021 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.55 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.56 2021/03/08 08:08:43 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.11.1
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.11.1
+BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.11.2
+BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.11.2
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=   build
 
diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Mon Mar 08 07:11:14 2021 +0000
+++ b/lang/ocaml/distinfo       Mon Mar 08 08:08:43 2021 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.141 2021/01/08 12:28:16 jperkin Exp $
+$NetBSD: distinfo,v 1.142 2021/03/08 08:08:43 jaapb Exp $
 
-SHA1 (ocaml-4.11.1.tar.gz) = a3f3d74a43a3d0054f0d0162522499f7d8958560
-RMD160 (ocaml-4.11.1.tar.gz) = 6bdd83aeab8a074cfeffa475fe2db72cbca2d6cf
-SHA512 (ocaml-4.11.1.tar.gz) = 7adc40ab1c4086861619ce7280c75d0d200c398f8a7c2c89b0569a34b4deac8c6857b645340a525f656523cb92c4f73c1329e757b6ed41ea080e9cd540e6cb7b
-Size (ocaml-4.11.1.tar.gz) = 5062453 bytes
+SHA1 (ocaml-4.11.2.tar.gz) = 66826c416f49f32374a63633876c29a532a42308
+RMD160 (ocaml-4.11.2.tar.gz) = ea2511f5114d489581378318e93ded251eb3307b
+SHA512 (ocaml-4.11.2.tar.gz) = 5697c8fe6a7d2b1a0199e60e397f766161d31edf146c4d9020dc08592c1ffb0e4cfaccaccfa3feb36bf31dceb10e23c566d6c4d53f0ecfa823abeef81235338e
+Size (ocaml-4.11.2.tar.gz) = 4969981 bytes
 SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
 SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
-SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
 SHA1 (patch-configure) = 5791eba70a6d06fe79f6268a3d4e40a1dc636fd1
 SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
@@ -18,7 +17,6 @@
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-otherlibs_unix_Makefile) = 84f236dab98d684e70fe92294779e65ce3f11e7f
 SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
-SHA1 (patch-runtime_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
 SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
 SHA1 (patch-tools_Makefile) = 69f92a8615ed6f9b33f27546c6a25a1f24995e55
 SHA1 (patch-tools_ocamlmklib.ml) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
--- a/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp   Mon Mar 08 07:11:14 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.6 2020/12/09 10:33:04 jaapb Exp $
-
-Fix attributes and entry size or 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() =
-     | 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.cst8"] (Some "aM") ["@progbits,8"]
-     end;
-     D.align 16;
-     _label (emit_symbol "caml_negf_mask");
-@@ -1046,7 +1046,7 @@ 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;
-     List.iter (fun (cst,lbl) -> emit_float_constant cst lbl) !float_constants
-   end;
diff -r 0291e4743df8 -r e11f10b26239 lang/ocaml/patches/patch-runtime_amd64.S
--- a/lang/ocaml/patches/patch-runtime_amd64.S  Mon Mar 08 07:11:14 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-runtime_amd64.S,v 1.1 2020/12/09 10:33:04 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):
- #elif defined(SYS_mingw64) || defined(SYS_cygwin)
-         .section .rdata,"dr"
- #else
--        .section    .rodata.cst8,"a",@progbits
-+        .section    .rodata.cst8,"aM",@progbits,8
- #endif
-         .globl  G(caml_negf_mask)
-         .align  SIXTEEN_ALIGN