CVS commit: pkgsrc/lang/ocaml

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/ocaml
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Wed, 9 Dec 2020 10:33:04 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Dec  9 10:33:04 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-configure patch-lex_Makefile
            patch-ocamldoc_Makefile patch-otherlibs_Makefile.otherlibs.common
            patch-otherlibs_systhreads_Makefile patch-runtime_Makefile
            patch-testsuite_tests_lib-systhreads_testyield.ml
            patch-tools_Makefile patch-yacc_Makefile
Added Files:
        pkgsrc/lang/ocaml/patches: patch-otherlibs_systhreads_st__stubs.c
            patch-runtime_amd64.S patch-tools_ocamlmklib.ml
Removed Files:
        pkgsrc/lang/ocaml/patches: patch-asmrun_amd64.S patch-tools_ocamlmklib

Log Message:
Updated lang/ocaml to 4.11.1.

Patches for solaris and friends are reinstated (thanks jperkin@)
Also thanks to he@ for testing on powerpc and arm

Highlights for 4.10.0:
* A new best-fit allocator for the major heap which reducing both GC cost
  and memory usage.
* Immutable strings are now enforced at configuration time
* User-defined indexing operators for multidimensional arrays
* Miscellaneous improvements to the manual
* A more precise exhaustiveness check for GADTs
* Many bug fixes

Highlights for 4.11.0:
* Statmemprof: a new statistical memory profiler
* A new instrumented runtime that logs runtime statistics in a standard
  format
* A native backend for the RISC-V architecture
* Improved backtraces that refer to function names
* Suppport for recursive and yet unboxed types
* A quoted extension syntax for ppxs.
* Many quality of life improvements
* Many bug fixes.

4.11.1 is a bugfix release. Full details in the CHANGELOG included with
the distribution.


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/lang/ocaml/Makefile \
    pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.60 -r1.61 pkgsrc/lang/ocaml/Makefile.common
cvs rdiff -u -r1.53 -r1.54 pkgsrc/lang/ocaml/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/ocaml/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ocaml/hacks.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ocaml/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/ocaml/patches/patch-Makefile
cvs rdiff -u -r1.2 -r1.3 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.5 -r1.6 \
    pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp \
    pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/ocaml/patches/patch-configure
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ocaml/patches/patch-runtime_amd64.S \
    pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
cvs rdiff -u -r1.9 -r0 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.137 pkgsrc/lang/ocaml/Makefile:1.138
--- pkgsrc/lang/ocaml/Makefile:1.137    Tue Dec  8 08:53:16 2020
+++ pkgsrc/lang/ocaml/Makefile  Wed Dec  9 10:33:04 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.137 2020/12/08 08:53:16 he Exp $
+# $NetBSD: Makefile,v 1.138 2020/12/09 10:33:04 jaapb Exp $
 
 .include "Makefile.common"
 
 #CONFIGURE_ENV+=               disable_x11=yes
 
-PKGREVISION=           1
-
 BUILD_TARGET=          world
+TEST_PROGRAM=          ocamltest
 MAKE_JOBS_SAFE=                no
 UNLIMIT_RESOURCES=     stacksize
 
@@ -15,11 +14,6 @@ USE_LANGUAGES+=              c
 USE_LIBTOOL=           yes
 USE_GNU_CONFIGURE_HOST=        no
 
-# This actually works fine, but requires some patches that the maintainer
-# insists on removing every time the package is updated, so we unfortunately
-# have to mark it broken to stop wasting people's valuable time investigating.
-BROKEN_ON_PLATFORM=    SunOS-*-*
-
 #USE_GCC_RUNTIME=      yes
 
 PLIST_VARS+=   ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
