Update some OCaml ports in preparation of OCaml 4.08.0

ok avsm@
2019-06-19 09:18:18 +00:00 · 2019-06-19 09:18:18 +00:00 · 0f6b43c83b
commit 0f6b43c83b
parent a67c768756
12 changed files with 81 additions and 24 deletions
--- a/devel/dune/Makefile
+++ b/devel/dune/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/04 12:51:12 chrisz Exp $
+# $OpenBSD: Makefile,v 1.4 2019/06/19 09:18:18 chrisz Exp $

 COMMENT =		OCaml build system

@ -6,7 +6,7 @@ CATEGORIES =		devel

 GH_ACCOUNT =		ocaml
 GH_PROJECT =		dune
-GH_TAGNAME =		1.7.2
+GH_TAGNAME =		1.10.0

 HOMEPAGE =		https://github.com/ocaml/dune

--- a/devel/dune/distinfo
+++ b/devel/dune/distinfo
@ -1,2 +1,2 @@
-SHA256 (dune-1.7.2.tar.gz) = bG95icQf0c77BlcM+j3DWvS7FlrM31gAljok/tCQo/M=
-SIZE (dune-1.7.2.tar.gz) = 666745
+SHA256 (dune-1.10.0.tar.gz) = fHeaZWgH1lnPi1wYr5Nitn/YJzo2GPIXQqyXtKU7cyg=
+SIZE (dune-1.10.0.tar.gz) = 786819
--- a/devel/dune/pkg/PLIST
+++ b/devel/dune/pkg/PLIST
@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2019/03/04 12:51:12 chrisz Exp $
+@comment $OpenBSD: PLIST,v 1.4 2019/06/19 09:18:18 chrisz Exp $
@pkgpath sysutils/dune
@bin bin/dune
@bin bin/jbuilder
+@bin bin/ocaml-syntax-shims
@man man/man1/dune-build.1
@man man/man1/dune-clean.1
@man man/man1/dune-compute.1
@ -9,6 +10,7 @@
@man man/man1/dune-external-lib-deps.1
@man man/man1/dune-format-dune-file.1
@man man/man1/dune-help.1
+@man man/man1/dune-init.1
@man man/man1/dune-install.1
@man man/man1/dune-installed-libraries.1
@man man/man1/dune-printenv.1
--- a/devel/ocaml-ocamlbuild/Makefile
+++ b/devel/ocaml-ocamlbuild/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/04 12:51:13 chrisz Exp $
+# $OpenBSD: Makefile,v 1.5 2019/06/19 09:18:18 chrisz Exp $

 COMMENT =	ocamlbuild
 CATEGORIES =	devel

-V =		0.12.0
+V =		0.14.0
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	ocamlbuild
 GH_TAGNAME =	${V}
--- a/devel/ocaml-ocamlbuild/distinfo
+++ b/devel/ocaml-ocamlbuild/distinfo
@ -1,2 +1,2 @@
-SHA256 (ocamlbuild-0.12.0.tar.gz) = 2d5WqpYfWFiWhEskxvdpWp562dACY/3+UKF/OLE7nOE=
-SIZE (ocamlbuild-0.12.0.tar.gz) = 197030
+SHA256 (ocamlbuild-0.14.0.tar.gz) = h7Kc6WlYCWwKGo7q/rYmgHey0R4b8rPeD168nPjULng=
+SIZE (ocamlbuild-0.14.0.tar.gz) = 198267
--- a/devel/ocaml-parmap/Makefile
+++ b/devel/ocaml-parmap/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2019/03/04 12:51:14 chrisz Exp $
+# $OpenBSD: Makefile,v 1.9 2019/06/19 09:18:18 chrisz Exp $

 COMMENT =	OCaml parallel map primitive for multicores
 CATEGORIES =	devel

-V =		1.0-rc9
+V =		1.0-rc10
 NAME =		ocaml-parmap
 DISTNAME =	ocaml-parmap-$V
 DISTFILES =	${DISTNAME}{$V}.tar.gz
