Upgrade OCaml and dependent ports

testing and OKs by avsm@, jca@, krw@ Thanks a lot !

devel/cil/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.34 2017/03/03 20:26:41 jca Exp $
+# $OpenBSD: Makefile,v 1.35 2019/03/04 12:51:12 chrisz Exp $
 
 # build system needs per-arch tweaks and is very unfriendly to
 # bytecode-only builds. powerpc nativecode is currently broken.
-ONLY_FOR_ARCHS = amd64 i386
+ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS}
 
 COMMENT=	framework for analysis and transformation of C
 CATEGORIES =	devel lang
 
-DISTNAME =	cil-1.5.1
+DISTNAME =	cil-1.7.3
-REVISION =      6
 EXTRACT_SUFX =	.tar.gz
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=cil/}
 
@@ -17,16 +16,17 @@ HOMEPAGE=	https://cil-project.github.io/cil/
 # BSD license
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=		c curses m pthread
+WANTLIB=		c m pthread
 
 MODULES =		lang/ocaml
-BUILD_DEPENDS=		sysutils/findlib
+BUILD_DEPENDS=		sysutils/findlib \
+			devel/ocaml-ocamlbuild \
+			math/ocaml-num
 
 CONFIGURE_STYLE =	autoconf no-autoheader
 AUTOCONF_VERSION =	2.69
 USE_GMAKE =		yes
-ALL_TARGET =		setup
+TEST_TARGET =		test
-TEST_TARGET =	check
 
 OURFILES =		kerneltrace.ml nullint.ml randomvars.ml
 CONFIGURE_ARGS =	EXTRAFEATURES="${OURFILES:R}"
@@ -35,7 +35,7 @@ P5INST =		${PREFIX}/${P5SITE}
 SUBST_VARS +=		P5SITE
 GCC =			/usr/bin/gcc# cant use CC in case it's set to cilly
 
-MAKE_FLAGS =		CC="${CC}"
+MAKE_FLAGS =		CC="${CC}" MAKE="${MAKE_PROGRAM}"
 
 .include <bsd.port.arch.mk>
 .if ${MACHINE_ARCH} == powerpc
@@ -50,13 +50,13 @@ post-extract:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKBUILD}/bin/cilly ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKBUILD}/bin/patcher ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKBUILD}/lib/patcher ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/cil
 	${INSTALL_PROGRAM} \
-		${WRKBUILD}/obj/*_OPENBSD/machdep-ml.exe \
+		${WRKBUILD}/_build/machdep-ml.exe \
 		${PREFIX}/libexec/cil
 	${INSTALL_DATA_DIR} ${P5INST}/CIL
-	mv ${PREFIX}/lib/*.pm ${P5INST}/CIL/
+	${INSTALL_DATA} ${WRKBUILD}/lib/App/Cilly/*.pm ${P5INST}/CIL/
 	sed -e 's,@CILLIBDIR@,${LOCALBASE}/${P5SITE}/CIL,g' \
 	    ${P5INST}/CIL/CilConfig.pm > ${P5INST}/CilConfig.pm
 

devel/cil/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cil-1.5.1.tar.gz) = 4hcrQFO/gGTsXqfe6/Fp0rlE9YimTBGf4xC0i1fizXs=
+SHA256 (cil-1.7.3.tar.gz) = abfykNKxXdROK4N9PeCSIkW+hB95q1an6bqCBVRL4xQ=
-SIZE (cil-1.5.1.tar.gz) = 1792712
+SIZE (cil-1.7.3.tar.gz) = 1893257

devel/cil/patches/patch-Makefile_in

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2017/03/03 20:26:41 jca Exp $
+$OpenBSD: patch-Makefile_in,v 1.5 2019/03/04 12:51:12 chrisz Exp $
---- Makefile.in.orig	Fri Mar  3 21:22:30 2017
+Index: Makefile.in
-+++ Makefile.in	Fri Mar  3 21:22:49 2017
+--- Makefile.in.orig
-@@ -69,7 +69,7 @@ ifdef EMUL
++++ Makefile.in
+@@ -45,7 +45,7 @@ ifdef EMUL
  	 # is broken on MacOS X)
     MACHDEPCC=$(CC) $(CFLAGS) -static -D_GNUCC
  else
@@ -9,4 +10,4 @@ $OpenBSD: patch-Makefile_in,v 1.4 2017/03/03 20:26:41 jca Exp $
 +   MACHDEPCC=$(CC) -D_GNUCC
  endif
  
- # Put here all the byproducts of make
+ # We have to use _build because of OCaml's bug #0004502

devel/cil/patches/patch-_tags

@@ -0,0 +1,10 @@
+$OpenBSD: patch-_tags,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+Index: _tags
+--- _tags.orig
++++ _tags
+@@ -4,3 +4,4 @@
+ "test": not_hygienic
+ # build every cmo in debug mode (for cil.cma)
+ <**/*.cmo>: debug
++true: unsafe_string

devel/cil/patches/patch-bin_CilConfig_pm_in

@@ -1,9 +1,9 @@
-$OpenBSD: patch-bin_CilConfig_pm_in,v 1.1 2006/05/28 15:44:14 avsm Exp $
+$OpenBSD: patch-bin_CilConfig_pm_in,v 1.2 2019/03/04 12:51:12 chrisz Exp $
---- bin/CilConfig.pm.in.orig	Sat May 27 19:27:29 2006
+Index: lib/App/Cilly/CilConfig.pm.in
-+++ bin/CilConfig.pm.in	Sat May 27 19:27:35 2006
+--- lib/App/Cilly/CilConfig.pm.in.orig
-@@ -1,4 +1,4 @@
++++ lib/App/Cilly/CilConfig.pm.in
--
+@@ -1,3 +1,3 @@
+-$::cc        = "@CC@";
 +use lib "@CILLIBDIR@";
- $::archos    = "@ARCHOS@";
+ $::exeext    = "@EXEEXT@";
- $::cc        = "@CC@";
+ $::default_mode = "@DEFAULT_CIL_MODE@";
- $::cilhome   = "@CILHOME@";

devel/cil/patches/patch-myocamlbuild_ml

@@ -0,0 +1,39 @@
+$OpenBSD: patch-myocamlbuild_ml,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+respect MAKE environment variable.
+Use ocamlfind
+
+Index: myocamlbuild.ml
+--- myocamlbuild.ml.orig
++++ myocamlbuild.ml
+@@ -21,22 +21,25 @@ let cil_version =
+   with Not_found -> "" ;;
+ 
+ dispatch begin function
++| Before_options ->
++    Options.use_ocamlfind := true
+ | After_rules ->
+     (* the main CIL library *)
+     ocaml_lib "src/cil";
+ 
+     (* residual reliance on make to build some OCaml source files *)
+     let make target =
++      let make = try Sys.getenv "MAKE" with Not_found -> "make" in
+       let basename = Pathname.basename target in
+       rule ("make " ^ target)
+       ~dep: "Makefile"
+       ~prod: basename
+       (fun _ _ -> Cmd (S
+-        [A "make"; A "-C"; P ".."; P ("_build" / target)]))
+-      in
+-      make "cilversion.ml";
+-      make "feature_config.ml";
+-      make "machdep.ml";
++        [A make; A "-C"; P ".."; P ("_build" / target)]))
++    in
++    make "cilversion.ml";
++    make "feature_config.ml";
++    make "machdep.ml";
+ 
+     (* Build an list of files to install with ocamlfind *)
+     rule "%.mllib -> %.libfiles"

devel/cil/patches/patch-src__tags

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src__tags,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+link to num, which is no longer shipped with OCaml.
+
+Index: src/_tags
+--- src/_tags.orig
++++ src/_tags
+@@ -2,4 +2,5 @@
+ "ext": include
+ "frontc": include
+ 
+-<main.{byte,native}>: use_unix, use_str, use_nums, use_cil
++<cilint.*>: package(num)
++<main.{byte,native}>: package(unix), package(str), package(num), use_cil

devel/cil/patches/patch-src_cil_mllib

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_cil_mllib,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+This would cause unsolvable circular dependencies since the
+feature modules would have to be linked after the Cil module,
+but before the Feature_config module, which is not possible
+when both of them are packed in one .cma / .cmxa.
+
+Index: src/cil.mllib
+--- src/cil.mllib.orig
++++ src/cil.mllib
+@@ -29,7 +29,6 @@ Epicenter
+ Errormsg
+ Escape
+ Expcompare
+-Feature_config
+ Formatcil
+ Formatlex
+ Formatparse

devel/cil/pkg/PFRAG.native

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.native,v 1.1 2012/08/18 22:00:56 avsm Exp $
+@comment $OpenBSD: PFRAG.native,v 1.2 2019/03/04 12:51:12 chrisz Exp $
 lib/ocaml/cil/alpha.cmx
 lib/ocaml/cil/availexps.cmx
 lib/ocaml/cil/availexpslv.cmx
@@ -32,7 +32,6 @@ lib/ocaml/cil/epicenter.cmx
 lib/ocaml/cil/errormsg.cmx
 lib/ocaml/cil/escape.cmx
 lib/ocaml/cil/expcompare.cmx
-lib/ocaml/cil/feature_config.cmx
 lib/ocaml/cil/formatcil.cmx
 lib/ocaml/cil/formatlex.cmx
 lib/ocaml/cil/formatparse.cmx
@@ -41,17 +40,18 @@ lib/ocaml/cil/growArray.cmx
 lib/ocaml/cil/heap.cmx
 lib/ocaml/cil/heapify.cmx
 lib/ocaml/cil/inthash.cmx
-lib/ocaml/cil/kerneltrace.cmx
 lib/ocaml/cil/lexerhack.cmx
 lib/ocaml/cil/liveness.cmx
+lib/ocaml/cil/llvm.cmx
+lib/ocaml/cil/llvmgen.cmx
+lib/ocaml/cil/llvmssa.cmx
+lib/ocaml/cil/llvmutils.cmx
 lib/ocaml/cil/logcalls.cmx
 lib/ocaml/cil/logwrites.cmx
 lib/ocaml/cil/longarray.cmx
 lib/ocaml/cil/machdep.cmx
 lib/ocaml/cil/machdepenv.cmx
-lib/ocaml/cil/main.cmx
 lib/ocaml/cil/mergecil.cmx
-lib/ocaml/cil/nullint.cmx
 lib/ocaml/cil/olf.cmx
 lib/ocaml/cil/oneret.cmx
 lib/ocaml/cil/partial.cmx
@@ -59,7 +59,6 @@ lib/ocaml/cil/patch.cmx
 lib/ocaml/cil/predabst.cmx
 lib/ocaml/cil/pretty.cmx
 lib/ocaml/cil/ptranal.cmx
-lib/ocaml/cil/randomvars.cmx
 lib/ocaml/cil/reachingdefs.cmx
 lib/ocaml/cil/rmtmps.cmx
 lib/ocaml/cil/setp.cmx
@@ -68,7 +67,6 @@ lib/ocaml/cil/simplemem.cmx
 lib/ocaml/cil/simplify.cmx
 lib/ocaml/cil/ssa.cmx
 lib/ocaml/cil/stats.cmx
-lib/ocaml/cil/testcil.cmx
 lib/ocaml/cil/trace.cmx
 lib/ocaml/cil/uref.cmx
 lib/ocaml/cil/usedef.cmx

devel/cil/pkg/PLIST

@@ -1,26 +1,29 @@
-@comment $OpenBSD: PLIST,v 1.7 2012/11/27 22:28:53 chrisz Exp $
+@comment $OpenBSD: PLIST,v 1.8 2019/03/04 12:51:12 chrisz Exp $
 bin/cilly
+@bin bin/cilly.native
 bin/patcher
 lib/ocaml/cil/
 lib/ocaml/cil/META
 lib/ocaml/cil/alpha.cmi
 lib/ocaml/cil/alpha.mli
 lib/ocaml/cil/availexps.cmi
+lib/ocaml/cil/availexps.inferred.mli
 lib/ocaml/cil/availexpslv.cmi
+lib/ocaml/cil/availexpslv.inferred.mli
 lib/ocaml/cil/bitmap.cmi
 lib/ocaml/cil/bitmap.mli
-lib/ocaml/cil/blockinggraph.mli
 lib/ocaml/cil/cabs.cmi
+lib/ocaml/cil/cabs.inferred.mli
 lib/ocaml/cil/cabs2cil.cmi
 lib/ocaml/cil/cabs2cil.mli
 lib/ocaml/cil/cabshelper.cmi
+lib/ocaml/cil/cabshelper.inferred.mli
 lib/ocaml/cil/cabsvisit.cmi
 lib/ocaml/cil/cabsvisit.mli
 lib/ocaml/cil/callgraph.cmi
 lib/ocaml/cil/callgraph.mli
 lib/ocaml/cil/canonicalize.cmi
 lib/ocaml/cil/canonicalize.mli
-lib/ocaml/cil/ccl.mli
 lib/ocaml/cil/cfg.cmi
 lib/ocaml/cil/cfg.mli
 lib/ocaml/cil/check.cmi
@@ -35,8 +38,11 @@ lib/ocaml/cil/cillower.mli
 lib/ocaml/cil/ciloptions.cmi
 lib/ocaml/cil/ciloptions.mli
 lib/ocaml/cil/ciltools.cmi
+lib/ocaml/cil/ciltools.inferred.mli
 lib/ocaml/cil/cilutil.cmi
+lib/ocaml/cil/cilutil.inferred.mli
 lib/ocaml/cil/cilversion.cmi
+lib/ocaml/cil/cilversion.inferred.mli
 lib/ocaml/cil/clexer.cmi
 lib/ocaml/cil/clexer.mli
 lib/ocaml/cil/clist.cmi
@@ -44,100 +50,117 @@ lib/ocaml/cil/clist.mli
 lib/ocaml/cil/cparser.cmi
 lib/ocaml/cil/cparser.mli
 lib/ocaml/cil/cprint.cmi
+lib/ocaml/cil/cprint.inferred.mli
 lib/ocaml/cil/dataflow.cmi
 lib/ocaml/cil/dataflow.mli
 lib/ocaml/cil/dataslicing.cmi
 lib/ocaml/cil/dataslicing.mli
 lib/ocaml/cil/deadcodeelim.cmi
+lib/ocaml/cil/deadcodeelim.inferred.mli
 lib/ocaml/cil/dominators.cmi
 lib/ocaml/cil/dominators.mli
 lib/ocaml/cil/epicenter.cmi
+lib/ocaml/cil/epicenter.inferred.mli
 lib/ocaml/cil/errormsg.cmi
 lib/ocaml/cil/errormsg.mli
 lib/ocaml/cil/escape.cmi
 lib/ocaml/cil/escape.mli
 lib/ocaml/cil/expcompare.cmi
-lib/ocaml/cil/feature_config.cmi
+lib/ocaml/cil/expcompare.inferred.mli
 lib/ocaml/cil/formatcil.cmi
 lib/ocaml/cil/formatcil.mli
 lib/ocaml/cil/formatlex.cmi
+lib/ocaml/cil/formatlex.inferred.mli
 lib/ocaml/cil/formatparse.cmi
 lib/ocaml/cil/formatparse.mli
 lib/ocaml/cil/frontc.cmi
 lib/ocaml/cil/frontc.mli
-lib/ocaml/cil/golf.mli
 lib/ocaml/cil/growArray.cmi
 lib/ocaml/cil/growArray.mli
 lib/ocaml/cil/heap.cmi
+lib/ocaml/cil/heap.inferred.mli
 lib/ocaml/cil/heapify.cmi
+lib/ocaml/cil/heapify.inferred.mli
 lib/ocaml/cil/inthash.cmi
 lib/ocaml/cil/inthash.mli
-lib/ocaml/cil/kerneltrace.cmi
 lib/ocaml/cil/lexerhack.cmi
+lib/ocaml/cil/lexerhack.inferred.mli
 lib/ocaml/cil/liveness.cmi
+lib/ocaml/cil/liveness.inferred.mli
+lib/ocaml/cil/llvm.cmi
+lib/ocaml/cil/llvm.inferred.mli
+lib/ocaml/cil/llvmgen.cmi
+lib/ocaml/cil/llvmgen.inferred.mli
+lib/ocaml/cil/llvmssa.cmi
+lib/ocaml/cil/llvmssa.inferred.mli
+lib/ocaml/cil/llvmutils.cmi
+lib/ocaml/cil/llvmutils.inferred.mli
 lib/ocaml/cil/logcalls.cmi
 lib/ocaml/cil/logcalls.mli
 lib/ocaml/cil/logwrites.cmi
+lib/ocaml/cil/logwrites.inferred.mli
 lib/ocaml/cil/longarray.cmi
 lib/ocaml/cil/longarray.mli
 lib/ocaml/cil/machdep.cmi
+lib/ocaml/cil/machdep.inferred.mli
 lib/ocaml/cil/machdepenv.cmi
-lib/ocaml/cil/main.cmi
+lib/ocaml/cil/machdepenv.inferred.mli
 lib/ocaml/cil/mergecil.cmi
 lib/ocaml/cil/mergecil.mli
-lib/ocaml/cil/nullint.cmi
 lib/ocaml/cil/olf.cmi
 lib/ocaml/cil/olf.mli
 lib/ocaml/cil/oneret.cmi
 lib/ocaml/cil/oneret.mli
-lib/ocaml/cil/optutil.mli
 lib/ocaml/cil/partial.cmi
+lib/ocaml/cil/partial.inferred.mli
 lib/ocaml/cil/patch.cmi
 lib/ocaml/cil/patch.mli
 lib/ocaml/cil/predabst.cmi
+lib/ocaml/cil/predabst.inferred.mli
 lib/ocaml/cil/pretty.cmi
 lib/ocaml/cil/pretty.mli
 lib/ocaml/cil/ptranal.cmi
 lib/ocaml/cil/ptranal.mli
-lib/ocaml/cil/randomvars.cmi
 lib/ocaml/cil/reachingdefs.cmi
+lib/ocaml/cil/reachingdefs.inferred.mli
 lib/ocaml/cil/rmtmps.cmi
 lib/ocaml/cil/rmtmps.mli
 lib/ocaml/cil/setp.cmi
 lib/ocaml/cil/setp.mli
 lib/ocaml/cil/sfi.cmi
+lib/ocaml/cil/sfi.inferred.mli
 lib/ocaml/cil/simplemem.cmi
+lib/ocaml/cil/simplemem.inferred.mli
 lib/ocaml/cil/simplify.cmi
 lib/ocaml/cil/simplify.mli
 lib/ocaml/cil/ssa.cmi
 lib/ocaml/cil/ssa.mli
-lib/ocaml/cil/stackoverflow.mli
 lib/ocaml/cil/stats.cmi
 lib/ocaml/cil/stats.mli
-lib/ocaml/cil/steensgaard.mli
-lib/ocaml/cil/testcil.cmi
 lib/ocaml/cil/trace.cmi
 lib/ocaml/cil/trace.mli
 lib/ocaml/cil/uref.cmi
 lib/ocaml/cil/uref.mli
 lib/ocaml/cil/usedef.cmi
+lib/ocaml/cil/usedef.inferred.mli
 lib/ocaml/cil/util.cmi
 lib/ocaml/cil/util.mli
 lib/ocaml/cil/whitetrack.cmi
 lib/ocaml/cil/whitetrack.mli
-lib/ocaml/cil/zrapp.mli
 %%native%%
-@comment ${P5SITE}/CIL/CilConfig.pm
+${P5SITE}/App/
+${P5SITE}/App/Cilly/
+${P5SITE}/App/Cilly.pm
+${P5SITE}/App/Cilly/CilConfig.pm
+${P5SITE}/App/Cilly/KeptFile.pm
+${P5SITE}/App/Cilly/OutputFile.pm
+${P5SITE}/App/Cilly/TempFile.pm
 ${P5SITE}/CIL/
+@comment ${P5SITE}/CIL/CilConfig.pm
 ${P5SITE}/CIL/CilConfig.pm
-${P5SITE}/CIL/Cilly.pm
 ${P5SITE}/CIL/KeptFile.pm
 ${P5SITE}/CIL/OutputFile.pm
 ${P5SITE}/CIL/TempFile.pm
 ${P5SITE}/CilConfig.pm
 libexec/cil/
 @bin libexec/cil/machdep-ml.exe
-libexec/cil/obj/
-libexec/cil/obj/${target}/
-@bin libexec/cil/obj/${target}/cilly.asm.exe
-@bin libexec/cil/obj/${target}/cilly.byte.exe

devel/coccinelle/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.35 2018/04/11 13:40:54 edd Exp $
+# $OpenBSD: Makefile,v 1.36 2019/03/04 12:51:12 chrisz Exp $
 
 COMMENT =	program matching and transformation engine
 
 # if updating, check for any additional use of diff/grep which
 # may need to be switched to gdiff/ggrep
-DISTNAME =	coccinelle-1.0.4
+DISTNAME =	coccinelle-1.0.6
 EXTRACT_SUFX =	.tgz
-REVISION = 2
 
 CATEGORIES =	devel
 
@@ -15,7 +14,7 @@ HOMEPAGE =	http://coccinelle.lip6.fr/
 # GPLv2 only
 PERMIT_PACKAGE_CDROM =	 Yes
 
-WANTLIB += c curses m pthread util pcre ${MODPY_WANTLIB}
+WANTLIB += c curses m pthread pcre ${MODPY_WANTLIB}
 
 MASTER_SITES = ${HOMEPAGE}distrib/
 
@@ -23,9 +22,10 @@ MODULES =		lang/ocaml \
 			lang/python
 
 BUILD_DEPENDS =		${RUN_DEPENDS} \
-			lang/ocaml-camlp4 \
 			print/texlive/base \
 			textproc/hevea \
+			devel/ocaml-menhir \
+			math/ocaml-num \
 			textproc/latexmk
 RUN_DEPENDS =		devel/ocaml-parmap \
 			devel/ocaml-pcre \
@@ -42,34 +42,38 @@ CONFIGURE_ENV =		MAKE_PROGRAM=${MAKE_PROGRAM}
 CONFIGURE_ENV +=	PYTHON_LIBS="`pkg-config --static --libs python`" \
 			ac_cv_path_PATCH="patch -z.ccorig"
 CONFIGURE_ARGS =	--with-python=${MODPY_BIN}
-CONFIGURE_ARGS +=	--disable-menhirLib # version in ports is too new
+
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mocaml_native}
+CONFIGURE_ARGS +=	--enable-opt
+.else
+CONFIGURE_ARGS +=	--disable-opt
+.endif
 
 USE_GMAKE =	Yes
 PORTHOME =	${WRKDIR}
 
+ALL_TARGET =		all-release
+
 TEST_TARGET =	test
 TEST_DEPENDS =	${FULLPKGPATH}
 TEST_ENV =	COCCINELLE_HOME=${TRUEPREFIX}/lib/coccinelle
 
-.include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mocaml_native_dynlink}
-# "world" builds both: opt AND byte
-ALL_TARGET =		world
-.else
-# "all-release" builds either opt OR byte
-ALL_TARGET =		all-release
-.endif
-
 pre-configure:
 	perl -pi -e s,/usr/local,${TRUEPREFIX},g ${WRKSRC}/scripts/spatch*
 