@@ -45,6 +39,7 @@ PLIST.ocaml-stub=     yes
     !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
     (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+=         opt opt.opt
+TEST_PROGRAM+=         ocamltest.opt
 PLIST.ocaml-opt=       yes
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
@@ -56,11 +51,11 @@ PLIST.ocaml-prof=   yes
 # XXX This conditional is not complete.  It should match the
 # conditional in ocaml-x.y.z/configure.
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64") || (${MACHINE_ARCH} == "powerpc")
+    (${MACHINE_ARCH} == "aarch64")
 .  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
       !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
       !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
-      !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \
+      (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
       !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
       !empty(MACHINE_PLATFORM:MSunOS-*-*)
 PLIST.ocaml-nat=       yes
@@ -104,6 +99,7 @@ REPLACE_AWK+=                tools/ocaml-instr-report
 .endif
 
 do-test:
+       cd ${WRKSRC} && ${MAKE_PROGRAM} ${TEST_PROGRAM}
        cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
 
 .if ${OPSYS} == "Darwin"
@@ -111,8 +107,8 @@ do-test:
 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; \
+               ${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
+               install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
        done
 .endif
 
Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.137 pkgsrc/lang/ocaml/distinfo:1.138
--- pkgsrc/lang/ocaml/distinfo:1.137    Tue Dec  1 23:16:44 2020
+++ pkgsrc/lang/ocaml/distinfo  Wed Dec  9 10:33:04 2020
@@ -1,22 +1,24 @@
-$NetBSD: distinfo,v 1.137 2020/12/01 23:16:44 he Exp $
+$NetBSD: distinfo,v 1.138 2020/12/09 10:33:04 jaapb Exp $
 
-SHA1 (ocaml-4.09.1.tar.gz) = b4e7140e977c0fae5182074dd93b3c1b74f49ee7
-RMD160 (ocaml-4.09.1.tar.gz) = 377e956327bac18a37f9e77b2558e9474fd07481
-SHA512 (ocaml-4.09.1.tar.gz) = 2313181aeac7922a868fbcd43b0f43ba2b08dd1f113abbcea8e4896caeb5fe26a1aee0c95a815dfa94675cc2eca510d03f230cda7f9361be26419ed02a42aac1
-Size (ocaml-4.09.1.tar.gz) = 4835466 bytes
-SHA1 (patch-Makefile) = 132a1cf1187dc05ec5338b496757d89047e91130
-SHA1 (patch-Makefile.common.in) = fbf3dc0614073ed5ac9b220211a837f69a4ffcaf
+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 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
+SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
 SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
-SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = dafa708f7ad063612cb93fa1089d49a6059d1e9f
-SHA1 (patch-lex_Makefile) = 18d1b8272ffb3e3a58c26d8a2494aaae6942426a
+SHA1 (patch-configure) = 5791eba70a6d06fe79f6268a3d4e40a1dc636fd1
+SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
-SHA1 (patch-ocamldoc_Makefile) = ca4997636f7a6a382bbcb7be365526e94be4534a
+SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 98211e0a220d360560c2b3f8d7e1fad4c83f2726
-SHA1 (patch-otherlibs_systhreads_Makefile) = a713371cf16e79ee3e5d0f9f8d128476d4c9bee9
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 05f14ad2635bfd2ded98ef38ac6e7578b5cfc08e
+SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d
+SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
-SHA1 (patch-tools_Makefile) = 871d40893d0300d80b9322631321803348a154cf
-SHA1 (patch-tools_ocamlmklib) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
-SHA1 (patch-yacc_Makefile) = c416081421f5e09273ea8b04062402cbfeba7497
+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
+SHA1 (patch-yacc_Makefile) = 3d8962a2d447aa7e88e59151d66e2080f7fad1fb

Index: pkgsrc/lang/ocaml/Makefile.common
diff -u pkgsrc/lang/ocaml/Makefile.common:1.60 pkgsrc/lang/ocaml/Makefile.common:1.61
--- pkgsrc/lang/ocaml/Makefile.common:1.60      Wed Apr 15 09:50:54 2020
+++ pkgsrc/lang/ocaml/Makefile.common   Wed Dec  9 10:33:04 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.60 2020/04/15 09:50:54 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.61 2020/12/09 10:33:04 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=      ocaml-4.09.1
+DISTNAME=      ocaml-4.11.1
 CATEGORIES=    lang
-MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.09/
+MASTER_SITES=  http://caml.inria.fr/pub/distrib/ocaml-4.11/
 #EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
@@ -21,6 +21,7 @@ GNU_CONFIGURE=                yes
 #CONFIGURE_ARGS+=      -with-pthread
 #CONFIGURE_ARGS+=      -host ${MACHINE_GNU_PLATFORM:Q}
 #CONFIGURE_ARGS+=      -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
+#CONFIGURE_ARGS+=      --without-x
 #CPPFLAGS+=            -DDB_DBM_HSEARCH
 
 #DISTINFO_FILE=        ${.CURDIR}/../../lang/ocaml/distinfo

Index: pkgsrc/lang/ocaml/PLIST
diff -u pkgsrc/lang/ocaml/PLIST:1.53 pkgsrc/lang/ocaml/PLIST:1.54
--- pkgsrc/lang/ocaml/PLIST:1.53        Wed Apr 15 09:50:54 2020
+++ pkgsrc/lang/ocaml/PLIST     Wed Dec  9 10:33:04 2020
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.53 2020/04/15 09:50:54 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.54 2020/12/09 10:33:04 jaapb Exp $
 bin/ocaml
-${PLIST.instrumented_runtime}bin/ocaml-instr-graph
-${PLIST.instrumented_runtime}bin/ocaml-instr-report
+@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
+@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-report
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
@@ -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
-@comment 4.09 bin/ocamloptp
-@comment 4.09 bin/ocamloptp.byte
-@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
+${PLIST.ocaml-opt}bin/ocamloptp
+${PLIST.ocaml-opt}bin/ocamloptp.byte
+${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
 ${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -79,7 +79,11 @@ lib/ocaml/caml/compatibility.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/debugger.h
+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 +107,7 @@ lib/ocaml/caml/m.h
 lib/ocaml/caml/major_gc.h
 lib/ocaml/caml/md5.h
 lib/ocaml/caml/memory.h
+lib/ocaml/caml/memprof.h
 lib/ocaml/caml/minor_gc.h
 lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
@@ -376,6 +381,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmti
@@ -396,6 +406,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
@@ -409,6 +424,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt2annot.cmx
 lib/ocaml/compiler-libs/cmt_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmt
 lib/ocaml/compiler-libs/cmt_format.cmti
@@ -538,6 +556,11 @@ lib/ocaml/compiler-libs/docstrings.cmt
 lib/ocaml/compiler-libs/docstrings.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/docstrings.cmx
 lib/ocaml/compiler-libs/docstrings.mli
+lib/ocaml/compiler-libs/domainstate.cmi
+lib/ocaml/compiler-libs/domainstate.cmt
+lib/ocaml/compiler-libs/domainstate.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/domainstate.cmx
+lib/ocaml/compiler-libs/domainstate.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmti
@@ -777,6 +800,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti
@@ -871,7 +899,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 lib/ocaml/compiler-libs/ocamlcommon.cma
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.a
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cma
+lib/ocaml/compiler-libs/ocamlmiddleend.cma
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cmxa
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cma
@@ -1305,6 +1333,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
+lib/ocaml/compiler-libs/type_immediacy.cmi
+lib/ocaml/compiler-libs/type_immediacy.cmt
+lib/ocaml/compiler-libs/type_immediacy.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/type_immediacy.cmx
+lib/ocaml/compiler-libs/type_immediacy.mli
 lib/ocaml/compiler-libs/typeclass.cmi
 lib/ocaml/compiler-libs/typeclass.cmt
 lib/ocaml/compiler-libs/typeclass.cmti
@@ -1330,6 +1363,11 @@ lib/ocaml/compiler-libs/typedecl_propert
 lib/ocaml/compiler-libs/typedecl_properties.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_properties.cmx
 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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_separability.cmx
+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
@@ -1445,6 +1483,7 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
+lib/ocaml/eventlog_metadata
 lib/ocaml/expunge
 lib/ocaml/extract_crc
 lib/ocaml/filename.ml
@@ -2183,6 +2222,7 @@ man/man3/Depend.String.3
 man/man3/Digest.3
 man/man3/Docstrings.3
 man/man3/Docstrings.WithMenhir.3
+man/man3/Domainstate.3
 man/man3/Dynlink.3
 man/man3/Ephemeron.3
 man/man3/Ephemeron.GenHashTable.3
@@ -2206,6 +2246,7 @@ man/man3/Float.ArrayLabels.3
 man/man3/Format.3
 man/man3/Fun.3
 man/man3/Gc.3
+man/man3/Gc.Memprof.3
 man/man3/Genlex.3
 man/man3/Hashtbl.3
 man/man3/Hashtbl.HashedType.3
@@ -2253,6 +2294,7 @@ man/man3/Misc.EnvLazy.3
 man/man3/Misc.Error_style.3
 man/man3/Misc.Int_literal_converter.3
 man/man3/Misc.LongString.3
+man/man3/Misc.Magic_number.3
 man/man3/Misc.Stdlib.3
 man/man3/Misc.Stdlib.Array.3
 man/man3/Misc.Stdlib.List.3
@@ -2296,8 +2338,6 @@ man/man3/Parser.Incremental.3
 man/man3/Parser.MenhirInterpreter.3
 man/man3/Parsetree.3
 man/man3/Parsing.3
-man/man3/Pervasives.3
-man/man3/Pervasives.LargeFile.3
 man/man3/Pparse.3
 man/man3/Pprintast.3
 man/man3/Printast.3
@@ -2391,6 +2431,10 @@ man/man3/Strongly_connected_components.S
 man/man3/Strongly_connected_components.S.Id.3
 man/man3/Syntaxerr.3
 man/man3/Sys.3
+man/man3/Sys.Immediate64.3
+man/man3/Sys.Immediate64.Immediate.3
+man/man3/Sys.Immediate64.Make.3
+man/man3/Sys.Immediate64.Non_immediate.3
 man/man3/Targetint.3
 man/man3/Terminfo.3
 man/man3/Thread.3

Index: pkgsrc/lang/ocaml/buildlink3.mk
diff -u pkgsrc/lang/ocaml/buildlink3.mk:1.54 pkgsrc/lang/ocaml/buildlink3.mk:1.55
--- pkgsrc/lang/ocaml/buildlink3.mk:1.54        Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/buildlink3.mk     Wed Dec  9 10:33:04 2020
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.54 2020/01/14 19:53:35 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2020/12/09 10:33:04 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.09.0
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.09.0
+BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=4.11.1
+BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=4.11.1
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=   build
 

Index: pkgsrc/lang/ocaml/hacks.mk
diff -u pkgsrc/lang/ocaml/hacks.mk:1.8 pkgsrc/lang/ocaml/hacks.mk:1.9
--- pkgsrc/lang/ocaml/hacks.mk:1.8      Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/hacks.mk  Wed Dec  9 10:33:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.8 2020/01/14 19:53:35 jaapb Exp $
+# $NetBSD: hacks.mk,v 1.9 2020/12/09 10:33:04 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.4 pkgsrc/lang/ocaml/options.mk:1.5
--- pkgsrc/lang/ocaml/options.mk:1.4    Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/options.mk        Wed Dec  9 10:33:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/01/14 19:53:35 jaapb Exp $
+# $NetBSD: options.mk,v 1.5 2020/12/09 10:33:04 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml
 PKG_SUPPORTED_OPTIONS= pic flambda spacetime

Index: pkgsrc/lang/ocaml/patches/patch-Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile:1.15 pkgsrc/lang/ocaml/patches/patch-Makefile:1.16
--- pkgsrc/lang/ocaml/patches/patch-Makefile:1.15       Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-Makefile    Wed Dec  9 10:33:04 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.15 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.16 2020/12/09 10:33:04 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir
 Honor LDFLAGS
 
---- Makefile.orig      2019-04-18 10:10:54.000000000 +0000
+--- Makefile.orig      2020-09-01 12:47:58.000000000 +0000
 +++ Makefile
-@@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing -
+@@ -61,7 +61,7 @@ INCLUDES=-I utils -I parsing -I typing -
  COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
          -warn-error A \
            -bin-annot -safe-string -strict-formats $(INCLUDES)
@@ -14,7 +14,7 @@ Honor LDFLAGS
  
  ifeq "$(strip $(NATDYNLINKOPTS))" ""
  OCAML_NATDYNLINKOPTS=
-@@ -513,10 +513,10 @@ endif
+@@ -351,10 +351,10 @@ endif
  # Installation
  .PHONY: install
  install:
@@ -29,7 +29,7 @@ Honor LDFLAGS
        $(INSTALL_DATA) \
          VERSION \
          "$(INSTALL_LIBDIR)"
-@@ -564,7 +564,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
+@@ -408,7 +408,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
  endif
        $(MAKE) -C tools install
  ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix

Index: pkgsrc/lang/ocaml/patches/patch-Makefile.common.in
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.2 pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.3
--- pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.2      Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-Makefile.common.in  Wed Dec  9 10:33:04 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.common.in,v 1.2 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-Makefile.common.in,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Use BSD_INSTALL_*
 
---- Makefile.common.in.orig    2019-03-01 15:13:45.000000000 +0000
+--- Makefile.common.in.orig    2020-01-10 16:10:46.000000000 +0000
 +++ Makefile.common.in
-@@ -16,9 +16,9 @@
- # This makefile contains common definitions shared by other Makefiles
+@@ -19,9 +19,9 @@
+ # other Makefiles
  # We assume that Makefile.config has already been included
  
 -INSTALL ?= @INSTALL@
Index: pkgsrc/lang/ocaml/patches/patch-lex_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.2 pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.3
--- pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.2    Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-lex_Makefile        Wed Dec  9 10:33:04 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-lex_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-lex_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
---- lex/Makefile.orig  2019-09-11 14:40:30.000000000 +0000
+--- lex/Makefile.orig  2020-01-10 16:10:46.000000000 +0000
 +++ lex/Makefile
 @@ -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 \
+ COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
              -safe-string -strict-sequence -strict-formats -bin-annot
 -LINKFLAGS =
 +LINKFLAGS = -cclib "$(LDFLAGS)"
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.2 pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.3
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.2     Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common Wed Dec  9 10:33:04 2020
@@ -1,14 +1,15 @@
-$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.2 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
---- otherlibs/Makefile.otherlibs.common.orig   2019-02-08 14:34:10.000000000 +0000
+--- otherlibs/Makefile.otherlibs.common.orig   2020-01-10 16:10:46.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
-@@ -48,6 +48,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm
- #LINKOPTS=
- #LDOPTS=
- #HEADERS=
-+LDOPTS=       -ldopt "$(LDFLAGS)"
- 
+@@ -51,7 +51,7 @@ COBJS ?=
+ EXTRACFLAGS ?=
+ EXTRACAMLFLAGS ?=
+ LINKOPTS ?=
+-LDOPTS ?=
++LDOPTS ?= -ldopt "$(LDFLAGS)"
+ HEADERS ?=
  CMIFILES ?= $(CAMLOBJS:.cmo=.cmi)
  CAMLOBJS_NAT ?= $(CAMLOBJS:.cmo=.cmx)
Index: pkgsrc/lang/ocaml/patches/patch-runtime_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.2 pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.3
--- pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.2        Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-runtime_Makefile    Wed Dec  9 10:33:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-runtime_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-runtime_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
Index: pkgsrc/lang/ocaml/patches/patch-tools_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.2 pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.3
--- pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.2  Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-tools_Makefile      Wed Dec  9 10:33:04 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-tools_Makefile,v 1.2 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-tools_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
---- tools/Makefile.orig        2019-09-11 14:40:30.000000000 +0000
+--- tools/Makefile.orig        2020-01-10 16:10:46.000000000 +0000
 +++ tools/Makefile
 @@ -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)
+  -principal -safe-string -strict-formats -bin-annot $(INCLUDES)
 -LINKFLAGS = $(INCLUDES)
 +LINKFLAGS = $(INCLUDES) -cclib "$(LDFLAGS)"
  VPATH := $(filter-out -I,$(INCLUDES))
  
- # scrapelabels addlabels
+ .PHONY: all allopt opt.opt # allopt and opt.opt are synonyms

Index: pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
diff -u pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.5 pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.6
--- pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.5  Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp      Wed Dec  9 10:33:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.5 2020/01/14 19:53:35 jaapb Exp $
+$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
 
Index: pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.5 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.6
--- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.5   Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile       Wed Dec  9 10:33:04 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-yacc_Makefile,v 1.5 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-yacc_Makefile,v 1.6 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS when building ocamlyacc.
 
---- yacc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
+--- yacc/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
 +++ yacc/Makefile
-@@ -36,7 +36,7 @@ MKEXE_ANSI=$(MKEXE)
- endif
+@@ -39,7 +39,7 @@ generated_files := ocamlyacc$(EXE) $(oca
+ all: ocamlyacc$(EXE)
  
  ocamlyacc$(EXE): $(ocamlyacc_OBJECTS)
--      $(MKEXE_ANSI) -o $@ $^ $(EXTRALIBS)
-+      $(MKEXE_ANSI) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+-      $(MKEXE) -o $@ $^ $(EXTRALIBS)
++      $(MKEXE) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
  
  version.h : $(ROOTDIR)/VERSION
        echo "#define OCAML_VERSION \"`sed -e 1q $< | tr -d '\r'`\"" > $@

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.42 pkgsrc/lang/ocaml/patches/patch-configure:1.43
--- pkgsrc/lang/ocaml/patches/patch-configure:1.42      Tue Dec  1 23:16:44 2020
+++ pkgsrc/lang/ocaml/patches/patch-configure   Wed Dec  9 10:33:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.42 2020/12/01 23:16:44 he Exp $
+$NetBSD: patch-configure,v 1.43 2020/12/09 10:33:04 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
@@ -7,18 +7,40 @@ Add SunOS -lnsl -lsocket
 Recognise SunOS/amd64 as amd64
 Recognise SunOS as having shared libraries
 
---- configure.orig     2019-09-11 14:40:30.000000000 +0000
+--- configure.orig     2020-09-01 12:47:58.000000000 +0000
 +++ configure
-@@ -13306,7 +13306,7 @@ sharedlib_cflags=''
+@@ -13476,7 +13476,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
 -natdynlinkopts=""
-+natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
++natdynlinkopts="-L/usr/lib -R/usr/lib -R${PREFIX}/lib"
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13392,6 +13392,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -13513,6 +13513,12 @@ esac ;; #(
+       mksharedlibrpath="-Wl,-rpath,"
+       natdynlinkopts="-Wl,-E"
+       shared_libraries_supported=true ;; #(
++  *-*-solaris*)
++    sharedlib_cflags="-fPIC"
++    mksharedlib="$CC -shared"
++    rpath="-Wl,-rpath,"
++    mksharedlibrpath="-Wl,rpath,"
++    shared_libraries_supported=true ;;
+   *) :
+      ;;
+ esac
+@@ -13534,6 +13540,8 @@ if test x"$enable_shared" != "xno"; then
+     natdynlink=true ;; #(
+   *-pc-windows) :
+     natdynlink=true ;; #(
++  *-*-solaris*) :
++    natdynlink=true ;; #(
+   i[3456]86-*-linux*) :
+     natdynlink=true ;; #(
+   i[3456]86-*-gnu*) :
+@@ -13562,6 +13570,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    i[3456]86-*-netbsd*) :
      natdynlink=true ;; #(