--- a/devel/ocaml-parmap/distinfo
+++ b/devel/ocaml-parmap/distinfo
@ -1,2 +1,2 @@
-SHA256 (ocaml-parmap-1.0-rc9.tar.gz) = i8zbJp6VW3rmq5gRF7/mSr8PgyeI5BOMebgzhcnJ4Wo=
-SIZE (ocaml-parmap-1.0-rc9.tar.gz) = 99394
+SHA256 (ocaml-parmap-1.0-rc10.tar.gz) = crjIsRFCqNvTyBwMZqx6hQhKYU+S8pX/IZVxBwPfywo=
+SIZE (ocaml-parmap-1.0-rc10.tar.gz) = 99391
--- a/devel/ocaml-parmap/patches/patch-bytearray_ml
+++ b/devel/ocaml-parmap/patches/patch-bytearray_ml
@ -0,0 +1,16 @@
+$OpenBSD: patch-bytearray_ml,v 1.1 2019/06/19 09:18:18 chrisz Exp $
+
+Index: bytearray.ml
+--- bytearray.ml.orig
+++ bytearray.ml
+@@ -61,7 +61,9 @@ let of_string s =
+ 
+ let mmap_of_string fd s =
+   let l = String.length s in
+-  let ba = Bigarray.Array1.map_file fd Bigarray.char Bigarray.c_layout true l in
+  let ba =
+    Bigarray.array1_of_genarray @@
+    Unix.map_file fd Bigarray.char Bigarray.c_layout true [|l|] in
+   unsafe_blit_from_string s 0 ba 0 l;
+   ba
+ (*
--- a/devel/ocaml-parmap/patches/patch-parmap_ml
+++ b/devel/ocaml-parmap/patches/patch-parmap_ml
@ -0,0 +1,37 @@
+$OpenBSD: patch-parmap_ml,v 1.1 2019/06/19 09:18:18 chrisz Exp $
+
+Index: parmap.ml
+--- parmap.ml.orig
+++ parmap.ml
+@@ -109,7 +109,8 @@ let redirect ?(path = (Printf.sprintf "/tmp/.parmap.%d
+ (* unmarshal from a mmap seen as a bigarray *)
+ let unmarshal fd =
+  let a =
+-   Bigarray.Array1.map_file fd Bigarray.char Bigarray.c_layout true (-1) in
+   Bigarray.array1_of_genarray @@
+   Unix.map_file fd Bigarray.char Bigarray.c_layout true [|~-1|] in
+  let res = Bytearray.unmarshal a 0 in
+  Unix.close fd;
+  res
+@@ -124,8 +125,9 @@ let unmarshal fd =
+     - on Linux kernels, we might allocate a mmapped memory area of huge_size
+       and marshal into it directly
+ 
+-      let ba = Bigarray.Array1.map_file
+-                 fd Bigarray.char Bigarray.c_layout true huge_size in
+      let ba =
+        Bigarray.array1_of_genarray @@
+        Unix.map_file fd Bigarray.char Bigarray.c_layout true huge_size in
+       ignore(Bytearray.marshal_to_buffer ba 0 v [Marshal.Closures]);
+       Unix.close fd
+ 
+@@ -624,7 +626,8 @@ let init_shared_buffer a =
+   let size = Array.length a in
+   let fd = Utils.tempfd() in
+   let arr =
+-    Bigarray.Array1.map_file fd Bigarray.float64 Bigarray.c_layout true size in
+    Bigarray.array1_of_genarray @@
+    Unix.map_file fd Bigarray.float64 Bigarray.c_layout true [|size|] in
+ 
+   (* The mmap() function shall add an extra reference to the file associated
+      with the file descriptor fildes which is not removed by a subsequent
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.44 2019/05/20 22:15:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2019/06/19 09:18:19 chrisz Exp $

 COMMENT =	OCaml interface to GTK+2

-V =		2.18.6
+V =		2.18.8
 DISTNAME =	lablgtk-$V
 PKGNAME =	lablgtk2-$V
 CATEGORIES =	x11 devel
-REVISION =	0

 HOMEPAGE =	http://lablgtk.forge.ocamlcore.org/
-MASTER_SITES =	https://forge.ocamlcore.org/frs/download.php/1726/
+GH_ACCOUNT =	garrigue
+GH_PROJECT =	lablgtk
+GH_TAGNAME =	lablgtk2188

 # LGPL
 PERMIT_PACKAGE_CDROM =	Yes
--- a/x11/lablgtk2/distinfo
+++ b/x11/lablgtk2/distinfo
@ -1,2 +1,2 @@
-SHA256 (lablgtk-2.18.6.tar.gz) = TdyiQwZkGOKoisSevy2Eb6xLZnsbF1PvrdB4rndzaPg=
-SIZE (lablgtk-2.18.6.tar.gz) = 804837
+SHA256 (lablgtk-2.18.8.tar.gz) = kRbunRcouV/AA/pZgXixaLo8uDxTb+B1Wcz4RnLPyZA=
+SIZE (lablgtk-2.18.8.tar.gz) = 1068307
--- a/x11/lablgtk2/patches/patch-src_Makefile
+++ b/x11/lablgtk2/patches/patch-src_Makefile
@ -1,7 +1,8 @@
-$OpenBSD: patch-src_Makefile,v 1.6 2014/10/29 14:02:10 dcoppa Exp $
--- src/Makefile.orig	Wed Oct 29 08:51:06 2014
-+++ src/Makefile	Wed Oct 29 14:54:08 2014
-@@ -49,7 +49,7 @@ CUSTOM = -custom
+$OpenBSD: patch-src_Makefile,v 1.7 2019/06/19 09:18:19 chrisz Exp $
+Index: src/Makefile
+--- src/Makefile.orig
+++ src/Makefile
+@@ -50,7 +50,7 @@ CUSTOM = -custom
 #MLLINK += -cclib -lcamlrund
 MLBYTEFLAGS = -g -dtypes
 else
@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile,v 1.6 2014/10/29 14:02:10 dcoppa Exp $
 ifneq ($(TOOLCHAIN),msvc)
 CFLAGS += -O
 endif
-@@ -64,7 +64,7 @@ endif
+@@ -65,7 +65,7 @@ endif
 THLINK = unix.cma threads.cma
 
 ifdef USE_CC