lang/ocaml: Update to 4.08.1

This update allows (and for some requires) to also update dependencies
to newer versions. Where possible I updated to the latest version.

The ocaml port now is MAKE_JOBS safe.

Changes to dependent ports included in this commit:

- devel/ocaml-sexplib: Rename to devel/ocaml-sexplib0 adapting to
  upstream. Update to 0.16.0
- devel/coccinelle: Update to 1.1.1, moved to github
- devel/ocaml-camlp4: Update to 4.08+1
- devel/ocaml-camomile: Use dune for build, adapt port
- devel/ocaml-cppo: Fix lib files installation [1]
- devel/ocaml-dune: Update to 3.7.1 [2]
- devel/ocaml-findlib: Update to 1.9.6 [3]
- devel/ocaml-ipaddr: Update to 3.1.0
- devel/ocaml-parmap: Update to 1.2.4, use dune for build [4]
- devel/ocaml-ppx-tools: Update to 6.6, use dune for build
- graphics/ocaml-cairo: Update to 0.6.4
- net-p2p/mldonkey: Update to 3.1.7-2 [2]
- net/unison: Remove ocaml 4.07 compatibility patches
- net/unison232: Mark broken, fails to build with newer ocaml [5]
- security/ocaml-ssl: Update to 0.5.13 [2]
- x11-toolkits/ocaml-labltk: Update to 8.06.7 [2]

Dune now requires full path as argument to --libdir, so various
ports have been patched accordingly.

Bumping PORTREVISION for all dependent ports that were not updated.

PR:			272067
Approved by:		michipili@gmail.com (maintainer timeout),
			eduardo (maintainer timeout) [1],
			danfe [2],
			hrs (maintainer timeout) [3],
			dumbbell (maintainer timeout) [4],
			mandree (implicit) [5]
Differential Revision:	https://reviews.freebsd.org/D40599

MOVED

@@ -7762,3 +7762,4 @@ www/kristall||2023-07-02|Has expired: Requires older openssl
 sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
 sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released
 devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs
+devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed

archivers/ocaml-bz2/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	bz2
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/72/
 PKGNAMEPREFIX=	ocaml-

archivers/ocaml-zip/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	zip
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	archivers
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	caml${PORTNAME}-${PORTVERSION}

converters/ocaml-base64/Makefile

@@ -1,6 +1,7 @@
 PORTNAME=	base64
 PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	converters
 PKGNAMEPREFIX=	ocaml-
 

converters/ocaml-jsonm/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	jsonm
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	https://erratique.ch/software/jsonm/releases/
 PKGNAMEPREFIX=	ocaml-

databases/ocaml-dbm/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	dbm
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
 PKGNAMEPREFIX=	ocaml-

databases/ocaml-mysql/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	mysql
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://ygrek.org.ua/p/release/ocaml-mysql/
 PKGNAMEPREFIX=	ocaml-

databases/ocaml-sqlite3/Makefile

@@ -1,6 +1,7 @@
 PORTNAME=	sqlite3
 PORTVERSION=	4.0.5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	ocaml-
 

devel/Makefile

@@ -1678,7 +1678,7 @@
     SUBDIR += ocaml-result
     SUBDIR += ocaml-sdl
     SUBDIR += ocaml-sem
-    SUBDIR += ocaml-sexplib
+    SUBDIR += ocaml-sexplib0
     SUBDIR += ocaml-topkg
     SUBDIR += ocaml-type_conv
     SUBDIR += ocaml-uchar

devel/aifad/Makefile

@@ -1,6 +1,7 @@
 PORTNAME=	aifad
 PORTVERSION=	2.0.8
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

devel/cil/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	cil
 PORTVERSION=	1.7.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 

devel/coccinelle/Makefile

@@ -1,8 +1,6 @@
 PORTNAME=	coccinelle
-PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	devel
-MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program matching and transformation engine
@@ -27,6 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
 MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"
 
+USE_GITHUB=	yes
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen

devel/coccinelle/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1578014897
-SHA256 (coccinelle-1.0.7.tar.gz) = 475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b
-SIZE (coccinelle-1.0.7.tar.gz) = 6607407
+TIMESTAMP = 1683065204
+SHA256 (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 095919e129ac563586d880ebbc5aac829fec224177090aebe34dc34ed5f142bf
+SIZE (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 2743457

devel/coccinelle/files/patch-stdcompat-fix

@@ -0,0 +1,39 @@
+From fa4d4abc816a1fe1d0ac98a0b9520bae5ea559d6 Mon Sep 17 00:00:00 2001
+From: Thierry Martinez <Thierry.Martinez@inria.fr>
+Date: Thu, 4 Nov 2021 14:22:08 +0100
+Subject: [PATCH] Add empty rule to make .cmt targets depend on .cmx
+
+Fix bug reported by Sabyrzhan Tasbolatov
+---
+ bundles/stdcompat/stdcompat-current/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/bundles/stdcompat/stdcompat-current/Makefile.am b/bundles/stdcompat/stdcompat-current/Makefile.am
+index f0d8dbc38..1b955cf86 100644
+--- bundles/stdcompat/stdcompat-current/Makefile.am
++++ bundles/stdcompat/stdcompat-current/Makefile.am
+@@ -71,10 +71,12 @@ mypkg_SCRIPTS = META $(MODULES_native) $(MODULES_native:.ml=.cmi) \
+
+ if OCAML_SUPPORTS_BYTECODE
+ mypkg_SCRIPTS += stdcompat.cma
++BEST_SUFFIX := .cmo
+ endif
+
+ if OCAML_SUPPORTS_NATIVE
+ mypkg_SCRIPTS += stdcompat.cmxa stdcompat.a $(MODULES_native:.ml=.cmx)
++BEST_SUFFIX := .cmx
+ endif
+
+ if OCAML_SUPPORTS_SHARED
+@@ -113,6 +115,8 @@ SUFFIXES = .ml .mli .cmi .cmo .cmx .cmxa .cmxs .cmt
+ .ml.cmx :
+ 	$(OCAMLOPT) -c $(OCAMLCFLAGS) $< -o $@
+
++$(BEST_SUFFIX).cmt : ;
++
+ stdcompat__stubs.$(OBJEXT) : stdcompat__stubs.c
+ 	$(OCAMLC) -c $<
+
+-- 
+GitLab
+

devel/coccinelle/pkg-plist

@@ -54,15 +54,6 @@ lib/coccinelle/ocaml/visitor_c.cmx
 lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
 lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmx
 lib/coccinelle/python/coccilib/__init__.py
-lib/coccinelle/python/coccilib/coccigui/__init__.py
-lib/coccinelle/python/coccilib/coccigui/coccigui.py
-lib/coccinelle/python/coccilib/coccigui/pycoccimodel.py
-lib/coccinelle/python/coccilib/coccigui/pygui.glade
-lib/coccinelle/python/coccilib/coccigui/pygui.gladep
-lib/coccinelle/python/coccilib/coccigui/vim.py
-lib/coccinelle/python/coccilib/coccigui/vimcom.py
-lib/coccinelle/python/coccilib/coccigui/vimeditor.py
-lib/coccinelle/python/coccilib/coccigui/vimembed.py
 lib/coccinelle/python/coccilib/elems.py
 lib/coccinelle/python/coccilib/iteration.py
 lib/coccinelle/python/coccilib/org.py

devel/menhir/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	menhir
 PORTVERSION=	20170712
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
 

devel/ocaml-annexlib/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	annexlib
 PORTVERSION=	0.13.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://raevnos.pennmush.org/code/extlib/
 PKGNAMEPREFIX=	ocaml-

devel/ocaml-calendar/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	calendar
 PORTVERSION=	2.03.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/915/
 PKGNAMEPREFIX=	ocaml-

devel/ocaml-camljava/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	camljava
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel java
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-

devel/ocaml-camlp4/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	camlp4
-PORTVERSION=	4.07+1
+PORTVERSION=	4.08+1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 

devel/ocaml-camlp4/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1520427832
-SHA256 (ocaml-camlp4-4.07+1_GH0.tar.gz) = ecdb8963063f41b387412317685f79823a26b3f53744f0472058991876877090
-SIZE (ocaml-camlp4-4.07+1_GH0.tar.gz) = 648842
+TIMESTAMP = 1681674686
+SHA256 (ocaml-camlp4-4.08+1_GH0.tar.gz) = 655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88
+SIZE (ocaml-camlp4-4.08+1_GH0.tar.gz) = 649830

devel/ocaml-camlp4/files/patch-camlp4_Camlp4_Debug.ml

@@ -0,0 +1,11 @@
+--- camlp4/Camlp4/Debug.ml.orig	2019-08-07 13:03:46 UTC
++++ camlp4/Camlp4/Debug.ml
+@@ -29,7 +29,7 @@ value out_channel =
+     open_out_gen [Open_wronly; Open_creat; Open_append; Open_text]
+                  0o666 f
+   with
+-  [ Not_found -> Pervasives.stderr ];
++  [ Not_found -> Stdlib.stderr ];
+
+ module StringSet = Set.Make String;
+

devel/ocaml-camlp5/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	camlp5
 PORTVERSION=	7.14
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 

devel/ocaml-camomile-examples/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	camomile
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 PKGNAMEPREFIX=	ocaml-

devel/ocaml-camomile/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	camomile
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
@@ -9,15 +10,15 @@ WWW=		http://camomile.sourceforge.net/
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	jbuilder:devel/ocaml-dune
+BUILD_DEPENDS=	dune:devel/ocaml-dune
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	yoriyuki
 GH_PROJECT=	Camomile
 USE_OCAML=	yes
 
-MAKE_ENV=	LIBDIR="${OCAML_SITELIBDIR}"
+MAKE_ENV=	LIBDIR="${PREFIX}/${OCAML_SITELIBDIR}"
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 
 PORTDOCS=	CHANGES.md LICENSE.md README.md

devel/ocaml-camomile/files/patch-Camomile_internal_byte__labeled__dag.ml

@@ -0,0 +1,11 @@
+--- Camomile/internal/byte_labeled_dag.ml.orig	2019-08-08 07:10:33 UTC
++++ Camomile/internal/byte_labeled_dag.ml
+@@ -87,7 +87,7 @@ let make_bytes def vs =
+           branch.(Char.code c') <- Some node;
+           scan d c leaf branch rest
+   in
+-  let comp (s1, _) (s2, _) = Pervasives.compare s1 s2 in
++  let comp (s1, _) (s2, _) = Stdlib.compare s1 s2 in
+   let vs = List.sort comp vs in
+   match vs with
+     (_, _) :: _ ->

devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.ml

@@ -0,0 +1,17 @@
+--- Camomile/public/charEncoding.ml.orig	2019-08-08 07:10:33 UTC
++++ Camomile/public/charEncoding.ml
+@@ -131,12 +131,12 @@ module type Interface = sig
+       {!OOChannel.obj_output_channel} which
+       receives Unicode characters and outputs them to [outchan] using
+       the encoding [enc]. *)
+-  class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel
++  class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel
+
+   (** [new in_channel enc inchan] creates the intput channel object
+       {!OOChannel.obj_input_channel} which
+       reads bytes from [inchan] and converts them to Unicode characters. *)
+-  class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel
++  class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel
+
+   (** [ustream_of enc chars] converts the byte stream [chars]
+       to the Unicode character stream by the encoding [enc]. *)

devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.mli

@@ -0,0 +1,17 @@
+--- Camomile/public/charEncoding.mli.orig	2019-08-08 07:10:33 UTC
++++ Camomile/public/charEncoding.mli
+@@ -130,12 +130,12 @@ module type Interface = sig
+       {!OOChannel.obj_output_channel} which
+       receives Unicode characters and outputs them to [outchan] using
+       the encoding [enc]. *)
+-  class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel
++  class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel
+
+   (** [new in_channel enc inchan] creates the intput channel object 
+       {!OOChannel.obj_input_channel} which
+       reads bytes from [inchan] and converts them to Unicode characters. *)
+-  class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel
++  class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel
+
+   (** [ustream_of enc chars] converts the byte stream [chars] 
+       to the Unicode character stream by the encoding [enc]. *)

devel/ocaml-camomile/files/patch-Camomile_public_oOChannel.mli

@@ -0,0 +1,12 @@
+--- Camomile/public/oOChannel.mli.orig	2019-08-08 07:10:33 UTC
++++ Camomile/public/oOChannel.mli
+@@ -113,7 +113,7 @@ class char_obj_output_channel_of : char_output_channel
+   [char] obj_output_channel
+
+ (** Convert an OCaml input channel to an OO-based character input channel *)
+-class of_in_channel : Pervasives.in_channel -> char_input_channel
++class of_in_channel : Stdlib.in_channel -> char_input_channel
+
+ (** Convert an OCaml output channel to an OO-based character output channel *)
+-class of_out_channel : Pervasives.out_channel -> char_output_channel
++class of_out_channel : Stdlib.out_channel -> char_output_channel

devel/ocaml-camomile/files/patch-Camomile_public_uCS4.ml

@@ -0,0 +1,9 @@
+--- Camomile/public/uCS4.ml.orig	2019-08-08 07:10:33 UTC
++++ Camomile/public/uCS4.ml
+@@ -140,5 +140,5 @@ let compare (a:t) (b:t) =
+
+ let compare (a:t) (b:t) =
+   match Array1.dim a - Array1.dim b with
+-    0 -> Pervasives.compare a b
++    0 -> Stdlib.compare a b
+   | sgn -> sgn