@@ -27,16 +49,24 @@ Recognise SunOS as having shared librari
    x86_64-*-netbsd*) :
      natdynlink=true ;; #(
    i386-*-gnu0.3) :
-@@ -13408,6 +13410,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -13572,12 +13582,16 @@ if test x"$enable_shared" != "xno"; then
+     natdynlink=true ;; #(
+   arm*-*-freebsd*) :
+     natdynlink=true ;; #(
++  arm*-*-netbsd*) :
++    natdynlink=true ;; #(
+   earm*-*-netbsd*) :
+     natdynlink=true ;; #(
+   aarch64-*-linux*) :
      natdynlink=true ;; #(
    aarch64-*-freebsd*) :
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
 +    natdynlink=true ;; #(
+   riscv*-*-linux*) :
+     natdynlink=true ;; #(
    *) :
-      ;;
- esac
-@@ -13459,6 +13463,8 @@ case $host in #(
+@@ -13649,6 +13663,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -45,7 +75,7 @@ Recognise SunOS as having shared librari
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -13475,6 +13481,8 @@ case $host in #(
+@@ -13665,6 +13681,8 @@ case $host in #(
  else
    model=ppc
  fi; system=elf ;; #(
@@ -54,7 +84,7 @@ Recognise SunOS as having shared librari
    s390x*-*-linux*) :
      arch=s390x; model=z10; system=elf ;; #(
    armv6*-*-linux-gnueabihf) :