+post-build:
+	cd ${WRKSRC}/docs/manual; \
+		${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle html
+
 post-install:
 	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
 	    ${PREFIX}/share/coccinelle/python/coccilib
-	mv ${PREFIX}/lib/coccinelle/dllpycaml_stubs.so \
+	mv ${PREFIX}/lib/coccinelle/*.so \
 		${PREFIX}/lib/ocaml/stublibs/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinelle
-	cd ${WRKSRC}/docs/manual; \
+	${INSTALL_DATA} \
-		${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle install
+		${WRKSRC}/docs/manual/*.{html,css,gif} \
+		${PREFIX}/share/doc/coccinelle/
 
 .include <bsd.port.mk>

devel/coccinelle/distinfo

@@ -1,2 +1,2 @@
-SHA256 (coccinelle-1.0.4.tgz) = f4I4E6LqKZwPbAHYQZuDxNxmFxFtMrqZ1yZEOhwisG0=
+SHA256 (coccinelle-1.0.6.tgz) = hFLtJlwgna6Zy7M7Z7x5Eucvi8oeJPM/Goi6PXmF6Qk=
-SIZE (coccinelle-1.0.4.tgz) = 2484218
+SIZE (coccinelle-1.0.6.tgz) = 6684278

devel/coccinelle/patches/patch-Makefile

@@ -1,10 +1,24 @@
-$OpenBSD: patch-Makefile,v 1.10 2015/10/29 15:41:36 sthen Exp $
+$OpenBSD: patch-Makefile,v 1.11 2019/03/04 12:51:12 chrisz Exp $
---- Makefile.orig	Wed Oct 28 14:07:59 2015
+
-+++ Makefile	Thu Oct 29 15:36:45 2015
+Some future version of coccinelle will hopefully configure for unbundled num
+or use Zarith instead.
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -71,7 +71,7 @@ INCLUDEDIRSDEP=commons commons/ocamlextra \
+  parsing_cocci parsing_c ocaml python engine popl09 extra \
+  $(MAKELIBS)
+ 
+-INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS)
++INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS) +num
+ 
+ ##############################################################################
+ # Generic variables
 @@ -347,7 +347,7 @@ install-man:
  	$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
  	$(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
- #	$(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
+ 	$(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
 -	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
 +	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
  
@@ -13,9 +27,9 @@ $OpenBSD: patch-Makefile,v 1.10 2015/10/29 15:41:36 sthen Exp $
 @@ -378,9 +378,9 @@ install-python:
  install-stubs:
  	$(MKDIR_P) $(DESTDIR)$(LIBDIR)
- 	@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
+ 	@if test -f ./bundles/pyml/dllpyml_stubs.so; then \
--		cp -fv ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR); fi
+-		cp -fv ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
-+		cp -f ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR); fi
++		cp -f ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
  	@if test -f ./bundles/pcre/dllpcre_stubs.so; then \
 -		cp -fv ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(LIBDIR); fi
 +		cp -f ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(LIBDIR); fi

devel/coccinelle/patches/patch-bundles_pyml_Makefile

@@ -0,0 +1,27 @@
+$OpenBSD: patch-bundles_pyml_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+our builtin test/[ doesn't support the < comparator.
+
+Index: bundles/pyml/Makefile
+--- bundles/pyml/Makefile.orig
++++ bundles/pyml/Makefile
+@@ -14,7 +14,7 @@ LIBRARY=pyml
+ SRC_DIR=$(PACKAGE_DIR)
+ 
+ PYML_COMPAT=$(shell \
+-	if [ "$(OCAMLVERSION)" "<" 4.03.0 ]; then \
++	if /bin/\[ "$(OCAMLVERSION)" "<" 4.03.0 ]; then \
+ 	  echo pyml_compat312.ml; \
+ 	else \
+ 	  echo pyml_compat403.ml; \
+@@ -52,8 +52,8 @@ $(SRC_DIR)/pyml_compat.cmx: $(SRC_DIR)/pyml_compat.ml 
+ $(SRC_DIR)/pyml_compat.cmo: $(SRC_DIR)/pyml_compat.ml $(SRC_DIR)/pyml_compat.cmi
+ 	$(OCAMLC_CMD) -c $< -o $@
+ 
+-$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmx $(SRC_DIR)/generate.cmx
+-	$(OCAMLOPT) $^ -o $@
++$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmo $(SRC_DIR)/generate.cmo
++	$(OCAMLC_CMD) $^ -o $@
+ 
+ $(SRC_DIR)/generate.cmx: $(SRC_DIR)/generate.ml $(SRC_DIR)/pyml_compat.cmx
+ 	$(OCAMLOPT_CMD) -c $< -o $@

devel/coccinelle/patches/patch-cocci_ml

@@ -1,7 +1,8 @@
-$OpenBSD: patch-cocci_ml,v 1.7 2015/10/27 14:43:07 sthen Exp $
+$OpenBSD: patch-cocci_ml,v 1.8 2019/03/04 12:51:12 chrisz Exp $
---- cocci.ml.orig	Mon Oct 26 16:22:50 2015
+Index: cocci.ml
-+++ cocci.ml	Tue Oct 27 14:33:27 2015
+--- cocci.ml.orig
-@@ -245,8 +245,8 @@ let show_or_not_diff2 cfile outfile =
++++ cocci.ml
+@@ -249,8 +249,8 @@ let show_or_not_diff2 cfile outfile =
  
        let line =
  	match !Flag_parsing_c.diff_lines with
@@ -12,7 +13,7 @@ $OpenBSD: patch-cocci_ml,v 1.7 2015/10/27 14:43:07 sthen Exp $
        let res = Common.cmd_to_list line in
        (match res with
  	[] -> ()
-@@ -524,7 +524,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
+@@ -528,7 +528,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
  
        ) in
        let com =
@@ -21,7 +22,7 @@ $OpenBSD: patch-cocci_ml,v 1.7 2015/10/27 14:43:07 sthen Exp $
  	  (String.concat "|" tokens) (String.concat " " cfiles) in
        (match Sys.command com with
        | 0 (* success *) -> true
-@@ -2293,7 +2293,7 @@ let check_duplicate_modif2 xs =
+@@ -2222,7 +2222,7 @@ let check_duplicate_modif2 xs =
                match res2 with
                | None -> false
                | Some res2 ->

devel/coccinelle/patches/patch-commons_common_ml

@@ -1,7 +1,8 @@
-$OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
+$OpenBSD: patch-commons_common_ml,v 1.7 2019/03/04 12:51:12 chrisz Exp $
---- commons/common.ml.orig	Mon Oct 26 16:22:50 2015
+Index: commons/common.ml
-+++ commons/common.ml	Tue Oct 27 14:23:22 2015
+--- commons/common.ml.orig
-@@ -3277,7 +3277,7 @@ let glob pattern =
++++ commons/common.ml
+@@ -3281,7 +3281,7 @@ let glob pattern =
  let files_of_dir_or_files ext xs =
    xs +> List.map (fun x ->
      if is_directory x
@@ -10,7 +11,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
      else [x]
    ) +> List.concat
  
-@@ -3287,7 +3287,7 @@ let files_of_dir_or_files_no_vcs ext xs =
+@@ -3291,7 +3291,7 @@ let files_of_dir_or_files_no_vcs ext xs =
      if is_directory x
      then
        cmd_to_list
@@ -19,7 +20,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
              "| grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v /_darcs/"
          )
      else [x]
-@@ -3300,7 +3300,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex xs 
+@@ -3304,7 +3304,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex xs 
      then
        cmd_to_list
          ("find " ^ x  ^
@@ -28,7 +29,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
          )
          +> List.filter (fun s -> s =~ regex)
      else [x]
-@@ -5241,7 +5241,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
+@@ -5256,7 +5256,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
      write_file file1 (unwords xs);
      write_file file2 (unwords ys);
      command2
@@ -37,7 +38,7 @@ $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
      let res = cat fileresult in
      let a = ref 0 in
      let b = ref 0 in
-@@ -5269,7 +5269,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string * 
+@@ -5284,7 +5284,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string * 
      write_file "/tmp/diff1" xstr;
      write_file "/tmp/diff2" ystr;
      command2
@@ -46,3 +47,13 @@ $OpenBSD: patch-commons_common_ml,v 1.6 2015/10/27 14:43:07 sthen Exp $
        "/tmp/diff1 /tmp/diff2 > /tmp/diffresult");
      let res = cat "/tmp/diffresult" in
      let a = ref 0 in
+@@ -5308,7 +5308,8 @@ let parserCommon lexbuf parserer lexer =
+     let result = parserer lexer lexbuf in
+     result
+   with Parsing.Parse_error ->
+-    print_string "buf: "; print_string lexbuf.Lexing.lex_buffer;
++    print_string "buf: ";
++    print_string (Bytes.to_string lexbuf.Lexing.lex_buffer);
+     print_string "\n";
+     print_string "current: "; print_int lexbuf.Lexing.lex_curr_pos;
+     print_string "\n";

devel/coccinelle/patches/patch-configure

@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure,v 1.6 2019/03/04 12:51:12 chrisz Exp $
+
+This does not set a default options as suggested in configure.ac,
+but overrides the user-provided setting.
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -14416,7 +14416,6 @@ fi
+ 
+ fi
+ 
+-enable_opt="yes"
+ 
+ 
+ if test "x$enable_opt" = xyes; then :

devel/coccinelle/patches/patch-parsing_c_Makefile

@@ -0,0 +1,20 @@
+$OpenBSD: patch-parsing_c_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+Some future version of coccinelle will hopefully configure for unbundled num
+or use Zarith instead.
+
+Index: parsing_c/Makefile
+--- parsing_c/Makefile.orig
++++ parsing_c/Makefile
+@@ -42,9 +42,9 @@ LIBS=../commons/commons.cma ../globals/globals.cma \
+ INCLUDESDEP= -I ../commons -I ../commons/ocamlextra \
+   -I ../globals -I  ../parsing_cocci
+ 
+-INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE)
++INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE) -I +num
+ 
+-SYSLIBS= str.cma unix.cma num.cma
++SYSLIBS= str.cma unix.cma nums.cma
+ 
+ ##############################################################################
+ # Generic variables

devel/coccinelle/patches/patch-parsing_c_unparse_c_ml

@@ -0,0 +1,21 @@
+$OpenBSD: patch-parsing_c_unparse_c_ml,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+just two simple occurences of string modification. Great!
+
+Index: parsing_c/unparse_c.ml
+--- parsing_c/unparse_c.ml.orig
++++ parsing_c/unparse_c.ml
+@@ -2362,11 +2362,11 @@ let start_mark = function
+ *)
+ module String = struct
+   let init n f =
+-    let s = String.make n ' ' in
++    let s = Bytes.make n ' ' in
+     for i = 0 to n - 1 do
+       s.[i] <- f i
+     done;
+-    s
++    Bytes.unsafe_to_string s
+ 
+   let map f s =
+     init (String.length s) (fun i -> f s.[i])

devel/coccinelle/patches/patch-tools_spgen_source_Makefile

@@ -0,0 +1,17 @@
+$OpenBSD: patch-tools_spgen_source_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+Some future version of coccinelle will hopefully configure for unbundled num
+or use Zarith instead.
+
+Index: tools/spgen/source/Makefile
+--- tools/spgen/source/Makefile.orig
++++ tools/spgen/source/Makefile
+@@ -39,7 +39,7 @@ LIBS_OPT = $(LIBS:=.cmxa)
+ 
+ INCLUDEDIRS= $(COCCIDIR)/commons $(COCCIDIR)/commons/ocamlextra \
+ 	$(COCCIDIR)/globals $(COCCIDIR)/parsing_cocci $(COCCIDIR)/parsing_c \
+-	$(PCREDIR)
++	$(PCREDIR) +num
+ 
+ INCLUDES=$(INCLUDEDIRS:%=-I %)
+ 

devel/coccinelle/patches/patch-tools_spgen_source_spgen_test_ml

@@ -0,0 +1,14 @@
+$OpenBSD: patch-tools_spgen_source_spgen_test_ml,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+Index: tools/spgen/source/spgen_test.ml
+--- tools/spgen/source/spgen_test.ml.orig
++++ tools/spgen/source/spgen_test.ml
+@@ -42,7 +42,7 @@ let score_ext = "score" (* marshalling format used by 
+  *  -B: ignore changes in blank lines
+  *)
+ let get_diff filename1 filename2 =
+-  let com = spf "diff -u -b -B %s %s" filename1 filename2 in
++  let com = spf "gdiff -u -b -B %s %s" filename1 filename2 in
+   let xs = Common.cmd_to_list com in
+ 
+   (* get rid of the --- and +++ lines *)

devel/coccinelle/pkg/PFRAG.dynlink-native

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+bin/spatch.opt
+@bin lib/coccinelle/spatch.opt

devel/coccinelle/pkg/PFRAG.native

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.native,v 1.3 2019/03/04 12:51:12 chrisz Exp $
+%%dynlink%%
+@bin lib/coccinelle/spgen/spgen.opt
+lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi

devel/coccinelle/pkg/PFRAG.no-native

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.no-native,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+lib/coccinelle/ocaml/no_prepare_ocamlcocci.cmi

devel/coccinelle/pkg/PLIST

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.12 2016/06/24 15:59:11 krw Exp $
+@comment $OpenBSD: PLIST,v 1.13 2019/03/04 12:51:12 chrisz Exp $
-%%dynlink%%
+%%native%%
 bin/pycocci
 bin/spatch
-bin/spatch.byte
+bin/spgen
 lib/coccinelle/
 lib/coccinelle/ocaml/
 lib/coccinelle/ocaml/ast0_cocci.cmi
@@ -12,6 +12,7 @@ lib/coccinelle/ocaml/coccilib.cmi
 lib/coccinelle/ocaml/common.cmi
 lib/coccinelle/ocaml/config.cmi
 lib/coccinelle/ocaml/exposed_modules.cmi
+lib/coccinelle/ocaml/externalanalysis.cmi
 lib/coccinelle/ocaml/flag.cmi
 lib/coccinelle/ocaml/iteration.cmi
 lib/coccinelle/ocaml/lexer_c.cmi
@@ -23,7 +24,6 @@ lib/coccinelle/ocaml/prepare_ocamlcocci.cmi
 lib/coccinelle/ocaml/pretty_print_c.cmi
 lib/coccinelle/ocaml/regexp.cmi
 lib/coccinelle/ocaml/run_ocamlcocci.cmi
-lib/coccinelle/ocaml/type_cocci.cmi
 lib/coccinelle/ocaml/visitor_c.cmi
 lib/coccinelle/python/
 lib/coccinelle/python/coccilib/
@@ -39,24 +39,26 @@ 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
 lib/coccinelle/python/coccilib/output.py
 lib/coccinelle/python/coccilib/report.py
 lib/coccinelle/python/coccilib/trac.py
 lib/coccinelle/python/coccilib/xml_firehose.py
-@bin lib/coccinelle/spatch
+lib/coccinelle/spgen/
+@bin lib/coccinelle/spgen/spgen
 lib/coccinelle/standard.h
 lib/coccinelle/standard.iso
-lib/ocaml/stublibs/dllpycaml_stubs.so
+lib/ocaml/stublibs/dllpyml_stubs.so
 @man man/man1/pycocci.1
 @man man/man1/spatch.1
+@man man/man1/spgen.1
 @man man/man3/Coccilib.3
 share/doc/coccinelle/
 share/doc/coccinelle/contents_motif.gif
 share/doc/coccinelle/index.html
 share/doc/coccinelle/main_grammar.css
 share/doc/coccinelle/main_grammar.html
-share/doc/coccinelle/main_grammar.pdf
 share/doc/coccinelle/main_grammar001.html
 share/doc/coccinelle/main_grammar002.html
 share/doc/coccinelle/main_grammar003.html
@@ -72,7 +74,7 @@ share/doc/coccinelle/main_grammar012.html
 share/doc/coccinelle/main_grammar013.html
 share/doc/coccinelle/main_grammar014.html
 share/doc/coccinelle/main_grammar015.html
-share/doc/coccinelle/manual.pdf
+share/doc/coccinelle/main_grammar016.html
+share/doc/coccinelle/main_grammar017.html
 share/doc/coccinelle/next_motif.gif
-share/doc/coccinelle/options.pdf
 share/doc/coccinelle/previous_motif.gif

devel/cudf/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2018/12/15 16:25:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2019/03/04 12:51:12 chrisz Exp $
 
 MULTI_PACKAGES =	-ocaml -main
 
@@ -11,7 +11,7 @@ VERSION =		0.9
 DISTNAME =		cudf-${VERSION}
 PKGNAME-ocaml =		ocaml-cudf-${VERSION}
 PKGNAME-main =		libcudf-${VERSION}
-REVISION =		0
+REVISION =		1
 
 MASTER_SITES =		https://gforge.inria.fr/frs/download.php/file/36602/
 
@@ -24,7 +24,6 @@ WANTLIB =		c m
 
 MODULES =		lang/ocaml
 BUILD_DEPENDS =		devel/ocaml-extlib \
-			lang/ocaml-camlp4 \
 			sysutils/findlib \
 			devel/ocaml-ocamlbuild \
 			devel/glib2

devel/dune/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/02/11 05:49:27 jca Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/04 12:51:12 chrisz Exp $
 
 COMMENT =		OCaml build system
 
@@ -6,8 +6,7 @@ CATEGORIES =		devel
 
 GH_ACCOUNT =		ocaml
 GH_PROJECT =		dune
-GH_TAGNAME =		1.6.3
+GH_TAGNAME =		1.7.2
-REVISION =		0
 
 HOMEPAGE =		https://github.com/ocaml/dune
 
@@ -29,16 +28,26 @@ MAKE_FLAGS =		DUNE_FLAGS="--display verbose -j ${MAKE_JOBS}"
 ALL_TARGET =		release
 INSTALL_TARGET =	install
 
-idir =			${WRKSRC}/_build_bootstrap/install/default
+idir =			${WRKSRC}/_boot/install/default
 docdir =		${PREFIX}/share/doc/dune
 
+.include <bsd.port.arch.mk>
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dune
 	${INSTALL_DATA} \
 		${idir}/doc/dune/{CHANGES,README,LICENSE}.md \
 		${PREFIX}/share/doc/dune
+	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} \
+		${idir}/share/emacs/site-lisp/* \
+		${PREFIX}/share/emacs/site-lisp/
 	${INSTALL_MAN} ${idir}/man/man1/* ${PREFIX}/man/man1/
 	${INSTALL_MAN} ${idir}/man/man5/* ${PREFIX}/man/man5/
+.if ${PROPERTIES:Mocaml_native}
 	${INSTALL_PROGRAM} ${idir}/bin/* ${PREFIX}/bin/
+.else
+	${INSTALL_SCRIPT} ${idir}/bin/* ${PREFIX}/bin/
+.endif
 
 .include <bsd.port.mk>

devel/dune/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dune-1.6.3.tar.gz) = V2puaXNkq/3698Foy7+YBcxVIEGm3+1TmXwcDt2CDW0=
+SHA256 (dune-1.7.2.tar.gz) = bG95icQf0c77BlcM+j3DWvS7FlrM31gAljok/tCQo/M=
-SIZE (dune-1.6.3.tar.gz) = 598099
+SIZE (dune-1.7.2.tar.gz) = 666745

devel/dune/pkg/PLIST

@@ -1,11 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/02/11 05:49:27 jca Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/03/04 12:51:12 chrisz Exp $
 @pkgpath sysutils/dune
 @bin bin/dune
 @bin bin/jbuilder
 @man man/man1/dune-build.1
 @man man/man1/dune-clean.1
+@man man/man1/dune-compute.1
 @man man/man1/dune-exec.1
 @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-install.1
 @man man/man1/dune-installed-libraries.1
@@ -15,7 +17,7 @@
 @man man/man1/dune-runtest.1
 @man man/man1/dune-subst.1
 @man man/man1/dune-uninstall.1
-@man man/man1/dune-unstable-fmt.1
+@man man/man1/dune-upgrade.1
 @man man/man1/dune-utop.1
 @man man/man1/dune.1
 @man man/man5/dune-config.5
@@ -23,3 +25,7 @@ share/doc/dune/
 share/doc/dune/CHANGES.md
 share/doc/dune/LICENSE.md
 share/doc/dune/README.md
+share/emacs/
+share/emacs/site-lisp/
+share/emacs/site-lisp/dune-flymake.el
+share/emacs/site-lisp/dune.el

devel/frama-c/Makefile

@@ -1,32 +1,28 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/21 00:12:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/04 12:51:12 chrisz Exp $
 
 COMMENT =		an extensible platform for analysis of C software
-#Error: Error while linking /usr/local/lib/ocaml/vmthreads/stdlib.cma(String):
-#Reference to undefined global `Bytes'
-BROKEN-powerpc =	Error while linking /usr/local/lib/ocaml/vmthreads/stdlib.cma
-BROKEN-alpha =		Error while linking /usr/local/lib/ocaml/vmthreads/stdlib.cma
 
-DISTNAME =		frama-c-Sodium-20150201
+DISTNAME =		frama-c-18.0-Argon
-PKGNAME =		frama-c-1.11
+PKGNAME =		frama-c-18.0
 CATEGORIES =		devel
-REVISION =		1
 HOMEPAGE =		http://www.frama-c.com/
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender art_lgpl_2 atk-1.0 c cairo curses fontconfig freetype
+WANTLIB += Xrender art_lgpl_2 atk-1.0 c cairo fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnomecanvas-2
-WANTLIB += gobject-2.0 gtk-x11-2.0 gtksourceview-2.0 iconv intl m
+WANTLIB += gobject-2.0 gtk-x11-2.0 gtksourceview-2.0 intl m gmp
 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z
 
-MASTER_SITES =		http://www.frama-c.com/download/
+MASTER_SITES =		https://frama-c.com/download/
 
 MODULES =		lang/ocaml
 
-BUILD_DEPENDS =		x11/lablgtk2 devel/ocaml-graph math/graphviz
+BUILD_DEPENDS =		x11/lablgtk2 devel/ocaml-graph \
-RUN_DEPENDS =		x11/lablgtk2 math/graphviz
+			math/graphviz math/ocaml-zarith sysutils/findlib
+RUN_DEPENDS =		x11/lablgtk2 math/graphviz math/ocaml-zarith
 
 LIB_DEPENDS =		x11/gnome/libgnomecanvas \
 			x11/gtksourceview
@@ -34,8 +30,11 @@ LIB_DEPENDS =		x11/gnome/libgnomecanvas \
 USE_GMAKE =		Yes
 TEST_TARGET =		oracles tests
 
-CONFIGURE_STYLE =	gnu
+CONFIGURE_STYLE =	gnu autoconf no-autoheader
+AUTOCONF_VERSION =	2.69
 CONFIGURE_ARGS +=	MAKE=${MAKE_PROGRAM} \
 			--docdir=${PREFIX}/share/doc/frama-c/
 
+DPB_PROPERTIES +=	parallel
+
 .include <bsd.port.mk>

devel/frama-c/distinfo

@@ -1,2 +1,2 @@
-SHA256 (frama-c-Sodium-20150201.tar.gz) = WHXYawwmnTSK+kYC8Mp/5raFYZH9twPY6wvJDUyYWn0=
+SHA256 (frama-c-18.0-Argon.tar.gz) = QrElQMYI879swlimvO3t88WWWJ5Yv9/Gv0c6BauYCCk=
-SIZE (frama-c-Sodium-20150201.tar.gz) = 6155507
+SIZE (frama-c-18.0-Argon.tar.gz) = 5358960

devel/frama-c/patches/patch-Makefile

@@ -0,0 +1,26 @@
+$OpenBSD: patch-Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+don't try to install cmx* files on bytecode builds.
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1863,14 +1863,16 @@ install:: install-lib
+ 	if [ -d "$(FRAMAC_PLUGIN)" ]; then \
+ 	  $(CP)  $(PLUGIN_DYN_CMI_LIST) $(PLUGIN_META_LIST) \
+ 		 $(FRAMAC_PLUGINDIR); \
+-	  $(CP)  $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
++	  $(CP)  $(PLUGIN_DYN_CMO_LIST) \
++		 $(if $(filter opt, $(OCAMLBEST)), $(PLUGIN_DYN_CMX_LIST),) \
+ 		 $(FRAMAC_PLUGINDIR)/top; \
+ 	fi
+ 	$(PRINT_INSTALL) gui plug-ins
+ 	if [ -d "$(FRAMAC_PLUGIN_GUI)" -a "$(PLUGIN_DYN_GUI_EXISTS)" = "yes" ]; \
+ 	then \
+ 	  $(CP) $(patsubst %.cma,%.cmi,$(PLUGIN_DYN_GUI_CMO_LIST:.cmo=.cmi)) \
+-		$(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST) \
++		$(PLUGIN_DYN_GUI_CMO_LIST) \
++		$(if $(filter opt, $(OCAMLBEST)), $(PLUGIN_DYN_GUI_CMX_LIST),) \
+ 		$(FRAMAC_PLUGINDIR)/gui; \
+ 	fi
+ 	$(PRINT_INSTALL) man pages

devel/frama-c/patches/patch-configure_in

@@ -0,0 +1,47 @@
+$OpenBSD: patch-configure_in,v 1.1 2019/03/04 12:51:12 chrisz Exp $
+
+Use system threads if available - even on bytecode builds.
+Vmthreads are broken and deprecated.
+
+Index: configure.in
+--- configure.in.orig
++++ configure.in
+@@ -436,23 +436,23 @@ else
+     EXE=
+   fi
+ 
+-  if test "$OCAMLBEST" = opt; then
+-    # OCaml native threads
+-    AC_MSG_CHECKING([OCaml native threads])
+-    echo "let f = Thread.create (fun () -> ())" > test_native_threads.ml
+-    if ($OCAMLOPT -thread -o test_native_threads unix.cmxa threads.cmxa \
+-         test_native_threads.ml) 2> /dev/null ;
+-    then
+-      HAS_NATIVE_THREADS=yes
+-      AC_MSG_RESULT([ok.]);
+-    else
+-      HAS_NATIVE_THREADS=no
+-      AC_MSG_WARN([unsupported.]);
+-    fi
+-    rm -f test_native_threads*;
++  # OCaml native threads
++  AC_MSG_CHECKING([OCaml native threads])
++  echo "let f = Thread.create (fun () -> ())" > test_native_threads.ml
++  if
++    test "$OCAMLBEST" = opt &&
++    ($OCAMLOPT -thread -o test_native_threads unix.cma threads.cma \
++       test_native_threads.ml) 2> /dev/null ||
++    ($OCAMLC -thread -o test_native_threads unix.cma threads.cma \
++       test_native_threads.ml) 2> /dev/null
++  then
++    HAS_NATIVE_THREADS=yes
++    AC_MSG_RESULT([ok.]);
+   else
+-    HAS_NATIVE_THREADS=no; # no native compilation anyway
++    HAS_NATIVE_THREADS=no
++    AC_MSG_WARN([unsupported.]);
+   fi
++  rm -f test_native_threads*;
+ fi
+ 
+ # C and POSIX standard headers used by C bindings.

devel/frama-c/pkg/PFRAG.dynlink-native

@@ -1,8 +1,40 @@
-@comment $OpenBSD: PFRAG.dynlink-native,v 1.2 2014/04/23 14:12:28 jca Exp $
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.3 2019/03/04 12:51:12 chrisz Exp $
-@bin lib/frama-c/plugins/Aorai.cmxs
+@bin lib/frama-c/plugins/gui/Callgraph.cmxs
-@bin lib/frama-c/plugins/Obfuscator.cmxs
+@bin lib/frama-c/plugins/gui/Eva.cmxs
-@bin lib/frama-c/plugins/Report.cmxs
+@bin lib/frama-c/plugins/gui/From.cmxs
-@bin lib/frama-c/plugins/Security_slicing.cmxs
+@bin lib/frama-c/plugins/gui/Impact.cmxs
-@bin lib/frama-c/plugins/Wp.cmxs
+@bin lib/frama-c/plugins/gui/Metrics.cmxs
+@bin lib/frama-c/plugins/gui/Occurrence.cmxs
+@bin lib/frama-c/plugins/gui/Qed.cmxs
+@bin lib/frama-c/plugins/gui/Scope.cmxs
 @bin lib/frama-c/plugins/gui/Security_slicing.cmxs
+@bin lib/frama-c/plugins/gui/Slicing.cmxs
+@bin lib/frama-c/plugins/gui/Studia.cmxs
 @bin lib/frama-c/plugins/gui/Wp.cmxs
+@bin lib/frama-c/plugins/top/Aorai.cmxs
+@bin lib/frama-c/plugins/top/Callgraph.cmxs
+@bin lib/frama-c/plugins/top/Constant_Propagation.cmxs
+@bin lib/frama-c/plugins/top/E_ACSL.cmxs
+@bin lib/frama-c/plugins/top/Eva.cmxs
+@bin lib/frama-c/plugins/top/From.cmxs
+@bin lib/frama-c/plugins/top/Impact.cmxs
+@bin lib/frama-c/plugins/top/Inout.cmxs
+@bin lib/frama-c/plugins/top/LoopAnalysis.cmxs
+@bin lib/frama-c/plugins/top/Metrics.cmxs
+@bin lib/frama-c/plugins/top/Nonterm.cmxs
+@bin lib/frama-c/plugins/top/Obfuscator.cmxs
+@bin lib/frama-c/plugins/top/Occurrence.cmxs
+@bin lib/frama-c/plugins/top/Pdg.cmxs
+@bin lib/frama-c/plugins/top/Postdominators.cmxs
+@bin lib/frama-c/plugins/top/Print_api.cmxs
+@bin lib/frama-c/plugins/top/Qed.cmxs
+@bin lib/frama-c/plugins/top/Report.cmxs
+@bin lib/frama-c/plugins/top/RteGen.cmxs
+@bin lib/frama-c/plugins/top/Scope.cmxs
+@bin lib/frama-c/plugins/top/Security_slicing.cmxs
+@bin lib/frama-c/plugins/top/Slicing.cmxs
+@bin lib/frama-c/plugins/top/Sparecode.cmxs
+@bin lib/frama-c/plugins/top/Studia.cmxs
+@bin lib/frama-c/plugins/top/Users.cmxs
+@bin lib/frama-c/plugins/top/Variadic.cmxs
+@bin lib/frama-c/plugins/top/Wp.cmxs

devel/frama-c/pkg/PFRAG.native

@@ -1,44 +1,14 @@
-@comment $OpenBSD: PFRAG.native,v 1.3 2015/08/30 16:22:15 avsm Exp $
+@comment $OpenBSD: PFRAG.native,v 1.4 2019/03/04 12:51:12 chrisz Exp $
 %%dynlink%%
 @bin bin/ptests.opt
-lib/frama-c/Constant_Propagation.cmx
+lib/frama-c/FCBuffer.cmx
-lib/frama-c/Constant_Propagation.o
+lib/frama-c/FCBuffer.o
 lib/frama-c/FCHashtbl.cmx
 lib/frama-c/FCHashtbl.o
 lib/frama-c/FCMap.cmx
 lib/frama-c/FCMap.o
 lib/frama-c/FCSet.cmx
 lib/frama-c/FCSet.o
-lib/frama-c/From.cmx
-lib/frama-c/From.o
-lib/frama-c/Impact.cmx
-lib/frama-c/Impact.o
-lib/frama-c/Inout.cmx
-lib/frama-c/Inout.o
-lib/frama-c/Metrics.cmx
-lib/frama-c/Metrics.o
-lib/frama-c/Occurrence.cmx
-lib/frama-c/Occurrence.o
-lib/frama-c/Pdg.cmx
-lib/frama-c/Pdg.o
-lib/frama-c/Postdominators.cmx
-lib/frama-c/Postdominators.o
-lib/frama-c/RteGen.cmx
-lib/frama-c/RteGen.o
-lib/frama-c/Scope.cmx
-lib/frama-c/Scope.o
-lib/frama-c/Semantic_callgraph.cmx
-lib/frama-c/Semantic_callgraph.o
-lib/frama-c/Slicing.cmx
-lib/frama-c/Slicing.o
-lib/frama-c/Sparecode.cmx
-lib/frama-c/Sparecode.o
-lib/frama-c/Syntactic_callgraph.cmx
-lib/frama-c/Syntactic_callgraph.o
-lib/frama-c/Users.cmx
-lib/frama-c/Users.o
-lib/frama-c/Value.cmx
-lib/frama-c/Value.o
 lib/frama-c/abstract_interp.cmx
 lib/frama-c/abstract_interp.o
 lib/frama-c/alarms.cmx
@@ -51,6 +21,8 @@ lib/frama-c/analyses_manager.cmx
 lib/frama-c/analyses_manager.o
 lib/frama-c/annotations.cmx
 lib/frama-c/annotations.o
+lib/frama-c/asm_contracts.cmx
+lib/frama-c/asm_contracts.o
 lib/frama-c/ast.cmx
 lib/frama-c/ast.o
 lib/frama-c/ast_info.cmx
@@ -69,7 +41,8 @@ lib/frama-c/book_manager.cmx
 lib/frama-c/book_manager.o
 lib/frama-c/boot.cmx
 lib/frama-c/boot.o
-lib/frama-c/buckx_c.o
+lib/frama-c/bottom.cmx
+lib/frama-c/bottom.o
 lib/frama-c/cabs.cmx
 lib/frama-c/cabs.o
 lib/frama-c/cabs2cil.cmx
@@ -80,8 +53,6 @@ lib/frama-c/cabshelper.cmx
 lib/frama-c/cabshelper.o
 lib/frama-c/cabsvisit.cmx
 lib/frama-c/cabsvisit.o
-lib/frama-c/callgraph.cmx
-lib/frama-c/callgraph.o
 lib/frama-c/cfg.cmx
 lib/frama-c/cfg.o
 lib/frama-c/cil.cmx
@@ -98,10 +69,10 @@ lib/frama-c/cil_printer.cmx
 lib/frama-c/cil_printer.o
 lib/frama-c/cil_state_builder.cmx
 lib/frama-c/cil_state_builder.o
+lib/frama-c/cil_types_debug.cmx
+lib/frama-c/cil_types_debug.o
 lib/frama-c/cilconfig.cmx
 lib/frama-c/cilconfig.o
-lib/frama-c/cilmsg.cmx
-lib/frama-c/cilmsg.o
 lib/frama-c/clexer.cmx
 lib/frama-c/clexer.o
 lib/frama-c/clone.cmx
@@ -118,8 +89,6 @@ lib/frama-c/cprint.cmx
 lib/frama-c/cprint.o
 lib/frama-c/cvalue.cmx
 lib/frama-c/cvalue.o
-lib/frama-c/dataflow.cmx
-lib/frama-c/dataflow.o
 lib/frama-c/dataflow2.cmx
 lib/frama-c/dataflow2.o
 lib/frama-c/dataflows.cmx
@@ -136,12 +105,12 @@ lib/frama-c/description.cmx
 lib/frama-c/description.o
 lib/frama-c/design.cmx
 lib/frama-c/design.o
+lib/frama-c/destructors.cmx
+lib/frama-c/destructors.o
 lib/frama-c/dominators.cmx
 lib/frama-c/dominators.o
 lib/frama-c/dynamic.cmx
 lib/frama-c/dynamic.o
-lib/frama-c/dynlink_common_interface.cmx
-lib/frama-c/dynlink_common_interface.o
 lib/frama-c/emitter.cmx
 lib/frama-c/emitter.o
 lib/frama-c/errorloc.cmx
@@ -152,16 +121,22 @@ lib/frama-c/exn_flow.cmx
 lib/frama-c/exn_flow.o
 lib/frama-c/extlib.cmx
 lib/frama-c/extlib.o
+lib/frama-c/fc_float.cmx
+lib/frama-c/fc_float.o
 lib/frama-c/file.cmx
 lib/frama-c/file.o
 lib/frama-c/file_manager.cmx
 lib/frama-c/file_manager.o
+lib/frama-c/filecheck.cmx
+lib/frama-c/filecheck.o
 lib/frama-c/filepath.cmx
 lib/frama-c/filepath.o
 lib/frama-c/filetree.cmx
 lib/frama-c/filetree.o
 lib/frama-c/filter.cmx
 lib/frama-c/filter.o
+lib/frama-c/float_interval.cmx
+lib/frama-c/float_interval.o
 lib/frama-c/floating_point.cmx
 lib/frama-c/floating_point.o
 lib/frama-c/frama_c_init.cmx
@@ -170,6 +145,8 @@ lib/frama-c/frontc.cmx
 lib/frama-c/frontc.o
 lib/frama-c/function_Froms.cmx
 lib/frama-c/function_Froms.o
+lib/frama-c/fval.cmx
+lib/frama-c/fval.o
 lib/frama-c/globals.cmx
 lib/frama-c/globals.o
 lib/frama-c/gtk_form.cmx
@@ -178,6 +155,8 @@ lib/frama-c/gtk_helper.cmx
 lib/frama-c/gtk_helper.o
 lib/frama-c/gui_parameters.cmx
 lib/frama-c/gui_parameters.o
+lib/frama-c/gui_printers.cmx
+lib/frama-c/gui_printers.o
 lib/frama-c/help_manager.cmx
 lib/frama-c/help_manager.o
 lib/frama-c/history.cmx
@@ -192,6 +171,8 @@ lib/frama-c/indexer.cmx
 lib/frama-c/indexer.o
 lib/frama-c/infer_annotations.cmx
 lib/frama-c/infer_annotations.o
+lib/frama-c/inline.cmx
+lib/frama-c/inline.o
 lib/frama-c/inout_type.cmx
 lib/frama-c/inout_type.o
 lib/frama-c/int_Base.cmx
@@ -200,16 +181,26 @@ lib/frama-c/int_Intervals.cmx
 lib/frama-c/int_Intervals.o
 lib/frama-c/integer.cmx
 lib/frama-c/integer.o
+lib/frama-c/interpreted_automata.cmx
+lib/frama-c/interpreted_automata.o
 lib/frama-c/ival.cmx
 lib/frama-c/ival.o
 lib/frama-c/journal.cmx
 lib/frama-c/journal.o
+lib/frama-c/json.cmx
+lib/frama-c/json.o
+lib/frama-c/json_compilation_database.cmx
+lib/frama-c/json_compilation_database.o
 lib/frama-c/kernel.cmx
 lib/frama-c/kernel.o
 lib/frama-c/kernel_function.cmx
 lib/frama-c/kernel_function.o
+lib/frama-c/lattice_messages.cmx
+lib/frama-c/lattice_messages.o
 lib/frama-c/launcher.cmx
 lib/frama-c/launcher.o
+lib/frama-c/leftistheap.cmx
+lib/frama-c/leftistheap.o
 lib/frama-c/lexerhack.cmx
 lib/frama-c/lexerhack.o
 lib/frama-c/lmap.cmx
@@ -244,8 +235,8 @@ lib/frama-c/loop.cmx
 lib/frama-c/loop.o
 lib/frama-c/machdeps.cmx
 lib/frama-c/machdeps.o
-lib/frama-c/map_Lattice.cmx
+lib/frama-c/map_lattice.cmx
-lib/frama-c/map_Lattice.o
+lib/frama-c/map_lattice.o
 lib/frama-c/menu_manager.cmx
 lib/frama-c/menu_manager.o
 lib/frama-c/mergecil.cmx
@@ -276,20 +267,33 @@ lib/frama-c/pdgTypes.cmx
 lib/frama-c/pdgTypes.o
 lib/frama-c/plugin.cmx
 lib/frama-c/plugin.o
-lib/frama-c/plugins/Aorai.cmi
+lib/frama-c/plugins/top/Aorai.cmx
-lib/frama-c/plugins/Aorai.cmo
+lib/frama-c/plugins/top/Callgraph.cmx
-lib/frama-c/plugins/Obfuscator.cmi
+lib/frama-c/plugins/top/Constant_Propagation.cmx
-lib/frama-c/plugins/Obfuscator.cmo
+lib/frama-c/plugins/top/E_ACSL.cmx
-lib/frama-c/plugins/Report.cmi
+lib/frama-c/plugins/top/Eva.cmx
-lib/frama-c/plugins/Report.cmo
+lib/frama-c/plugins/top/From.cmx
-lib/frama-c/plugins/Security_slicing.cmi
+lib/frama-c/plugins/top/Impact.cmx
-lib/frama-c/plugins/Security_slicing.cmo
+lib/frama-c/plugins/top/Inout.cmx
-lib/frama-c/plugins/Wp.cma
+lib/frama-c/plugins/top/LoopAnalysis.cmx
-lib/frama-c/plugins/Wp.cmi
+lib/frama-c/plugins/top/Metrics.cmx
-lib/frama-c/plugins/gui/Security_slicing.cmi
+lib/frama-c/plugins/top/Nonterm.cmx
-lib/frama-c/plugins/gui/Security_slicing.cmo
+lib/frama-c/plugins/top/Obfuscator.cmx
-lib/frama-c/plugins/gui/Wp.cma
+lib/frama-c/plugins/top/Occurrence.cmx
-lib/frama-c/plugins/gui/Wp.cmi
+lib/frama-c/plugins/top/Pdg.cmx
+lib/frama-c/plugins/top/Postdominators.cmx
+lib/frama-c/plugins/top/Print_api.cmx
+lib/frama-c/plugins/top/Qed.cmx
+lib/frama-c/plugins/top/Report.cmx
+lib/frama-c/plugins/top/RteGen.cmx
+lib/frama-c/plugins/top/Scope.cmx
+lib/frama-c/plugins/top/Security_slicing.cmx
+lib/frama-c/plugins/top/Slicing.cmx
+lib/frama-c/plugins/top/Sparecode.cmx
+lib/frama-c/plugins/top/Studia.cmx
+lib/frama-c/plugins/top/Users.cmx
+lib/frama-c/plugins/top/Variadic.cmx
+lib/frama-c/plugins/top/Wp.cmx
 lib/frama-c/precise_locs.cmx
 lib/frama-c/precise_locs.o
 lib/frama-c/pretty_source.cmx
@@ -318,14 +322,14 @@ lib/frama-c/qstack.cmx
 lib/frama-c/qstack.o
 lib/frama-c/rangemap.cmx
 lib/frama-c/rangemap.o
+lib/frama-c/rgmap.cmx
+lib/frama-c/rgmap.o
+lib/frama-c/rich_text.cmx
+lib/frama-c/rich_text.o
 lib/frama-c/rmtmps.cmx
 lib/frama-c/rmtmps.o
 lib/frama-c/service_graph.cmx
 lib/frama-c/service_graph.o
-lib/frama-c/slicingInternals.cmx
-lib/frama-c/slicingInternals.o
-lib/frama-c/slicingTypes.cmx
-lib/frama-c/slicingTypes.o
 lib/frama-c/source_manager.cmx
 lib/frama-c/source_manager.o
 lib/frama-c/source_viewer.cmx
@@ -348,34 +352,30 @@ lib/frama-c/stmts_graph.cmx
 lib/frama-c/stmts_graph.o
 lib/frama-c/structural_descr.cmx
 lib/frama-c/structural_descr.o
-lib/frama-c/sysutil.cmx
-lib/frama-c/sysutil.o
 lib/frama-c/task.cmx
 lib/frama-c/task.o
-lib/frama-c/toolbox.cmx
-lib/frama-c/toolbox.o
 lib/frama-c/tr_offset.cmx
 lib/frama-c/tr_offset.o
-lib/frama-c/trace.cmx
+lib/frama-c/transitioning.cmx
-lib/frama-c/trace.o
+lib/frama-c/transitioning.o
 lib/frama-c/translate_lightweight.cmx
 lib/frama-c/translate_lightweight.o
 lib/frama-c/type.cmx
 lib/frama-c/type.o
 lib/frama-c/typed_parameter.cmx
 lib/frama-c/typed_parameter.o
+lib/frama-c/undefined_sequence.cmx
+lib/frama-c/undefined_sequence.o
 lib/frama-c/unicode.cmx
 lib/frama-c/unicode.o
 lib/frama-c/unmarshal.cmx
 lib/frama-c/unmarshal.o
-lib/frama-c/unmarshal_nums.cmx
+lib/frama-c/unmarshal_z.cmx
-lib/frama-c/unmarshal_nums.o
+lib/frama-c/unmarshal_z.o
 lib/frama-c/unroll_loops.cmx
 lib/frama-c/unroll_loops.o
 lib/frama-c/utf8_logic.cmx
 lib/frama-c/utf8_logic.o
-lib/frama-c/value_messages.cmx
-lib/frama-c/value_messages.o
 lib/frama-c/value_types.cmx
 lib/frama-c/value_types.o
 lib/frama-c/vector.cmx
@@ -384,5 +384,25 @@ lib/frama-c/visitor.cmx
 lib/frama-c/visitor.o
 lib/frama-c/warning_manager.cmx
 lib/frama-c/warning_manager.o
+lib/frama-c/wbox.cmx
+lib/frama-c/wbox.o
+lib/frama-c/wfile.cmx
+lib/frama-c/wfile.o
 lib/frama-c/widen_type.cmx
 lib/frama-c/widen_type.o
+lib/frama-c/widget.cmx
+lib/frama-c/widget.o
+lib/frama-c/wpalette.cmx
+lib/frama-c/wpalette.o
+lib/frama-c/wpane.cmx
+lib/frama-c/wpane.o
+lib/frama-c/wtable.cmx
+lib/frama-c/wtable.o
+lib/frama-c/wtext.cmx
+lib/frama-c/wtext.o
+lib/frama-c/wto.cmx
+lib/frama-c/wto.o
+lib/frama-c/wto_statement.cmx
+lib/frama-c/wto_statement.o
+lib/frama-c/wutil.cmx
+lib/frama-c/wutil.o

devel/frama-c/pkg/PFRAG.no-native

@@ -1,8 +1,3 @@
-@comment $OpenBSD: PFRAG.no-native,v 1.2 2014/04/23 14:12:28 jca Exp $
+@comment $OpenBSD: PFRAG.no-native,v 1.3 2019/03/04 12:51:12 chrisz Exp $
 bin/ptests.byte
-lib/frama-c/Aorai.cmo
-lib/frama-c/Obfuscator.cmo
-lib/frama-c/Report.cmo
-lib/frama-c/Security_slicing.cmo
-lib/frama-c/Wp.cma
 lib/frama-c/ptests_config.cmo

devel/frama-c/pkg/PLIST

@@ -1,50 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.3 2015/08/30 16:22:15 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2019/03/04 12:51:12 chrisz Exp $
 %%native%%
-!%%native%%
+bin/e-acsl-gcc.sh
 @bin bin/frama-c
 @bin bin/frama-c-config
 @bin bin/frama-c-gui
 @bin bin/frama-c-gui.byte
+bin/frama-c-script
 @bin bin/frama-c.byte
 lib/frama-c/
-lib/frama-c/Constant_Propagation.cmi
+lib/frama-c/FCBuffer.cmi
-lib/frama-c/Constant_Propagation.cmo
+lib/frama-c/FCBuffer.cmo
 lib/frama-c/FCHashtbl.cmi
 lib/frama-c/FCHashtbl.cmo
 lib/frama-c/FCMap.cmi
 lib/frama-c/FCMap.cmo
 lib/frama-c/FCSet.cmi
 lib/frama-c/FCSet.cmo
-lib/frama-c/From.cmi
-lib/frama-c/From.cmo
-lib/frama-c/Impact.cmi
-lib/frama-c/Impact.cmo
-lib/frama-c/Inout.cmi
-lib/frama-c/Inout.cmo
-lib/frama-c/Metrics.cmi
-lib/frama-c/Metrics.cmo
-lib/frama-c/Occurrence.cmi
-lib/frama-c/Occurrence.cmo
-lib/frama-c/Pdg.cmi
-lib/frama-c/Pdg.cmo
-lib/frama-c/Postdominators.cmi
-lib/frama-c/Postdominators.cmo
-lib/frama-c/RteGen.cmi
-lib/frama-c/RteGen.cmo
-lib/frama-c/Scope.cmi
-lib/frama-c/Scope.cmo
-lib/frama-c/Semantic_callgraph.cmi
-lib/frama-c/Semantic_callgraph.cmo
-lib/frama-c/Slicing.cmi
-lib/frama-c/Slicing.cmo
-lib/frama-c/Sparecode.cmi
-lib/frama-c/Sparecode.cmo
-lib/frama-c/Syntactic_callgraph.cmi
-lib/frama-c/Syntactic_callgraph.cmo
-lib/frama-c/Users.cmi
-lib/frama-c/Users.cmo
-lib/frama-c/Value.cmi
-lib/frama-c/Value.cmo
 lib/frama-c/abstract_interp.cmi
 lib/frama-c/abstract_interp.cmo
 lib/frama-c/alarms.cmi
@@ -57,6 +28,8 @@ lib/frama-c/analyses_manager.cmi
 lib/frama-c/analyses_manager.cmo
 lib/frama-c/annotations.cmi
 lib/frama-c/annotations.cmo
+lib/frama-c/asm_contracts.cmi
+lib/frama-c/asm_contracts.cmo
 lib/frama-c/ast.cmi
 lib/frama-c/ast.cmo
 lib/frama-c/ast_info.cmi
@@ -75,6 +48,9 @@ lib/frama-c/book_manager.cmi
 lib/frama-c/book_manager.cmo
 lib/frama-c/boot.cmi
 lib/frama-c/boot.cmo
+lib/frama-c/bottom.cmi
+lib/frama-c/bottom.cmo
+lib/frama-c/c_bindings.o
 lib/frama-c/cabs.cmi
 lib/frama-c/cabs.cmo
 lib/frama-c/cabs2cil.cmi
@@ -85,8 +61,6 @@ lib/frama-c/cabshelper.cmi
 lib/frama-c/cabshelper.cmo
 lib/frama-c/cabsvisit.cmi
 lib/frama-c/cabsvisit.cmo
-lib/frama-c/callgraph.cmi
-lib/frama-c/callgraph.cmo
 lib/frama-c/cfg.cmi
 lib/frama-c/cfg.cmo
 lib/frama-c/cil.cmi
@@ -104,10 +78,10 @@ lib/frama-c/cil_printer.cmo
 lib/frama-c/cil_state_builder.cmi
 lib/frama-c/cil_state_builder.cmo
 lib/frama-c/cil_types.cmi
+lib/frama-c/cil_types_debug.cmi
+lib/frama-c/cil_types_debug.cmo
 lib/frama-c/cilconfig.cmi
 lib/frama-c/cilconfig.cmo
-lib/frama-c/cilmsg.cmi
-lib/frama-c/cilmsg.cmo
 lib/frama-c/clexer.cmi
 lib/frama-c/clexer.cmo
 lib/frama-c/clone.cmi
@@ -124,8 +98,6 @@ lib/frama-c/cprint.cmi
 lib/frama-c/cprint.cmo
 lib/frama-c/cvalue.cmi
 lib/frama-c/cvalue.cmo
-lib/frama-c/dataflow.cmi
-lib/frama-c/dataflow.cmo
 lib/frama-c/dataflow2.cmi
 lib/frama-c/dataflow2.cmo
 lib/frama-c/dataflows.cmi
@@ -142,12 +114,12 @@ lib/frama-c/description.cmi
 lib/frama-c/description.cmo
 lib/frama-c/design.cmi
 lib/frama-c/design.cmo
+lib/frama-c/destructors.cmi
+lib/frama-c/destructors.cmo
 lib/frama-c/dominators.cmi
 lib/frama-c/dominators.cmo
 lib/frama-c/dynamic.cmi
 lib/frama-c/dynamic.cmo
-lib/frama-c/dynlink_common_interface.cmi
-lib/frama-c/dynlink_common_interface.cmo
 lib/frama-c/emitter.cmi
 lib/frama-c/emitter.cmo
 lib/frama-c/errorloc.cmi
@@ -158,34 +130,44 @@ lib/frama-c/exn_flow.cmi
 lib/frama-c/exn_flow.cmo
 lib/frama-c/extlib.cmi
 lib/frama-c/extlib.cmo
+lib/frama-c/fc_float.cmi
+lib/frama-c/fc_float.cmo
 lib/frama-c/file.cmi
 lib/frama-c/file.cmo
 lib/frama-c/file_manager.cmi
 lib/frama-c/file_manager.cmo
+lib/frama-c/filecheck.cmi
+lib/frama-c/filecheck.cmo
 lib/frama-c/filepath.cmi
 lib/frama-c/filepath.cmo
 lib/frama-c/filetree.cmi
 lib/frama-c/filetree.cmo
 lib/frama-c/filter.cmi
 lib/frama-c/filter.cmo
+lib/frama-c/float_interval.cmi
+lib/frama-c/float_interval.cmo
+lib/frama-c/float_interval_sig.cmi
+lib/frama-c/float_sig.cmi
 lib/frama-c/floating_point.cmi
 lib/frama-c/floating_point.cmo
-lib/frama-c/frama_c_config.cmi
 lib/frama-c/frama_c_init.cmi
 lib/frama-c/frama_c_init.cmo
 lib/frama-c/frontc.cmi
 lib/frama-c/frontc.cmo
 lib/frama-c/function_Froms.cmi
 lib/frama-c/function_Froms.cmo
+lib/frama-c/fval.cmi
+lib/frama-c/fval.cmo
 lib/frama-c/globals.cmi
 lib/frama-c/globals.cmo
 lib/frama-c/gtk_form.cmi
 lib/frama-c/gtk_form.cmo
 lib/frama-c/gtk_helper.cmi
 lib/frama-c/gtk_helper.cmo
-lib/frama-c/gui_init.cmi
 lib/frama-c/gui_parameters.cmi
 lib/frama-c/gui_parameters.cmo
+lib/frama-c/gui_printers.cmi
+lib/frama-c/gui_printers.cmo
 lib/frama-c/help_manager.cmi
 lib/frama-c/help_manager.cmo
 lib/frama-c/history.cmi
@@ -194,12 +176,15 @@ lib/frama-c/hook.cmi
 lib/frama-c/hook.cmo
 lib/frama-c/hptmap.cmi
 lib/frama-c/hptmap.cmo
+lib/frama-c/hptmap_sig.cmi
 lib/frama-c/hptset.cmi
 lib/frama-c/hptset.cmo
 lib/frama-c/indexer.cmi
 lib/frama-c/indexer.cmo
 lib/frama-c/infer_annotations.cmi
 lib/frama-c/infer_annotations.cmo
+lib/frama-c/inline.cmi
+lib/frama-c/inline.cmo
 lib/frama-c/inout_type.cmi
 lib/frama-c/inout_type.cmo
 lib/frama-c/int_Base.cmi
@@ -209,17 +194,27 @@ lib/frama-c/int_Intervals.cmo
 lib/frama-c/int_Intervals_sig.cmi
 lib/frama-c/integer.cmi
 lib/frama-c/integer.cmo
+lib/frama-c/interpreted_automata.cmi
+lib/frama-c/interpreted_automata.cmo
 lib/frama-c/ival.cmi
 lib/frama-c/ival.cmo
 lib/frama-c/journal.cmi
 lib/frama-c/journal.cmo
+lib/frama-c/json.cmi
+lib/frama-c/json.cmo
+lib/frama-c/json_compilation_database.cmi
+lib/frama-c/json_compilation_database.cmo
 lib/frama-c/kernel.cmi
 lib/frama-c/kernel.cmo
 lib/frama-c/kernel_function.cmi
 lib/frama-c/kernel_function.cmo
+lib/frama-c/lattice_messages.cmi
+lib/frama-c/lattice_messages.cmo
 lib/frama-c/lattice_type.cmi
 lib/frama-c/launcher.cmi
 lib/frama-c/launcher.cmo
+lib/frama-c/leftistheap.cmi
+lib/frama-c/leftistheap.cmo
 lib/frama-c/lexerhack.cmi
 lib/frama-c/lexerhack.cmo
 lib/frama-c/lmap.cmi
@@ -256,8 +251,8 @@ lib/frama-c/loop.cmi
 lib/frama-c/loop.cmo
 lib/frama-c/machdeps.cmi
 lib/frama-c/machdeps.cmo
-lib/frama-c/map_Lattice.cmi
+lib/frama-c/map_lattice.cmi
-lib/frama-c/map_Lattice.cmo
+lib/frama-c/map_lattice.cmo
 lib/frama-c/menu_manager.cmi
 lib/frama-c/menu_manager.cmo
 lib/frama-c/mergecil.cmi
@@ -293,7 +288,113 @@ lib/frama-c/pdgTypes.cmo
 lib/frama-c/plugin.cmi
 lib/frama-c/plugin.cmo
 lib/frama-c/plugins/
+lib/frama-c/plugins/Aorai.cmi
+lib/frama-c/plugins/Callgraph.cmi
+lib/frama-c/plugins/Constant_Propagation.cmi
+lib/frama-c/plugins/E_ACSL.cmi
+lib/frama-c/plugins/Eva.cmi
+lib/frama-c/plugins/From.cmi
+lib/frama-c/plugins/Impact.cmi
+lib/frama-c/plugins/Inout.cmi
+lib/frama-c/plugins/LoopAnalysis.cmi
+lib/frama-c/plugins/META.frama-c-aorai
+lib/frama-c/plugins/META.frama-c-callgraph
+lib/frama-c/plugins/META.frama-c-constant_propagation
+lib/frama-c/plugins/META.frama-c-e_acsl
+lib/frama-c/plugins/META.frama-c-eva
+lib/frama-c/plugins/META.frama-c-from
+lib/frama-c/plugins/META.frama-c-impact
+lib/frama-c/plugins/META.frama-c-inout
+lib/frama-c/plugins/META.frama-c-loopanalysis
+lib/frama-c/plugins/META.frama-c-metrics
+lib/frama-c/plugins/META.frama-c-nonterm
+lib/frama-c/plugins/META.frama-c-obfuscator
+lib/frama-c/plugins/META.frama-c-occurrence
+lib/frama-c/plugins/META.frama-c-pdg
+lib/frama-c/plugins/META.frama-c-postdominators
+lib/frama-c/plugins/META.frama-c-print_api
+lib/frama-c/plugins/META.frama-c-qed
+lib/frama-c/plugins/META.frama-c-report
+lib/frama-c/plugins/META.frama-c-rtegen
+lib/frama-c/plugins/META.frama-c-scope
+lib/frama-c/plugins/META.frama-c-security_slicing
+lib/frama-c/plugins/META.frama-c-slicing
+lib/frama-c/plugins/META.frama-c-sparecode
+lib/frama-c/plugins/META.frama-c-studia
+lib/frama-c/plugins/META.frama-c-users
+lib/frama-c/plugins/META.frama-c-variadic
+lib/frama-c/plugins/META.frama-c-wp
+lib/frama-c/plugins/Metrics.cmi
+lib/frama-c/plugins/Nonterm.cmi
+lib/frama-c/plugins/Obfuscator.cmi
+lib/frama-c/plugins/Occurrence.cmi
+lib/frama-c/plugins/Pdg.cmi
+lib/frama-c/plugins/Postdominators.cmi
+lib/frama-c/plugins/Print_api.cmi
+lib/frama-c/plugins/Qed.cmi
+lib/frama-c/plugins/Report.cmi
+lib/frama-c/plugins/RteGen.cmi
+lib/frama-c/plugins/Scope.cmi
+lib/frama-c/plugins/Security_slicing.cmi
+lib/frama-c/plugins/Slicing.cmi
+lib/frama-c/plugins/Sparecode.cmi
+lib/frama-c/plugins/Studia.cmi
+lib/frama-c/plugins/Users.cmi
+lib/frama-c/plugins/Variadic.cmi
+lib/frama-c/plugins/Wp.cmi
 lib/frama-c/plugins/gui/
+lib/frama-c/plugins/gui/Callgraph.cmi
+lib/frama-c/plugins/gui/Callgraph.cmo
+lib/frama-c/plugins/gui/Eva.cmi
+lib/frama-c/plugins/gui/Eva.cmo
+lib/frama-c/plugins/gui/From.cmi
+lib/frama-c/plugins/gui/From.cmo
+lib/frama-c/plugins/gui/Impact.cmi
+lib/frama-c/plugins/gui/Impact.cmo
+lib/frama-c/plugins/gui/Metrics.cmi
+lib/frama-c/plugins/gui/Metrics.cmo
+lib/frama-c/plugins/gui/Occurrence.cmi
+lib/frama-c/plugins/gui/Occurrence.cmo
+lib/frama-c/plugins/gui/Qed.cmi
+lib/frama-c/plugins/gui/Qed.cmo
+lib/frama-c/plugins/gui/Scope.cmi
+lib/frama-c/plugins/gui/Scope.cmo
+lib/frama-c/plugins/gui/Security_slicing.cmi
+lib/frama-c/plugins/gui/Security_slicing.cmo
+lib/frama-c/plugins/gui/Slicing.cmi
+lib/frama-c/plugins/gui/Slicing.cmo
+lib/frama-c/plugins/gui/Studia.cmi
+lib/frama-c/plugins/gui/Studia.cmo
+lib/frama-c/plugins/gui/Wp.cmi
+lib/frama-c/plugins/gui/Wp.cmo
+lib/frama-c/plugins/top/
+lib/frama-c/plugins/top/Aorai.cmo
+lib/frama-c/plugins/top/Callgraph.cmo
+lib/frama-c/plugins/top/Constant_Propagation.cmo
+lib/frama-c/plugins/top/E_ACSL.cmo
+lib/frama-c/plugins/top/Eva.cmo
+lib/frama-c/plugins/top/From.cmo
+lib/frama-c/plugins/top/Impact.cmo
+lib/frama-c/plugins/top/Inout.cmo
+lib/frama-c/plugins/top/LoopAnalysis.cmo
+lib/frama-c/plugins/top/Metrics.cmo
+lib/frama-c/plugins/top/Nonterm.cmo
+lib/frama-c/plugins/top/Obfuscator.cmo
+lib/frama-c/plugins/top/Occurrence.cmo
+lib/frama-c/plugins/top/Pdg.cmo
+lib/frama-c/plugins/top/Postdominators.cmo
+lib/frama-c/plugins/top/Print_api.cmo
+lib/frama-c/plugins/top/Qed.cmo
+lib/frama-c/plugins/top/Report.cmo
+lib/frama-c/plugins/top/RteGen.cmo
+lib/frama-c/plugins/top/Scope.cmo
+lib/frama-c/plugins/top/Security_slicing.cmo
+lib/frama-c/plugins/top/Slicing.cmo
+lib/frama-c/plugins/top/Sparecode.cmo
+lib/frama-c/plugins/top/Studia.cmo
+lib/frama-c/plugins/top/Users.cmo
+lib/frama-c/plugins/top/Variadic.cmo
+lib/frama-c/plugins/top/Wp.cmo
 lib/frama-c/precise_locs.cmi
 lib/frama-c/precise_locs.cmo
 lib/frama-c/pretty_source.cmi
@@ -322,14 +423,14 @@ lib/frama-c/qstack.cmi
 lib/frama-c/qstack.cmo
 lib/frama-c/rangemap.cmi
 lib/frama-c/rangemap.cmo
+lib/frama-c/rgmap.cmi
+lib/frama-c/rgmap.cmo
+lib/frama-c/rich_text.cmi
+lib/frama-c/rich_text.cmo
 lib/frama-c/rmtmps.cmi
 lib/frama-c/rmtmps.cmo
 lib/frama-c/service_graph.cmi
 lib/frama-c/service_graph.cmo
-lib/frama-c/slicingInternals.cmi
-lib/frama-c/slicingInternals.cmo
-lib/frama-c/slicingTypes.cmi
-lib/frama-c/slicingTypes.cmo
 lib/frama-c/source_manager.cmi
 lib/frama-c/source_manager.cmo
 lib/frama-c/source_viewer.cmi
@@ -352,34 +453,30 @@ lib/frama-c/stmts_graph.cmi
 lib/frama-c/stmts_graph.cmo
 lib/frama-c/structural_descr.cmi
 lib/frama-c/structural_descr.cmo
-lib/frama-c/sysutil.cmi
-lib/frama-c/sysutil.cmo
 lib/frama-c/task.cmi
 lib/frama-c/task.cmo
-lib/frama-c/toolbox.cmi
-lib/frama-c/toolbox.cmo
 lib/frama-c/tr_offset.cmi
 lib/frama-c/tr_offset.cmo
-lib/frama-c/trace.cmi
+lib/frama-c/transitioning.cmi
-lib/frama-c/trace.cmo
+lib/frama-c/transitioning.cmo
 lib/frama-c/translate_lightweight.cmi
 lib/frama-c/translate_lightweight.cmo
 lib/frama-c/type.cmi
 lib/frama-c/type.cmo
 lib/frama-c/typed_parameter.cmi
 lib/frama-c/typed_parameter.cmo
+lib/frama-c/undefined_sequence.cmi
+lib/frama-c/undefined_sequence.cmo
 lib/frama-c/unicode.cmi
 lib/frama-c/unicode.cmo
 lib/frama-c/unmarshal.cmi
 lib/frama-c/unmarshal.cmo
-lib/frama-c/unmarshal_nums.cmi
+lib/frama-c/unmarshal_z.cmi
-lib/frama-c/unmarshal_nums.cmo
+lib/frama-c/unmarshal_z.cmo
 lib/frama-c/unroll_loops.cmi
 lib/frama-c/unroll_loops.cmo
 lib/frama-c/utf8_logic.cmi
 lib/frama-c/utf8_logic.cmo
-lib/frama-c/value_messages.cmi
-lib/frama-c/value_messages.cmo
 lib/frama-c/value_types.cmi
 lib/frama-c/value_types.cmo
 lib/frama-c/vector.cmi
@@ -388,8 +485,32 @@ lib/frama-c/visitor.cmi
 lib/frama-c/visitor.cmo
 lib/frama-c/warning_manager.cmi
 lib/frama-c/warning_manager.cmo
+lib/frama-c/wbox.cmi
+lib/frama-c/wbox.cmo
+lib/frama-c/wfile.cmi
+lib/frama-c/wfile.cmo
 lib/frama-c/widen_type.cmi
 lib/frama-c/widen_type.cmo
+!%%native%%
+lib/frama-c/widget.cmi
+lib/frama-c/widget.cmo
+lib/frama-c/wpalette.cmi
+lib/frama-c/wpalette.cmo
+lib/frama-c/wpane.cmi
+lib/frama-c/wpane.cmo
+lib/frama-c/wtable.cmi
+lib/frama-c/wtable.cmo
+lib/frama-c/wtext.cmi
+lib/frama-c/wtext.cmo
+lib/frama-c/wto.cmi
+lib/frama-c/wto.cmo
+lib/frama-c/wto_statement.cmi
+lib/frama-c/wto_statement.cmo
+lib/frama-c/wutil.cmi
+lib/frama-c/wutil.cmo
+lib/libeacsl-dlmalloc.a
+lib/libeacsl-gmp.a
+@man man/man1/e-acsl-gcc.sh.1
 @man man/man1/frama-c-gui.1
 @man man/man1/frama-c.1
 share/frama-c/
@@ -398,33 +519,82 @@ share/frama-c/Makefile.config
 share/frama-c/Makefile.dynamic
 share/frama-c/Makefile.dynamic_config
 share/frama-c/Makefile.generic
-share/frama-c/Makefile.kernel
+share/frama-c/Makefile.plugin.template
-share/frama-c/Makefile.plugin
+share/frama-c/_frama-c
-share/frama-c/acsl.el
+share/frama-c/analysis-scripts/
-share/frama-c/builtin.c
+share/frama-c/analysis-scripts/README.md
+share/frama-c/analysis-scripts/cmd-dep.sh
+share/frama-c/analysis-scripts/concat-csv.sh
+share/frama-c/analysis-scripts/examples/
+share/frama-c/analysis-scripts/examples/Makefile
+share/frama-c/analysis-scripts/examples/example-multi.mk
+share/frama-c/analysis-scripts/examples/example-slevel.mk
+share/frama-c/analysis-scripts/examples/example.c
+share/frama-c/analysis-scripts/examples/example.mk
+share/frama-c/analysis-scripts/flamegraph.pl
+share/frama-c/analysis-scripts/frama-c.mk
+share/frama-c/analysis-scripts/list_files.py
+share/frama-c/analysis-scripts/parse-coverage.sh
+share/frama-c/analysis-scripts/summary.sh
+share/frama-c/analysis-scripts/template.mk
+share/frama-c/autocomplete_frama-c
 share/frama-c/builtin.h
 share/frama-c/configure.ac
 share/frama-c/doc/
 share/frama-c/doc/code/
-share/frama-c/doc/code/docgen_ge400.ml
+share/frama-c/doc/code/docgen.ml
-share/frama-c/doc/code/docgen_lt400.ml
 share/frama-c/doc/code/intro_kernel_plugin.txt
 share/frama-c/doc/code/intro_plugin.txt
 share/frama-c/doc/code/intro_plugin_default.txt
 share/frama-c/doc/code/style.css
 share/frama-c/doc/code/toc_head.htm
 share/frama-c/doc/code/toc_tail.htm
-share/frama-c/frama-c.gif
+share/frama-c/e-acsl/
+share/frama-c/e-acsl/bittree_model/
+share/frama-c/e-acsl/bittree_model/e_acsl_bittree.h
+share/frama-c/e-acsl/bittree_model/e_acsl_bittree_api.h
+share/frama-c/e-acsl/bittree_model/e_acsl_bittree_mmodel.c
+share/frama-c/e-acsl/e_acsl.h
+share/frama-c/e-acsl/e_acsl_alias.h
+share/frama-c/e-acsl/e_acsl_assert.h
+share/frama-c/e-acsl/e_acsl_bits.h
+share/frama-c/e-acsl/e_acsl_debug.h
+share/frama-c/e-acsl/e_acsl_floating_point.h
+share/frama-c/e-acsl/e_acsl_format.h
+share/frama-c/e-acsl/e_acsl_gmp_api.h
+share/frama-c/e-acsl/e_acsl_leak.h
+share/frama-c/e-acsl/e_acsl_libc_replacements.h
+share/frama-c/e-acsl/e_acsl_malloc.h
+share/frama-c/e-acsl/e_acsl_printf.h
+share/frama-c/e-acsl/e_acsl_rtl.c
+share/frama-c/e-acsl/e_acsl_safe_locations.h
+share/frama-c/e-acsl/e_acsl_shexec.h
+share/frama-c/e-acsl/e_acsl_string.h
+share/frama-c/e-acsl/e_acsl_temporal.h
+share/frama-c/e-acsl/e_acsl_temporal_timestamp.h
+share/frama-c/e-acsl/e_acsl_trace.h
+share/frama-c/e-acsl/segment_model/
+share/frama-c/e-acsl/segment_model/e_acsl_segment_mmodel.c
+share/frama-c/e-acsl/segment_model/e_acsl_segment_tracking.h
+share/frama-c/e-acsl/segment_model/e_acsl_shadow_layout.h
+share/frama-c/emacs/
+share/frama-c/emacs/acsl.el
+share/frama-c/emacs/frama-c-dev.el
+share/frama-c/emacs/frama-c-init.el
+share/frama-c/emacs/frama-c-recommended.el
 share/frama-c/frama-c.ico
+share/frama-c/frama-c.png
 share/frama-c/frama-c.rc
 share/frama-c/libc/
 share/frama-c/libc.c
-share/frama-c/libc.h
+share/frama-c/libc/__fc_alloc_axiomatic.h
+share/frama-c/libc/__fc_builtin.c
 share/frama-c/libc/__fc_builtin.h
-share/frama-c/libc/__fc_builtin_for_normalization.i
 share/frama-c/libc/__fc_define_blkcnt_t.h
 share/frama-c/libc/__fc_define_blksize_t.h
+share/frama-c/libc/__fc_define_clockid_t.h
 share/frama-c/libc/__fc_define_dev_t.h
+share/frama-c/libc/__fc_define_eof.h
 share/frama-c/libc/__fc_define_fd_set_t.h
 share/frama-c/libc/__fc_define_file.h
 share/frama-c/libc/__fc_define_fpos_t.h
@@ -432,12 +602,13 @@ share/frama-c/libc/__fc_define_id_t.h
 share/frama-c/libc/__fc_define_ino_t.h
 share/frama-c/libc/__fc_define_intptr_t.h
 share/frama-c/libc/__fc_define_iovec.h
+share/frama-c/libc/__fc_define_key_t.h
 share/frama-c/libc/__fc_define_mode_t.h
 share/frama-c/libc/__fc_define_nlink_t.h
 share/frama-c/libc/__fc_define_null.h
 share/frama-c/libc/__fc_define_off_t.h
 share/frama-c/libc/__fc_define_pid_t.h
-share/frama-c/libc/__fc_define_restrict.h
+share/frama-c/libc/__fc_define_pthread_types.h
 share/frama-c/libc/__fc_define_sa_family_t.h
 share/frama-c/libc/__fc_define_seek_macros.h
 share/frama-c/libc/__fc_define_sigset_t.h
@@ -447,34 +618,46 @@ share/frama-c/libc/__fc_define_ssize_t.h
 share/frama-c/libc/__fc_define_stat.h
 share/frama-c/libc/__fc_define_suseconds_t.h
 share/frama-c/libc/__fc_define_time_t.h
+share/frama-c/libc/__fc_define_timer_t.h
 share/frama-c/libc/__fc_define_timespec.h
 share/frama-c/libc/__fc_define_uid_and_gid.h
 share/frama-c/libc/__fc_define_useconds_t.h
 share/frama-c/libc/__fc_define_wchar_t.h
 share/frama-c/libc/__fc_define_wint_t.h
+share/frama-c/libc/__fc_inet.h
 share/frama-c/libc/__fc_machdep.h
 share/frama-c/libc/__fc_machdep_linux_gcc_shared.h
 share/frama-c/libc/__fc_select.h
 share/frama-c/libc/__fc_string_axiomatic.h
+share/frama-c/libc/alloca.h
 share/frama-c/libc/arpa/
 share/frama-c/libc/arpa/inet.h
+share/frama-c/libc/assert.c
 share/frama-c/libc/assert.h
 share/frama-c/libc/byteswap.h
 share/frama-c/libc/complex.h
+share/frama-c/libc/ctype.c
 share/frama-c/libc/ctype.h
 share/frama-c/libc/dirent.h
 share/frama-c/libc/dlfcn.h
 share/frama-c/libc/endian.h
+share/frama-c/libc/errno.c
 share/frama-c/libc/errno.h
+share/frama-c/libc/fc_runtime.c
 share/frama-c/libc/fcntl.h
 share/frama-c/libc/features.h
+share/frama-c/libc/fenv.c
 share/frama-c/libc/fenv.h
 share/frama-c/libc/float.h
+share/frama-c/libc/fnmatch.h
+share/frama-c/libc/getopt.c
 share/frama-c/libc/getopt.h
+share/frama-c/libc/glob.c
 share/frama-c/libc/glob.h
 share/frama-c/libc/grp.h
 share/frama-c/libc/iconv.h
 share/frama-c/libc/ifaddrs.h
+share/frama-c/libc/inttypes.c
 share/frama-c/libc/inttypes.h
 share/frama-c/libc/iso646.h
 share/frama-c/libc/libgen.h
@@ -486,41 +669,65 @@ share/frama-c/libc/linux/if_addr.h
 share/frama-c/libc/linux/if_netlink.h
 share/frama-c/libc/linux/netlink.h
 share/frama-c/libc/linux/rtnetlink.h
+share/frama-c/libc/locale.c
 share/frama-c/libc/locale.h
+share/frama-c/libc/malloc.h
+share/frama-c/libc/math.c
 share/frama-c/libc/math.h
+share/frama-c/libc/memory.h
 share/frama-c/libc/net/
 share/frama-c/libc/net/if.h
+share/frama-c/libc/netdb.c
 share/frama-c/libc/netdb.h
 share/frama-c/libc/netinet/
 share/frama-c/libc/netinet/in.h
 share/frama-c/libc/netinet/in_systm.h
 share/frama-c/libc/netinet/ip.h
 share/frama-c/libc/netinet/ip_icmp.h
+share/frama-c/libc/netinet/tcp.h
 share/frama-c/libc/nl_types.h
+share/frama-c/libc/poll.h
+share/frama-c/libc/pthread.h
 share/frama-c/libc/pwd.h
 share/frama-c/libc/regex.h
+share/frama-c/libc/resolv.h
+share/frama-c/libc/sched.h
+share/frama-c/libc/semaphore.h
 share/frama-c/libc/setjmp.h
 share/frama-c/libc/signal.h
 share/frama-c/libc/stdarg.h
 share/frama-c/libc/stdbool.h
 share/frama-c/libc/stddef.h
 share/frama-c/libc/stdint.h
+share/frama-c/libc/stdio.c
 share/frama-c/libc/stdio.h
+share/frama-c/libc/stdlib.c
 share/frama-c/libc/stdlib.h
+share/frama-c/libc/string.c
 share/frama-c/libc/string.h
 share/frama-c/libc/strings.h
+share/frama-c/libc/stropts.h
 share/frama-c/libc/sys/
+share/frama-c/libc/sys/file.h
 share/frama-c/libc/sys/ioctl.h
+share/frama-c/libc/sys/ipc.h
+share/frama-c/libc/sys/mman.h
 share/frama-c/libc/sys/param.h
+share/frama-c/libc/sys/random.h
 share/frama-c/libc/sys/resource.h
 share/frama-c/libc/sys/select.h
+share/frama-c/libc/sys/shm.h
+share/frama-c/libc/sys/signal.h
 share/frama-c/libc/sys/socket.h
 share/frama-c/libc/sys/stat.h
 share/frama-c/libc/sys/sysctl.h
 share/frama-c/libc/sys/time.h
+share/frama-c/libc/sys/times.h
+share/frama-c/libc/sys/timex.h
 share/frama-c/libc/sys/types.h
 share/frama-c/libc/sys/uio.h
 share/frama-c/libc/sys/un.h
+share/frama-c/libc/sys/utsname.h
 share/frama-c/libc/sys/wait.h
 share/frama-c/libc/syslog.h
 share/frama-c/libc/termios.h
@@ -528,52 +735,73 @@ share/frama-c/libc/tgmath.h
 share/frama-c/libc/time.h
 share/frama-c/libc/uchar.h
 share/frama-c/libc/unistd.h
+share/frama-c/libc/utime.h
+share/frama-c/libc/utmpx.h
+share/frama-c/libc/wchar.c
 share/frama-c/libc/wchar.h
 share/frama-c/libc/wctype.h
-share/frama-c/machine.h
+share/frama-c/machdep.c
-share/frama-c/math.c
+share/frama-c/switch-off.png
-share/frama-c/math.h
+share/frama-c/switch-on.png
 share/frama-c/theme/
 share/frama-c/theme/colorblind/
 share/frama-c/theme/colorblind/considered_valid.png
+share/frama-c/theme/colorblind/fold.png
 share/frama-c/theme/colorblind/inconsistent.png
 share/frama-c/theme/colorblind/invalid_but_dead.png
 share/frama-c/theme/colorblind/invalid_under_hyp.png
 share/frama-c/theme/colorblind/never_tried.png
 share/frama-c/theme/colorblind/surely_invalid.png
 share/frama-c/theme/colorblind/surely_valid.png
-share/frama-c/theme/colorblind/switch-off.png
+share/frama-c/theme/colorblind/unfold.png
-share/frama-c/theme/colorblind/switch-on.png
 share/frama-c/theme/colorblind/unknown.png
 share/frama-c/theme/colorblind/unknown_but_dead.png
 share/frama-c/theme/colorblind/valid_but_dead.png
 share/frama-c/theme/colorblind/valid_under_hyp.png
 share/frama-c/theme/default/
 share/frama-c/theme/default/considered_valid.png
+share/frama-c/theme/default/fold.png
 share/frama-c/theme/default/inconsistent.png
 share/frama-c/theme/default/invalid_but_dead.png
 share/frama-c/theme/default/invalid_under_hyp.png
 share/frama-c/theme/default/never_tried.png
 share/frama-c/theme/default/surely_invalid.png
 share/frama-c/theme/default/surely_valid.png
-share/frama-c/theme/default/switch-off.png
+share/frama-c/theme/default/unfold.png
-share/frama-c/theme/default/switch-on.png
 share/frama-c/theme/default/unknown.png
 share/frama-c/theme/default/unknown_but_dead.png
 share/frama-c/theme/default/valid_but_dead.png
 share/frama-c/theme/default/valid_under_hyp.png
+share/frama-c/theme/flat/
+share/frama-c/theme/flat/considered_valid.png
+share/frama-c/theme/flat/fold.png
+share/frama-c/theme/flat/inconsistent.png
+share/frama-c/theme/flat/invalid_but_dead.png
+share/frama-c/theme/flat/invalid_under_hyp.png
+share/frama-c/theme/flat/never_tried.png
+share/frama-c/theme/flat/surely_invalid.png
+share/frama-c/theme/flat/surely_valid.png
+share/frama-c/theme/flat/unfold.png
+share/frama-c/theme/flat/unknown.png
+share/frama-c/theme/flat/unknown_but_dead.png
+share/frama-c/theme/flat/valid_but_dead.png
+share/frama-c/theme/flat/valid_under_hyp.png
 share/frama-c/unmark.png
 share/frama-c/wp/
 share/frama-c/wp/coqwp/
+share/frama-c/wp/coqwp/ArcTrigo.v
 share/frama-c/wp/coqwp/Bits.v
 share/frama-c/wp/coqwp/BuiltIn.v
 share/frama-c/wp/coqwp/Cbits.v
 share/frama-c/wp/coqwp/Cfloat.v
 share/frama-c/wp/coqwp/Cint.v
 share/frama-c/wp/coqwp/Cmath.v
+share/frama-c/wp/coqwp/ExpLog.v
 share/frama-c/wp/coqwp/Memory.v
 share/frama-c/wp/coqwp/Qed.v
 share/frama-c/wp/coqwp/Qedlib.v
+share/frama-c/wp/coqwp/Square.v
+share/frama-c/wp/coqwp/Vlist.v
 share/frama-c/wp/coqwp/Vset.v
 share/frama-c/wp/coqwp/Zbits.v
 share/frama-c/wp/coqwp/bool/
@@ -584,35 +812,52 @@ share/frama-c/wp/coqwp/int/ComputerDivision.v
 share/frama-c/wp/coqwp/int/Int.v
 share/frama-c/wp/coqwp/int/MinMax.v
 share/frama-c/wp/coqwp/map/
+share/frama-c/wp/coqwp/map/Const.v
 share/frama-c/wp/coqwp/map/Map.v
 share/frama-c/wp/coqwp/real/
 share/frama-c/wp/coqwp/real/Abs.v
+share/frama-c/wp/coqwp/real/ExpLog.v
 share/frama-c/wp/coqwp/real/FromInt.v
 share/frama-c/wp/coqwp/real/MinMax.v
+share/frama-c/wp/coqwp/real/PowerReal.v
 share/frama-c/wp/coqwp/real/Real.v
 share/frama-c/wp/coqwp/real/RealInfix.v
 share/frama-c/wp/coqwp/real/Square.v
+share/frama-c/wp/coqwp/real/Trigonometry.v
 share/frama-c/wp/ergo/
+share/frama-c/wp/ergo/ArcTrigo.mlw
 share/frama-c/wp/ergo/Cbits.mlw
 share/frama-c/wp/ergo/Cfloat.mlw
 share/frama-c/wp/ergo/Cint.mlw
 share/frama-c/wp/ergo/Cmath.mlw
+share/frama-c/wp/ergo/ExpLog.mlw
 share/frama-c/wp/ergo/Memory.mlw
 share/frama-c/wp/ergo/Qed.mlw
+share/frama-c/wp/ergo/Square.mlw
+share/frama-c/wp/ergo/Vlist.mlw
 share/frama-c/wp/ergo/Vset.mlw
 share/frama-c/wp/ergo/bool.Bool.mlw
 share/frama-c/wp/ergo/int.Abs.mlw
 share/frama-c/wp/ergo/int.ComputerDivision.mlw
 share/frama-c/wp/ergo/int.Int.mlw
 share/frama-c/wp/ergo/int.MinMax.mlw
+share/frama-c/wp/ergo/map.Const.mlw
 share/frama-c/wp/ergo/map.Map.mlw
 share/frama-c/wp/ergo/real.Abs.mlw
+share/frama-c/wp/ergo/real.ExpLog.mlw
 share/frama-c/wp/ergo/real.FromInt.mlw
+share/frama-c/wp/ergo/real.Hyperbolic.mlw
 share/frama-c/wp/ergo/real.MinMax.mlw
+share/frama-c/wp/ergo/real.Polar.mlw
+share/frama-c/wp/ergo/real.PowerReal.mlw
 share/frama-c/wp/ergo/real.Real.mlw
 share/frama-c/wp/ergo/real.RealInfix.mlw
 share/frama-c/wp/ergo/real.Square.mlw
+share/frama-c/wp/ergo/real.Trigonometry.mlw
+share/frama-c/wp/ergo/real.Truncate.mlw
 share/frama-c/wp/why3/
+share/frama-c/wp/why3/ArcTrigo.v
+share/frama-c/wp/why3/ArcTrigo.why
 share/frama-c/wp/why3/Bits.v
 share/frama-c/wp/why3/Cbits.v
 share/frama-c/wp/why3/Cbits.why
@@ -622,11 +867,17 @@ share/frama-c/wp/why3/Cint.v
 share/frama-c/wp/why3/Cint.why
 share/frama-c/wp/why3/Cmath.v
 share/frama-c/wp/why3/Cmath.why
+share/frama-c/wp/why3/ExpLog.v
+share/frama-c/wp/why3/ExpLog.why
 share/frama-c/wp/why3/Memory.v
 share/frama-c/wp/why3/Memory.why
 share/frama-c/wp/why3/Qed.v
 share/frama-c/wp/why3/Qed.why
 share/frama-c/wp/why3/Qedlib.v
+share/frama-c/wp/why3/Square.v
+share/frama-c/wp/why3/Square.why
+share/frama-c/wp/why3/Vlist.v
+share/frama-c/wp/why3/Vlist.why
 share/frama-c/wp/why3/Vset.v
 share/frama-c/wp/why3/Vset.why
 share/frama-c/wp/why3/Zbits.v

devel/ocaml-cppo/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2016/06/23 13:54:26 krw Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/04 12:51:12 chrisz Exp $
 
 COMMENT =	OCaml preprocessor
 CATEGORIES =	devel
 
-V =		1.3.2
+V =		1.6.5
 GH_ACCOUNT =	mjambon
 GH_PROJECT =	cppo
 GH_TAGNAME =	v${V}
@@ -18,23 +18,28 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c m
 MODULES =		lang/ocaml
 
-BUILD_DEPENDS =		sysutils/findlib devel/ocaml-ocamlbuild
+BUILD_DEPENDS =		devel/dune \
+			sysutils/findlib \
+			devel/ocaml-ocamlbuild
 
-USE_GMAKE =		Yes
+MAKE_ENV +=		BINDIR=${DESTDIR}${PREFIX}/bin
 
-.include <bsd.port.arch.mk>
+INST_DIR =		${WRKSRC}/_build/install/default
-.if ${PROPERTIES:Mocaml_native}
-ALL_TARGET =		ocamlbuild opt
-.else
-ALL_TARGET =		ocamlbuild all
-.endif
 
 
-post-install:
+do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-cppo
+	${INSTALL_SCRIPT} \
+		${INST_DIR}/bin/cppo \
+		${PREFIX}/bin/
+	${INSTALL_DATA_DIR} \
+		${PREFIX}/lib/ocaml/cppo_ocamlbuild \
+		${PREFIX}/share/doc/cppo
 	${INSTALL_DATA} \
-		${WRKSRC}/{Changes,README.md} \
+		${INST_DIR}/lib/cppo_ocamlbuild/{META,*.*} \
-		${PREFIX}/share/doc/ocaml-cppo
+		${PREFIX}/lib/ocaml/cppo_ocamlbuild/
+	${INSTALL_DATA} \
+		${INST_DIR}/doc/cppo/* \
+		${PREFIX}/share/doc/cppo/
 
 
 .include <bsd.port.mk>

devel/ocaml-cppo/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cppo-1.3.2.tar.gz) = xJ4wgLMyZGbH3dlxAMY71WgwGAKz5Izr6jQG4cp268g=
+SHA256 (cppo-1.6.5.tar.gz) = Dr/jJhA3oUyfU7Hesncq9F/aIxezsXdG8qZAA0sbdbY=
-SIZE (cppo-1.3.2.tar.gz) = 26332
+SIZE (cppo-1.6.5.tar.gz) = 28091

devel/ocaml-cppo/pkg/PFRAG.dynlink-native

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.dynlink-native,v 1.1 2016/06/23 13:54:26 krw Exp $
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.2 2019/03/04 12:51:13 chrisz Exp $
-@bin lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmxs
+lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs

devel/ocaml-cppo/pkg/PFRAG.native

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.native,v 1.1 2016/06/23 13:54:26 krw Exp $
+@comment $OpenBSD: PFRAG.native,v 1.2 2019/03/04 12:51:13 chrisz Exp $
 %%dynlink%%
-lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.a
+lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a
-lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmxa
+lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
+lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx

devel/ocaml-cppo/pkg/PLIST

@@ -1,10 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1 2016/06/23 13:54:26 krw Exp $
+@comment $OpenBSD: PLIST,v 1.2 2019/03/04 12:51:13 chrisz Exp $
 %%native%%
 @bin bin/cppo
 lib/ocaml/cppo_ocamlbuild/
 lib/ocaml/cppo_ocamlbuild/META
-lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cma
+lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma
 lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi
-share/doc/ocaml-cppo/
+lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt
-share/doc/ocaml-cppo/Changes
+lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti
-share/doc/ocaml-cppo/README.md
+lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml
+lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli
+share/doc/cppo/
+share/doc/cppo/LICENSE.md
+share/doc/cppo/README.md

devel/ocaml-dose/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2017/12/24 19:06:29 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2019/03/04 12:51:13 chrisz Exp $
 
 COMMENT =		software repository analysis in OCaml
 CATEGORIES =		devel
 
-VERSION =		3.3
+VERSION =		5.0.1
 DISTNAME =		dose3-${VERSION}
 PKGNAME =		ocaml-dose-${VERSION}
-REVISION =		5
 
 HOMEPAGE =		http://dose.gforge.inria.fr/
 
@@ -15,36 +14,30 @@ MAINTAINER =		Christopher Zimmermann <chrisz@openbsd.org>
 # LGPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-MASTER_SITES =		https://gforge.inria.fr/frs/download.php/file/34277/
+MASTER_SITES =		https://gforge.inria.fr/frs/download.php/file/36063/
 
 MODULES =		lang/ocaml
 
-WANTLIB =		c m
+WANTLIB =		c m pthread
-BUILD_DEPENDS =		sysutils/findlib \
+BUILD_DEPENDS =		devel/ocaml-cppo>=1.1.2 \
-			lang/ocaml-camlp4 \
+			sysutils/findlib \
 			devel/ounit \
 			devel/cudf,-ocaml \
-			devel/ocaml-extlib \
+			devel/ocaml-extlib>=1.7.0 \
 			devel/ocaml-graph>=1.8.7 \
-			devel/ocaml-pcre \
+			devel/ocaml-ocamlbuild \
-			devel/cudf,-main \
+			devel/ocaml-re
-			devel/ocaml-re \
-			devel/ocaml-ocamlbuild
 
 
-FAKE_FLAGS =		BINDIR=${WRKINST}/${PREFIX}/bin
-
 USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--with-ocamlgraph --with-oUnit
+CONFIGURE_ARGS =	--with-oUnit
+FAKE_FLAGS =		${DESTDIRNAME}=${DESTDIR}${TRUEPREFIX}
 
 #doc seems broken, needs texlive_texmf-full, graphviz and hevea
 ALL_TARGET =		all
 
 
-post-extract:
-	#rm ${WRKSRC}/doseparse/boilerplateNoRpm.ml
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/manpages/*.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/manpages/*.5 ${PREFIX}/man/man5

devel/ocaml-dose/distinfo

@@ -1,2 +1,2 @@
-SHA256 (dose3-3.3.tar.gz) = jcTa6bGoG7OkKrsoPfeFuj6wCt4psTh1ghxp8D4AaA4=
+SHA256 (dose3-5.0.1.tar.gz) = VYr5Kw7F3SGeZ4AslahQyrlYLfOBvd0s/kMQSarz2wM=
-SIZE (dose3-3.3.tar.gz) = 257658
+SIZE (dose3-5.0.1.tar.gz) = 297433

devel/ocaml-dose/patches/patch-Makefile

@@ -1,16 +1,20 @@
-$OpenBSD: patch-Makefile,v 1.2 2015/08/30 15:56:12 avsm Exp $
+$OpenBSD: patch-Makefile,v 1.3 2019/03/04 12:51:13 chrisz Exp $
---- Makefile.orig	Mon Aug  3 18:07:33 2015
+
-+++ Makefile	Mon Aug  3 18:07:38 2015
+BINDIR includes DESTDIR !!
-@@ -178,9 +178,9 @@ install: META installcudf
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -241,9 +241,9 @@ install: installlib
  	for f in $$(ls *.$(OCAMLEXT)) ; do \
- 	  install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLEXT)} ; \
+ 		install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLEXT)}$(EXE) ; \
  	done
--	@ln -s $(BINDIR)/distcheck $(BINDIR)/debcheck
+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/debcheck$(EXE)
--	@ln -s $(BINDIR)/distcheck $(BINDIR)/rpmcheck
+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/rpmcheck$(EXE)
--	@ln -s $(BINDIR)/distcheck $(BINDIR)/eclipsecheck
+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/eclipsecheck$(EXE)
-+	@ln $(BINDIR)/distcheck $(BINDIR)/debcheck
++	@cd $(BINDIR) && $(LN) distcheck debcheck$(EXE)
-+	@ln $(BINDIR)/distcheck $(BINDIR)/rpmcheck
++	@cd $(BINDIR) && $(LN) distcheck rpmcheck$(EXE)
-+	@ln $(BINDIR)/distcheck $(BINDIR)/eclipsecheck
++	@cd $(BINDIR) && $(LN) distcheck eclipsecheck$(EXE)
- 	@echo "Install dose librairies to $(LIBDIR)"
  	@echo "Install dose binaries to $(BINDIR)"
  
+ uninstalllib:

devel/ocaml-dose/patches/patch-common_criteria_lexer_mll

@@ -0,0 +1,27 @@
+$OpenBSD: patch-common_criteria_lexer_mll,v 1.1 2019/03/04 12:51:13 chrisz Exp $
+
+Index: common/criteria_lexer.mll
+--- common/criteria_lexer.mll.orig
++++ common/criteria_lexer.mll
+@@ -18,7 +18,7 @@
+     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
+     (* find the terminating delimiter *)
+     let endpos =
+-      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
++      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+       |Invalid_argument _ ->
+           raise (Format822.Syntax_error (
+             Format822.error lexbuf "String too short"))
+@@ -27,9 +27,9 @@
+             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
+     in
+     let len = endpos - (lexbuf.lex_start_pos + 3) in
+-    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+-    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
+-    s
++    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
++    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
++    Bytes.unsafe_to_string s
+ 
+ }
+ 

devel/ocaml-dose/patches/patch-configure

@@ -0,0 +1,11 @@
+$OpenBSD: patch-configure,v 1.1 2019/03/04 12:51:13 chrisz Exp $
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -6554,4 +6554,4 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
+ fi
+ 
+ 
+-make printconf
++$MAKE printconf

devel/ocaml-dose/pkg/PFRAG.dynlink-native

@@ -1,9 +1,11 @@
-@comment $OpenBSD: PFRAG.dynlink-native,v 1.2 2015/08/30 15:56:12 avsm Exp $
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.3 2019/03/04 12:51:13 chrisz Exp $
 @bin lib/ocaml/dose3/algo.cmxs
 @bin lib/ocaml/dose3/common.cmxs
 @bin lib/ocaml/dose3/csw.cmxs
 @bin lib/ocaml/dose3/debian.cmxs
-@bin lib/ocaml/dose3/eclipse.cmxs
-@bin lib/ocaml/dose3/doseparseNoRpm.cmxs
-@bin lib/ocaml/dose3/cv.cmxs
 @bin lib/ocaml/dose3/doseparse.cmxs
+@bin lib/ocaml/dose3/doseparseNoRpm.cmxs
+@bin lib/ocaml/dose3/npm.cmxs
+@bin lib/ocaml/dose3/opam.cmxs
+@bin lib/ocaml/dose3/pef.cmxs
+@bin lib/ocaml/dose3/versioning.cmxs

devel/ocaml-dose/pkg/PFRAG.native

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.native,v 1.2 2015/08/30 15:56:12 avsm Exp $
+@comment $OpenBSD: PFRAG.native,v 1.3 2019/03/04 12:51:13 chrisz Exp $
 %%dynlink%%
 lib/ocaml/dose3/algo.a
 lib/ocaml/dose3/algo.cmxa
@@ -8,11 +8,15 @@ lib/ocaml/dose3/csw.a
 lib/ocaml/dose3/csw.cmxa
 lib/ocaml/dose3/debian.a
 lib/ocaml/dose3/debian.cmxa
-lib/ocaml/dose3/eclipse.a
-lib/ocaml/dose3/eclipse.cmxa
-lib/ocaml/dose3/cv.cmxa
-lib/ocaml/dose3/cv.a
-lib/ocaml/dose3/doseparse.cmxa
 lib/ocaml/dose3/doseparse.a
-lib/ocaml/dose3/doseparseNoRpm.cmxa
+lib/ocaml/dose3/doseparse.cmxa
 lib/ocaml/dose3/doseparseNoRpm.a
+lib/ocaml/dose3/doseparseNoRpm.cmxa
+lib/ocaml/dose3/npm.a
+lib/ocaml/dose3/npm.cmxa
+lib/ocaml/dose3/opam.a
+lib/ocaml/dose3/opam.cmxa
+lib/ocaml/dose3/pef.a
+lib/ocaml/dose3/pef.cmxa
+lib/ocaml/dose3/versioning.a
+lib/ocaml/dose3/versioning.cmxa

devel/ocaml-dose/pkg/PLIST

@@ -1,54 +1,41 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/08/30 15:56:12 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/03/04 12:51:13 chrisz Exp $
 %%native%%
 @bin bin/apt-cudf
 @bin bin/ceve
 @bin bin/challenged
 @bin bin/deb-buildcheck
 @bin bin/deb-coinstall
-@bin bin/debcheck
+bin/debcheck
 @bin bin/distcheck
-@bin bin/dominators-graph
+bin/eclipsecheck
-@bin bin/eclipsecheck
 @bin bin/outdated
-@bin bin/rpmcheck
+bin/rpmcheck
-@bin bin/smallworld
-@bin bin/strong-deps
 lib/ocaml/dose3/
 lib/ocaml/dose3/META
 lib/ocaml/dose3/algo.cma
 lib/ocaml/dose3/algo.cmi
-lib/ocaml/dose3/architecture.mli
 lib/ocaml/dose3/common.cma
 lib/ocaml/dose3/common.cmi
 lib/ocaml/dose3/csw.cma
 lib/ocaml/dose3/csw.cmi
-lib/ocaml/dose3/cudfAdd.mli
-lib/ocaml/dose3/cv.cma
-lib/ocaml/dose3/cv.cmi
-lib/ocaml/dose3/debcudf.mli
 lib/ocaml/dose3/debian.cma
 lib/ocaml/dose3/debian.cmi
-lib/ocaml/dose3/depsolver.mli
-lib/ocaml/dose3/diagnostic.mli
 lib/ocaml/dose3/doseparse.cma
 lib/ocaml/dose3/doseparse.cmi
 lib/ocaml/dose3/doseparseNoRpm.cma
 lib/ocaml/dose3/doseparseNoRpm.cmi
-lib/ocaml/dose3/eclipse.cma
+lib/ocaml/dose3/npm.cma
-lib/ocaml/dose3/eclipse.cmi
+lib/ocaml/dose3/npm.cmi
-lib/ocaml/dose3/edosSolver.mli
+lib/ocaml/dose3/opam.cma
-lib/ocaml/dose3/format822_parser.mli
+lib/ocaml/dose3/opam.cmi
-lib/ocaml/dose3/input.mli
+lib/ocaml/dose3/pef.cma
-lib/ocaml/dose3/packages_parser.mli
+lib/ocaml/dose3/pef.cmi
-lib/ocaml/dose3/release.mli
+lib/ocaml/dose3/versioning.cma
-lib/ocaml/dose3/strongdeps.mli
+lib/ocaml/dose3/versioning.cmi
-lib/ocaml/dose3/url.mli
-lib/ocaml/dose3/util.mli
-lib/ocaml/dose3/version.mli
 @man man/man1/apt-cudf.1
-@man man/man1/buildcheck.1
 @man man/man1/ceve.1
 @man man/man1/challenged.1
+@man man/man1/deb-buildcheck.1
 @man man/man1/debcoinstall.1
 @man man/man1/distcheck.1
 @man man/man1/outdated.1

devel/ocaml-jsonm/Makefile

@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2016/06/23 19:23:53 krw Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/04 12:51:13 chrisz Exp $
 
 COMMENT =	non-blocking streaming JSON codec
 CATEGORIES =	devel
 
-V =		0.9.1
+V =		1.0.1
 NAME =		jsonm
 DISTNAME =	${NAME}-${V}
 EXTRACT_SUFX =	.tbz
 PKGNAME =	ocaml-${DISTNAME}
 MASTER_SITES =	http://erratique.ch/software/${NAME}/releases/
-REVISION =      2
 
 HOMEPAGE =	http://erratique.ch/software/${NAME}
 
@@ -19,23 +18,37 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 MODULES =		lang/ocaml
 
-WANTLIB +=		c m
-
 RUN_DEPENDS =		devel/ocaml-uutf
-BUILD_DEPENDS =		devel/ocaml-uutf devel/ocaml-ocamlbuild
+BUILD_DEPENDS =		devel/ocaml-uutf \
-
+			devel/ocaml-ocamlbuild \
-CONFIGURE_STYLE =	oasis
+			sysutils/findlib
-
-ALL_TARGET =		-build
 
 
-post-install:
+ALL_TARGET =	${NAME}.{cma,cmi,mli}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${NAME}
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mocaml_native}
+ALL_TARGET +=	${NAME}.{a,cmx,cmxa}
+.if ${PROPERTIES:Mocaml_native_dynlink}
+ALL_TARGET +=	${NAME}.cmxs
+.endif
+.endif
+
+
+do-build:
+	cd ${WRKSRC} && ocamlbuild -use-ocamlfind \
+		${ALL_TARGET} doc/api.docdir/index.html
+
+do-install:
+	env -i ${MAKE_ENV} ocamlfind install ${NAME} \
+		${WRKSRC}/pkg/META \
+		${ALL_TARGET:S|^|${WRKSRC}/_build/src/|}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${NAME}/api
-	${INSTALL_DATA} ${WRKDIST}/doc/* \
+	${INSTALL_DATA} \
-		${PREFIX}/share/doc/ocaml-${NAME}/api/
+		${WRKSRC}/*.md \
-	${INSTALL_DATA} ${WRKDIST}/{CHANGES,README} \
 		${PREFIX}/share/doc/ocaml-${NAME}/
+	${INSTALL_DATA} \
+		${WRKSRC}/_build/doc/api.docdir/* \
+		${PREFIX}/share/doc/ocaml-${NAME}/api/
 
 
 .include <bsd.port.mk>

devel/ocaml-jsonm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (jsonm-0.9.1.tbz) = P9TcoEXYIzLahH5l6YHYtQSINXHSmaP35xRH1GvGX3M=
+SHA256 (jsonm-1.0.1.tbz) = PAlWLtQ7YX2LbZUiokn/dwIo59ben5UIty6E1Str5oQ=
-SIZE (jsonm-0.9.1.tbz) = 64843
+SIZE (jsonm-1.0.1.tbz) = 21608

devel/ocaml-jsonm/pkg/PLIST

@@ -1,25 +1,26 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/10/25 17:01:23 chrisz Exp $
+@comment $OpenBSD: PLIST,v 1.2 2019/03/04 12:51:13 chrisz Exp $
 %%native%%
-@bin bin/jsontrip
-@bin bin/ocamltweets
 lib/ocaml/jsonm/
 lib/ocaml/jsonm/META
 lib/ocaml/jsonm/jsonm.cma
 lib/ocaml/jsonm/jsonm.cmi
 lib/ocaml/jsonm/jsonm.mli
 share/doc/ocaml-jsonm/
-share/doc/ocaml-jsonm/CHANGES
+share/doc/ocaml-jsonm/CHANGES.md
-share/doc/ocaml-jsonm/README
+share/doc/ocaml-jsonm/LICENSE.md
+share/doc/ocaml-jsonm/README.md
+share/doc/ocaml-jsonm/TODO.md
 share/doc/ocaml-jsonm/api/
 share/doc/ocaml-jsonm/api/Jsonm.Manual.html
 share/doc/ocaml-jsonm/api/Jsonm.Uncut.html
 share/doc/ocaml-jsonm/api/Jsonm.html
-share/doc/ocaml-jsonm/api/api.odocl
+share/doc/ocaml-jsonm/api/html.stamp
 share/doc/ocaml-jsonm/api/index.html
 share/doc/ocaml-jsonm/api/index_attributes.html
 share/doc/ocaml-jsonm/api/index_class_types.html
 share/doc/ocaml-jsonm/api/index_classes.html
 share/doc/ocaml-jsonm/api/index_exceptions.html
+share/doc/ocaml-jsonm/api/index_extensions.html
 share/doc/ocaml-jsonm/api/index_methods.html
 share/doc/ocaml-jsonm/api/index_module_types.html
 share/doc/ocaml-jsonm/api/index_modules.html

devel/ocaml-menhir/Makefile

@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.11 2018/10/27 01:34:16 daniel Exp $
+# $OpenBSD: Makefile,v 1.12 2019/03/04 12:51:13 chrisz Exp $
 
 COMMENT =		OCaml parser generator for LR(1) grammars
 
-DISTNAME =		menhir-20180905
+V =			20181113
+DISTNAME =		menhir-${V}
 PKGNAME =		ocaml-${DISTNAME}
 
-MASTER_SITES =		http://cristal.inria.fr/~fpottier/menhir/
+MASTER_SITES =		https://gitlab.inria.fr/fpottier/menhir/-/archive/${V}/
 
 HOMEPAGE =		http://cristal.inria.fr/~fpottier/menhir/
 CATEGORIES =		devel
@@ -15,7 +16,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =		lang/ocaml
 
-WANTLIB =		c m
+WANTLIB =		c m pthread
 BUILD_DEPENDS =		sysutils/findlib devel/ocaml-ocamlbuild
 
 USE_GMAKE =		Yes

devel/ocaml-menhir/distinfo

@@ -1,2 +1,2 @@
-SHA256 (menhir-20180905.tar.gz) = gvN2cpDjm/HOPiYM089IYpWJHVc1HNzK7caRkAB0Z1A=
+SHA256 (menhir-20181113.tar.gz) = OHj4dyYgvRPwjqLDZ8D2CxB40lY81HEVd++v/EVQoXY=
-SIZE (menhir-20180905.tar.gz) = 995363
+SIZE (menhir-20181113.tar.gz) = 1028432

devel/ocaml-menhir/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/10/27 01:34:16 daniel Exp $
+@comment $OpenBSD: PLIST,v 1.9 2019/03/04 12:51:13 chrisz Exp $
 %%native%%
 @bin bin/menhir
 lib/ocaml/menhirLib/
@@ -16,21 +16,44 @@ share/doc/ocaml-menhir/
 share/doc/ocaml-menhir/demos/
 share/doc/ocaml-menhir/demos/Makefile
 share/doc/ocaml-menhir/demos/calc/
+share/doc/ocaml-menhir/demos/calc-alias/
+share/doc/ocaml-menhir/demos/calc-alias/.gitignore
+share/doc/ocaml-menhir/demos/calc-alias/.merlin
+share/doc/ocaml-menhir/demos/calc-alias/Makefile
+share/doc/ocaml-menhir/demos/calc-alias/README
+share/doc/ocaml-menhir/demos/calc-alias/calc.ml
+share/doc/ocaml-menhir/demos/calc-alias/lexer.mll
+share/doc/ocaml-menhir/demos/calc-alias/parser.mly
+share/doc/ocaml-menhir/demos/calc-ast-dune/
+share/doc/ocaml-menhir/demos/calc-ast-dune/.gitignore
+share/doc/ocaml-menhir/demos/calc-ast-dune/Makefile
+share/doc/ocaml-menhir/demos/calc-ast-dune/README.md
+share/doc/ocaml-menhir/demos/calc-ast-dune/calc.ml
+share/doc/ocaml-menhir/demos/calc-ast-dune/dune
+share/doc/ocaml-menhir/demos/calc-ast-dune/dune-project
+share/doc/ocaml-menhir/demos/calc-ast-dune/lexer.mll
+share/doc/ocaml-menhir/demos/calc-ast-dune/parser.mly
+share/doc/ocaml-menhir/demos/calc-ast-dune/syntax.ml
 share/doc/ocaml-menhir/demos/calc-dune/
+share/doc/ocaml-menhir/demos/calc-dune/.gitignore
 share/doc/ocaml-menhir/demos/calc-dune/Makefile
-share/doc/ocaml-menhir/demos/calc-dune/README
+share/doc/ocaml-menhir/demos/calc-dune/README.md
 share/doc/ocaml-menhir/demos/calc-dune/calc.ml
-share/doc/ocaml-menhir/demos/calc-dune/jbuild
+share/doc/ocaml-menhir/demos/calc-dune/dune
+share/doc/ocaml-menhir/demos/calc-dune/dune-project
 share/doc/ocaml-menhir/demos/calc-dune/lexer.mll
 share/doc/ocaml-menhir/demos/calc-dune/parser.mly
 share/doc/ocaml-menhir/demos/calc-incremental/
 share/doc/ocaml-menhir/demos/calc-incremental-dune/
+share/doc/ocaml-menhir/demos/calc-incremental-dune/.gitignore
 share/doc/ocaml-menhir/demos/calc-incremental-dune/Makefile
-share/doc/ocaml-menhir/demos/calc-incremental-dune/README
+share/doc/ocaml-menhir/demos/calc-incremental-dune/README.md
 share/doc/ocaml-menhir/demos/calc-incremental-dune/calc.ml
-share/doc/ocaml-menhir/demos/calc-incremental-dune/jbuild
+share/doc/ocaml-menhir/demos/calc-incremental-dune/dune
+share/doc/ocaml-menhir/demos/calc-incremental-dune/dune-project
 share/doc/ocaml-menhir/demos/calc-incremental-dune/lexer.mll
 share/doc/ocaml-menhir/demos/calc-incremental-dune/parser.mly
+share/doc/ocaml-menhir/demos/calc-incremental/.gitignore
 share/doc/ocaml-menhir/demos/calc-incremental/.merlin
 share/doc/ocaml-menhir/demos/calc-incremental/Makefile
 share/doc/ocaml-menhir/demos/calc-incremental/README
@@ -39,6 +62,7 @@ share/doc/ocaml-menhir/demos/calc-incremental/lexer.mll
 share/doc/ocaml-menhir/demos/calc-incremental/parser.mly
 share/doc/ocaml-menhir/demos/calc-inspection/
 share/doc/ocaml-menhir/demos/calc-inspection-dune/
+share/doc/ocaml-menhir/demos/calc-inspection-dune/.gitignore
 share/doc/ocaml-menhir/demos/calc-inspection-dune/CalcErrorReporting.ml
 share/doc/ocaml-menhir/demos/calc-inspection-dune/CalcErrorReporting.mli
 share/doc/ocaml-menhir/demos/calc-inspection-dune/CalcPrinters.ml
@@ -48,9 +72,11 @@ share/doc/ocaml-menhir/demos/calc-inspection-dune/ErrorReporting.mli
 share/doc/ocaml-menhir/demos/calc-inspection-dune/Makefile
 share/doc/ocaml-menhir/demos/calc-inspection-dune/README
 share/doc/ocaml-menhir/demos/calc-inspection-dune/calc.ml
-share/doc/ocaml-menhir/demos/calc-inspection-dune/jbuild
+share/doc/ocaml-menhir/demos/calc-inspection-dune/dune
+share/doc/ocaml-menhir/demos/calc-inspection-dune/dune-project
 share/doc/ocaml-menhir/demos/calc-inspection-dune/lexer.mll
 share/doc/ocaml-menhir/demos/calc-inspection-dune/parser.mly
+share/doc/ocaml-menhir/demos/calc-inspection/.gitignore
 share/doc/ocaml-menhir/demos/calc-inspection/.merlin
 share/doc/ocaml-menhir/demos/calc-inspection/CalcErrorReporting.ml
 share/doc/ocaml-menhir/demos/calc-inspection/CalcErrorReporting.mli
@@ -63,15 +89,27 @@ share/doc/ocaml-menhir/demos/calc-inspection/README
 share/doc/ocaml-menhir/demos/calc-inspection/calc.ml
 share/doc/ocaml-menhir/demos/calc-inspection/lexer.mll
 share/doc/ocaml-menhir/demos/calc-inspection/parser.mly
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/.gitignore
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/Makefile
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/README.md
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/calc.ml
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/dune
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/dune-project
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/lexer.mll
+share/doc/ocaml-menhir/demos/calc-new-syntax-dune/parser.mly
 share/doc/ocaml-menhir/demos/calc-param/
 share/doc/ocaml-menhir/demos/calc-param-dune/
+share/doc/ocaml-menhir/demos/calc-param-dune/.gitignore
 share/doc/ocaml-menhir/demos/calc-param-dune/Makefile
 share/doc/ocaml-menhir/demos/calc-param-dune/README
 share/doc/ocaml-menhir/demos/calc-param-dune/calc.ml
-share/doc/ocaml-menhir/demos/calc-param-dune/jbuild
+share/doc/ocaml-menhir/demos/calc-param-dune/dune
+share/doc/ocaml-menhir/demos/calc-param-dune/dune-project
 share/doc/ocaml-menhir/demos/calc-param-dune/lexer.mll
 share/doc/ocaml-menhir/demos/calc-param-dune/parser.mly
 share/doc/ocaml-menhir/demos/calc-param-dune/tokens.mly
+share/doc/ocaml-menhir/demos/calc-param/.gitignore
 share/doc/ocaml-menhir/demos/calc-param/.merlin
 share/doc/ocaml-menhir/demos/calc-param/Makefile
 share/doc/ocaml-menhir/demos/calc-param/README
@@ -85,18 +123,21 @@ share/doc/ocaml-menhir/demos/calc-param/tokens.mly
 share/doc/ocaml-menhir/demos/calc-param/tokens.mlypack
 share/doc/ocaml-menhir/demos/calc-two/
 share/doc/ocaml-menhir/demos/calc-two-dune/
+share/doc/ocaml-menhir/demos/calc-two-dune/.gitignore
 share/doc/ocaml-menhir/demos/calc-two-dune/Makefile
 share/doc/ocaml-menhir/demos/calc-two-dune/README
 share/doc/ocaml-menhir/demos/calc-two-dune/algebraic.mly
 share/doc/ocaml-menhir/demos/calc-two-dune/algebraic.mlypack
 share/doc/ocaml-menhir/demos/calc-two-dune/calc.ml
 share/doc/ocaml-menhir/demos/calc-two-dune/common.mly
-share/doc/ocaml-menhir/demos/calc-two-dune/jbuild
+share/doc/ocaml-menhir/demos/calc-two-dune/dune
+share/doc/ocaml-menhir/demos/calc-two-dune/dune-project
 share/doc/ocaml-menhir/demos/calc-two-dune/lexer.mll
 share/doc/ocaml-menhir/demos/calc-two-dune/reverse.mly
 share/doc/ocaml-menhir/demos/calc-two-dune/reverse.mlypack
 share/doc/ocaml-menhir/demos/calc-two-dune/tokens.mly
 share/doc/ocaml-menhir/demos/calc-two-dune/tokens.mlypack
+share/doc/ocaml-menhir/demos/calc-two/.gitignore
 share/doc/ocaml-menhir/demos/calc-two/.merlin
 share/doc/ocaml-menhir/demos/calc-two/Makefile
 share/doc/ocaml-menhir/demos/calc-two/README
@@ -111,19 +152,22 @@ share/doc/ocaml-menhir/demos/calc-two/reverse.mly
 share/doc/ocaml-menhir/demos/calc-two/reverse.mlypack
 share/doc/ocaml-menhir/demos/calc-two/tokens.mly
 share/doc/ocaml-menhir/demos/calc-two/tokens.mlypack
+share/doc/ocaml-menhir/demos/calc/.gitignore
 share/doc/ocaml-menhir/demos/calc/.merlin
 share/doc/ocaml-menhir/demos/calc/Makefile
 share/doc/ocaml-menhir/demos/calc/README
 share/doc/ocaml-menhir/demos/calc/calc.ml
 share/doc/ocaml-menhir/demos/calc/lexer.mll
 share/doc/ocaml-menhir/demos/calc/parser.mly
-share/doc/ocaml-menhir/demos/find-menhir.sh
 share/doc/ocaml-menhir/demos/generate-printers/
 share/doc/ocaml-menhir/demos/generate-printers-dune/
+share/doc/ocaml-menhir/demos/generate-printers-dune/.gitignore
 share/doc/ocaml-menhir/demos/generate-printers-dune/Makefile
 share/doc/ocaml-menhir/demos/generate-printers-dune/README.md
+share/doc/ocaml-menhir/demos/generate-printers-dune/dune
+share/doc/ocaml-menhir/demos/generate-printers-dune/dune-project
 share/doc/ocaml-menhir/demos/generate-printers-dune/generate.ml
-share/doc/ocaml-menhir/demos/generate-printers-dune/jbuild
+share/doc/ocaml-menhir/demos/generate-printers/.gitignore
 share/doc/ocaml-menhir/demos/generate-printers/.merlin
 share/doc/ocaml-menhir/demos/generate-printers/Makefile
 share/doc/ocaml-menhir/demos/generate-printers/README.md
@@ -136,5 +180,8 @@ share/doc/ocaml-menhir/demos/obsolete/Makefile.shared
 share/doc/ocaml-menhir/demos/obsolete/ocamldep.wrapper
 share/doc/ocaml-menhir/manual.html
 share/doc/ocaml-menhir/manual.pdf
+share/doc/ocaml-menhir/manual001.png
+share/doc/ocaml-menhir/manual002.png
+share/doc/ocaml-menhir/manual003.png
 share/menhir/
 share/menhir/standard.mly

devel/ocaml-ocamlbuild/Makefile

@@ -1,19 +1,18 @@
-# $OpenBSD: Makefile,v 1.3 2017/06/08 13:43:24 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/04 12:51:13 chrisz Exp $
 
 COMMENT =	ocamlbuild
 CATEGORIES =	devel
 
-V =		0.9.2
+V =		0.12.0
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	ocamlbuild
 GH_TAGNAME =	${V}
 DISTNAME =	${GH_PROJECT}-${V}
-REVISION =	1
 
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c m
+WANTLIB += c m pthread
 
 MODULES =		lang/ocaml
 

devel/ocaml-ocamlbuild/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ocamlbuild-0.9.2.tar.gz) = JXo5YdoapH3rPejaI46+Ha8Tpz7+8iKPl6BkqQ+Rxrw=
+SHA256 (ocamlbuild-0.12.0.tar.gz) = 2d5WqpYfWFiWhEskxvdpWp562dACY/3+UKF/OLE7nOE=
-SIZE (ocamlbuild-0.9.2.tar.gz) = 163014
+SIZE (ocamlbuild-0.12.0.tar.gz) = 197030

devel/ocaml-ocamlbuild/patches/patch-configure_make

@@ -1,6 +1,7 @@
---- configure.make.orig	Fri Jun 10 15:45:34 2016
+Index: configure.make
-+++ configure.make	Fri Jun 10 15:46:12 2016
+--- configure.make.orig
-@@ -17,13 +17,8 @@
++++ configure.make
+@@ -18,16 +18,9 @@ OCAML_MANDIR = $(MANDIR)
  # OCAMLBUILD_* variables.
  
  OCAMLBUILD_PREFIX ?= $(PREFIX)
@@ -10,9 +11,13 @@
 -OCAMLBUILD_LIBDIR ?= \
 -  $(or $(shell opam config var lib 2>/dev/null),\
 -       $(shell ocamlfind printconf destdir 2>/dev/null),\
--       $(LIBDIR))
+-       $(OCAML_LIBDIR))
+-OCAMLBUILD_MANDIR ?= \
+-  $(or $(shell opam config var man 2>/dev/null),\
+-       $(OCAML_MANDIR))
 +OCAMLBUILD_BINDIR ?= $(BINDIR)
 +OCAMLBUILD_LIBDIR ?= $(LIBDIR)
++OCAMLBUILD_MANDIR ?= $(MANDIR)
  
  # It is important to distinguish OCAML_LIBDIR, which points to the
  # directory of the ocaml compiler distribution, and OCAMLBUILD_LIBDIR,

devel/ocaml-ocamlbuild/pkg/PFRAG.native

@@ -1,13 +1,13 @@
-@comment $OpenBSD: PFRAG.native,v 1.1 2016/06/23 13:54:25 krw Exp $
+@comment $OpenBSD: PFRAG.native,v 1.2 2019/03/04 12:51:13 chrisz Exp $
 @bin bin/ocamlbuild.native
-lib/ocaml/ocamlbuild/ocamlbuild.o
 lib/ocaml/ocamlbuild/ocamlbuild.cmx
-lib/ocaml/ocamlbuild/ocamlbuild_executor.o
+lib/ocaml/ocamlbuild/ocamlbuild.o
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
-lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
+lib/ocaml/ocamlbuild/ocamlbuild_executor.o
-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
-lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
 lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
 lib/ocaml/ocamlbuild/ocamlbuildlib.a
 lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa

devel/ocaml-ocamlbuild/pkg/PLIST

@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1 2016/06/23 13:54:25 krw Exp $
+@comment $OpenBSD: PLIST,v 1.2 2019/03/04 12:51:13 chrisz Exp $
 %%native%%
 @bin bin/ocamlbuild
-@bin bin/ocamlbuild.byte
+bin/ocamlbuild.byte
 lib/ocaml/ocamlbuild/
 lib/ocaml/ocamlbuild/META
 lib/ocaml/ocamlbuild/ocamlbuild.cmo
@@ -10,5 +10,7 @@ lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
 lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
 lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
 lib/ocaml/ocamlbuild/ocamlbuildlib.cma
+lib/ocaml/ocamlbuild/signatures.cmi
+lib/ocaml/ocamlbuild/signatures.cmti
 lib/ocaml/ocamlbuild/signatures.mli
 @man man/man1/ocamlbuild.1

devel/ocaml-parmap/Makefile

@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.7 2016/06/26 14:15:26 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/04 12:51:14 chrisz Exp $
 
 COMMENT =	OCaml parallel map primitive for multicores
 CATEGORIES =	devel
 
-V =		1.0-rc7
+V =		1.0-rc9
 NAME =		ocaml-parmap
 DISTNAME =	ocaml-parmap-$V
 DISTFILES =	${DISTNAME}{$V}.tar.gz
 WRKDIST =	${WRKDIR}/parmap-$V
 PKGNAME =	ocaml-parmap-${V:S/-//}
-REVISION =	2
 MASTER_SITES =	https://github.com/rdicosmo/parmap/archive/
 
 HOMEPAGE =	https://github.com/rdicosmo/parmap
@@ -28,7 +27,5 @@ FAKE_FLAGS =	DESTDIR=${WRKINST}${TRUEPREFIX}
 TEST_TARGET =	tests
 TEST_DEPENDS =	${BASE_PKGPATH}
 
-post-patch:
-	cp ${WRKSRC}/setcore.mli ${WRKSRC}/setcore.ml
 
 .include <bsd.port.mk>

devel/ocaml-parmap/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ocaml-parmap-1.0-rc7.tar.gz) = uZPUe4uOU0KDm4UbRqulImS0+MUn2wjzEk7Xp95+GRI=
+SHA256 (ocaml-parmap-1.0-rc9.tar.gz) = i8zbJp6VW3rmq5gRF7/mSr8PgyeI5BOMebgzhcnJ4Wo=
-SIZE (ocaml-parmap-1.0-rc7.tar.gz) = 97799
+SIZE (ocaml-parmap-1.0-rc9.tar.gz) = 99394

devel/ocaml-parmap/pkg/PFRAG.native

@@ -1,7 +1,8 @@
-@comment $OpenBSD: PFRAG.native,v 1.2 2016/06/24 15:59:12 krw Exp $
+@comment $OpenBSD: PFRAG.native,v 1.3 2019/03/04 12:51:14 chrisz Exp $
 %%dynlink%%
-lib/ocaml/parmap/parmap.a
 lib/ocaml/parmap/bytearray.cmx
+lib/ocaml/parmap/myocamlbuild.cmx
+lib/ocaml/parmap/parmap.a
 lib/ocaml/parmap/parmap.cmx
 lib/ocaml/parmap/parmap.cmxa
 lib/ocaml/parmap/parmap_utils.cmx

devel/ocaml-parmap/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/03/29 11:27:00 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2019/03/04 12:51:14 chrisz Exp $
 %%native%%
 lib/ocaml/parmap/
 lib/ocaml/parmap/META
@@ -11,7 +11,6 @@ lib/ocaml/parmap/parmap.mli
 lib/ocaml/parmap/parmap_utils.cmi
 lib/ocaml/parmap/parmap_utils.mli
 lib/ocaml/parmap/setcore.cmi
-lib/ocaml/parmap/setcore.mli
 lib/ocaml/stublibs/dllparmap_stubs.so
 @comment lib/ocaml/stublibs/dllparmap_stubs.so.owner
 @man man/man3/Parmap.3o

devel/ocaml-re/Makefile

@@ -1,29 +1,35 @@
-# $OpenBSD: Makefile,v 1.5 2016/06/23 19:23:53 krw Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/04 12:51:14 chrisz Exp $
 
 COMMENT =	regular expression library for OCaml
 CATEGORIES =	devel
 
-V =		1.4.1
+V =		1.8.0
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	ocaml-re
-GH_TAGNAME =	${GH_PROJECT}-${V}
+GH_TAGNAME =	${V}
 DISTNAME =	${GH_PROJECT}-${V}
-REVISION =	0
 
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =		lang/ocaml
 
-USE_GMAKE =		Yes
+#USE_GMAKE =		Yes
-CONFIGURE_STYLE =	oasis
+BUILD_DEPENDS =         devel/dune \
-CONFIGURE_ARGS =	--enable-tests
+			devel/ounit
-BUILD_DEPENDS =         devel/ounit devel/ocaml-ocamlbuild
 
 
-post-install:
+do-install:
+	cd ${WRKSRC}/_build/install/default/lib && \
+	  for dir in `find . -type d`; do \
+	    ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/$$dir; \
+          done && \
+	  for file in `find . -not -type d -and -not -iname \*.ml -and -not -iname \*dune\*` ; do \
+	    ${INSTALL_DATA} $$file ${PREFIX}/lib/ocaml/$$file; \
+	  done
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-re
 	${INSTALL_DATA} \
-		${WRKSRC}/{CHANGES,README.md,TODO.txt} \
+		${WRKSRC}/_build/install/default/doc/re/* \
 		${PREFIX}/share/doc/ocaml-re/
 
 

devel/ocaml-re/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ocaml-re-1.4.1.tar.gz) = JiVUMJ1kX0EmoqLiHjp5jSUCkyZP2jTWJxJDzGwW5XY=
+SHA256 (ocaml-re-1.8.0.tar.gz) = DeIsevbAqNqqdLqyk2p+CWPbFi1uZLq+Nl2Vb3IFq90=
-SIZE (ocaml-re-1.4.1.tar.gz) = 99877
+SIZE (ocaml-re-1.8.0.tar.gz) = 81774

devel/ocaml-re/patches/patch-lib_jbuild

@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_jbuild,v 1.1 2019/03/04 12:51:14 chrisz Exp $
+
+only needed for OCaml < 4.07
+
+Index: lib/jbuild
+--- lib/jbuild.orig
++++ lib/jbuild
+@@ -3,5 +3,4 @@
+ (library
+  ((name re)
+   (synopsis "Pure OCaml regular expression library")
+-  (libraries (seq))
+   (public_name re)))

devel/ocaml-re/pkg/PFRAG.dynlink-native

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PFRAG.dynlink-native,v 1.1.1.1 2014/10/25 16:59:17 chrisz Exp $
+@comment $OpenBSD: PFRAG.dynlink-native,v 1.2 2019/03/04 12:51:14 chrisz Exp $
-@bin lib/ocaml/re/re.cmxs
+lib/ocaml/re/emacs/re_emacs.cmxs
-@bin lib/ocaml/re/re_emacs.cmxs
+lib/ocaml/re/glob/re_glob.cmxs
-@bin lib/ocaml/re/re_glob.cmxs
+lib/ocaml/re/pcre/re_pcre.cmxs
-@bin lib/ocaml/re/re_pcre.cmxs
+lib/ocaml/re/perl/re_perl.cmxs
-@bin lib/ocaml/re/re_perl.cmxs
+lib/ocaml/re/posix/re_posix.cmxs
-@bin lib/ocaml/re/re_posix.cmxs
+lib/ocaml/re/re.cmxs
-@bin lib/ocaml/re/re_str.cmxs
+lib/ocaml/re/str/re_str.cmxs

devel/ocaml-re/pkg/PFRAG.native

@@ -1,25 +1,36 @@
-@comment $OpenBSD: PFRAG.native,v 1.2 2015/08/30 16:03:42 avsm Exp $
+@comment $OpenBSD: PFRAG.native,v 1.3 2019/03/04 12:51:14 chrisz Exp $
 %%dynlink%%
+lib/ocaml/re/emacs/re_emacs.a
+lib/ocaml/re/emacs/re_emacs.cmx
+lib/ocaml/re/emacs/re_emacs.cmxa
+lib/ocaml/re/glob/re_glob.a
+lib/ocaml/re/glob/re_glob.cmx
+lib/ocaml/re/glob/re_glob.cmxa
+lib/ocaml/re/pcre/re_pcre.a
+lib/ocaml/re/pcre/re_pcre.cmx
+lib/ocaml/re/pcre/re_pcre.cmxa
+lib/ocaml/re/perl/re_perl.a
+lib/ocaml/re/perl/re_perl.cmx
+lib/ocaml/re/perl/re_perl.cmxa
+lib/ocaml/re/posix/re_posix.a
+lib/ocaml/re/posix/re_posix.cmx
+lib/ocaml/re/posix/re_posix.cmxa
 lib/ocaml/re/re.a
 lib/ocaml/re/re.cmx
 lib/ocaml/re/re.cmxa
-lib/ocaml/re/re_emacs.a
+lib/ocaml/re/re__.cmx
-lib/ocaml/re/re_emacs.cmx
+lib/ocaml/re/re__Automata.cmx
-lib/ocaml/re/re_emacs.cmxa
+lib/ocaml/re/re__Category.cmx
-lib/ocaml/re/re_glob.a
+lib/ocaml/re/re__Core.cmx
-lib/ocaml/re/re_glob.cmx
+lib/ocaml/re/re__Cset.cmx
-lib/ocaml/re/re_glob.cmxa
+lib/ocaml/re/re__Emacs.cmx
-lib/ocaml/re/re_pcre.a
+lib/ocaml/re/re__Fmt.cmx
-lib/ocaml/re/re_pcre.cmx
+lib/ocaml/re/re__Glob.cmx
-lib/ocaml/re/re_pcre.cmxa
+lib/ocaml/re/re__Pcre.cmx
-lib/ocaml/re/re_perl.a
+lib/ocaml/re/re__Perl.cmx
-lib/ocaml/re/re_perl.cmx
+lib/ocaml/re/re__Pmark.cmx
-lib/ocaml/re/re_perl.cmxa
+lib/ocaml/re/re__Posix.cmx
-lib/ocaml/re/re_posix.a
+lib/ocaml/re/re__Str.cmx
-lib/ocaml/re/re_posix.cmx
+lib/ocaml/re/str/re_str.a
-lib/ocaml/re/re_posix.cmxa
+lib/ocaml/re/str/re_str.cmx
-lib/ocaml/re/re_str.a
+lib/ocaml/re/str/re_str.cmxa
-lib/ocaml/re/re_str.cmx
-lib/ocaml/re/re_str.cmxa
-lib/ocaml/re/re_automata.cmx
-lib/ocaml/re/re_cset.cmx

devel/ocaml-re/pkg/PLIST

@@ -1,79 +1,84 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/08/30 16:03:42 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/03/04 12:51:14 chrisz Exp $
 %%native%%
 lib/ocaml/re/
 lib/ocaml/re/META
-lib/ocaml/re/re.annot
+lib/ocaml/re/automata.mli
+lib/ocaml/re/category.mli
+lib/ocaml/re/core.mli
+lib/ocaml/re/cset.mli
+lib/ocaml/re/emacs/
+lib/ocaml/re/emacs.mli
+lib/ocaml/re/emacs/re_emacs.cma
+lib/ocaml/re/emacs/re_emacs.cmi
+lib/ocaml/re/emacs/re_emacs.cmt
+lib/ocaml/re/glob/
+lib/ocaml/re/glob.mli
+lib/ocaml/re/glob/re_glob.cma
+lib/ocaml/re/glob/re_glob.cmi
+lib/ocaml/re/glob/re_glob.cmt
+@comment lib/ocaml/re/opam
+lib/ocaml/re/pcre/
+lib/ocaml/re/pcre.mli
+lib/ocaml/re/pcre/re_pcre.cma
+lib/ocaml/re/pcre/re_pcre.cmi
+lib/ocaml/re/pcre/re_pcre.cmt
+lib/ocaml/re/perl/
+lib/ocaml/re/perl.mli
+lib/ocaml/re/perl/re_perl.cma
+lib/ocaml/re/perl/re_perl.cmi
+lib/ocaml/re/perl/re_perl.cmt
+lib/ocaml/re/pmark.mli
+lib/ocaml/re/posix/
+lib/ocaml/re/posix.mli
+lib/ocaml/re/posix/re_posix.cma
+lib/ocaml/re/posix/re_posix.cmi
+lib/ocaml/re/posix/re_posix.cmt
 lib/ocaml/re/re.cma
 lib/ocaml/re/re.cmi
 lib/ocaml/re/re.cmt
-lib/ocaml/re/re.cmti
+lib/ocaml/re/re__.cmi
-lib/ocaml/re/re.mli
+lib/ocaml/re/re__.cmt
-lib/ocaml/re/re_emacs.annot
+lib/ocaml/re/re__Automata.cmi
-lib/ocaml/re/re_emacs.cma
+lib/ocaml/re/re__Automata.cmt
-lib/ocaml/re/re_emacs.cmi
+lib/ocaml/re/re__Automata.cmti
-lib/ocaml/re/re_emacs.cmt
+lib/ocaml/re/re__Category.cmi
-lib/ocaml/re/re_emacs.cmti
+lib/ocaml/re/re__Category.cmt
-lib/ocaml/re/re_emacs.mli
+lib/ocaml/re/re__Category.cmti
-lib/ocaml/re/re_glob.annot
+lib/ocaml/re/re__Core.cmi
-lib/ocaml/re/re_glob.cma
+lib/ocaml/re/re__Core.cmt
-lib/ocaml/re/re_glob.cmi
+lib/ocaml/re/re__Core.cmti
-lib/ocaml/re/re_glob.cmt
+lib/ocaml/re/re__Cset.cmi
-lib/ocaml/re/re_glob.cmti
+lib/ocaml/re/re__Cset.cmt
-lib/ocaml/re/re_glob.mli
+lib/ocaml/re/re__Cset.cmti
-lib/ocaml/re/re_pcre.annot
+lib/ocaml/re/re__Emacs.cmi
-lib/ocaml/re/re_pcre.cma
+lib/ocaml/re/re__Emacs.cmt
-lib/ocaml/re/re_pcre.cmi
+lib/ocaml/re/re__Emacs.cmti
-lib/ocaml/re/re_pcre.cmt
+lib/ocaml/re/re__Fmt.cmi
-lib/ocaml/re/re_pcre.cmti
+lib/ocaml/re/re__Fmt.cmt
-lib/ocaml/re/re_pcre.mli
+lib/ocaml/re/re__Glob.cmi
-lib/ocaml/re/re_perl.annot
+lib/ocaml/re/re__Glob.cmt
-lib/ocaml/re/re_perl.cma
+lib/ocaml/re/re__Glob.cmti
-lib/ocaml/re/re_perl.cmi
+lib/ocaml/re/re__Pcre.cmi
-lib/ocaml/re/re_perl.cmt
+lib/ocaml/re/re__Pcre.cmt
-lib/ocaml/re/re_perl.cmti
+lib/ocaml/re/re__Pcre.cmti
-lib/ocaml/re/re_perl.mli
+lib/ocaml/re/re__Perl.cmi
-lib/ocaml/re/re_posix.annot
+lib/ocaml/re/re__Perl.cmt
-lib/ocaml/re/re_posix.cma
+lib/ocaml/re/re__Perl.cmti
-lib/ocaml/re/re_posix.cmi
+lib/ocaml/re/re__Pmark.cmi
-lib/ocaml/re/re_posix.cmt
+lib/ocaml/re/re__Pmark.cmt
-lib/ocaml/re/re_posix.cmti
+lib/ocaml/re/re__Pmark.cmti
-lib/ocaml/re/re_posix.mli
+lib/ocaml/re/re__Posix.cmi
-lib/ocaml/re/re_str.annot
+lib/ocaml/re/re__Posix.cmt
-lib/ocaml/re/re_str.cma
+lib/ocaml/re/re__Posix.cmti
-lib/ocaml/re/re_str.cmi
+lib/ocaml/re/re__Str.cmi
-lib/ocaml/re/re_str.cmt
+lib/ocaml/re/re__Str.cmt
-lib/ocaml/re/re_str.cmti
+lib/ocaml/re/re__Str.cmti
-lib/ocaml/re/re_str.mli
+lib/ocaml/re/str/
+lib/ocaml/re/str.mli
+lib/ocaml/re/str/re_str.cma
+lib/ocaml/re/str/re_str.cmi
+lib/ocaml/re/str/re_str.cmt
 share/doc/ocaml-re/
-share/doc/ocaml-re/CHANGES
+share/doc/ocaml-re/CHANGES.md
+share/doc/ocaml-re/LICENSE.md
 share/doc/ocaml-re/README.md
-share/doc/ocaml-re/TODO.txt
-share/doc/ocaml-re/api/
-share/doc/ocaml-re/api/Re.MarkSet.html
-share/doc/ocaml-re/api/Re.html
-share/doc/ocaml-re/api/Re_emacs.html
-share/doc/ocaml-re/api/Re_glob.html
-share/doc/ocaml-re/api/Re_pcre.html
-share/doc/ocaml-re/api/Re_perl.html
-share/doc/ocaml-re/api/Re_posix.html
-share/doc/ocaml-re/api/Re_str.html
-share/doc/ocaml-re/api/index.html
-share/doc/ocaml-re/api/index_attributes.html
-share/doc/ocaml-re/api/index_class_types.html
-share/doc/ocaml-re/api/index_classes.html
-share/doc/ocaml-re/api/index_exceptions.html
-share/doc/ocaml-re/api/index_extensions.html
-share/doc/ocaml-re/api/index_methods.html
-share/doc/ocaml-re/api/index_module_types.html
-share/doc/ocaml-re/api/index_modules.html
-share/doc/ocaml-re/api/index_types.html
-share/doc/ocaml-re/api/index_values.html
-share/doc/ocaml-re/api/style.css
-share/doc/ocaml-re/api/type_Re.MarkSet.html
-share/doc/ocaml-re/api/type_Re.html
-share/doc/ocaml-re/api/type_Re_emacs.html
-share/doc/ocaml-re/api/type_Re_glob.html
-share/doc/ocaml-re/api/type_Re_pcre.html
-share/doc/ocaml-re/api/type_Re_perl.html
-share/doc/ocaml-re/api/type_Re_posix.html
-share/doc/ocaml-re/api/type_Re_str.html

devel/ocaml-uutf/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2016/06/23 19:23:53 krw Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/04 12:51:14 chrisz Exp $
 
 COMMENT =	non-blocking streaming unicode codec
 CATEGORIES =	devel
 
-V =		0.9.4
+V =		1.0.1
 NAME =		uutf
 DISTNAME =	${NAME}-${V}
 EXTRACT_SUFX =	.tbz
@@ -31,7 +31,8 @@ ALL_TARGET +=	${NAME}.cmxs
 
 
 do-build:
-	cd ${WRKSRC} && ocamlbuild ${ALL_TARGET}
+	cd ${WRKSRC} && ocamlbuild -use-ocamlfind \
+		${ALL_TARGET} doc/api.docdir/index.html
 
 do-install:
 	env -i ${MAKE_ENV} ocamlfind install ${NAME} \
@@ -39,9 +40,11 @@ do-install:
 		${ALL_TARGET:S|^|${WRKSRC}/_build/src/|}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${NAME}/api
 	${INSTALL_DATA} \
-		${WRKDIST}/{README,CHANGES}.md \
+		${WRKSRC}/*.md \
 		${PREFIX}/share/doc/ocaml-${NAME}/
-	${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/ocaml-${NAME}/api/
+	${INSTALL_DATA} \
+		${WRKSRC}/_build/doc/api.docdir/* \
+		${PREFIX}/share/doc/ocaml-${NAME}/api/
 
 
 .include <bsd.port.mk>

devel/ocaml-uutf/distinfo

@@ -1,2 +1,2 @@
-SHA256 (uutf-0.9.4.tbz) = E3BnIqADexZ+7zWbrGjVQm0F9kqjCPRMF4SqzpV34bg=
+SHA256 (uutf-1.0.1.tbz) = Ejsm56Rx8sW9D85FTM9RXSmWEOw1bjISQfrg91gz6b4=
-SIZE (uutf-0.9.4.tbz) = 36987
+SIZE (uutf-1.0.1.tbz) = 22215

devel/ocaml-uutf/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/10/25 16:56:00 chrisz Exp $
+@comment $OpenBSD: PLIST,v 1.2 2019/03/04 12:51:14 chrisz Exp $
 %%native%%
 lib/ocaml/uutf/
 lib/ocaml/uutf/META
@@ -7,18 +7,20 @@ lib/ocaml/uutf/uutf.cmi
 lib/ocaml/uutf/uutf.mli
 share/doc/ocaml-uutf/
 share/doc/ocaml-uutf/CHANGES.md
+share/doc/ocaml-uutf/LICENSE.md
 share/doc/ocaml-uutf/README.md
 share/doc/ocaml-uutf/api/
 share/doc/ocaml-uutf/api/Uutf.Buffer.html
 share/doc/ocaml-uutf/api/Uutf.Manual.html
 share/doc/ocaml-uutf/api/Uutf.String.html
 share/doc/ocaml-uutf/api/Uutf.html
-share/doc/ocaml-uutf/api/api.odocl
+share/doc/ocaml-uutf/api/html.stamp
 share/doc/ocaml-uutf/api/index.html
 share/doc/ocaml-uutf/api/index_attributes.html
 share/doc/ocaml-uutf/api/index_class_types.html
 share/doc/ocaml-uutf/api/index_classes.html
 share/doc/ocaml-uutf/api/index_exceptions.html
+share/doc/ocaml-uutf/api/index_extensions.html
 share/doc/ocaml-uutf/api/index_methods.html
 share/doc/ocaml-uutf/api/index_module_types.html
 share/doc/ocaml-uutf/api/index_modules.html

devel/omake/Makefile

@@ -1,19 +1,14 @@
-# $OpenBSD: Makefile,v 1.16 2015/08/30 16:24:09 avsm Exp $
+# $OpenBSD: Makefile,v 1.17 2019/03/04 12:51:14 chrisz Exp $
 
 COMMENT=	build system designed for scalability and portability
 CATEGORIES=	devel
 
-V=		0.9.8.5
+V=		0.10.3
-VEXTRA=		3
+DISTNAME=	omake-${V}
-DISTNAME=	omake-${V}-${VEXTRA}
+MASTER_SITES=	http://download.camlcity.org/download/
-PKGNAME=	omake-${V}pl${VEXTRA}
-REVISION =	7
-WRKDIST=	${WRKDIR}/omake-${V}
-MASTER_SITES=	http://omake.metaprl.org/downloads/ \
-		http://www.ocaml-programming.de/godi-backup/
 
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
-HOMEPAGE=	http://omake.metaprl.org/
+HOMEPAGE=	http://projects.camlcity.org/projects/omake.html
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -22,13 +17,16 @@ MODULES=	lang/ocaml
 NO_TEST=	Yes
 DESTDIRNAME=	INSTALL_ROOT
 
+BUILD_DEPENDS=	textproc/hevea
+
+CONFIGURE_STYLE=simple
+
 MAKE_ENV=	MAN_ENABLED=Yes
-WANTLIB=	curses m pthread readline ncurses c
+WANTLIB=	curses m pthread readline c
 
 DOC_DIR=	${PREFIX}/share/doc/omake
-DOC_FILES=	LICENSE LICENSE.OMake doc/txt/omake-doc.txt doc/ps/omake-doc.ps \
+DOC_FILES=	LICENSE LICENSE.OMake doc/txt/omake-doc.txt \
-		doc/ps/omake-doc.pdf CHANGELOG.txt ocamldep/LICENSE.ocamldep-omake \
+		doc/ps/omake-doc.pdf ChangeLog ChangeLog_old.txt doc/html
-		doc/html
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR}

devel/omake/distinfo

@@ -1,2 +1,2 @@
-SHA256 (omake-0.9.8.5-3.tar.gz) = W2deCfSf+CSad1eY8lqxJ1Fc8v7TlSeyAnhHV6Ne3a0=
+SHA256 (omake-0.10.3.tar.gz) = /zEH6UWWFeplJjCcUzsEgV7vYGkqINzTphafWGB4bR0=
-SIZE (omake-0.9.8.5-3.tar.gz) = 3321245
+SIZE (omake-0.10.3.tar.gz) = 2438877

devel/omake/patches/patch-doc_OMakefile

@@ -0,0 +1,13 @@
+$OpenBSD: patch-doc_OMakefile,v 1.1 2019/03/04 12:51:14 chrisz Exp $
+
+Index: doc/OMakefile
+--- doc/OMakefile.orig
++++ doc/OMakefile
+@@ -177,6 +177,7 @@ ALLOWED_HEVEA_VERSIONS[] =
+     2.25
+     2.28
+     2.29
++    2.31
+ 
+ public.HEVEA = hevea
+ public.HACHA = hacha

devel/omake/patches/patch-lib_build_OCaml_om

@@ -1,15 +1,14 @@
-$OpenBSD: patch-lib_build_OCaml_om,v 1.1 2012/08/19 00:06:31 avsm Exp $
+$OpenBSD: patch-lib_build_OCaml_om,v 1.2 2019/03/04 12:51:14 chrisz Exp $
-OCaml 4.00 added several new warnings, which are now triggered many times.
-Instead of fixing the code, just remove the -warn-error A.
 
---- lib/build/OCaml.om.orig	Sat Aug  4 10:41:56 2012
+Index: lib/build/OCaml.om
-+++ lib/build/OCaml.om	Sat Aug  4 10:42:02 2012
+--- lib/build/OCaml.om.orig
-@@ -170,7 +170,7 @@ public.PREFIXED_OCAMLPACKS =\
++++ lib/build/OCaml.om
- #
+@@ -181,7 +181,7 @@ private.get_bytecomp_c_comp() =
- declare OCAMLDEPFLAGS
+     # Figure out the params for the C compiler
- public.OCAMLPPFLAGS  =
+     #
--public.OCAMLFLAGS    = -warn-error A
+     private.c_comp = $(get_c_comp)
-+public.OCAMLFLAGS    =
+-    if $(equal X$(c_comp)X, XX)
- public.OCAMLCFLAGS   = -g
++    if $(equal $(string X$(c_comp)X), XX)
- public.OCAMLOPTFLAGS =
+         private.bytecomp_c_comp = $(get_bytecomp_c_comp)
- public.OCAMLCPPFLAGS =
+         OCAML_CC = $(nth-hd 1, $(bytecomp_c_comp))
+         OCAML_CFLAGS = $(nth-tl 1, $(bytecomp_c_comp))

devel/omake/pkg/PLIST

@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2012/08/19 00:06:31 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2019/03/04 12:51:14 chrisz Exp $
 @conflict osh-*
-@bin bin/cvs_realclean
-bin/ocamldep-omake
 @bin bin/omake
 bin/osh
 lib/omake/
@@ -20,35 +18,29 @@ lib/omake/configure/Configure.om
 lib/omake/configure/X.om
 lib/omake/configure/fam.om
 lib/omake/configure/fs_case_sensitive.om
+lib/omake/configure/moncontrol.om
 lib/omake/configure/ncurses.om
+lib/omake/configure/posix_spawn.om
 lib/omake/configure/readline.om
 lib/omake/configure/snprintf.om
 lib/omake/parse/
 lib/omake/parse/C/
 lib/omake/parse/C/Lex.om
 lib/omake/parse/C/Parse.om
+lib/omake/parse/LaTeX/
+lib/omake/parse/LaTeX/Lex.om
+lib/omake/parse/LaTeX/Macros.om
+lib/omake/parse/LaTeX/Parse.om
+lib/omake/parse/LaTeX/Spell.om
+lib/omake/web/
+lib/omake/web/simple-xml.om
 share/doc/omake/
-share/doc/omake/CHANGELOG.txt
+share/doc/omake/ChangeLog
+share/doc/omake/ChangeLog_old.txt
 share/doc/omake/LICENSE
 share/doc/omake/LICENSE.OMake
-share/doc/omake/LICENSE.ocamldep-omake
 share/doc/omake/html/
-share/doc/omake/html/announce.txt
-share/doc/omake/html/changelog.html
-share/doc/omake/html/contents_motif.gif
-share/doc/omake/html/download.html
-share/doc/omake/html/images/
-share/doc/omake/html/images/announce.ps
-share/doc/omake/html/images/announce.tex
-share/doc/omake/html/images/grid.ai
-share/doc/omake/html/images/omake-manual.ai
-share/doc/omake/html/images/omake-manual.gif
-share/doc/omake/html/images/omake.ai
-share/doc/omake/html/images/omake.eps
-share/doc/omake/html/images/omake.gif
-share/doc/omake/html/images/omake.psd
 share/doc/omake/html/index.html
-share/doc/omake/html/next_motif.gif
 share/doc/omake/html/omake-all-index.html
 share/doc/omake/html/omake-autoconf.html
 share/doc/omake/html/omake-base.html
@@ -76,11 +68,6 @@ share/doc/omake/html/omake-target-index.html
 share/doc/omake/html/omake-toc.html
 share/doc/omake/html/omake-var-index.html
 share/doc/omake/html/omake.html
-share/doc/omake/html/omake_lists.html
-share/doc/omake/html/omake_papers.html
-share/doc/omake/html/omake_users.html
 share/doc/omake/html/osh.html
-share/doc/omake/html/previous_motif.gif
 share/doc/omake/omake-doc.pdf
-share/doc/omake/omake-doc.ps
 share/doc/omake/omake-doc.txt

devel/ounit/Makefile

@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.11 2016/06/23 19:23:53 krw Exp $
+# $OpenBSD: Makefile,v 1.12 2019/03/04 12:51:14 chrisz Exp $
 
 COMMENT =	unit test framework for OCaml
 CATEGORIES =	devel
 
-DISTNAME =	ounit-2.0.0
+DISTNAME =	ounit-2.0.8
-REVISION =	2
 
 # The last url component (the number) changes every release, too.
-MASTER_SITES =	http://forge.ocamlcore.org/frs/download.php/1258/
+MASTER_SITES =	http://forge.ocamlcore.org/frs/download.php/1749/
 
 HOMEPAGE =	http://ounit.forge.ocamlcore.org/
 MAINTAINER =	Christopher Zimmermann <chrisz@openbsd.org>
@@ -18,8 +17,7 @@ PERMIT_PACKAGE_CDROM =		Yes
 MODULES =		lang/ocaml
 
 BUILD_DEPENDS +=	sysutils/findlib \
-			devel/ocaml-ocamlbuild \
+			devel/ocaml-ocamlbuild
-			lang/ocaml-camlp4
 
 CONFIGURE_STYLE =	oasis
 

devel/ounit/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ounit-2.0.0.tar.gz) = TUoFsgw5xg10hvt6kOtMXAjoyYYjYLWTi5egnpvSHYU=
+SHA256 (ounit-2.0.8.tar.gz) = LjD+eWSOkotanSD4PVoagFgmxxk+ghRkqeR1JmG6Lg4=
-SIZE (ounit-2.0.0.tar.gz) = 103504
+SIZE (ounit-2.0.8.tar.gz) = 116095

devel/ounit/pkg/PLIST

@@ -1,60 +1,115 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/09/03 07:41:10 chrisz Exp $
+@comment $OpenBSD: PLIST,v 1.4 2019/03/04 12:51:14 chrisz Exp $
 %%native%%
 lib/ocaml/oUnit/
 lib/ocaml/oUnit/META
+lib/ocaml/oUnit/oUnit.annot
 lib/ocaml/oUnit/oUnit.cma
 lib/ocaml/oUnit/oUnit.cmi
+lib/ocaml/oUnit/oUnit.cmt
+lib/ocaml/oUnit/oUnit.cmti
 lib/ocaml/oUnit/oUnit.mli
+lib/ocaml/oUnit/oUnit2.annot
 lib/ocaml/oUnit/oUnit2.cmi
+lib/ocaml/oUnit/oUnit2.cmt
+lib/ocaml/oUnit/oUnit2.cmti
 lib/ocaml/oUnit/oUnit2.mli
 lib/ocaml/oUnit/oUnitAdvanced.cma
+lib/ocaml/oUnit/oUnitAssert.annot
 lib/ocaml/oUnit/oUnitAssert.cmi
+lib/ocaml/oUnit/oUnitAssert.cmt
 lib/ocaml/oUnit/oUnitAssert.ml
+lib/ocaml/oUnit/oUnitBracket.annot
 lib/ocaml/oUnit/oUnitBracket.cmi
+lib/ocaml/oUnit/oUnitBracket.cmt
 lib/ocaml/oUnit/oUnitBracket.ml
+lib/ocaml/oUnit/oUnitCache.annot
 lib/ocaml/oUnit/oUnitCache.cmi
+lib/ocaml/oUnit/oUnitCache.cmt
 lib/ocaml/oUnit/oUnitCache.ml
+lib/ocaml/oUnit/oUnitCheckEnv.annot
 lib/ocaml/oUnit/oUnitCheckEnv.cmi
+lib/ocaml/oUnit/oUnitCheckEnv.cmt
 lib/ocaml/oUnit/oUnitCheckEnv.ml
+lib/ocaml/oUnit/oUnitChooser.annot
 lib/ocaml/oUnit/oUnitChooser.cmi
+lib/ocaml/oUnit/oUnitChooser.cmt
 lib/ocaml/oUnit/oUnitChooser.ml
+lib/ocaml/oUnit/oUnitConf.annot
 lib/ocaml/oUnit/oUnitConf.cmi
+lib/ocaml/oUnit/oUnitConf.cmt
 lib/ocaml/oUnit/oUnitConf.ml
+lib/ocaml/oUnit/oUnitCore.annot
 lib/ocaml/oUnit/oUnitCore.cmi
+lib/ocaml/oUnit/oUnitCore.cmt
 lib/ocaml/oUnit/oUnitCore.ml
+lib/ocaml/oUnit/oUnitDiff.annot
 lib/ocaml/oUnit/oUnitDiff.cmi
+lib/ocaml/oUnit/oUnitDiff.cmt
+lib/ocaml/oUnit/oUnitDiff.cmti
 lib/ocaml/oUnit/oUnitDiff.mli
+lib/ocaml/oUnit/oUnitLogger.annot
 lib/ocaml/oUnit/oUnitLogger.cmi
+lib/ocaml/oUnit/oUnitLogger.cmt
 lib/ocaml/oUnit/oUnitLogger.ml
+lib/ocaml/oUnit/oUnitLoggerHTML.annot
 lib/ocaml/oUnit/oUnitLoggerHTML.cmi
+lib/ocaml/oUnit/oUnitLoggerHTML.cmt
 lib/ocaml/oUnit/oUnitLoggerHTML.ml
+lib/ocaml/oUnit/oUnitLoggerHTMLData.annot
 lib/ocaml/oUnit/oUnitLoggerHTMLData.cmi
+lib/ocaml/oUnit/oUnitLoggerHTMLData.cmt
+lib/ocaml/oUnit/oUnitLoggerJUnit.annot
 lib/ocaml/oUnit/oUnitLoggerJUnit.cmi
+lib/ocaml/oUnit/oUnitLoggerJUnit.cmt
 lib/ocaml/oUnit/oUnitLoggerJUnit.ml
+lib/ocaml/oUnit/oUnitLoggerStd.annot
 lib/ocaml/oUnit/oUnitLoggerStd.cmi
+lib/ocaml/oUnit/oUnitLoggerStd.cmt
 lib/ocaml/oUnit/oUnitLoggerStd.ml
+lib/ocaml/oUnit/oUnitPlugin.annot
 lib/ocaml/oUnit/oUnitPlugin.cmi
+lib/ocaml/oUnit/oUnitPlugin.cmt
 lib/ocaml/oUnit/oUnitPlugin.ml
+lib/ocaml/oUnit/oUnitPropList.annot
 lib/ocaml/oUnit/oUnitPropList.cmi
+lib/ocaml/oUnit/oUnitPropList.cmt
 lib/ocaml/oUnit/oUnitPropList.ml
+lib/ocaml/oUnit/oUnitResultSummary.annot
 lib/ocaml/oUnit/oUnitResultSummary.cmi
+lib/ocaml/oUnit/oUnitResultSummary.cmt
 lib/ocaml/oUnit/oUnitResultSummary.ml
+lib/ocaml/oUnit/oUnitRunner.annot
 lib/ocaml/oUnit/oUnitRunner.cmi
+lib/ocaml/oUnit/oUnitRunner.cmt
 lib/ocaml/oUnit/oUnitRunner.ml
+lib/ocaml/oUnit/oUnitRunnerProcesses.annot
 lib/ocaml/oUnit/oUnitRunnerProcesses.cmi
+lib/ocaml/oUnit/oUnitRunnerProcesses.cmt
 lib/ocaml/oUnit/oUnitRunnerProcesses.ml
+lib/ocaml/oUnit/oUnitShared.annot
 lib/ocaml/oUnit/oUnitShared.cmi
+lib/ocaml/oUnit/oUnitShared.cmt
 lib/ocaml/oUnit/oUnitShared.ml
+lib/ocaml/oUnit/oUnitState.annot
 lib/ocaml/oUnit/oUnitState.cmi
+lib/ocaml/oUnit/oUnitState.cmt
 lib/ocaml/oUnit/oUnitState.ml
+lib/ocaml/oUnit/oUnitTest.annot
 lib/ocaml/oUnit/oUnitTest.cmi
+lib/ocaml/oUnit/oUnitTest.cmt
 lib/ocaml/oUnit/oUnitTest.ml
+lib/ocaml/oUnit/oUnitTestData.annot
 lib/ocaml/oUnit/oUnitTestData.cmi
+lib/ocaml/oUnit/oUnitTestData.cmt
 lib/ocaml/oUnit/oUnitTestData.ml
+lib/ocaml/oUnit/oUnitThreads.annot
 lib/ocaml/oUnit/oUnitThreads.cma
 lib/ocaml/oUnit/oUnitThreads.cmi
+lib/ocaml/oUnit/oUnitThreads.cmt
 lib/ocaml/oUnit/oUnitThreads.ml
+lib/ocaml/oUnit/oUnitUtils.annot
 lib/ocaml/oUnit/oUnitUtils.cmi
+lib/ocaml/oUnit/oUnitUtils.cmt
 lib/ocaml/oUnit/oUnitUtils.ml
 share/doc/ounit/
 share/doc/ounit/OUnit.html

lang/ocaml-camlp4/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2016/06/24 15:59:12 krw Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/04 12:51:15 chrisz Exp $
 
 COMMENT =	OCaml Preprocessor and Pretty-Printer
 CATEGORIES =	lang
 
-V =		4.03+1
+V =		4.07+1
 GH_ACCOUNT =	ocaml
 GH_PROJECT =	camlp4
 GH_TAGNAME =	${V}
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =		lang/ocaml
 
-WANTLIB +=		c m
+WANTLIB +=		c m pthread
 
 USE_GMAKE =		Yes
 

lang/ocaml-camlp4/distinfo

@@ -1,2 +1,2 @@
-SHA256 (camlp4-4.03+1.tar.gz) = bu/qzO2BzKWd35DCU4UF/VzWWWo/waz0lx6XlsLn8q4=
+SHA256 (camlp4-4.07+1.tar.gz) = 7NuJYwY/QbOHQSMXaF95gjoms/U3RPBHIFiZGHaHcJA=
-SIZE (camlp4-4.03+1.tar.gz) = 648030
+SIZE (camlp4-4.07+1.tar.gz) = 648842

lang/ocaml-camlp5/Makefile

@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2018/05/06 15:45:06 bcallah Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/04 12:51:15 chrisz Exp $
 
-V =		7.05
+V =		7.07
 COMMENT =	OCaml Preprocessor and Pretty-Printer
 DISTFILES =	camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX}
 PKGNAME =	ocaml-camlp5-${V}
@@ -12,7 +12,7 @@ MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c m
+WANTLIB += c m pthread
 
 MASTER_SITES =	https://github.com/camlp5/camlp5/archive/
 

lang/ocaml-camlp5/distinfo

@@ -1,2 +1,2 @@
-SHA256 (camlp5-rel7.05.tar.gz) = zMev0pNsdcvuSq1YzS74578N3tVWuR125ORionVQ/xI=
+SHA256 (camlp5-rel7.07.tar.gz) = osSTuDOyF635TSAA6xkBW5kMTkQb6zXPNrHTPtI1GZE=
-SIZE (camlp5-rel7.05.tar.gz) = 759965
+SIZE (camlp5-rel7.07.tar.gz) = 813500

lang/ocaml-camlp5/patches/patch-configure

@@ -0,0 +1,25 @@
+$OpenBSD: patch-configure,v 1.1 2019/03/04 12:51:15 chrisz Exp $
+
+our builtin test/[ doesn't support the < comparator.
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -188,7 +188,7 @@ if test "$x" = ""; then win=false; else win=true; fi
+ x="$(echo 'Sys.os_type;;' | ocaml | grep 'Win32')"
+ if test "$x" = ""; then win32=false; else win32=true; fi
+ OLIBDIR="$y"
+-if [ "$OVERSION" "<" "4.00" ]; then
++if /bin/\[ "$OVERSION" "<" "4.00" ]; then
+   OCLIBDIR="."
+ else
+   OCLIBDIR="+compiler-libs"
+@@ -277,7 +277,7 @@ echo OCLIBDIR=$OCLIBDIR
+ if test "$prefix" != ""; then
+   echo PREFIX=$prefix
+ fi
+-if test "$OVERSION" "<" "4.00.0"; then
++if /bin/test "$OVERSION" "<" "4.00.0"; then
+   echo "OTOPP=\$(TOP)/ocaml_stuff$verspfx/$OVERSION/parsing"
+   echo "OTOPW=\$(TOP)/ocaml_stuff$verspfx/$OVERSION/utils"
+ else

lang/ocaml-camlp5/patches/patch-etc_Makefile

@@ -1,11 +1,11 @@
-$OpenBSD: patch-etc_Makefile,v 1.1 2018/05/06 15:45:06 bcallah Exp $
+$OpenBSD: patch-etc_Makefile,v 1.2 2019/03/04 12:51:15 chrisz Exp $
 
 Index: etc/Makefile
 --- etc/Makefile.orig
 +++ etc/Makefile
-@@ -106,6 +106,7 @@ install:
+@@ -107,6 +107,7 @@ install:
- 	$(RM) -f "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/pa_lex.cmo"
  	cp $(OBJS) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
+ 	cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
  	cp lib.sml "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
 +	cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
  	cp $(CAMLP5N)o$(EXE) $(CAMLP5N)sch$(EXE) "$(DESTDIR)$(BINDIR)/."

lang/ocaml-camlp5/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/05/06 15:45:06 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/03/04 12:51:15 chrisz Exp $
 %%native%%
 bin/camlp5
 bin/camlp5o
@@ -8,6 +8,8 @@ bin/mkcamlp5
 bin/ocpp5
 lib/ocaml/camlp5/
 lib/ocaml/camlp5/META
+lib/ocaml/camlp5/ast2pt.cmi
+lib/ocaml/camlp5/ast2pt.mli
 lib/ocaml/camlp5/camlp5.cma
 lib/ocaml/camlp5/camlp5_top.cma
 lib/ocaml/camlp5/camlp5o.cma

lang/ocaml/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2018/11/28 18:23:08 naddy Exp $
+# $OpenBSD: Makefile,v 1.82 2019/03/04 12:51:14 chrisz Exp $
 
 MULTI_PACKAGES = -graphics -main
 
@@ -7,9 +7,7 @@ COMMENT-graphics = OCaml Graphics library providing basic drawing primitives
 
 # XXX Don't even think of updating ocaml alone.
 # Do check that the ports that depend on it still work, or repair them.
-# Don't forget to bump version in ocaml.port.mk, too!
+VERSION=		4.07.1
-VERSION=		4.03.0
-REVISION=		4
 
 PKGNAME-main =		ocaml-${VERSION}
 PKGNAME-graphics =	ocaml-graphics-${VERSION}
@@ -49,7 +47,7 @@ LDFLAGS+=		-Wl,-znotext
 USE_GMAKE=	Yes
 
 RUN_DEPENDS-graphics +=	lang/ocaml
-WANTLIB-main =		c curses m pthread
+WANTLIB-main =		c m pthread
 WANTLIB-graphics =	X11
 
 # for libbfd (used by ocamlobjinfo on .cmxs files)
@@ -59,7 +57,7 @@ WANTLIB-main +=		iberty z
 .include <bsd.port.arch.mk>
 
 .if ${PROPERTIES:Mocaml_native}
-ALL_TARGET=	world bootstrap opt opt.opt
+ALL_TARGET=	world.opt
 PKG_ARGS +=	-Dnative=1
 TEST_DEPENDS +=	${BUILD_PKGPATH}
 
@@ -70,11 +68,12 @@ PKG_ARGS +=	-Ddynlink=0
 .endif
 
 .else
-ALL_TARGET=	world bootstrap
+ALL_TARGET=	world
 PKG_ARGS +=	-Dnative=0
 NO_TEST   =	yes
 .endif
 
+DPB_PROPERTIES +=	parallel
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml/html/libref

lang/ocaml/distinfo

@@ -1,4 +1,4 @@
-SHA256 (ocaml-4.03-refman-html.tar.gz) = 4qMHU54zMZN2B+lvjPqp5Dbd7sq7DX4l+ILP/LJ/1+k=
+SHA256 (ocaml-4.07-refman-html.tar.gz) = bZfBExooGqtXWTYCoZsrRxTb8mY9UTrmOrzi5cAujbg=
-SHA256 (ocaml-4.03.0.tar.gz) = f98oDMbAot5PyYkdC/RjPqQXBG7OYZ8BH9RFQPz8jaI=
+SHA256 (ocaml-4.07.1.tar.gz) = KtQ74X7Vx06ieIeuDMR5O4NUCBgMC5F1vJrVMIKlmvQ=
-SIZE (ocaml-4.03-refman-html.tar.gz) = 814882
+SIZE (ocaml-4.07-refman-html.tar.gz) = 1003312
-SIZE (ocaml-4.03.0.tar.gz) = 3388739
+SIZE (ocaml-4.07.1.tar.gz) = 4215856

lang/ocaml/patches/patch-configure

@@ -1,78 +1,41 @@
-$OpenBSD: patch-configure,v 1.22 2018/11/28 18:23:08 naddy Exp $
+$OpenBSD: patch-configure,v 1.23 2019/03/04 12:51:14 chrisz Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -292,8 +292,8 @@ esac
+@@ -431,7 +431,7 @@ ocamlc_cflags=""
- bytecc="$cc"
+ ocamlc_cppflags=""
- mkexe="\$(BYTECC)"
+ ocamlopt_cflags=""
- mkexedebugflag="-g"
+ ocamlopt_cppflags=""
--bytecccompopts=""
+-ldflags=""
--bytecclinkopts=""
++ldflags="$LDFLAGS"
-+bytecccompopts="$CFLAGS"
-+bytecclinkopts="$LDFLAGS"
- dllccompopts=""
  ostype="Unix"
  exe=""
-@@ -319,7 +319,7 @@ esac
+ iflexdir=""
+@@ -456,7 +456,7 @@ esac
  
  case "$ccfamily" in
    clang-*)
--    bytecccompopts="-O2 -fno-strict-aliasing -fwrapv $gcc_warnings";;
+-    common_cflags="-O2 -fno-strict-aliasing -fwrapv";
-+    bytecccompopts="$bytecccompopts -fno-strict-aliasing -fwrapv $gcc_warnings";;
++    common_cflags="$CFLAGS -fno-strict-aliasing -fwrapv";
+     internal_cflags="$gcc_warnings";;
    gcc-[012]-*)
      # Some versions known to miscompile OCaml, e,g, 2.7.2.1, some 2.96.
-     # Plus: C99 support unknown.
+@@ -871,8 +871,9 @@ if $with_sharedlibs; then
-@@ -329,9 +329,9 @@ case "$ccfamily" in
+     *-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
-     # Known problems with -fwrapv fixed in 4.2 only.
+     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*)
-     wrn "This version of GCC is rather old.  Reducing optimization level."
-     wrn "Consider using GCC version 4.2 or above."
--    bytecccompopts="-std=gnu99 -O $gcc_warnings";;
-+    bytecccompopts="$bytecccompopts -std=gnu99 $gcc_warnings";;
-   gcc-*)
--    bytecccompopts="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv $gcc_warnings";;
-+    bytecccompopts="$bytecccompopts -std=gnu99 -fno-strict-aliasing -fwrapv $gcc_warnings";;
-   *)
-     bytecccompopts="-O";;
- esac
-@@ -673,7 +673,8 @@ if test $with_sharedlibs = "yes"; then
-     *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
-     |*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
        sharedcccompopts="-fPIC"
--      mksharedlib="$bytecc -shared"
+-      mksharedlib="$cc -shared"
-+      mkexe="$bytecc $bytecclinkopts"
++      mksharedlib="$cc $common_cflags -shared"
-+      mksharedlib="$bytecc $bytecclinkopts -shared"
+       ldflags="$ldflags -Wl,-E"
-       bytecclinkopts="$bytecclinkopts -Wl,-E"
++      mkexe="$cc $ldflags"
-       byteccrpath="-Wl,-rpath,"
+       rpath="-Wl,-rpath,"
        mksharedlibrpath="-Wl,-rpath,"
-@@ -839,6 +840,7 @@ case "$target" in
+       natdynlinkopts="-Wl,-E"
+@@ -981,6 +982,7 @@ case "$target" in
    s390x*-*-linux*)              arch=s390x; model=z10; system=elf;;
    armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
-   arm*-*-linux-gnueabihf)       arch=arm; system=linux_eabihf;;
+   armv7*-*-linux-gnueabihf)     arch=arm; model=armv7; system=linux_eabihf;;
 +  arm*-*-openbsd*)              arch=arm; system=bsd;;
+   armv8*-*-linux-gnueabihf)     arch=arm; model=armv8; system=linux_eabihf;;
+   armv8*-*-linux-gnueabi)       arch=arm; model=armv8; system=linux_eabi;;
    armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;
-   armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
-   armv6*-*-linux-gnueabi)       arch=arm; model=armv6; system=linux_eabi;;
-@@ -885,7 +887,7 @@ fi
- 
- nativecccompopts="$bytecccompopts"
- nativeccprofopts=''
--nativecclinkopts=''
-+nativecclinkopts=`echo $LDFLAGS | sed 's/-Wl,//g'`
- # FIXME the naming of nativecclinkopts is broken: these are options for
- # ld (for shared libs), not for cc
- nativeccrpath="$byteccrpath"
-@@ -1673,11 +1675,11 @@ echo "X11_LINK=$x11_link" >> Makefile
- 
- # Look for BFD library
- 
--if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
--   sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
-+if sh ./hasgot -I${OPENBSD_LOCALBASE}/include -DPACKAGE=ocaml -i bfd.h && \
-+   sh ./hasgot -L${OPENBSD_LOCALBASE}/lib -DPACKAGE=ocaml -lbfd -liberty -lz bfd_openr; then
-   inf "BFD library found."
-   echo "#define HAS_LIBBFD" >> s.h
--  echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
-+  echo "LIBBFD_LINK=-I${OPENBSD_LOCALBASE}/include -L${OPENBSD_LOCALBASE}/lib -lbfd -liberty -lz" >> Makefile
-   echo LIBBFD_INCLUDE= >>Makefile
- elif sh ./hasgot -DPACKAGE=ocaml -I/opt/local/include -i bfd.h && \
-      sh ./hasgot -DPACKAGE=ocaml -L/opt/local/lib -lbfd -ldl \

lang/ocaml/pkg/PFRAG.dynlink-native-main

@@ -1,8 +1,7 @@
-@comment $OpenBSD: PFRAG.dynlink-native-main,v 1.1 2014/08/21 20:54:04 chrisz Exp $
+@comment $OpenBSD: PFRAG.dynlink-native-main,v 1.2 2019/03/04 12:51:15 chrisz Exp $
 @bin lib/ocaml/bigarray.cmxs
 lib/ocaml/dynlink.a
 lib/ocaml/dynlink.cmx
 lib/ocaml/dynlink.cmxa
-@bin lib/ocaml/nums.cmxs
 @bin lib/ocaml/str.cmxs
 @bin lib/ocaml/unix.cmxs

lang/ocaml/pkg/PFRAG.native-main

@@ -1,39 +1,23 @@
-@comment $OpenBSD: PFRAG.native-main,v 1.8 2017/09/14 15:43:45 chrisz Exp $
+@comment $OpenBSD: PFRAG.native-main,v 1.9 2019/03/04 12:51:15 chrisz Exp $
 %%dynlink%%
 @bin bin/ocamlc.opt
+@bin bin/ocamlcp.opt
 @bin bin/ocamldep.opt
 @bin bin/ocamldoc.opt
 @bin bin/ocamllex.opt
+@bin bin/ocamlmklib.opt
+@bin bin/ocamlmktop.opt
+@bin bin/ocamlobjinfo.opt
 bin/ocamlopt
+bin/ocamlopt.byte
 @bin bin/ocamlopt.opt
-@bin bin/ocamloptp
+bin/ocamloptp
-lib/ocaml/arg.cmx
+bin/ocamloptp.byte
-lib/ocaml/arg.p.cmt
+@bin bin/ocamloptp.opt
-lib/ocaml/arg.p.cmx
+@bin bin/ocamlprof.opt
-lib/ocaml/arith_flags.cmx
-lib/ocaml/arith_status.cmx
-lib/ocaml/array.cmx
-lib/ocaml/array.p.cmt
-lib/ocaml/array.p.cmx
-lib/ocaml/arrayLabels.cmx
-lib/ocaml/arrayLabels.p.cmt
-lib/ocaml/arrayLabels.p.cmx
-lib/ocaml/big_int.cmx
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
-lib/ocaml/buffer.cmx
-lib/ocaml/buffer.p.cmt
-lib/ocaml/buffer.p.cmx
-lib/ocaml/bytes.cmx
-lib/ocaml/bytes.p.cmt
-lib/ocaml/bytes.p.cmx
-lib/ocaml/bytesLabels.cmx
-lib/ocaml/bytesLabels.p.cmt
-lib/ocaml/bytesLabels.p.cmx
-lib/ocaml/callback.cmx
-lib/ocaml/callback.p.cmt
-lib/ocaml/callback.p.cmx
 lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.p.cmt
 lib/ocaml/camlinternalFormat.p.cmx
@@ -49,9 +33,6 @@ lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.p.cmt
 lib/ocaml/camlinternalOO.p.cmx
-lib/ocaml/char.cmx
-lib/ocaml/char.p.cmt
-lib/ocaml/char.p.cmx
 lib/ocaml/compiler-libs/CSE.cmi
 lib/ocaml/compiler-libs/CSE.cmt
 lib/ocaml/compiler-libs/CSE.cmx
@@ -59,12 +40,20 @@ lib/ocaml/compiler-libs/CSEgen.cmi
 lib/ocaml/compiler-libs/CSEgen.cmt
 lib/ocaml/compiler-libs/CSEgen.cmti
 lib/ocaml/compiler-libs/CSEgen.cmx
+lib/ocaml/compiler-libs/CSEgen.mli
+lib/ocaml/compiler-libs/afl_instrument.cmi
+lib/ocaml/compiler-libs/afl_instrument.cmt
+lib/ocaml/compiler-libs/afl_instrument.cmti
+lib/ocaml/compiler-libs/afl_instrument.cmx
+lib/ocaml/compiler-libs/afl_instrument.mli
 lib/ocaml/compiler-libs/alias_analysis.cmi
 lib/ocaml/compiler-libs/alias_analysis.cmt
 lib/ocaml/compiler-libs/alias_analysis.cmti
+lib/ocaml/compiler-libs/alias_analysis.mli
 lib/ocaml/compiler-libs/allocated_const.cmi
 lib/ocaml/compiler-libs/allocated_const.cmt
 lib/ocaml/compiler-libs/allocated_const.cmti
+lib/ocaml/compiler-libs/allocated_const.mli
 lib/ocaml/compiler-libs/arch.cmi
 lib/ocaml/compiler-libs/arch.cmt
 lib/ocaml/compiler-libs/arch.cmx
@@ -73,18 +62,22 @@ lib/ocaml/compiler-libs/asmgen.cmi
 lib/ocaml/compiler-libs/asmgen.cmt
 lib/ocaml/compiler-libs/asmgen.cmti
 lib/ocaml/compiler-libs/asmgen.cmx
+lib/ocaml/compiler-libs/asmgen.mli
 lib/ocaml/compiler-libs/asmlibrarian.cmi
 lib/ocaml/compiler-libs/asmlibrarian.cmt
 lib/ocaml/compiler-libs/asmlibrarian.cmti
 lib/ocaml/compiler-libs/asmlibrarian.cmx
+lib/ocaml/compiler-libs/asmlibrarian.mli
 lib/ocaml/compiler-libs/asmlink.cmi
 lib/ocaml/compiler-libs/asmlink.cmt
 lib/ocaml/compiler-libs/asmlink.cmti
 lib/ocaml/compiler-libs/asmlink.cmx
+lib/ocaml/compiler-libs/asmlink.mli
 lib/ocaml/compiler-libs/asmpackager.cmi
 lib/ocaml/compiler-libs/asmpackager.cmt
 lib/ocaml/compiler-libs/asmpackager.cmti
 lib/ocaml/compiler-libs/asmpackager.cmx
+lib/ocaml/compiler-libs/asmpackager.mli
 lib/ocaml/compiler-libs/ast_helper.cmx
 lib/ocaml/compiler-libs/ast_invariants.cmx
 lib/ocaml/compiler-libs/ast_iterator.cmx
@@ -93,12 +86,15 @@ lib/ocaml/compiler-libs/attr_helper.cmx
 lib/ocaml/compiler-libs/augment_specialised_args.cmi
 lib/ocaml/compiler-libs/augment_specialised_args.cmt
 lib/ocaml/compiler-libs/augment_specialised_args.cmti
+lib/ocaml/compiler-libs/augment_specialised_args.mli
 lib/ocaml/compiler-libs/backend_intf.cmi
 lib/ocaml/compiler-libs/backend_intf.cmti
+lib/ocaml/compiler-libs/backend_intf.mli
 lib/ocaml/compiler-libs/branch_relaxation.cmi
 lib/ocaml/compiler-libs/branch_relaxation.cmt
 lib/ocaml/compiler-libs/branch_relaxation.cmti
 lib/ocaml/compiler-libs/branch_relaxation.cmx
+lib/ocaml/compiler-libs/branch_relaxation.mli
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
 lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
@@ -107,6 +103,8 @@ lib/ocaml/compiler-libs/build_export_info.cmi
 lib/ocaml/compiler-libs/build_export_info.cmt
 lib/ocaml/compiler-libs/build_export_info.cmti
 lib/ocaml/compiler-libs/build_export_info.cmx
+lib/ocaml/compiler-libs/build_export_info.mli
+lib/ocaml/compiler-libs/build_path_prefix_map.cmx
 lib/ocaml/compiler-libs/builtin_attributes.cmx
 lib/ocaml/compiler-libs/bytegen.cmx
 lib/ocaml/compiler-libs/bytelibrarian.cmx
@@ -118,57 +116,77 @@ lib/ocaml/compiler-libs/clambda.cmi
 lib/ocaml/compiler-libs/clambda.cmt
 lib/ocaml/compiler-libs/clambda.cmti
 lib/ocaml/compiler-libs/clambda.cmx
+lib/ocaml/compiler-libs/clambda.mli
 lib/ocaml/compiler-libs/clflags.cmx
 lib/ocaml/compiler-libs/closure.cmi
 lib/ocaml/compiler-libs/closure.cmt
 lib/ocaml/compiler-libs/closure.cmti
 lib/ocaml/compiler-libs/closure.cmx
+lib/ocaml/compiler-libs/closure.mli
 lib/ocaml/compiler-libs/closure_conversion.cmi
 lib/ocaml/compiler-libs/closure_conversion.cmt
 lib/ocaml/compiler-libs/closure_conversion.cmti
+lib/ocaml/compiler-libs/closure_conversion.mli
 lib/ocaml/compiler-libs/closure_conversion_aux.cmi
 lib/ocaml/compiler-libs/closure_conversion_aux.cmt
 lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+lib/ocaml/compiler-libs/closure_conversion_aux.mli
 lib/ocaml/compiler-libs/closure_element.cmi
 lib/ocaml/compiler-libs/closure_element.cmt
 lib/ocaml/compiler-libs/closure_element.cmti
+lib/ocaml/compiler-libs/closure_element.mli
 lib/ocaml/compiler-libs/closure_id.cmi
 lib/ocaml/compiler-libs/closure_id.cmt
 lib/ocaml/compiler-libs/closure_id.cmti
+lib/ocaml/compiler-libs/closure_id.mli
 lib/ocaml/compiler-libs/closure_offsets.cmi
 lib/ocaml/compiler-libs/closure_offsets.cmt
 lib/ocaml/compiler-libs/closure_offsets.cmti
 lib/ocaml/compiler-libs/closure_offsets.cmx
+lib/ocaml/compiler-libs/closure_offsets.mli
+lib/ocaml/compiler-libs/closure_origin.cmi
+lib/ocaml/compiler-libs/closure_origin.cmt
+lib/ocaml/compiler-libs/closure_origin.cmti
+lib/ocaml/compiler-libs/closure_origin.mli
 lib/ocaml/compiler-libs/cmi_format.cmx
 lib/ocaml/compiler-libs/cmm.cmi
 lib/ocaml/compiler-libs/cmm.cmt
 lib/ocaml/compiler-libs/cmm.cmti
 lib/ocaml/compiler-libs/cmm.cmx
+lib/ocaml/compiler-libs/cmm.mli
 lib/ocaml/compiler-libs/cmmgen.cmi
 lib/ocaml/compiler-libs/cmmgen.cmt
 lib/ocaml/compiler-libs/cmmgen.cmti
 lib/ocaml/compiler-libs/cmmgen.cmx
+lib/ocaml/compiler-libs/cmmgen.mli
 lib/ocaml/compiler-libs/cmt_format.cmx
 lib/ocaml/compiler-libs/cmx_format.cmi
 lib/ocaml/compiler-libs/cmx_format.cmti
+lib/ocaml/compiler-libs/cmx_format.mli
 lib/ocaml/compiler-libs/coloring.cmi
 lib/ocaml/compiler-libs/coloring.cmt
 lib/ocaml/compiler-libs/coloring.cmti
 lib/ocaml/compiler-libs/coloring.cmx
+lib/ocaml/compiler-libs/coloring.mli
 lib/ocaml/compiler-libs/comballoc.cmi
 lib/ocaml/compiler-libs/comballoc.cmt
 lib/ocaml/compiler-libs/comballoc.cmti
 lib/ocaml/compiler-libs/comballoc.cmx
+lib/ocaml/compiler-libs/comballoc.mli
+lib/ocaml/compiler-libs/compdynlink.cmx
 lib/ocaml/compiler-libs/compenv.cmx
 lib/ocaml/compiler-libs/compilation_unit.cmi
 lib/ocaml/compiler-libs/compilation_unit.cmt
 lib/ocaml/compiler-libs/compilation_unit.cmti
+lib/ocaml/compiler-libs/compilation_unit.mli
 lib/ocaml/compiler-libs/compile.cmx
 lib/ocaml/compiler-libs/compilenv.cmi
 lib/ocaml/compiler-libs/compilenv.cmt
 lib/ocaml/compiler-libs/compilenv.cmti
 lib/ocaml/compiler-libs/compilenv.cmx
+lib/ocaml/compiler-libs/compilenv.mli
 lib/ocaml/compiler-libs/compmisc.cmx
+lib/ocaml/compiler-libs/compplugin.cmx
 lib/ocaml/compiler-libs/config.cmx
 lib/ocaml/compiler-libs/consistbl.cmx
 lib/ocaml/compiler-libs/ctype.cmx
@@ -177,20 +195,28 @@ lib/ocaml/compiler-libs/deadcode.cmi
 lib/ocaml/compiler-libs/deadcode.cmt
 lib/ocaml/compiler-libs/deadcode.cmti
 lib/ocaml/compiler-libs/deadcode.cmx
-lib/ocaml/compiler-libs/debuginfo.cmx
+lib/ocaml/compiler-libs/deadcode.mli
+lib/ocaml/compiler-libs/debuginfo.cmi
+lib/ocaml/compiler-libs/debuginfo.cmt
+lib/ocaml/compiler-libs/debuginfo.cmti
+lib/ocaml/compiler-libs/debuginfo.mli
+lib/ocaml/compiler-libs/depend.cmx
 lib/ocaml/compiler-libs/dll.cmx
 lib/ocaml/compiler-libs/docstrings.cmx
 lib/ocaml/compiler-libs/effect_analysis.cmi
 lib/ocaml/compiler-libs/effect_analysis.cmt
 lib/ocaml/compiler-libs/effect_analysis.cmti
+lib/ocaml/compiler-libs/effect_analysis.mli
 lib/ocaml/compiler-libs/emit.cmi
 lib/ocaml/compiler-libs/emit.cmt
 lib/ocaml/compiler-libs/emit.cmti
 lib/ocaml/compiler-libs/emit.cmx
+lib/ocaml/compiler-libs/emit.mli
 lib/ocaml/compiler-libs/emitaux.cmi
 lib/ocaml/compiler-libs/emitaux.cmt
 lib/ocaml/compiler-libs/emitaux.cmti
 lib/ocaml/compiler-libs/emitaux.cmx
+lib/ocaml/compiler-libs/emitaux.mli
 lib/ocaml/compiler-libs/emitcode.cmx
 lib/ocaml/compiler-libs/env.cmx
 lib/ocaml/compiler-libs/envaux.cmx
@@ -198,129 +224,178 @@ lib/ocaml/compiler-libs/errors.cmx
 lib/ocaml/compiler-libs/export_id.cmi
 lib/ocaml/compiler-libs/export_id.cmt
 lib/ocaml/compiler-libs/export_id.cmti
+lib/ocaml/compiler-libs/export_id.mli
 lib/ocaml/compiler-libs/export_info.cmi
 lib/ocaml/compiler-libs/export_info.cmt
 lib/ocaml/compiler-libs/export_info.cmti
 lib/ocaml/compiler-libs/export_info.cmx
+lib/ocaml/compiler-libs/export_info.mli
 lib/ocaml/compiler-libs/export_info_for_pack.cmi
 lib/ocaml/compiler-libs/export_info_for_pack.cmt
 lib/ocaml/compiler-libs/export_info_for_pack.cmti
 lib/ocaml/compiler-libs/export_info_for_pack.cmx
+lib/ocaml/compiler-libs/export_info_for_pack.mli
 lib/ocaml/compiler-libs/extract_projections.cmi
 lib/ocaml/compiler-libs/extract_projections.cmt
 lib/ocaml/compiler-libs/extract_projections.cmti
+lib/ocaml/compiler-libs/extract_projections.mli
 lib/ocaml/compiler-libs/find_recursive_functions.cmi
 lib/ocaml/compiler-libs/find_recursive_functions.cmt
 lib/ocaml/compiler-libs/find_recursive_functions.cmti
+lib/ocaml/compiler-libs/find_recursive_functions.mli
 lib/ocaml/compiler-libs/flambda.cmi
 lib/ocaml/compiler-libs/flambda.cmt
 lib/ocaml/compiler-libs/flambda.cmti
+lib/ocaml/compiler-libs/flambda.mli
 lib/ocaml/compiler-libs/flambda_invariants.cmi
 lib/ocaml/compiler-libs/flambda_invariants.cmt
 lib/ocaml/compiler-libs/flambda_invariants.cmti
+lib/ocaml/compiler-libs/flambda_invariants.mli
 lib/ocaml/compiler-libs/flambda_iterators.cmi
 lib/ocaml/compiler-libs/flambda_iterators.cmt
 lib/ocaml/compiler-libs/flambda_iterators.cmti
+lib/ocaml/compiler-libs/flambda_iterators.mli
 lib/ocaml/compiler-libs/flambda_to_clambda.cmi
 lib/ocaml/compiler-libs/flambda_to_clambda.cmt
 lib/ocaml/compiler-libs/flambda_to_clambda.cmti
 lib/ocaml/compiler-libs/flambda_to_clambda.cmx
+lib/ocaml/compiler-libs/flambda_to_clambda.mli
 lib/ocaml/compiler-libs/flambda_utils.cmi
 lib/ocaml/compiler-libs/flambda_utils.cmt
 lib/ocaml/compiler-libs/flambda_utils.cmti
+lib/ocaml/compiler-libs/flambda_utils.mli
 lib/ocaml/compiler-libs/freshening.cmi
 lib/ocaml/compiler-libs/freshening.cmt
 lib/ocaml/compiler-libs/freshening.cmti
+lib/ocaml/compiler-libs/freshening.mli
 lib/ocaml/compiler-libs/id_types.cmi
 lib/ocaml/compiler-libs/id_types.cmt
 lib/ocaml/compiler-libs/id_types.cmti
+lib/ocaml/compiler-libs/id_types.mli
 lib/ocaml/compiler-libs/ident.cmx
 lib/ocaml/compiler-libs/identifiable.cmx
 lib/ocaml/compiler-libs/import_approx.cmi
 lib/ocaml/compiler-libs/import_approx.cmt
 lib/ocaml/compiler-libs/import_approx.cmti
 lib/ocaml/compiler-libs/import_approx.cmx
+lib/ocaml/compiler-libs/import_approx.mli
 lib/ocaml/compiler-libs/includeclass.cmx
 lib/ocaml/compiler-libs/includecore.cmx
 lib/ocaml/compiler-libs/includemod.cmx
 lib/ocaml/compiler-libs/inconstant_idents.cmi
 lib/ocaml/compiler-libs/inconstant_idents.cmt
 lib/ocaml/compiler-libs/inconstant_idents.cmti
+lib/ocaml/compiler-libs/inconstant_idents.mli
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
 lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
 lib/ocaml/compiler-libs/inline_and_simplify.cmi
 lib/ocaml/compiler-libs/inline_and_simplify.cmt
 lib/ocaml/compiler-libs/inline_and_simplify.cmti
+lib/ocaml/compiler-libs/inline_and_simplify.mli
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
 lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
+lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
 lib/ocaml/compiler-libs/inlining_cost.cmi
 lib/ocaml/compiler-libs/inlining_cost.cmt
 lib/ocaml/compiler-libs/inlining_cost.cmti
+lib/ocaml/compiler-libs/inlining_cost.mli
 lib/ocaml/compiler-libs/inlining_decision.cmi
 lib/ocaml/compiler-libs/inlining_decision.cmt
 lib/ocaml/compiler-libs/inlining_decision.cmti
+lib/ocaml/compiler-libs/inlining_decision.mli
 lib/ocaml/compiler-libs/inlining_decision_intf.cmi
 lib/ocaml/compiler-libs/inlining_decision_intf.cmti
+lib/ocaml/compiler-libs/inlining_decision_intf.mli
 lib/ocaml/compiler-libs/inlining_stats.cmi
 lib/ocaml/compiler-libs/inlining_stats.cmt
 lib/ocaml/compiler-libs/inlining_stats.cmti
+lib/ocaml/compiler-libs/inlining_stats.mli
 lib/ocaml/compiler-libs/inlining_stats_types.cmi
 lib/ocaml/compiler-libs/inlining_stats_types.cmt
 lib/ocaml/compiler-libs/inlining_stats_types.cmti
+lib/ocaml/compiler-libs/inlining_stats_types.mli
 lib/ocaml/compiler-libs/inlining_transforms.cmi
 lib/ocaml/compiler-libs/inlining_transforms.cmt
 lib/ocaml/compiler-libs/inlining_transforms.cmti
+lib/ocaml/compiler-libs/inlining_transforms.mli
 lib/ocaml/compiler-libs/instruct.cmx
 lib/ocaml/compiler-libs/interf.cmi
 lib/ocaml/compiler-libs/interf.cmt
 lib/ocaml/compiler-libs/interf.cmti
 lib/ocaml/compiler-libs/interf.cmx
+lib/ocaml/compiler-libs/interf.mli
+lib/ocaml/compiler-libs/internal_variable_names.cmi
+lib/ocaml/compiler-libs/internal_variable_names.cmt
+lib/ocaml/compiler-libs/internal_variable_names.cmti
+lib/ocaml/compiler-libs/internal_variable_names.mli
+lib/ocaml/compiler-libs/interval.cmi
+lib/ocaml/compiler-libs/interval.cmt
+lib/ocaml/compiler-libs/interval.cmti
+lib/ocaml/compiler-libs/interval.cmx
+lib/ocaml/compiler-libs/interval.mli
 lib/ocaml/compiler-libs/invariant_params.cmi
 lib/ocaml/compiler-libs/invariant_params.cmt
 lib/ocaml/compiler-libs/invariant_params.cmti
+lib/ocaml/compiler-libs/invariant_params.mli
 lib/ocaml/compiler-libs/lambda.cmx
 lib/ocaml/compiler-libs/lexer.cmx
 lib/ocaml/compiler-libs/lift_code.cmi
 lib/ocaml/compiler-libs/lift_code.cmt
 lib/ocaml/compiler-libs/lift_code.cmti
+lib/ocaml/compiler-libs/lift_code.mli
 lib/ocaml/compiler-libs/lift_constants.cmi
 lib/ocaml/compiler-libs/lift_constants.cmt
 lib/ocaml/compiler-libs/lift_constants.cmti
+lib/ocaml/compiler-libs/lift_constants.mli
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
 lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
 lib/ocaml/compiler-libs/linearize.cmi
 lib/ocaml/compiler-libs/linearize.cmt
 lib/ocaml/compiler-libs/linearize.cmti
 lib/ocaml/compiler-libs/linearize.cmx
+lib/ocaml/compiler-libs/linearize.mli
 lib/ocaml/compiler-libs/linkage_name.cmi
 lib/ocaml/compiler-libs/linkage_name.cmt
 lib/ocaml/compiler-libs/linkage_name.cmti
+lib/ocaml/compiler-libs/linkage_name.mli
+lib/ocaml/compiler-libs/linscan.cmi
+lib/ocaml/compiler-libs/linscan.cmt
+lib/ocaml/compiler-libs/linscan.cmti
+lib/ocaml/compiler-libs/linscan.cmx
+lib/ocaml/compiler-libs/linscan.mli
 lib/ocaml/compiler-libs/liveness.cmi
 lib/ocaml/compiler-libs/liveness.cmt
 lib/ocaml/compiler-libs/liveness.cmti
 lib/ocaml/compiler-libs/liveness.cmx
+lib/ocaml/compiler-libs/liveness.mli
 lib/ocaml/compiler-libs/location.cmx
 lib/ocaml/compiler-libs/longident.cmx
 lib/ocaml/compiler-libs/mach.cmi
 lib/ocaml/compiler-libs/mach.cmt
 lib/ocaml/compiler-libs/mach.cmti
 lib/ocaml/compiler-libs/mach.cmx
+lib/ocaml/compiler-libs/mach.mli
 lib/ocaml/compiler-libs/main.cmx
 lib/ocaml/compiler-libs/main.o
 lib/ocaml/compiler-libs/main_args.cmx
+lib/ocaml/compiler-libs/makedepend.cmx
 lib/ocaml/compiler-libs/matching.cmx
 lib/ocaml/compiler-libs/meta.cmx
 lib/ocaml/compiler-libs/middle_end.cmi
 lib/ocaml/compiler-libs/middle_end.cmt
 lib/ocaml/compiler-libs/middle_end.cmti
+lib/ocaml/compiler-libs/middle_end.mli
 lib/ocaml/compiler-libs/misc.cmx
 lib/ocaml/compiler-libs/mtype.cmx
 lib/ocaml/compiler-libs/mutable_variable.cmi
 lib/ocaml/compiler-libs/mutable_variable.cmt
 lib/ocaml/compiler-libs/mutable_variable.cmti
+lib/ocaml/compiler-libs/mutable_variable.mli
 lib/ocaml/compiler-libs/numbers.cmx
 lib/ocaml/compiler-libs/ocamlbytecomp.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
@@ -345,12 +420,17 @@ lib/ocaml/compiler-libs/optmain.cmt
 lib/ocaml/compiler-libs/optmain.cmti
 lib/ocaml/compiler-libs/optmain.cmx
 lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/parameter.cmi
+lib/ocaml/compiler-libs/parameter.cmt
+lib/ocaml/compiler-libs/parameter.cmti
+lib/ocaml/compiler-libs/parameter.mli
 lib/ocaml/compiler-libs/parmatch.cmx
 lib/ocaml/compiler-libs/parse.cmx
 lib/ocaml/compiler-libs/parser.cmx
 lib/ocaml/compiler-libs/pass_wrapper.cmi
 lib/ocaml/compiler-libs/pass_wrapper.cmt
 lib/ocaml/compiler-libs/pass_wrapper.cmti
+lib/ocaml/compiler-libs/pass_wrapper.mli
 lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/pparse.cmx
 lib/ocaml/compiler-libs/pprintast.cmx
@@ -361,115 +441,150 @@ lib/ocaml/compiler-libs/printclambda.cmi
 lib/ocaml/compiler-libs/printclambda.cmt
 lib/ocaml/compiler-libs/printclambda.cmti
 lib/ocaml/compiler-libs/printclambda.cmx
+lib/ocaml/compiler-libs/printclambda.mli
 lib/ocaml/compiler-libs/printcmm.cmi
 lib/ocaml/compiler-libs/printcmm.cmt
 lib/ocaml/compiler-libs/printcmm.cmti
 lib/ocaml/compiler-libs/printcmm.cmx
+lib/ocaml/compiler-libs/printcmm.mli
 lib/ocaml/compiler-libs/printinstr.cmx
 lib/ocaml/compiler-libs/printlambda.cmx
 lib/ocaml/compiler-libs/printlinear.cmi
 lib/ocaml/compiler-libs/printlinear.cmt
 lib/ocaml/compiler-libs/printlinear.cmti
 lib/ocaml/compiler-libs/printlinear.cmx
+lib/ocaml/compiler-libs/printlinear.mli
 lib/ocaml/compiler-libs/printmach.cmi
 lib/ocaml/compiler-libs/printmach.cmt
 lib/ocaml/compiler-libs/printmach.cmti
 lib/ocaml/compiler-libs/printmach.cmx
+lib/ocaml/compiler-libs/printmach.mli
+lib/ocaml/compiler-libs/printpat.cmx
 lib/ocaml/compiler-libs/printtyp.cmx
 lib/ocaml/compiler-libs/printtyped.cmx
 lib/ocaml/compiler-libs/proc.cmi
 lib/ocaml/compiler-libs/proc.cmt
 lib/ocaml/compiler-libs/proc.cmti
 lib/ocaml/compiler-libs/proc.cmx
+lib/ocaml/compiler-libs/proc.mli
+lib/ocaml/compiler-libs/profile.cmx
 lib/ocaml/compiler-libs/projection.cmi
 lib/ocaml/compiler-libs/projection.cmt
 lib/ocaml/compiler-libs/projection.cmti
+lib/ocaml/compiler-libs/projection.mli
 lib/ocaml/compiler-libs/ref_to_variables.cmi
 lib/ocaml/compiler-libs/ref_to_variables.cmt
 lib/ocaml/compiler-libs/ref_to_variables.cmti
+lib/ocaml/compiler-libs/ref_to_variables.mli
 lib/ocaml/compiler-libs/reg.cmi
 lib/ocaml/compiler-libs/reg.cmt
 lib/ocaml/compiler-libs/reg.cmti
 lib/ocaml/compiler-libs/reg.cmx
+lib/ocaml/compiler-libs/reg.mli
 lib/ocaml/compiler-libs/reload.cmi
 lib/ocaml/compiler-libs/reload.cmt
 lib/ocaml/compiler-libs/reload.cmti
 lib/ocaml/compiler-libs/reload.cmx
+lib/ocaml/compiler-libs/reload.mli
 lib/ocaml/compiler-libs/reloadgen.cmi
 lib/ocaml/compiler-libs/reloadgen.cmt
 lib/ocaml/compiler-libs/reloadgen.cmti
 lib/ocaml/compiler-libs/reloadgen.cmx
+lib/ocaml/compiler-libs/reloadgen.mli
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
 lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
 lib/ocaml/compiler-libs/remove_unused_arguments.cmi
 lib/ocaml/compiler-libs/remove_unused_arguments.cmt
 lib/ocaml/compiler-libs/remove_unused_arguments.cmti
+lib/ocaml/compiler-libs/remove_unused_arguments.mli
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
 lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
+lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
 lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
+lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
 lib/ocaml/compiler-libs/runtimedef.cmx
 lib/ocaml/compiler-libs/schedgen.cmi
 lib/ocaml/compiler-libs/schedgen.cmt
 lib/ocaml/compiler-libs/schedgen.cmti
 lib/ocaml/compiler-libs/schedgen.cmx
+lib/ocaml/compiler-libs/schedgen.mli
 lib/ocaml/compiler-libs/scheduling.cmi
 lib/ocaml/compiler-libs/scheduling.cmt
 lib/ocaml/compiler-libs/scheduling.cmti
 lib/ocaml/compiler-libs/scheduling.cmx
+lib/ocaml/compiler-libs/scheduling.mli
 lib/ocaml/compiler-libs/selectgen.cmi
 lib/ocaml/compiler-libs/selectgen.cmt
 lib/ocaml/compiler-libs/selectgen.cmti
 lib/ocaml/compiler-libs/selectgen.cmx
+lib/ocaml/compiler-libs/selectgen.mli
 lib/ocaml/compiler-libs/selection.cmi
 lib/ocaml/compiler-libs/selection.cmt
 lib/ocaml/compiler-libs/selection.cmti
 lib/ocaml/compiler-libs/selection.cmx
-lib/ocaml/compiler-libs/semantics_of_primitives.cmi
+lib/ocaml/compiler-libs/selection.mli
-lib/ocaml/compiler-libs/semantics_of_primitives.cmt
+lib/ocaml/compiler-libs/semantics_of_primitives.cmx
-lib/ocaml/compiler-libs/semantics_of_primitives.cmti
 lib/ocaml/compiler-libs/set_of_closures_id.cmi
 lib/ocaml/compiler-libs/set_of_closures_id.cmt
 lib/ocaml/compiler-libs/set_of_closures_id.cmti
+lib/ocaml/compiler-libs/set_of_closures_id.mli
 lib/ocaml/compiler-libs/set_of_closures_origin.cmi
 lib/ocaml/compiler-libs/set_of_closures_origin.cmt
 lib/ocaml/compiler-libs/set_of_closures_origin.cmti
+lib/ocaml/compiler-libs/set_of_closures_origin.mli
 lib/ocaml/compiler-libs/share_constants.cmi
 lib/ocaml/compiler-libs/share_constants.cmt
 lib/ocaml/compiler-libs/share_constants.cmti
+lib/ocaml/compiler-libs/share_constants.mli
 lib/ocaml/compiler-libs/simple_value_approx.cmi
 lib/ocaml/compiler-libs/simple_value_approx.cmt
 lib/ocaml/compiler-libs/simple_value_approx.cmti
+lib/ocaml/compiler-libs/simple_value_approx.mli
 lib/ocaml/compiler-libs/simplif.cmx
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
 lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
 lib/ocaml/compiler-libs/simplify_common.cmi
 lib/ocaml/compiler-libs/simplify_common.cmt
 lib/ocaml/compiler-libs/simplify_common.cmti
+lib/ocaml/compiler-libs/simplify_common.mli
 lib/ocaml/compiler-libs/simplify_primitives.cmi
 lib/ocaml/compiler-libs/simplify_primitives.cmt
 lib/ocaml/compiler-libs/simplify_primitives.cmti
+lib/ocaml/compiler-libs/simplify_primitives.mli
+lib/ocaml/compiler-libs/spacetime_profiling.cmi
+lib/ocaml/compiler-libs/spacetime_profiling.cmt
+lib/ocaml/compiler-libs/spacetime_profiling.cmti
+lib/ocaml/compiler-libs/spacetime_profiling.cmx
+lib/ocaml/compiler-libs/spacetime_profiling.mli
 lib/ocaml/compiler-libs/spill.cmi
 lib/ocaml/compiler-libs/spill.cmt
 lib/ocaml/compiler-libs/spill.cmti
 lib/ocaml/compiler-libs/spill.cmx
+lib/ocaml/compiler-libs/spill.mli
 lib/ocaml/compiler-libs/split.cmi
 lib/ocaml/compiler-libs/split.cmt
 lib/ocaml/compiler-libs/split.cmti
 lib/ocaml/compiler-libs/split.cmx
+lib/ocaml/compiler-libs/split.mli
 lib/ocaml/compiler-libs/static_exception.cmi
 lib/ocaml/compiler-libs/static_exception.cmt
 lib/ocaml/compiler-libs/static_exception.cmti
+lib/ocaml/compiler-libs/static_exception.mli
 lib/ocaml/compiler-libs/strmatch.cmi
 lib/ocaml/compiler-libs/strmatch.cmt
 lib/ocaml/compiler-libs/strmatch.cmti
 lib/ocaml/compiler-libs/strmatch.cmx
+lib/ocaml/compiler-libs/strmatch.mli
 lib/ocaml/compiler-libs/strongly_connected_components.cmx
 lib/ocaml/compiler-libs/stypes.cmx
 lib/ocaml/compiler-libs/subst.cmx
@@ -477,20 +592,28 @@ lib/ocaml/compiler-libs/switch.cmx
 lib/ocaml/compiler-libs/symbol.cmi
 lib/ocaml/compiler-libs/symbol.cmt
 lib/ocaml/compiler-libs/symbol.cmti
+lib/ocaml/compiler-libs/symbol.mli
 lib/ocaml/compiler-libs/symtable.cmx
 lib/ocaml/compiler-libs/syntaxerr.cmx
 lib/ocaml/compiler-libs/tag.cmi
 lib/ocaml/compiler-libs/tag.cmt
 lib/ocaml/compiler-libs/tag.cmti
+lib/ocaml/compiler-libs/tag.mli
+lib/ocaml/compiler-libs/targetint.cmx
 lib/ocaml/compiler-libs/tast_mapper.cmx
 lib/ocaml/compiler-libs/tbl.cmx
 lib/ocaml/compiler-libs/terminfo.cmx
-lib/ocaml/compiler-libs/timings.cmx
 lib/ocaml/compiler-libs/translattribute.cmx
 lib/ocaml/compiler-libs/translclass.cmx
 lib/ocaml/compiler-libs/translcore.cmx
 lib/ocaml/compiler-libs/translmod.cmx
 lib/ocaml/compiler-libs/translobj.cmx
+lib/ocaml/compiler-libs/translprim.cmx
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
 lib/ocaml/compiler-libs/typeclass.cmx
 lib/ocaml/compiler-libs/typecore.cmx
 lib/ocaml/compiler-libs/typedecl.cmx
@@ -505,108 +628,59 @@ lib/ocaml/compiler-libs/un_anf.cmi
 lib/ocaml/compiler-libs/un_anf.cmt
 lib/ocaml/compiler-libs/un_anf.cmti
 lib/ocaml/compiler-libs/un_anf.cmx
+lib/ocaml/compiler-libs/un_anf.mli
 lib/ocaml/compiler-libs/unbox_closures.cmi
 lib/ocaml/compiler-libs/unbox_closures.cmt
 lib/ocaml/compiler-libs/unbox_closures.cmti
+lib/ocaml/compiler-libs/unbox_closures.mli
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
 lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
 lib/ocaml/compiler-libs/unbox_specialised_args.cmi
 lib/ocaml/compiler-libs/unbox_specialised_args.cmt
 lib/ocaml/compiler-libs/unbox_specialised_args.cmti
+lib/ocaml/compiler-libs/unbox_specialised_args.mli
 lib/ocaml/compiler-libs/untypeast.cmx
 lib/ocaml/compiler-libs/var_within_closure.cmi
 lib/ocaml/compiler-libs/var_within_closure.cmt
 lib/ocaml/compiler-libs/var_within_closure.cmti
+lib/ocaml/compiler-libs/var_within_closure.mli
 lib/ocaml/compiler-libs/variable.cmi
 lib/ocaml/compiler-libs/variable.cmt
 lib/ocaml/compiler-libs/variable.cmti
+lib/ocaml/compiler-libs/variable.mli
 lib/ocaml/compiler-libs/warnings.cmx
 lib/ocaml/compiler-libs/x86_ast.cmi
 lib/ocaml/compiler-libs/x86_ast.cmti
+lib/ocaml/compiler-libs/x86_ast.mli
 lib/ocaml/compiler-libs/x86_dsl.cmi
 lib/ocaml/compiler-libs/x86_dsl.cmt
 lib/ocaml/compiler-libs/x86_dsl.cmti
 lib/ocaml/compiler-libs/x86_dsl.cmx
+lib/ocaml/compiler-libs/x86_dsl.mli
 lib/ocaml/compiler-libs/x86_gas.cmi
 lib/ocaml/compiler-libs/x86_gas.cmt
 lib/ocaml/compiler-libs/x86_gas.cmti
 lib/ocaml/compiler-libs/x86_gas.cmx
+lib/ocaml/compiler-libs/x86_gas.mli
 lib/ocaml/compiler-libs/x86_masm.cmi
 lib/ocaml/compiler-libs/x86_masm.cmt
 lib/ocaml/compiler-libs/x86_masm.cmti
 lib/ocaml/compiler-libs/x86_masm.cmx
+lib/ocaml/compiler-libs/x86_masm.mli
 lib/ocaml/compiler-libs/x86_proc.cmi
 lib/ocaml/compiler-libs/x86_proc.cmt
 lib/ocaml/compiler-libs/x86_proc.cmti
 lib/ocaml/compiler-libs/x86_proc.cmx
-lib/ocaml/complex.cmx
+lib/ocaml/compiler-libs/x86_proc.mli
-lib/ocaml/complex.p.cmt
-lib/ocaml/complex.p.cmx
-lib/ocaml/digest.cmx
-lib/ocaml/digest.p.cmt
-lib/ocaml/digest.p.cmx
-lib/ocaml/ephemeron.cmx
-lib/ocaml/ephemeron.p.cmt
-lib/ocaml/ephemeron.p.cmx
-lib/ocaml/filename.cmx
-lib/ocaml/filename.p.cmt
-lib/ocaml/filename.p.cmx
-lib/ocaml/format.cmx
-lib/ocaml/format.p.cmt
-lib/ocaml/format.p.cmx
-lib/ocaml/gc.cmx
-lib/ocaml/gc.p.cmt
-lib/ocaml/gc.p.cmx
-lib/ocaml/genlex.cmx
-lib/ocaml/genlex.p.cmt
-lib/ocaml/genlex.p.cmx
-lib/ocaml/hashtbl.cmx
-lib/ocaml/hashtbl.p.cmt
-lib/ocaml/hashtbl.p.cmx
-lib/ocaml/int32.cmx
-lib/ocaml/int32.p.cmt
-lib/ocaml/int32.p.cmx
-lib/ocaml/int64.cmx
-lib/ocaml/int64.p.cmt
-lib/ocaml/int64.p.cmx
-lib/ocaml/int_misc.cmx
-lib/ocaml/lazy.cmx
-lib/ocaml/lazy.p.cmt
-lib/ocaml/lazy.p.cmx
-lib/ocaml/lexing.cmx
-lib/ocaml/lexing.p.cmt
-lib/ocaml/lexing.p.cmx
 lib/ocaml/libasmrun.a
 lib/ocaml/libasmrun_pic.a
 lib/ocaml/libasmrun_shared.so
+lib/ocaml/libasmrund.a
+lib/ocaml/libasmruni.a
 lib/ocaml/libasmrunp.a
 lib/ocaml/libthreadsnat.a
-lib/ocaml/list.cmx
-lib/ocaml/list.p.cmt
-lib/ocaml/list.p.cmx
-lib/ocaml/listLabels.cmx
-lib/ocaml/listLabels.p.cmt
-lib/ocaml/listLabels.p.cmx
-lib/ocaml/map.cmx
-lib/ocaml/map.p.cmt
-lib/ocaml/map.p.cmx
-lib/ocaml/marshal.cmx
-lib/ocaml/marshal.p.cmt
-lib/ocaml/marshal.p.cmx
-lib/ocaml/moreLabels.cmx
-lib/ocaml/moreLabels.p.cmt
-lib/ocaml/moreLabels.p.cmx
-lib/ocaml/nat.cmx
-lib/ocaml/nativeint.cmx
-lib/ocaml/nativeint.p.cmt
-lib/ocaml/nativeint.p.cmx
-lib/ocaml/num.cmx
-lib/ocaml/nums.a
-lib/ocaml/nums.cmxa
-lib/ocaml/obj.cmx
-lib/ocaml/obj.p.cmt
-lib/ocaml/obj.p.cmx
 lib/ocaml/ocamldoc/odoc.cmx
 lib/ocaml/ocamldoc/odoc_analyse.cmx
 lib/ocaml/ocamldoc/odoc_args.cmx
@@ -656,69 +730,167 @@ lib/ocaml/ocamldoc/odoc_to_text.cmx
 lib/ocaml/ocamldoc/odoc_type.cmx
 lib/ocaml/ocamldoc/odoc_types.cmx
 lib/ocaml/ocamldoc/odoc_value.cmx
-lib/ocaml/oo.cmx
-lib/ocaml/oo.p.cmt
-lib/ocaml/oo.p.cmx
-lib/ocaml/parsing.cmx
-lib/ocaml/parsing.p.cmt
-lib/ocaml/parsing.p.cmx
-lib/ocaml/pervasives.cmx
-lib/ocaml/pervasives.p.cmt
-lib/ocaml/pervasives.p.cmx
-lib/ocaml/printexc.cmx
-lib/ocaml/printexc.p.cmt
-lib/ocaml/printexc.p.cmx
-lib/ocaml/printf.cmx
-lib/ocaml/printf.p.cmt
-lib/ocaml/printf.p.cmx
 lib/ocaml/profiling.cmx
 lib/ocaml/profiling.o
-lib/ocaml/queue.cmx
-lib/ocaml/queue.p.cmt
-lib/ocaml/queue.p.cmx
-lib/ocaml/random.cmx
-lib/ocaml/random.p.cmt
-lib/ocaml/random.p.cmx
-lib/ocaml/ratio.cmx
-lib/ocaml/scanf.cmx
-lib/ocaml/scanf.p.cmt
-lib/ocaml/scanf.p.cmx
-lib/ocaml/set.cmx
-lib/ocaml/set.p.cmt
-lib/ocaml/set.p.cmx
-lib/ocaml/sort.cmx
-lib/ocaml/sort.p.cmt
-lib/ocaml/sort.p.cmx
-lib/ocaml/stack.cmx
-lib/ocaml/stack.p.cmt
-lib/ocaml/stack.p.cmx
-lib/ocaml/stdLabels.cmx
-lib/ocaml/stdLabels.p.cmt
-lib/ocaml/stdLabels.p.cmx
 lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.o
 lib/ocaml/std_exit.p.cmt
 lib/ocaml/std_exit.p.cmx
 lib/ocaml/std_exit.p.o
 lib/ocaml/stdlib.a
+lib/ocaml/stdlib.cmx
 lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.p.a
+lib/ocaml/stdlib.p.cmt
+lib/ocaml/stdlib.p.cmx
 lib/ocaml/stdlib.p.cmxa
+lib/ocaml/stdlib__arg.cmx
+lib/ocaml/stdlib__arg.p.cmt
+lib/ocaml/stdlib__arg.p.cmx
+lib/ocaml/stdlib__array.cmx
+lib/ocaml/stdlib__array.p.cmt
+lib/ocaml/stdlib__array.p.cmx
+lib/ocaml/stdlib__arrayLabels.cmx
+lib/ocaml/stdlib__arrayLabels.p.cmt
+lib/ocaml/stdlib__arrayLabels.p.cmx
+lib/ocaml/stdlib__bigarray.cmx
+lib/ocaml/stdlib__bigarray.p.cmt
+lib/ocaml/stdlib__bigarray.p.cmx
+lib/ocaml/stdlib__buffer.cmx
+lib/ocaml/stdlib__buffer.p.cmt
+lib/ocaml/stdlib__buffer.p.cmx
+lib/ocaml/stdlib__bytes.cmx
+lib/ocaml/stdlib__bytes.p.cmt
+lib/ocaml/stdlib__bytes.p.cmx
+lib/ocaml/stdlib__bytesLabels.cmx
+lib/ocaml/stdlib__bytesLabels.p.cmt
+lib/ocaml/stdlib__bytesLabels.p.cmx
+lib/ocaml/stdlib__callback.cmx
+lib/ocaml/stdlib__callback.p.cmt
+lib/ocaml/stdlib__callback.p.cmx
+lib/ocaml/stdlib__char.cmx
+lib/ocaml/stdlib__char.p.cmt
+lib/ocaml/stdlib__char.p.cmx
+lib/ocaml/stdlib__complex.cmx
+lib/ocaml/stdlib__complex.p.cmt
+lib/ocaml/stdlib__complex.p.cmx
+lib/ocaml/stdlib__digest.cmx
+lib/ocaml/stdlib__digest.p.cmt
+lib/ocaml/stdlib__digest.p.cmx
+lib/ocaml/stdlib__ephemeron.cmx
+lib/ocaml/stdlib__ephemeron.p.cmt
+lib/ocaml/stdlib__ephemeron.p.cmx
+lib/ocaml/stdlib__filename.cmx
+lib/ocaml/stdlib__filename.p.cmt
+lib/ocaml/stdlib__filename.p.cmx
+lib/ocaml/stdlib__float.cmx
+lib/ocaml/stdlib__float.p.cmt
+lib/ocaml/stdlib__float.p.cmx
+lib/ocaml/stdlib__format.cmx
+lib/ocaml/stdlib__format.p.cmt
+lib/ocaml/stdlib__format.p.cmx
+lib/ocaml/stdlib__gc.cmx
+lib/ocaml/stdlib__gc.p.cmt
+lib/ocaml/stdlib__gc.p.cmx
+lib/ocaml/stdlib__genlex.cmx
+lib/ocaml/stdlib__genlex.p.cmt
+lib/ocaml/stdlib__genlex.p.cmx
+lib/ocaml/stdlib__hashtbl.cmx
+lib/ocaml/stdlib__hashtbl.p.cmt
+lib/ocaml/stdlib__hashtbl.p.cmx
+lib/ocaml/stdlib__int32.cmx
+lib/ocaml/stdlib__int32.p.cmt
+lib/ocaml/stdlib__int32.p.cmx
+lib/ocaml/stdlib__int64.cmx
+lib/ocaml/stdlib__int64.p.cmt
+lib/ocaml/stdlib__int64.p.cmx
+lib/ocaml/stdlib__lazy.cmx
+lib/ocaml/stdlib__lazy.p.cmt
+lib/ocaml/stdlib__lazy.p.cmx
+lib/ocaml/stdlib__lexing.cmx
+lib/ocaml/stdlib__lexing.p.cmt
+lib/ocaml/stdlib__lexing.p.cmx
+lib/ocaml/stdlib__list.cmx
+lib/ocaml/stdlib__list.p.cmt
+lib/ocaml/stdlib__list.p.cmx
+lib/ocaml/stdlib__listLabels.cmx
+lib/ocaml/stdlib__listLabels.p.cmt
+lib/ocaml/stdlib__listLabels.p.cmx
+lib/ocaml/stdlib__map.cmx
+lib/ocaml/stdlib__map.p.cmt
+lib/ocaml/stdlib__map.p.cmx
+lib/ocaml/stdlib__marshal.cmx
+lib/ocaml/stdlib__marshal.p.cmt
+lib/ocaml/stdlib__marshal.p.cmx
+lib/ocaml/stdlib__moreLabels.cmx
+lib/ocaml/stdlib__moreLabels.p.cmt
+lib/ocaml/stdlib__moreLabels.p.cmx
+lib/ocaml/stdlib__nativeint.cmx
+lib/ocaml/stdlib__nativeint.p.cmt
+lib/ocaml/stdlib__nativeint.p.cmx
+lib/ocaml/stdlib__obj.cmx
+lib/ocaml/stdlib__obj.p.cmt
+lib/ocaml/stdlib__obj.p.cmx
+lib/ocaml/stdlib__oo.cmx
+lib/ocaml/stdlib__oo.p.cmt
+lib/ocaml/stdlib__oo.p.cmx
+lib/ocaml/stdlib__parsing.cmx
+lib/ocaml/stdlib__parsing.p.cmt
+lib/ocaml/stdlib__parsing.p.cmx
+lib/ocaml/stdlib__printexc.cmx
+lib/ocaml/stdlib__printexc.p.cmt
+lib/ocaml/stdlib__printexc.p.cmx
+lib/ocaml/stdlib__printf.cmx
+lib/ocaml/stdlib__printf.p.cmt
+lib/ocaml/stdlib__printf.p.cmx
+lib/ocaml/stdlib__queue.cmx
+lib/ocaml/stdlib__queue.p.cmt
+lib/ocaml/stdlib__queue.p.cmx
+lib/ocaml/stdlib__random.cmx
+lib/ocaml/stdlib__random.p.cmt
+lib/ocaml/stdlib__random.p.cmx
+lib/ocaml/stdlib__scanf.cmx
+lib/ocaml/stdlib__scanf.p.cmt
+lib/ocaml/stdlib__scanf.p.cmx
+lib/ocaml/stdlib__seq.cmx
+lib/ocaml/stdlib__seq.p.cmt
+lib/ocaml/stdlib__seq.p.cmx
+lib/ocaml/stdlib__set.cmx
+lib/ocaml/stdlib__set.p.cmt
+lib/ocaml/stdlib__set.p.cmx
+lib/ocaml/stdlib__sort.cmx
+lib/ocaml/stdlib__sort.p.cmt
+lib/ocaml/stdlib__sort.p.cmx
+lib/ocaml/stdlib__spacetime.cmx
+lib/ocaml/stdlib__spacetime.p.cmt
+lib/ocaml/stdlib__spacetime.p.cmx
+lib/ocaml/stdlib__stack.cmx
+lib/ocaml/stdlib__stack.p.cmt
+lib/ocaml/stdlib__stack.p.cmx
+lib/ocaml/stdlib__stdLabels.cmx
+lib/ocaml/stdlib__stdLabels.p.cmt
+lib/ocaml/stdlib__stdLabels.p.cmx
+lib/ocaml/stdlib__stream.cmx
+lib/ocaml/stdlib__stream.p.cmt
+lib/ocaml/stdlib__stream.p.cmx
+lib/ocaml/stdlib__string.cmx
+lib/ocaml/stdlib__string.p.cmt
+lib/ocaml/stdlib__string.p.cmx
+lib/ocaml/stdlib__stringLabels.cmx
+lib/ocaml/stdlib__stringLabels.p.cmt
+lib/ocaml/stdlib__stringLabels.p.cmx
+lib/ocaml/stdlib__sys.cmx
+lib/ocaml/stdlib__sys.p.cmt
+lib/ocaml/stdlib__sys.p.cmx
+lib/ocaml/stdlib__uchar.cmx
+lib/ocaml/stdlib__uchar.p.cmt
+lib/ocaml/stdlib__uchar.p.cmx
+lib/ocaml/stdlib__weak.cmx
+lib/ocaml/stdlib__weak.p.cmt
+lib/ocaml/stdlib__weak.p.cmx
 lib/ocaml/str.a
 lib/ocaml/str.cmx
 lib/ocaml/str.cmxa
-lib/ocaml/stream.cmx
-lib/ocaml/stream.p.cmt
-lib/ocaml/stream.p.cmx
-lib/ocaml/string.cmx
-lib/ocaml/string.p.cmt
-lib/ocaml/string.p.cmx
-lib/ocaml/stringLabels.cmx
-lib/ocaml/stringLabels.p.cmt
-lib/ocaml/stringLabels.p.cmx
-lib/ocaml/sys.cmx
-lib/ocaml/sys.p.cmt
-lib/ocaml/sys.p.cmx
 lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/event.cmx
 lib/ocaml/threads/mutex.cmx
@@ -726,16 +898,7 @@ lib/ocaml/threads/thread.cmx
 lib/ocaml/threads/threadUnix.cmx
 lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cmxa
-lib/ocaml/uchar.cmx
-lib/ocaml/uchar.p.cmt
-lib/ocaml/uchar.p.cmx
 lib/ocaml/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
 lib/ocaml/unixLabels.cmx
-lib/ocaml/weak.cmx
-lib/ocaml/weak.p.cmt
-lib/ocaml/weak.p.cmx
-@man man/man1/ocamlopt.1
-@man man/man1/ocamlopt.opt.1
-@man man/man1/ocamloptp.1

lang/ocaml/pkg/PLIST-graphics

@@ -1,30 +1,11 @@
-@comment $OpenBSD: PLIST-graphics,v 1.3 2016/06/24 15:59:12 krw Exp $
+@comment $OpenBSD: PLIST-graphics,v 1.4 2019/03/04 12:51:15 chrisz Exp $
 %%native%%
 lib/ocaml/graphics.cma
 lib/ocaml/graphics.cmi
+lib/ocaml/graphics.cmti
 lib/ocaml/graphics.mli
 lib/ocaml/graphicsX11.cmi
+lib/ocaml/graphicsX11.cmti
 lib/ocaml/graphicsX11.mli
 lib/ocaml/libgraphics.a
 lib/ocaml/stublibs/dllgraphics.so
-@man man/man3/Ast_helper.Const.3o
-@man man/man3/Ast_invariants.3o
-@man man/man3/Ast_iterator.3o
-@man man/man3/Attr_helper.3o
-@man man/man3/Builtin_attributes.3o
-@man man/man3/Ephemeron.3o
-@man man/man3/Ephemeron.GenHashTable.3o
-@man man/man3/Ephemeron.GenHashTable.MakeSeeded.3o
-@man man/man3/Ephemeron.K1.3o
-@man man/man3/Ephemeron.K1.Make.3o
-@man man/man3/Ephemeron.K1.MakeSeeded.3o
-@man man/man3/Ephemeron.K2.3o
-@man man/man3/Ephemeron.K2.Make.3o
-@man man/man3/Ephemeron.K2.MakeSeeded.3o
-@man man/man3/Ephemeron.Kn.3o
-@man man/man3/Ephemeron.Kn.Make.3o
-@man man/man3/Ephemeron.Kn.MakeSeeded.3o
-@man man/man3/Ephemeron.S.3o
-@man man/man3/Ephemeron.SeededS.3o
-@man man/man3/Obj.Ephemeron.3o
-@man man/man3/Uchar.3o

math/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.157 2019/02/22 11:12:27 landry Exp $
+# $OpenBSD: Makefile,v 1.158 2019/03/04 12:51:15 chrisz Exp $
 
      SUBDIR =
      SUBDIR += R
@@ -62,6 +62,8 @@
      SUBDIR += nonogram
      SUBDIR += nonolib
      SUBDIR += ntl
+     SUBDIR += ocaml-num
+     SUBDIR += ocaml-zarith
      SUBDIR += octave
      SUBDIR += openfst
      SUBDIR += p5-AI-FANN

math/coq/Makefile

@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.35 2018/05/20 08:25:36 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2019/03/04 12:51:15 chrisz Exp $
 
 COMMENT=		proof assistant based on a typed lambda calculus
 
-V=			8.4pl6
+V=			8.8.0
-DISTNAME=		coq-$V
+GH_ACCOUNT =		coq
-REVISION=		3
+GH_PROJECT =		coq
+GH_TAGNAME =		V${V}
+DISTNAME =		${GH_PROJECT}-${V}
+WRKDIST =		${WRKDIR}/${GH_PROJECT}-${V}
 
 CATEGORIES=		math
 HOMEPAGE=		https://coq.inria.fr/
@@ -15,17 +18,16 @@ MAINTAINER=		Yozo Toda <yozo@v007.vaio.ne.jp>
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += gtksourceview-2.0 gtk-x11-2.0 intl m pango-1.0 pangocairo-1.0
-WANTLIB += pthread z
+WANTLIB += pangoft2-1.0 pthread z 
-
-MASTER_SITES=	https://coq.inria.fr/distrib/V${V}/files/
 
 MODULES=	lang/ocaml
 
 BUILD_DEPENDS=	x11/lablgtk2 \
-		lang/ocaml-camlp4 \
+		lang/ocaml-camlp5 \
+		math/ocaml-num \
 		sysutils/findlib
 RUN_DEPENDS=	x11/lablgtk2
 
@@ -35,30 +37,31 @@ USE_GMAKE=	Yes
 
 CONFIGURE_STYLE= simple
 CONFIGURE_ARGS=	-emacslib ${PREFIX}/share/emacs/site-lisp \
-		-makecmd ${GMAKE} \
 		-prefix ${PREFIX} \
+		-libdir ${PREFIX}/lib/ocaml/coq \
 		-mandir ${PREFIX}/man \
-		-configdir ${SYSCONFDIR}/xdg/coq \
+		-configdir ${SYSCONFDIR}/xdg/coq
-		-with-doc no \
-		-usecamlp4
 
 .include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mocaml_native_dynlink}
+.if ${PROPERTIES:Mocaml_native}
-CONFIGURE_ARGS+=	-opt
+ALL_TARGET=		world
+INSTALL_TARGET=		install
 .else
-CONFIGURE_ARGS+=	-byteonly
+ALL_TARGET=		byte coq documentation \
+			bin/coqide coqide-files theories/Init/Prelude.vo
+INSTALL_TARGET=		install-coq install-byte install-meta
 .endif
 
-ALL_TARGET=		world
+DPB_PROPERTIES +=	parallel
+
 # Order is important!
-INSTALL_TARGET=		install-byte install-ide-byte install
 TEST_TARGET=		check
 
 post-install:
-	cd ${WRKDIST}; ${INSTALL_DATA} LICENSE COPYRIGHT CREDITS CHANGES \
+	${INSTALL_DATA_DIR} \
-	    COMPATIBILITY ${PREFIX}/share/doc/coq/
+		${PREFIX}/share/doc/coq/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/coq/
+	${INSTALL_DATA} \
-	mv ${WRKINST}${SYSCONFDIR}/xdg/coq/* ${PREFIX}/share/examples/coq/
+		${WRKDIST}/{LICENSE,CREDITS,CHANGES,CONTRIBUTING.md,README.md} \
-	rmdir ${WRKINST}${SYSCONFDIR}/xdg/coq/ ${WRKINST}${SYSCONFDIR}/xdg/
+		${PREFIX}/share/doc/coq/
 
 .include <bsd.port.mk>

math/coq/distinfo

@@ -1,2 +1,2 @@
-SHA256 (coq-8.4pl6.tar.gz) = pUCiMamXCkk1PKA581RGFv+GogiWarHFk3ea4TyR69Y=
+SHA256 (coq-8.8.0.tar.gz) = yvfB055o4OQe2Svh1XyImD+xLtufqVZnpa0tarqYJj0=
-SIZE (coq-8.4pl6.tar.gz) = 4099815
+SIZE (coq-8.8.0.tar.gz) = 5927663

math/coq/patches/patch-Makefile_ide

@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile_ide,v 1.1 2019/03/04 12:51:15 chrisz Exp $
+
+Index: Makefile.ide
+--- Makefile.ide.orig
++++ Makefile.ide
+@@ -149,7 +149,7 @@ endif
+ ifeq ($(HASCOQIDE),no)
+ install-coqide-byte: install-ide-toploop-byte
+ else
+-install-coqide-byte: install-ide-toploop-byte install-ide-byte
++install-coqide-byte: install-ide-byte install-ide-bin install-ide-toploop-byte install-ide-files install-ide-info install-ide-devfiles
+ endif
+ 
+ # Apparently, coqide.byte is not meant to be installed