ocaml: fallout from merge with master

[Jaap Boender <jaapb%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Sun Jun 27 09:27:50 2021 +0200
Changeset:	5136c55cea1d74993ab092048b89c385da22af56

Modified Files:
	ocaml/buildlink3.mk
	ocaml/distinfo

Log Message:
ocaml: fallout from merge with master

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5136c55cea1d74993ab092048b89c385da22af56

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

diffstat:
 ocaml/buildlink3.mk |  2 +-
 ocaml/distinfo      | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs:
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 9b002a7553..4d59c6a14f 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -7,7 +7,7 @@ OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.12.0
 BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.12.0
-BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
+BUILDLINK_PKGSRCDIR.ocaml?=	../../wip/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
 BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.ocaml}/lib/ocaml
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 7947ef051a..2ee20387a2 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -4,16 +4,15 @@ SHA1 (ocaml-4.12.0~alpha2.tar.gz) = 48748180b87f5cba3bb5e2c00c3167a13ae320d1
 RMD160 (ocaml-4.12.0~alpha2.tar.gz) = 99d505156e72e1e3e397d6a5fc48c590dad91921
 SHA512 (ocaml-4.12.0~alpha2.tar.gz) = 26ac762186563afe19f7edcb96963193de26701d8690a17b6b7cff4c6e816b32502c5ac8e9be7068d78ddae4deda85c21f6a9cd0eef5c2d2056195d2f7c61cd8
 Size (ocaml-4.12.0~alpha2.tar.gz) = 5044907 bytes
-SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
-SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
-SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
+SHA1 (patch-Makefile) = be3b62bba4d9e74f97df188cdf9eb09108cd64cd
+SHA1 (patch-Makefile.build_config.in) = ae8b9bce21ef1540d0380371ceb212733ffaa758
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 32b499d2acbd3075762fa578be1cad74bbcd2817
-SHA1 (patch-lex_Makefile) = b549f0913f4ee1d86df977c2a3bb7d8f887915d4
+SHA1 (patch-configure) = 932998a64ee85d81aa0c7704c509612ee8a82eee
+SHA1 (patch-lex_Makefile) = 344301fb02d8f266f57274c1f67f74697d05a7bd
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 6ad7b42f06ef86e4a88440bfd16e1ff0fc4b3556
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 5518c6b4d8772d995252b6f640323e2602097c4d
 SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-otherlibs_unix_Makefile) = ebcd541dc3b425c96b00f457c4779bd35976c3f4