-@@ -13493,6 +13501,10 @@ fi; system=elf ;; #(
+@@ -13683,6 +13701,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -65,26 +95,39 @@ Recognise SunOS as having shared librari
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13529,6 +13541,8 @@ fi; system=elf ;; #(
+@@ -13719,8 +13741,12 @@ 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 ;; #(
+   riscv64-*-linux*) :
+     arch=riscv; model=riscv64; system=linux
   ;; #(
-@@ -13730,6 +13744,9 @@ esac ;; #(
+@@ -13851,8 +13877,6 @@ if test -z "$PARTIALLD"; then :
+   case "$arch,$CC,$system,$model" in #(
+   amd64,gcc*,macosx,*) :
+     PACKLD='ld -r -arch x86_64 -o $(EMPTY)' ;; #(
+-  amd64,gcc*,solaris,*) :
+-    PACKLD='ld -r -m elf_x86_64 -o $(EMPTY)' ;; #(
+   power,gcc*,elf,ppc) :
+     PACKLD='ld -r -m elf32ppclinux -o $(EMPTY)' ;; #(
+   power,gcc*,elf,ppc64) :
+@@ -13947,6 +13971,9 @@ esac ;; #(
    *) :
       ;;
  esac ;; #(
-+  power,netbsd) :
++  power,netbsd):
 +    default_as="${toolpref}as -mppc"
 +    default_aspp="${toolpref}gcc -c" ;; #(
    s390x,elf) :
      default_as="${toolpref}as -m 64 -march=$model"
      default_aspp="${toolpref}gcc -c -Wa,-march=$model" ;; #(
-@@ -13813,7 +13830,7 @@ fi
+@@ -14028,7 +14055,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
@@ -93,3 +136,13 @@ Recognise SunOS as having shared librari
       ;; #(
    *) :
      has_c99_float_ops=true
+@@ -14317,6 +14344,9 @@ case $host in #(
+   *-*-mingw32|*-pc-windows) :
+     cclibs="$cclibs -lws2_32"
+     sockets=true ;; #(
++  *-*-solaris*) :
++    cclibs="$cclibs -lnsl -lsocket"
++    sockets=true ;; #(
+   *-*-haiku) :
+     cclibs="$cclibs -lnetwork"
+     sockets=true ;; #(

Index: pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.8 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.9
--- pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.8       Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile   Wed Dec  9 10:33:04 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.8 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-ocamldoc_Makefile,v 1.9 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
---- ocamldoc/Makefile.orig     2019-03-01 15:13:46.000000000 +0000
+--- ocamldoc/Makefile.orig     2020-01-10 16:10:46.000000000 +0000
 +++ ocamldoc/Makefile
-@@ -104,7 +104,7 @@ DEPINCLUDES=$(INCLUDES_DEP)
- INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODEP)
+@@ -121,7 +121,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE
+ COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+   -safe-string -strict-sequence -strict-formats -bin-annot -principal
  
- COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A -safe-string -strict-sequence -strict-formats -bin-annot
 -LINKFLAGS=$(INCLUDES) -nostdlib
 +LINKFLAGS=$(INCLUDES) -nostdlib -cclib "$(LDFLAGS)"
  

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.11 pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.12
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.11  Tue Jan 14 19:53:35 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile       Wed Dec  9 10:33:04 2020
@@ -1,18 +1,18 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.11 2020/01/14 19:53:35 jaapb Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.12 2020/12/09 10:33:04 jaapb Exp $
 
-Honor LFLAGS.
+Honor LDFLAGS.
 
---- otherlibs/systhreads/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
 +++ otherlibs/systhreads/Makefile
-@@ -21,6 +21,7 @@ include $(ROOTDIR)/Makefile.common
+@@ -29,6 +29,7 @@ NATIVE_CPPFLAGS = \
  CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun
  
  LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB)
-+LDOPTS=       -ldopt "$(LDFLAGS)"
++LDOPTS = -ldopt "$(LDFLAGS)"
  
- CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc $(LIBS)
- CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt $(LIBS)
-@@ -61,7 +62,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
+ CAMLC=$(BEST_OCAMLC) $(LIBS)
+ CAMLOPT=$(BEST_OCAMLOPT) $(LIBS)
+@@ -70,7 +71,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
  allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES)
  
  lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS)
@@ -21,7 +21,7 @@ Honor LFLAGS.
  
  lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS)
        $(MKLIB_CMD) -o $(LIBNAME)nat $^
-@@ -69,7 +70,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB
+@@ -78,7 +79,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB
  $(LIBNAME).cma: $(THREADS_BCOBJS)
  ifeq "$(UNIX_OR_WIN32)" "unix"
        $(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall \
@@ -30,7 +30,7 @@ Honor LFLAGS.
  # TODO: Figure out why -cclib -lunix is used here.
  # It may be because of the threadsUnix module which is deprecated.
  # It may hence be good to figure out whether this module shouldn't be
-@@ -117,7 +118,7 @@ install:
+@@ -124,7 +125,7 @@ install:
        fi
        $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
        cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)

Index: pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
diff -u pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml:1.1 pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml:1.2
--- pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml:1.1     Tue Dec  8 08:53:16 2020
+++ pkgsrc/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml Wed Dec  9 10:33:04 2020
@@ -1,15 +1,14 @@
-$NetBSD: patch-testsuite_tests_lib-systhreads_testyield.ml,v 1.1 2020/12/08 08:53:16 he Exp $
+$NetBSD: patch-testsuite_tests_lib-systhreads_testyield.ml,v 1.2 2020/12/09 10:33:04 jaapb Exp $
 
-Reduce the number of threads to 2, so that we don't loop forever
-on NetBSD, where the scheduler appears to only alternate between
-two threads instead of doing round-robin scheduling.
+On NetBSD, the "thread scheduler" appears to just schedule two
+threads out of 4 when all they in essence to is "yield", and not
+do round-robin scheduling, causing the test to loop.  Reduce the
+number of threads in the test to 2.
 
-Ref. https://github.com/ocaml/ocaml/issues/10067
-
---- testsuite/tests/lib-systhreads/testyield.ml.orig   2020-03-18 15:02:03.000000000 +0000
+--- testsuite/tests/lib-systhreads/testyield.ml.orig   2020-09-01 12:47:58.000000000 +0000
 +++ testsuite/tests/lib-systhreads/testyield.ml
-@@ -7,7 +7,7 @@
-    ** native
+@@ -8,7 +8,7 @@
+    *** native
  *)
  
 -let threads = 4

Added files:

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c:1.4
--- /dev/null   Wed Dec  9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c    Wed Dec  9 10:33:04 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-otherlibs_systhreads_st__stubs.c,v 1.4 2020/12/09 10:33:04 jaapb Exp $
+
+Make the POSIX sigwait visible on SmartOS
+
+--- otherlibs/systhreads/st_stubs.c.orig       2020-09-01 12:47:58.000000000 +0000
++++ otherlibs/systhreads/st_stubs.c
+@@ -15,6 +15,9 @@
+ 
+ #define CAML_INTERNALS
+ 
++/* Needed for sigwait */
++#define _POSIX_PTHREAD_SEMANTICS
++
+ #include "caml/alloc.h"
+ #include "caml/backtrace.h"
+ #include "caml/callback.h"

Index: pkgsrc/lang/ocaml/patches/patch-runtime_amd64.S
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-runtime_amd64.S:1.1
--- /dev/null   Wed Dec  9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-runtime_amd64.S     Wed Dec  9 10:33:04 2020
@@ -0,0 +1,15 @@
+$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
Index: pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml:1.1
--- /dev/null   Wed Dec  9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml Wed Dec  9 10:33:04 2020
@@ -0,0 +1,52 @@
+$NetBSD: patch-tools_ocamlmklib.ml,v 1.1 2020/12/09 10:33:04 jaapb Exp $
+
+Add ELF mode support to ocamlmklib
+
+--- tools/ocamlmklib.ml.orig   2019-02-08 14:34:11.000000000 +0000
++++ tools/ocamlmklib.ml
+@@ -43,6 +43,7 @@ and c_objs = ref []         (* .o, .a, .
+ and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
+ and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
+ and dynlink = ref supports_shared_libraries
++and elfmode = ref false     (* do not add C link lib path to run-time path *)
+ and failsafe = ref false    (* whether to fall back on static build only *)
+ and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
+ and c_Lopts = ref []      (* options to pass to mksharedlib and ocamlc -cclib *)
+@@ -110,6 +111,8 @@ let parse_arguments argv =
+       c_objs := s :: !c_objs
+     else if s = "-cclib" then
+       caml_libs := next_arg s :: "-cclib" :: !caml_libs
++              else if starts_with s "-Wl,-z" then
++                      c_libs := s :: !c_libs
+     else if s = "-ccopt" then
+       caml_opts := next_arg s :: "-ccopt" :: !caml_opts
+     else if s = "-custom" then
+@@ -136,8 +139,9 @@ let parse_arguments argv =
+       c_libs := s :: !c_libs
+     else if starts_with s "-L" then
+      (c_Lopts := s :: !c_Lopts;
+-      let l = chop_prefix s "-L" in
+-      if not (Filename.is_relative l) then rpath := l :: !rpath)
++               if not !elfmode then
++     (let l = chop_prefix s "-L" in
++      if not (Filename.is_relative l) then rpath := l :: !rpath))
+     else if s = "-ocamlcflags" then
+       ocamlc_opts := next_arg s :: !ocamlc_opts
+     else if s = "-ocamlc" then
+@@ -152,6 +156,8 @@ let parse_arguments argv =
+       output_c := next_arg s
+     else if s = "-dllpath" || s = "-R" || s = "-rpath" then
+       rpath := next_arg s :: !rpath
++              else if s = "-elfmode" then
++                elfmode := true
+     else if starts_with s "-R" then
+       rpath := chop_prefix s "-R" :: !rpath
+     else if s = "-Wl,-rpath" then
+@@ -200,6 +206,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+ \n  -custom        Disable dynamic loading\
+ \n  -g             Build with debug information\
+ \n  -dllpath <dir> Add <dir> to the run-time search path for DLLs\
++\n  -elfmode       Do not add link-time search path to run-time path\
+ \n  -F<dir>        Specify a framework directory (MacOSX)\
+ \n  -framework <name>    Use framework <name> (MacOSX)\
+ \n  -help          Print this help message and exit\

Prev by Date: CVS commit: pkgsrc/ham/xlog
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/ham/xlog
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index