Attachment 183347 Details for Bug 218333 – [ocaml patch of 20170609]

[ocaml patch of 20170609]

ocaml-2017-06-09.diff.txt (text/plain), 546.75 KB, created by Wen Heping on 2017-06-09 01:27:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2017-06-09 01:27:31 UTC

Size: 546.75 KB

patch

obsolete

>Index: Mk/Uses/ocaml.mk
>===================================================================
>--- Mk/Uses/ocaml.mk	(nonexistent)
>+++ Mk/Uses/ocaml.mk	(working copy)
>@@ -0,0 +1,245 @@
>+# $FreeBSD$
>+#
>+# Provide support for the Objective Caml language packages
>+# Feature:      ocaml
>+# MAINTAINER:   hrs@FreeBSD.org
>+# Usage:        USES=   ocaml[:[build|run]]
>+#		USE_OCAML=	findlib ldconfig camlp4 camlp5 tk
>+# Valid args in USES=ocaml are:
>+#
>+# build		Add ocamlc only to BUILD_DEPENDS.
>+#
>+# run		Add ocamlc only to RUN_DEPENDS.
>+#
>+# If no arg is specified, dependency on ocamlc to both BUILD and RUN_DEPENDS.
>+#
>+# Valid keywords in USE_OCAML are:
>+#
>+# findlib[:plist]	Set if your port uses ocamlfind to install packages.
>+#			Package directories will be automatically deleted.
>+#			If "plist" argument is specified, the findlib target
>+#			directories will be added to the plist automatically.
>+#
>+# ocamlbuild	Set if your port uses ocamlbuild to build.
>+#
>+# camlp4	Set if your port uses camlp4 to build.
>+#
>+# camlp5	Set if your port uses camlp5 to build.
>+#
>+# tk		Set if you port needs ocaml-labltk.
>+#
>+# ldconfig	Set if your port installs shared libraries
>+#		into ocaml site-lib dir. OCaml ld.conf file
>+#		will be automatically processed.
>+#
>+# wash		Set if your port wants to automatically
>+#		purge shared Ocaml dirs on uninstall. It's
>+#		useful when installing to non-standard PREFIX
>+#
>+# nox11		Set if your port wants X11-disabled ocaml.
>+#
>+#
>+# OCAML_PKGDIRS		-	Directories under site-lib to be processed
>+#				if "findlib" specified.
>+#				Default: ${PORTNAME}
>+# OCAML_LDLIBS		-	Directories under PREFIX to be automatically
>+#				added/removed from ld.conf
>+#				Default: ${OCAML_SITELIBDIR}/${PORTNAME}
>+
>+.if !defined(_INCLUDES_USES_OCAML_MK)
>+_INCLUDES_USES_OCAML_MK=	yes
>+
>+_OCAML_ARGS=	${ocaml_ARGS}
>+.if empty(_OCAML_ARGS)
>+_OCAML_ARGS=	build run
>+.endif
>+.if !empty(USE_OCAML:Mfindlib*)
>+_OCAML_FINDLIB_ARGS=	${USE_OCAML:Mfindlib*:C/^.*://}
>+.endif
>+
>+#
>+# OCaml programs location
>+#
>+OCAML_CMD?=		${LOCALBASE}/bin/ocaml
>+OCAMLC?=		${LOCALBASE}/bin/ocamlc
>+OCAMLC_OPT?=		${LOCALBASE}/bin/ocamlc.opt
>+OCAMLCP?=		${LOCALBASE}/bin/ocamlcp
>+OCAMLFIND?=		${LOCALBASE}/bin/ocamlfind
>+CAMLP4?=		${LOCALBASE}/bin/camlp4
>+CAMLP5?=		${LOCALBASE}/bin/camlp5
>+OCAMLTK?=		${LOCALBASE}/bin/labltk
>+OCAMLBUILD?=		${LOCALBASE}/bin/ocamlbuild
>+
>+#
>+# OCaml library directory
>+#
>+OCAML_LIBDIR?=		lib/ocaml
>+
>+#
>+# Where to install site libraries
>+#
>+OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
>+
>+#
>+# OCaml compiler port dependency
>+#
>+OCAMLC_PORT?=		lang/ocaml
>+.if !empty(USE_OCAML:Mnox11)
>+OCAMLC_DEPEND?=		ocaml-nox11>=0:${OCAMLC_PORT}
>+.else
>+OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
>+.endif
>+
>+#
>+# OCaml package manager port dependency
>+#
>+OCAMLFIND_PORT?=	devel/ocaml-findlib
>+OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
>+
>+# OCaml build port dependency
>+#
>+OCAMLBUILD_PORT?=	devel/ocaml-ocamlbuild
>+OCAMLBUILD_DEPEND?=	${OCAMLBUILD}:${OCAMLBUILD_PORT}
>+
>+#
>+# OCaml camlp4 port dependency
>+#
>+CAMLP4_PORT?=		devel/ocaml-camlp4
>+CAMLP4_DEPEND?=		${CAMLP4}:${CAMLP4_PORT}
>+
>+#
>+# OCaml camlp5 port dependency
>+#
>+CAMLP5_PORT?=		devel/ocaml-camlp5
>+CAMLP5_DEPEND?=		${CAMLP5}:${CAMLP5_PORT}
>+
>+#
>+# OCaml TK bindings dependency
>+
>+#
>+# OCaml TK bindings dependency
>+#
>+OCAMLTK_PORT?=		x11-toolkits/ocaml-labltk
>+OCAMLTK_DEPENDS?=	${OCAMLTK}:${OCAMLTK_PORT}
>+
>+#
>+# Common OCaml examples and documents location
>+#
>+OCAML_DOCSDIR=		${PREFIX}/share/doc/ocaml
>+OCAML_EXAMPLESDIR=	${PREFIX}/share/examples/ocaml
>+
>+#
>+# Location of OCaml ld.conf file
>+#
>+OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
>+
>+# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
>+# work well with staging.
>+.if !empty(USE_OCAML:Mldconfig)
>+. if !target(ocaml-ldconfig)
>+OCAMLFIND_LDCONF?=	/dev/null
>+. endif
>+.endif
>+
>+OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
>+OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
>+
>+PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
>+.for K in ${_OCAML_ARGS}
>+${K:tu}_DEPENDS+=	${OCAMLC_DEPEND}
>+.endfor
>+
>+.if !empty(USE_OCAML:Mfindlib*)
>+#
>+# We'll additionally add ocamlfind to RUN_DEPENDS, since
>+# if the port requires ocamlfind to install - it requires
>+# some ocaml libraries and these libraries RUN_DEPENDS on
>+# ocamlfind
>+#
>+BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
>+RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
>+MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
>+		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
>+
>+_USES_install+=	250:findlib-pre-install
>+.if !target(findlib-pre-install)
>+findlib-pre-install:
>+	@${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}
>+.endif
>+#
>+# Directories under site-lib to process automatically
>+#
>+OCAML_PKGDIRS?=	${PORTNAME}
>+_USES_install+=	735:ocaml-findlib
>+. if !target(ocaml-findlib)
>+ocaml-findlib:
>+.  for DIR in ${OCAML_PKGDIRS}
>+.   if !empty(_OCAML_FINDLIB_ARGS:Mplist)
>+	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ \
>+	    -type f -print | ${SED} -e \
>+	    's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>+.   endif
>+#	@${ECHO_CMD} "@postunexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
>+#		>> ${TMPPLIST}
>+.  endfor
>+. endif
>+.endif
>+
>+.if !empty(USE_OCAML:Mocamlbuild)
>+BUILD_DEPENDS+=	${OCAMLBUILD_DEPEND}
>+.endif
>+
>+OCAMLBUILD_PREFIX=	${PREFIX}
>+OCAMLBUILD_BINDIR=	${PREFIX}/bin
>+OCAMLBUILD_LIBDIR=	${PREFIX}/${OCAML_SITELIBDIR}
>+OCAMLBUILD_MANDIR=	${PREFIX}/man
>+MAKE_ENV+=	OCAMLBUILD_PREFIX=${OCAMLBUILD_PREFIX} \
>+		OCAMLBUILD_BINDIR=${OCAMLBUILD_BINDIR} \
>+		OCAMLBUILD_LIBDIR=${OCAMLBUILD_LIBDIR} \
>+		OCAMLBUILD_MANDIR=${OCAMLBUILD_MANDIR}
>+
>+.if !empty(USE_OCAML:Mcamlp4)
>+BUILD_DEPENDS+=		${CAMLP4_DEPEND}
>+.endif
>+
>+.if !empty(USE_OCAML:Mcamlp5)
>+BUILD_DEPENDS+=		${CAMLP5_DEPEND}
>+.endif
>+
>+.if !empty(USE_OCAML:Mtk)
>+. if !defined(NO_OCAMLTK_BUILDDEPENDS)
>+EXTRACT_DEPENDS+=	${OCAMLTK_DEPENDS}
>+PATCH_DEPENDS+=		${OCAMLTK_DEPENDS}
>+BUILD_DEPENDS+=		${OCAMLTK_DEPENDS}
>+. endif
>+. if !defined(NO_OCAMLTK_RUNDEPENDS)
>+RUN_DEPENDS+=		${OCAMLTK_DEPENDS}
>+. endif
>+.endif
>+
>+.if !empty(USE_OCAML:Mldconfig)
>+#
>+# Directories under PREFIX for appending to ld.conf
>+#
>+OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
>+_USES_install+=	740:ocaml-ldconfig
>+. if !target(ocaml-ldconfig)
>+ocaml-ldconfig:
>+.  for LIB in ${OCAML_LDLIBS}
>+	@${ECHO_CMD} "@postexec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
>+		>> ${TMPPLIST}
>+	@${ECHO_CMD} "@postunexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
>+.  endfor
>+. endif
>+.endif
>+
>+.if !empty(USE_OCAML:Mwash)
>+. if !target(ocaml-wash)
>+_USES_install+=	745:ocaml-wash
>+ocaml-wash:
>+#	If ld.conf is empty
>+	@${ECHO_CMD} "@postunexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST}
>+. endif
>+.endif
>+
>+.endif # !defined(_INCLUDES_USES_OCAML_MK)
>
>Property changes on: Mk/Uses/ocaml.mk
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: Mk/bsd.ocaml.mk
>===================================================================
>--- Mk/bsd.ocaml.mk	(revision 442522)
>+++ Mk/bsd.ocaml.mk	(nonexistent)
>@@ -1,204 +0,0 @@
>-# ex:ts=4
>-#
>-# $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
>-# $FreeBSD$
>-#
>-# bsd.ocaml.mk - Support for the Objective Caml language packages
>-#
>-# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
>-#
>-# Feel free to send any comments and suggestions to maintainer.
>-#
>-# Currently recognised variables are:
>-#
>-# USE_OCAML		-	Set if your port uses OCaml to build/install.
>-# NO_OCAML_BUILDDEPENDS	-	Don't add ocamlc to BUILD|EXTRACT|PATCH_DEPENDS.
>-# NO_OCAML_RUNDEPENDS	-	Don't add ocamlc to RUN_DEPENDS.
>-# USE_OCAML_FINDLIB	-	Set if your port uses ocamlfind to install
>-#				packages. Package direcories will be
>-#				automatically deleted.
>-# USE_OCAML_CAMLP4	-	Set if your port uses camlp4 to build.
>-# USE_OCAML_TK		-	Set if you port needs ocaml-labltk.
>-# NO_OCAMLTK_BUILDDEPENDS -	Don't add labltk to BUILD|EXTRACT|PATCH_DEPENDS.
>-# NO_OCAMLTK_RUNDEPENDS	-	Don't add labltk to RUN_DEPENDS.
>-# USE_OCAML_LDCONFIG	-	Set if your port installs shared libraries
>-#				into ocaml site-lib dir. OCaml ld.conf file
>-#				will be automatically processed.
>-# USE_OCAMLFIND_PLIST	-	Add contents of findlib target directories
>-#				automatically.
>-# USE_OCAML_WASH	-	Set if your port wants to automatically
>-#				purge shared Ocaml dirs on uninstall. It's
>-#				useful when installing to non-standard PREFIX
>-# OCAML_PKGDIRS		-	Directories under site-lib to be processed
>-#				if USE_OCAML_FINDLIB specified.
>-#				Default: ${PORTNAME}
>-# OCAML_LDLIBS		-	Directories under PREFIX to be automatically
>-#				added/removed from ld.conf
>-#				Default: ${OCAML_SITELIBDIR}/${PORTNAME}
>-
>-.if !defined(OCAML_include)
>-
>-OCAML_MAINTAINER=	ports@FreeBSD.org
>-OCAML_include=		bsd.ocaml.mk
>-
>-#
>-# OCaml programs location
>-#
>-OCAMLC?=		${LOCALBASE}/bin/ocamlc
>-OCAMLC_OPT?=		${LOCALBASE}/bin/ocamlc.opt
>-OCAMLCP?=		${LOCALBASE}/bin/ocamlcp
>-OCAMLFIND?=		${LOCALBASE}/bin/ocamlfind
>-CAMLP4?=		${LOCALBASE}/bin/camlp4
>-OCAMLTK?=		${LOCALBASE}/bin/labltk
>-
>-#
>-# OCaml library directory
>-#
>-OCAML_LIBDIR?=		lib/ocaml
>-
>-#
>-# Where to install site libraries
>-#
>-OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
>-
>-#
>-# OCaml compiler port dependency
>-#
>-OCAMLC_PORT?=		lang/ocaml
>-OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
>-
>-#
>-# OCaml package manager port dependency
>-#
>-OCAMLFIND_PORT?=	devel/ocaml-findlib
>-OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
>-
>-#
>-# OCaml camlp4 port dependency
>-#
>-CAMLP4_PORT?=		devel/ocaml-camlp4
>-CAMLP4_DEPEND?=		${CAMLP4}:${CAMLP4_PORT}
>-
>-#
>-# OCaml TK bindings dependency
>-#
>-OCAMLTK_PORT?=		x11-toolkits/ocaml-labltk
>-OCAMLTK_DEPENDS?=	${OCAMLTK}:${OCAMLTK_PORT}
>-
>-#
>-# Common OCaml examples and documents location
>-#
>-OCAML_DOCSDIR=		${PREFIX}/share/doc/ocaml
>-OCAML_EXAMPLESDIR=	${PREFIX}/share/examples/ocaml
>-
>-#
>-# Location of OCaml ld.conf file
>-#
>-OCAML_LDCONF?=		${OCAML_LIBDIR}/ld.conf
>-
>-# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
>-# work well with staging.
>-.if defined(USE_OCAML_LDCONFIG)
>-. if !target(ocaml-ldconfig)
>-OCAMLFIND_LDCONF?=	/dev/null
>-. endif
>-.endif
>-
>-OCAMLFIND_DESTDIR?=	${PREFIX}/${OCAML_SITELIBDIR}
>-OCAMLFIND_LDCONF?=	${PREFIX}/${OCAML_LDCONF}
>-
>-.if defined(USE_OCAML)
>-. if !defined(NO_OCAML_BUILDDEPENDS)
>-EXTRACT_DEPENDS+=	${OCAMLC_DEPEND}
>-PATCH_DEPENDS+=		${OCAMLC_DEPEND}
>-BUILD_DEPENDS+=		${OCAMLC_DEPEND}
>-. endif
>-. if !defined(NO_OCAML_RUNDEPENDS)
>-RUN_DEPENDS+=		${OCAMLC_DEPEND}
>-. endif
>-PLIST_SUB+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
>-.endif
>-
>-.if defined(USE_OCAML_FINDLIB)
>-#
>-# We'll additionally add ocamlfind to RUN_DEPENDS, since
>-# if the port requires ocamlfind to install - it requires
>-# some ocaml libraries and these libraries RUN_DEPENDS on
>-# ocamlfind
>-#
>-BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
>-RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
>-MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
>-		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
>-
>-#
>-# Directories under site-lib to process automatically
>-#
>-OCAML_PKGDIRS?=	${PORTNAME}
>-_USES_install+=	735:ocaml-findlib
>-. if !target(ocaml-findlib)
>-ocaml-findlib:
>-.  for DIR in ${OCAML_PKGDIRS}
>-.   if defined(USE_OCAMLFIND_PLIST)
>-	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
>-		's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>-.   endif
>-	@${ECHO_CMD} "@postunexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
>-		>> ${TMPPLIST}
>-.  endfor
>-. endif
>-.endif
>-
>-.if defined(USE_OCAML_CAMLP4)
>-BUILD_DEPENDS+=		${CAMLP4_DEPEND}
>-.endif
>-
>-.if defined(USE_OCAML_TK)
>-. if !defined(NO_OCAMLTK_BUILDDEPENDS)
>-EXTRACT_DEPENDS+=	${OCAMLTK_DEPENDS}
>-PATCH_DEPENDS+=		${OCAMLTK_DEPENDS}
>-BUILD_DEPENDS+=		${OCAMLTK_DEPENDS}
>-. endif
>-. if !defined(NO_OCAMLTK_RUNDEPENDS)
>-RUN_DEPENDS+=		${OCAMLTK_DEPENDS}
>-. endif
>-.endif
>-
>-.if defined(USE_OCAML_LDCONFIG)
>-#
>-# Directories under PREFIX for appending to ld.conf
>-#
>-OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${PORTNAME}
>-_USES_install+=	740:ocaml-ldconfig
>-. if !target(ocaml-ldconfig)
>-ocaml-ldconfig:
>-.  for LIB in ${OCAML_LDLIBS}
>-	@${ECHO_CMD} "@postexec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
>-		>> ${TMPPLIST}
>-	@${ECHO_CMD} "@postunexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
>-.  endfor
>-. endif
>-.endif
>-
>-.if defined(USE_OCAML_WASH)
>-. if !target(ocaml-wash)
>-_USES_install+=	745:ocaml-wash
>-ocaml-wash:
>-#	If ld.conf is empty
>-	@${ECHO_CMD} "@postunexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST}
>-. endif
>-.endif
>-
>-.endif #!defined(OCAML_include)
>-
>-.if defined(_POSTMKINCLUDED)
>-
>-.if defined(USE_OCAML_FINDLIB)
>-
>-pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR}
>-${STAGEDIR}${OCAMLFIND_DESTDIR}:
>-	@${MKDIR} ${.TARGET}
>-
>-.endif
>-
>-.endif # _POSTMKINCLUDED
>
>Property changes on: Mk/bsd.ocaml.mk
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 442522)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -1361,8 +1361,10 @@
> .include "${PORTSDIR}/Mk/bsd.ruby.mk"
> .endif
> 
>-.if defined(USE_OCAML)
>-.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
>+.if defined(USE_OCAML) && \
>+    (!defined(USES) || (defined(USES) && !${USES:Mocaml*}))
>+DEV_WARNING+= "Using USE_OCAML alone is deprecated, please use USES=ocaml"
>+USES+=	ocaml
> .endif
> 
> .if defined(USE_APACHE) || defined(USE_APACHE_BUILD) || defined(USE_APACHE_RUN)
>@@ -1844,10 +1846,6 @@
> .include "${PORTSDIR}/Mk/bsd.java.mk"
> .endif
> 
>-.if defined(USE_OCAML)
>-.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
>-.endif
>-
> .if defined(USE_QT4) || defined(USE_QT5)
> .include "${PORTSDIR}/Mk/bsd.qt.mk"
> .endif
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 442522)
>+++ devel/Makefile	(working copy)
>@@ -1697,6 +1697,7 @@
>     SUBDIR += obby
>     SUBDIR += objecthash
>     SUBDIR += ocaml-annexlib
>+    SUBDIR += ocaml-biniou
>     SUBDIR += ocaml-calendar
>     SUBDIR += ocaml-camljava
>     SUBDIR += ocaml-camlp4
>@@ -1707,7 +1708,10 @@
>     SUBDIR += ocaml-classes
>     SUBDIR += ocaml-cmdliner
>     SUBDIR += ocaml-cppo
>+    SUBDIR += ocaml-cudf
>     SUBDIR += ocaml-deriving-ocsigen
>+    SUBDIR += ocaml-dose3
>+    SUBDIR += ocaml-easy-format
>     SUBDIR += ocaml-extlib
>     SUBDIR += ocaml-findlib
>     SUBDIR += ocaml-ipaddr
>@@ -1714,7 +1718,9 @@
>     SUBDIR += ocaml-lacaml
>     SUBDIR += ocaml-lwt
>     SUBDIR += ocaml-magic
>+    SUBDIR += ocaml-ocamlbuild
>     SUBDIR += ocaml-opam
>+    SUBDIR += ocaml-optcomp
>     SUBDIR += ocaml-ounit
>     SUBDIR += ocaml-parmap
>     SUBDIR += ocaml-pcre
>@@ -1723,14 +1729,18 @@
>     SUBDIR += ocaml-re
>     SUBDIR += ocaml-react
>     SUBDIR += ocaml-res
>+    SUBDIR += ocaml-result
>     SUBDIR += ocaml-sdl
>     SUBDIR += ocaml-sem
>     SUBDIR += ocaml-sexplib
>     SUBDIR += ocaml-type_conv
>+    SUBDIR += ocaml-topkg
>+    SUBDIR += ocaml-uchar
>     SUBDIR += ocaml-ulex
>     SUBDIR += ocaml-uutf
>     SUBDIR += ocaml-xstr
>     SUBDIR += ocaml-xstrp4
>+    SUBDIR += ocaml-yojson
>     SUBDIR += ocl-icd
>     SUBDIR += oclgrind
>     SUBDIR += ode
>Index: archivers/ocaml-bz2/Makefile
>===================================================================
>--- archivers/ocaml-bz2/Makefile	(revision 442522)
>+++ archivers/ocaml-bz2/Makefile	(working copy)
>@@ -3,33 +3,30 @@
> 
> PORTNAME=	bz2
> PORTVERSION=	0.6.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	archivers
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/72/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	caml${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml library to manipulate bz2 files
> 
> LICENSE=	LGPL21 LGPL3
> LICENSE_COMB=	dual
> 
>-OPTIONS_DEFINE=	DOCS
>-
>-DESTDIRNAME=	DONTUSEIT
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ldconfig wash
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_WASH=		yes
>-USE_OCAMLFIND_PLIST=	yes
>-USES=		gmake
> 
> PORTDOCS=	*
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> 
>+OPTIONS_DEFINE=	DOCS
>+
>+DESTDIRNAME=	DONTUSEIT
>+
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/bz2/dllcamlbz2.so
> 
>@@ -36,6 +33,6 @@
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
>+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: archivers/ocaml-zip/Makefile
>===================================================================
>--- archivers/ocaml-zip/Makefile	(revision 442522)
>+++ archivers/ocaml-zip/Makefile	(working copy)
>@@ -2,22 +2,20 @@
> # $FreeBSD$
> 
> PORTNAME=	zip
>-PORTVERSION=	1.05
>+PORTVERSION=	1.07
> CATEGORIES=	archivers
>-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1037/
> PKGNAMEPREFIX=	ocaml-
>-DISTNAME=	caml${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
> 
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USE_OCAML=	yes
>-USE_OCAML_LDCONFIG=yes
>-USE_OCAML_WASH=	yes
>-
>+USES=		gmake ocaml
>+USE_OCAML=	ldconfig wash
>+USE_GITHUB=	yes
>+GH_TUPLE=	xavierleroy:camlzip:rel107
> ALL_TARGET=	all allopt
> INSTALL_TARGET=	install installopt
> PATTERN=	([[:space:]]*)cp([[:space:]]+.*)
>@@ -25,15 +23,16 @@
> post-extract:
> # PREFIX, CFLAGS and permissions safeness
> 	@${REINPLACE_CMD} -E \
>-		-e "s,${PATTERN},\1\$${BSD_INSTALL_DATA}\2," \
>-		-e "s,(-ccopt[[:space:]])-g,\1\"${CFLAGS}\"," \
>-		-e "s,^(INSTALLDIR=).*,\1${STAGEDIR}${OCAMLFIND_DESTDIR}/zip," \
>-		-e "/ldconf/d" ${WRKSRC}/Makefile
>+	    -e "s,${PATTERN},\1\$${BSD_INSTALL_DATA}\2," \
>+	    -e "s,(-ccopt[[:space:]])-g,\1\"${CFLAGS}\"," \
>+	    -e "s,^(INSTALLDIR=).*,\1${STAGEDIR}${OCAMLFIND_DESTDIR}/zip," \
>+	    -e "/ldconf/d" ${WRKSRC}/Makefile
> 
> post-install:
>-	${INSTALL_DATA} ${FILESDIR}/META ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME}
>+	${INSTALL_DATA} ${WRKSRC}/META-zip \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/zip/META
> 	@${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
>-		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/zip/dllcamlzip.so
>+	    ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/zip/dllcamlzip.so
> 
> .include <bsd.port.mk>
>Index: archivers/ocaml-zip/distinfo
>===================================================================
>--- archivers/ocaml-zip/distinfo	(revision 442522)
>+++ archivers/ocaml-zip/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (camlzip-1.05.tar.gz) = 930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b
>-SIZE (camlzip-1.05.tar.gz) = 25817
>+TIMESTAMP = 1488692454
>+SHA256 (xavierleroy-camlzip-1.07-rel107_GH0.tar.gz) = 2f4df4df258b8bca89176a5c4200a6920eccb3134f3df70d61a67e16fd1fbfdd
>+SIZE (xavierleroy-camlzip-1.07-rel107_GH0.tar.gz) = 26652
>Index: archivers/ocaml-zip/files/META
>===================================================================
>--- archivers/ocaml-zip/files/META	(revision 442522)
>+++ archivers/ocaml-zip/files/META	(working copy)
>@@ -1,7 +0,0 @@
>-name="zip"
>-version="1.04"
>-description="reading and writing ZIP, JAR and GZIP files"
>-requires="unix"
>-archive(byte)="zip.cma"
>-archive(native)="zip.cmxa"
>-linkopts = ""
>Index: archivers/ocaml-zip/files/patch-Makefile
>===================================================================
>--- archivers/ocaml-zip/files/patch-Makefile	(revision 442522)
>+++ archivers/ocaml-zip/files/patch-Makefile	(working copy)
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2015-10-01 02:48:15 UTC
>-+++ Makefile
>-@@ -56,7 +56,7 @@ clean:
>- 
>- install:
>- 	mkdir -p $(INSTALLDIR)
>--	${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
>-+	${BSD_INSTALL_DATA} zip.cma zip.cmi gzip.cmi zip.mli gzip.mli zlib.cmi zlib.mli libcamlzip.a $(INSTALLDIR)
>- 	if test -f dllcamlzip.so; then \
>- 	  ${BSD_INSTALL_DATA} dllcamlzip.so $(INSTALLDIR); \
>-           installdir=$(INSTALLDIR); \
>Index: astro/planets/Makefile
>===================================================================
>--- astro/planets/Makefile	(revision 442522)
>+++ astro/planets/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	planets
> PORTVERSION=	0.1.13
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	astro
> MASTER_SITES=	GENTOO \
> 		http://planets.homedns.org/dist/
>@@ -14,10 +14,8 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake tar:tgz
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>-USE_OCAML_TK=	yes
>+USES=		gmake ocaml tar:tgz tk tcl
>+USE_OCAML=	camlp4 tk
> USE_XORG=	x11
> ALL_TARGET=	${PORTNAME}
> 
>Index: converters/ocaml-base64/Makefile
>===================================================================
>--- converters/ocaml-base64/Makefile	(revision 442522)
>+++ converters/ocaml-base64/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	base64
> PORTVERSION=	2.0.0
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	converters
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -10,18 +11,17 @@
> MAINTAINER=	vg@FreeBSD.org
> COMMENT=	Base64 encoding and decoding in OCaml
> 
>+LICENSE=	MIT
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	mirage
> GH_PROJECT=	ocaml-base64
> 
>-USES=			gmake
>-HAS_CONFIGURE=		yes
>-MAKE_JOBS_UNSAFE=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
>+HAS_CONFIGURE=	yes
>+MAKE_JOBS_UNSAFE=yes
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
> DOCSDIR=	${PREFIX}/share/doc/pcre-ocaml
> 
> CONFIGURE_ARGS=		--destdir="${DESTDIRNAME}"
>Index: converters/ocaml-jsonm/Makefile
>===================================================================
>--- converters/ocaml-jsonm/Makefile	(revision 442522)
>+++ converters/ocaml-jsonm/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	jsonm
> PORTVERSION=	0.9.1
>+PORTREVISION=	1
> CATEGORIES=	converters
> MASTER_SITES=	http://erratique.ch/software/jsonm/releases/
> PKGNAMEPREFIX=	ocaml-
>@@ -15,14 +16,10 @@
> BUILD_DEPENDS=	${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
> RUN_DEPENDS=	${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
> 
>-USES=	tar:tbz
>-USE_OCAML=		yes
>+USES=	tar:tbz ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
> SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
> 
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>-
> do-build:
> 	cd ${WRKSRC} && ocamlbuild src/jsonm.cmxs src/jsonm.cma src/jsonm.a
> 
>Index: databases/ocaml-dbm/Makefile
>===================================================================
>--- databases/ocaml-dbm/Makefile	(revision 442522)
>+++ databases/ocaml-dbm/Makefile	(working copy)
>@@ -3,12 +3,13 @@
> 
> PORTNAME=	dbm
> PORTVERSION=	1.0
>+PORTREVISION=	1
> CATEGORIES=	databases
> MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	caml${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml binding to the NDBM and GDBM database library
> 
> LICENSE=	LGPL20
>@@ -15,18 +16,17 @@
> 
> CONFLICTS=	ocaml-[0-3]* ocaml-nox11-[0-3]*
> 
>-USES=		tar:tgz
>+USES=		tar:tgz ocaml
> HAS_CONFIGURE=	yes
>-USE_OCAML=	yes
>+MAKE_ENV=	DESTDIR="${STAGEDIR}"
> DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
>-MAKE_ENV+=	DESTDIR="${STAGEDIR}"
> 
> pre-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm \
>-		${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm \
>+	    ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/META \
>-		${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm
> 
> .include <bsd.port.mk>
>Index: databases/ocaml-mysql/Makefile
>===================================================================
>--- databases/ocaml-mysql/Makefile	(revision 442522)
>+++ databases/ocaml-mysql/Makefile	(working copy)
>@@ -3,24 +3,20 @@
> 
> PORTNAME=	mysql
> PORTVERSION=	1.1.1
>+PORTREVISION=	1
> CATEGORIES=	databases
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/870/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml bindings to libmysqlclient
> 
>-USES=			gmake
>-USE_MYSQL=		yes
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>+LICENSE=	LGPL21
> 
>+USES=		gmake mysql ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig ocamlbuild
> GNU_CONFIGURE=		yes
>-
> ALL_TARGET=		all opt
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -28,12 +24,11 @@
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
>-
> DOCS_ALL_TARGET=	htdoc
> 
> post-patch:
> 	${REINPLACE_CMD} 's,OCAMLFIND_INSTFLAGS=,OCAMLFIND_INSTFLAGS=-ldconf ignore ,' \
>-		${WRKSRC}/Makefile.in
>+	    ${WRKSRC}/Makefile.in
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: databases/ocaml-mysql/files/patch-mysql_stub.c
>===================================================================
>--- databases/ocaml-mysql/files/patch-mysql_stub.c	(nonexistent)
>+++ databases/ocaml-mysql/files/patch-mysql_stub.c	(working copy)
>@@ -0,0 +1,35 @@
>+--- mysql_stubs.c.orig	2017-03-05 14:58:57.707208000 +0900
>++++ mysql_stubs.c	2017-03-05 14:59:19.532484000 +0900
>+@@ -501,14 +501,14 @@
>+ 
>+ EXTERNAL value
>+ db_to_row(value result, value offset) {
>+-  int64 off = Int64_val(offset);
>++  int64_t off = Int64_val(offset);
>+   MYSQL_RES *res;
>+ 
>+   res = RESval(result);
>+   if (!res) 
>+     mysqlfailwith("Mysql.to_row: result did not return fetchable data");
>+ 
>+-  if (off < 0 || off > (int64)mysql_num_rows(res)-1)
>++  if (off < 0 || off > (int64_t)mysql_num_rows(res)-1)
>+     invalid_argument("Mysql.to_row: offset out of range");
>+ 
>+   mysql_data_seek(res, off);
>+@@ -633,13 +633,13 @@
>+ {
>+   CAMLparam1(result);
>+   MYSQL_RES *res;
>+-  int64 size;
>++  int64_t size;
>+ 
>+   res = RESval(result);
>+   if (!res)
>+     size = 0;
>+   else
>+-    size = (int64)(mysql_num_rows(res));
>++    size = (int64_t)(mysql_num_rows(res));
>+   
>+   CAMLreturn(copy_int64(size));
>+ }
>
>Property changes on: databases/ocaml-mysql/files/patch-mysql_stub.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/ocaml-sqlite3/Makefile
>===================================================================
>--- databases/ocaml-sqlite3/Makefile	(revision 442522)
>+++ databases/ocaml-sqlite3/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	sqlite3
> PORTVERSION=	4.0.5
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	databases
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -15,11 +16,8 @@
> LICENSE_FILE=	${WRKSRC}/COPYING.txt
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=			compiler:features gmake pkgconfig sqlite
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=			compiler:features gmake pkgconfig sqlite ocaml
>+USE_OCAML=		findlib:plist ldconfig ocamlbuild
> HAS_CONFIGURE=		yes
> MAKE_JOBS_UNSAFE=	yes
> CONFIGURE_ARGS=		--destdir "${STAGEDIR}" \
>@@ -40,12 +38,12 @@
> .endif
> 
> do-configure:
>-	(cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS})
>+	(cd ${WRKSRC} && ${OCAML_CMD} setup.ml -configure ${CONFIGURE_ARGS})
> 
> do-build:
>-	(cd ${WRKSRC} && ocaml setup.ml -build)
>+	(cd ${WRKSRC} && ${OCAML_CMD} setup.ml -build)
> 
> do-install:
>-	(cd ${WRKSRC} && ocaml setup.ml -install)
>+	(cd ${WRKSRC} && ${OCAML_CMD} setup.ml -install)
> 
> .include <bsd.port.post.mk>
>Index: deskutils/semantik/Makefile
>===================================================================
>--- deskutils/semantik/Makefile	(revision 442522)
>+++ deskutils/semantik/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	semantik
> PORTVERSION=	0.9.5
>-PORTREVISION=	1
> CATEGORIES=	deskutils kde
> MASTER_SITES=	http://ftp.waf.io/pub/release/ \
> 		http://www.freehackers.org/~tnagy/release/
>Index: deskutils/wyrd/Makefile
>===================================================================
>--- deskutils/wyrd/Makefile	(revision 442522)
>+++ deskutils/wyrd/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wyrd
> PORTVERSION=	1.4.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	deskutils
> MASTER_SITES=	http://pessimization.com/software/wyrd/
> 
>@@ -14,9 +14,8 @@
> 
> RUN_DEPENDS=	remind:deskutils/remind
> 
>-USES=		gmake ncurses
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>+USES=		gmake ncurses ocaml
>+USE_OCAML=	camlp4
> GNU_CONFIGURE=	yes
> 
> CONFIGURE_ARGS= CPPFLAGS="${CFLAGS}"
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 442522)
>+++ devel/Makefile	(working copy)
>@@ -1697,6 +1697,7 @@
>     SUBDIR += obby
>     SUBDIR += objecthash
>     SUBDIR += ocaml-annexlib
>+    SUBDIR += ocaml-biniou
>     SUBDIR += ocaml-calendar
>     SUBDIR += ocaml-camljava
>     SUBDIR += ocaml-camlp4
>@@ -1707,7 +1708,10 @@
>     SUBDIR += ocaml-classes
>     SUBDIR += ocaml-cmdliner
>     SUBDIR += ocaml-cppo
>+    SUBDIR += ocaml-cudf
>     SUBDIR += ocaml-deriving-ocsigen
>+    SUBDIR += ocaml-dose3
>+    SUBDIR += ocaml-easy-format
>     SUBDIR += ocaml-extlib
>     SUBDIR += ocaml-findlib
>     SUBDIR += ocaml-ipaddr
>@@ -1714,7 +1718,9 @@
>     SUBDIR += ocaml-lacaml
>     SUBDIR += ocaml-lwt
>     SUBDIR += ocaml-magic
>+    SUBDIR += ocaml-ocamlbuild
>     SUBDIR += ocaml-opam
>+    SUBDIR += ocaml-optcomp
>     SUBDIR += ocaml-ounit
>     SUBDIR += ocaml-parmap
>     SUBDIR += ocaml-pcre
>@@ -1723,14 +1729,18 @@
>     SUBDIR += ocaml-re
>     SUBDIR += ocaml-react
>     SUBDIR += ocaml-res
>+    SUBDIR += ocaml-result
>     SUBDIR += ocaml-sdl
>     SUBDIR += ocaml-sem
>     SUBDIR += ocaml-sexplib
>     SUBDIR += ocaml-type_conv
>+    SUBDIR += ocaml-topkg
>+    SUBDIR += ocaml-uchar
>     SUBDIR += ocaml-ulex
>     SUBDIR += ocaml-uutf
>     SUBDIR += ocaml-xstr
>     SUBDIR += ocaml-xstrp4
>+    SUBDIR += ocaml-yojson
>     SUBDIR += ocl-icd
>     SUBDIR += oclgrind
>     SUBDIR += ode
>Index: devel/aifad/Makefile
>===================================================================
>--- devel/aifad/Makefile	(revision 442522)
>+++ devel/aifad/Makefile	(working copy)
>@@ -4,9 +4,10 @@
> PORTNAME=	aifad
> PORTVERSION=	2.0.8
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Machine learning system
> 
> LICENSE=	LGPL21+
>@@ -17,15 +18,11 @@
> 		ocaml-res>0:devel/ocaml-res
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>+USES=		ocaml:build
> USE_GITHUB=	yes
> GH_ACCOUNT=	mmottl
>-
>-USE_OCAML=	yes
>-NO_OCAML_RUNDEPENDS=yes
>-
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${STAGEDIR}${PREFIX}
>-
> PORTDOCS=	AUTHORS.txt CHANGES.txt README.md TODO.md
> PORTEXAMPLES=	*
> PLIST_FILES=	bin/aifad
>Index: devel/cil/Makefile
>===================================================================
>--- devel/cil/Makefile	(revision 442522)
>+++ devel/cil/Makefile	(working copy)
>@@ -3,11 +3,11 @@
> 
> PORTNAME=	cil
> PORTVERSION=	1.7.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel lang
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Infrastructure for C Program Analysis and Transformation
> 
> LICENSE=	BSD3CLAUSE
>@@ -16,9 +16,8 @@
> CONFLICTS=	ccured-[0-9]*
> 
> ONLY_FOR_ARCHS=	i386 amd64
>-USES=		gmake perl5
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>+USES=		gmake ocaml perl5
>+USE_OCAML=	findlib ocamlbuild
> OCAML_PKGDIRS=
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=yes
>Index: devel/coccinelle/Makefile
>===================================================================
>--- devel/coccinelle/Makefile	(revision 442522)
>+++ devel/coccinelle/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	coccinelle
> PORTVERSION=	1.0.4
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
> 
>@@ -17,15 +18,15 @@
> 		ocaml-pcre>=0:devel/ocaml-pcre
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-USE_OCAML=	3.0+
>-USE_OCAML_CAMLP4=yes
>-
>-USES=		gmake perl5 pkgconfig:build python tar:tgz
>+USES=		gmake perl5 pkgconfig:build ocaml python tar:tgz
> USE_PERL5=	build
>+USE_OCAML=	camlp4 findlib
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
> MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"
> 
>+IGNORE=		does not build: Required module Setcore is unavailable
>+
> post-install:
> 	# FIXME: Stripping spatch(1) breaks the executable.
> 	# ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/spatch
>Index: devel/frama-c/Makefile
>===================================================================
>--- devel/frama-c/Makefile	(revision 442522)
>+++ devel/frama-c/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	frama-c
> DISTVERSIONPREFIX=	Silicon-
> DISTVERSION=	20161101
>+PORTREVISION=	1
> CATEGORIES=	devel lang
> MASTER_SITES=	http://frama-c.com/download/
> DIST_SUBDIR=	framac-01
>@@ -13,16 +14,14 @@
> 
> LICENSE=	LGPL21
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph \
>-	    ${LOCALBASE}/lib/ocaml/site-lib/zarith/zarith.a:math/ocaml-zarith
>-RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph \
>-	    ${LOCALBASE}/lib/ocaml/site-lib/zarith/zarith.a:math/ocaml-zarith
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ocamlgraph/META:math/ocaml-ocamlgraph \
>+	    ${LOCALBASE}/${OCAML_SITELIBDIR}/zarith/META:math/ocaml-zarith
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
> LIB_DEPENDS=	libgmp.so:math/gmp \
> 	    libfreetype.so:print/freetype2 \
> 	    libfontconfig.so:x11-fonts/fontconfig
> 
>-USES=		gettext-runtime gmake gnome localbase pathfix pkgconfig
>-USE_OCAML=	yes
>+USES=		gettext-runtime gmake gnome localbase ocaml pathfix pkgconfig
> USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 \
> 	    libartlgpl2 libgnomecanvas pango
> 
>Index: devel/menhir/Makefile
>===================================================================
>--- devel/menhir/Makefile	(revision 442522)
>+++ devel/menhir/Makefile	(working copy)
>@@ -5,21 +5,19 @@
> PORTVERSION=	20160303
> CATEGORIES=	devel
> MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
>+PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	LR(1) parser generator for OCaml
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-OCAML_PKGDIRS=		menhirLib
>+LICENSE=	LGPL20
> 
>-USES=		gmake shebangfix
>+USES=		gmake shebangfix ocaml
>+USE_OCAML=	findlib:plist ocamlbuild
>+OCAML_PKGDIRS=	menhirLib
> SHEBANG_FILES=	demos/find-menhir.sh
>-MAKE_JOBS_UNSAFE=	yes
>-
>+MAKE_JOBS_UNSAFE= yes
> DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
>-
> PORTDOCS=	*
> PLIST_FILES=	bin/menhir man/man1/menhir.1.gz %%DATADIR%%/standard.mly
> 
>@@ -26,15 +24,15 @@
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|share/man|man| ; \
>-		 s|doc/menhir|doc/ocaml/menhir| ; \
>-		 s| $$$(bindir)$| $${DESTDIR}\1| ; \
>-		 s| $$$(libdir)$| $${DESTDIR}\1| ; \
>-		 s| $$$(docdir)$| $${DESTDIR}\1| ; \
>-		 s| $$$(mandir)$| $${DESTDIR}\1|' ${WRKSRC}/Makefile
>+	${REINPLACE_CMD} -e \
>+	    's|share/man|man| ; \
>+	     s|doc/menhir|doc/ocaml/menhir| ; \
>+	     s| $$$(bindir)$| $${DESTDIR}\1| ; \
>+	     s| $$$(libdir)$| $${DESTDIR}\1| ; \
>+	     s| $$$(docdir)$| $${DESTDIR}\1| ; \
>+	     s| $$$(mandir)$| $${DESTDIR}\1|' ${WRKSRC}/Makefile
> 
> post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/menhir
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/menhir
> 
> .include <bsd.port.mk>
>Index: devel/monotone-viz/Makefile
>===================================================================
>--- devel/monotone-viz/Makefile	(revision 442522)
>+++ devel/monotone-viz/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	monotone-viz
> PORTVERSION=	1.0.2
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	devel
> MASTER_SITES=	http://oandrieu.nerim.net/monotone-viz/
> 
>@@ -24,9 +24,8 @@
> 		bash:shells/bash \
> 		lablgtk2:x11-toolkits/ocaml-lablgtk2
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>+USES=		gmake ocaml
>+USE_OCAML=	camlp4
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--without-local-lablgtk
> 
>Index: devel/ocaml-annexlib/Makefile
>===================================================================
>--- devel/ocaml-annexlib/Makefile	(revision 442522)
>+++ devel/ocaml-annexlib/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	annexlib
> PORTVERSION=	0.13.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	http://raevnos.pennmush.org/code/extlib/
> PKGNAMEPREFIX=	ocaml-
>@@ -16,11 +16,8 @@
> BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
> RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ldconfig
> GNU_CONFIGURE=	yes
> ALL_TARGET=	all opt
> SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
>Index: devel/ocaml-biniou/Makefile
>===================================================================
>--- devel/ocaml-biniou/Makefile	(nonexistent)
>+++ devel/ocaml-biniou/Makefile	(working copy)
>@@ -0,0 +1,28 @@
>+# $FreeBSD$
>+
>+PORTNAME=	biniou
>+PORTVERSION=	1.0.12
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	devel www
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Binary data format library in OCaml
>+
>+LICENSE=	BSD3CLAUSE
>+
>+BUILD_DEPENDS=	${OCAMLFIND_DESTDIR}/easy-format/easy_format.cmxs:devel/ocaml-easy-format
>+
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mjambon
>+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
>+MAKE_JOBS_UNSAFE= yes
>+PLIST_FILES=	bin/bdump
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bdump \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/biniou.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-biniou/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-biniou/distinfo
>===================================================================
>--- devel/ocaml-biniou/distinfo	(nonexistent)
>+++ devel/ocaml-biniou/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489429348
>+SHA256 (mjambon-biniou-v1.0.12_GH0.tar.gz) = b946e720d94d524b95bb0401d9e47a971e9234df808fe5f12601140ab09ec686
>+SIZE (mjambon-biniou-v1.0.12_GH0.tar.gz) = 24262
>
>Property changes on: devel/ocaml-biniou/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-biniou/pkg-descr
>===================================================================
>--- devel/ocaml-biniou/pkg-descr	(nonexistent)
>+++ devel/ocaml-biniou/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+Easy-format: indentation made easy
>+
>+WWW: https://github.com/mjambon/easy-format
>
>Property changes on: devel/ocaml-biniou/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-calendar/Makefile
>===================================================================
>--- devel/ocaml-calendar/Makefile	(revision 442522)
>+++ devel/ocaml-calendar/Makefile	(working copy)
>@@ -3,17 +3,18 @@
> 
> PORTNAME=	calendar
> PORTVERSION=	2.03.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/915/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Date and time library for OCaml
> 
>+LICENSE=	LGPL21
>+
>+USES=		gmake ocaml
> GNU_CONFIGURE=	yes
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USE_OCAML=	findlib:plist
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-camljava/Makefile
>===================================================================
>--- devel/ocaml-camljava/Makefile	(revision 442522)
>+++ devel/ocaml-camljava/Makefile	(working copy)
>@@ -3,15 +3,18 @@
> 
> PORTNAME=	camljava
> PORTVERSION=	0.3
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel java
> MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml-Java library interface
> 
>-USE_OCAML=	yes
>+LICENSE=	LGPL20
>+
>+USES=		ocaml
>+USE_OCAML=	ocamlbuild
> USE_JAVA=	yes
> JAVA_VERSION=	1.6+
> 
>Index: devel/ocaml-camlp4/Makefile
>===================================================================
>--- devel/ocaml-camlp4/Makefile	(revision 442522)
>+++ devel/ocaml-camlp4/Makefile	(working copy)
>@@ -2,30 +2,28 @@
> # $FreeBSD$
> 
> PORTNAME=	camlp4
>-PORTVERSION=	4.02.1+1
>-PORTREVISION=	1
>+PORTVERSION=	4.04
>+DISTVERSIONSUFFIX=	+1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	michipili@gmail.com
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Camlp4 is a system for writing extensible parsers for OCaml
> 
> LICENSE=	LGPL20
> 
>+USES=		gmake ocaml
>+USE_OCAML=	ocamlbuild
> USE_GITHUB=	yes
> GH_ACCOUNT=	ocaml
>-
>-USES=		gmake
>-USE_OCAML=	yes
> HAS_CONFIGURE=	yes
>-MAKE_ENV+=	DESTDIR="${STAGEDIR}"
>+MAKE_ENV=	DESTDIR="${STAGEDIR}"
> MAKE_JOBS_UNSAFE=yes
> ALL_TARGET=	all camlp4/META
> INSTALL_TARGET=	install install-META
>+PROGS=		camlp4o camlp4of camlp4oof camlp4orf camlp4r camlp4rf
> 
> post-install:
>-.for f in camlp4o camlp4of camlp4oof camlp4orf camlp4r camlp4rf
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}.opt
>-.endfor
>+	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} ${PROGS:S/$/.opt/}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-camlp4/distinfo
>===================================================================
>--- devel/ocaml-camlp4/distinfo	(revision 442522)
>+++ devel/ocaml-camlp4/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1464772487
>-SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2
>-SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754
>+TIMESTAMP = 1484416148
>+SHA256 (ocaml-camlp4-4.04+1_GH0.tar.gz) = 6044f24a44053684d1260f19387e59359f59b0605cdbf7295e1de42783e48ff1
>+SIZE (ocaml-camlp4-4.04+1_GH0.tar.gz) = 648320
>Index: devel/ocaml-camlp4/files/patch-Makefile
>===================================================================
>--- devel/ocaml-camlp4/files/patch-Makefile	(revision 442522)
>+++ devel/ocaml-camlp4/files/patch-Makefile	(working copy)
>@@ -1,18 +1,11 @@
>---- Makefile.orig	2014-10-21 11:41:15 UTC
>-+++ Makefile
>-@@ -19,12 +19,12 @@ all: byte native
>+--- Makefile.orig	2016-11-07 21:56:48.000000000 +0900
>++++ Makefile	2017-01-15 02:50:08.583346000 +0900
>+@@ -21,7 +21,7 @@
>  
>  .PHONY: install
>  install:
>--	./build/install.sh
>-+	env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh
>+-	env DESTDIR=$(DESTDIR) ./build/install.sh
>++	env DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) ./build/install.sh
>  
>  .PHONY: install-META
>  install-META: camlp4/META
>--	mkdir -p ${PKGDIR}/camlp4/
>--	cp -f camlp4/META ${PKGDIR}/camlp4/
>-+	mkdir -p ${DESTDIR}${PKGDIR}/camlp4/
>-+	cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/
>- 
>- camlp4/META: camlp4/META.in
>- 	sed -e s/@@VERSION@@/${version}/g $? > $@
>Index: devel/ocaml-camlp4/files/patch-build_install.sh
>===================================================================
>--- devel/ocaml-camlp4/files/patch-build_install.sh	(revision 442522)
>+++ devel/ocaml-camlp4/files/patch-build_install.sh	(nonexistent)
>@@ -1,13 +0,0 @@
>---- build/install.sh.orig	2014-10-21 11:41:15 UTC
>-+++ build/install.sh
>-@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}"
>- 
>- . ./config.sh
>- 
>--BINDIR="${SAVED_BINDIR:-${BINDIR}}"
>--LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}"
>-+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}"
>-+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}"
>- 
>- not_installed=$PWD/_build/not_installed
>- 
>
>Property changes on: devel/ocaml-camlp4/files/patch-build_install.sh
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/ocaml-camlp5/Makefile
>===================================================================
>--- devel/ocaml-camlp5/Makefile	(revision 442522)
>+++ devel/ocaml-camlp5/Makefile	(working copy)
>@@ -2,11 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	camlp5
>-PORTVERSION=	6.16
>+PORTVERSION=	6.17
> CATEGORIES=	devel
>-MASTER_SITES=	http://camlp5.gforge.inria.fr/distrib/src/ \
>-		http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \
>-		http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
> PKGNAMEPREFIX=	ocaml-
> DIST_SUBDIR=	${PKGBASE}
> 
>@@ -18,8 +15,9 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=		tar:tgz
>-USE_OCAML=	yes
>+USES=		tar:tgz ocaml
>+USE_GITHUB=	yes
>+GH_TAGNAME=	rel617
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX}
> ALL_TARGET=	world.opt
>Index: devel/ocaml-camlp5/distinfo
>===================================================================
>--- devel/ocaml-camlp5/distinfo	(revision 442522)
>+++ devel/ocaml-camlp5/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ocaml-camlp5/camlp5-6.16.tgz) = fd446cff6421f5144a521c7cecfdc7217b1424908186cddd3d5be543b35058b1
>-SIZE (ocaml-camlp5/camlp5-6.16.tgz) = 759877
>+TIMESTAMP = 1484413746
>+SHA256 (ocaml-camlp5/camlp5-camlp5-6.17-rel617_GH0.tar.gz) = 8fa2a46a7030b1194862650cbb71ab52a10a0174890560a8b6edf236f8937414
>+SIZE (ocaml-camlp5/camlp5-camlp5-6.17-rel617_GH0.tar.gz) = 718935
>Index: devel/ocaml-camomile/Makefile
>===================================================================
>--- devel/ocaml-camomile/Makefile	(revision 442522)
>+++ devel/ocaml-camomile/Makefile	(working copy)
>@@ -3,21 +3,18 @@
> 
> PORTNAME=	camomile
> PORTVERSION=	0.8.3
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Comprehensive Unicode library for Objective Caml
> 
> LICENSE=	LGPL21
> 
>-USES=		gmake tar:bzip2
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAML_CAMLP4=yes
>-USE_OCAML_LDCONFIG=yes
>-USE_OCAML_WASH=	yes
>+USES=		gmake tar:bzip2 ocaml
>+USE_OCAML=	findlib camlp4 ldconfig wash
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -26,8 +23,8 @@
> 
> post-install:
> 	@${FIND} ${STAGEDIR}${DATADIR} ! -type d | \
>-		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>+	    ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
> 	@${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} ! -type d | \
>-		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>+	    ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-camomile-examples/Makefile
>===================================================================
>--- devel/ocaml-camomile-examples/Makefile	(revision 442522)
>+++ devel/ocaml-camomile-examples/Makefile	(working copy)
>@@ -9,12 +9,12 @@
> PKGNAMESUFFIX=	-examples
> DISTNAME=	examples-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Example programs for Camomile library
> 
>+USES=		tar:bzip2
> WRKSRC=		${WRKDIR}/examples
> NO_BUILD=	yes
>-USES=	tar:bzip2
> EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
> 
> do-install:
>Index: devel/ocaml-cfg/Makefile
>===================================================================
>--- devel/ocaml-cfg/Makefile	(revision 442522)
>+++ devel/ocaml-cfg/Makefile	(working copy)
>@@ -4,10 +4,11 @@
> PORTNAME=	cfg
> PORTVERSION=	2.0.4
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Library for manipulation of context-free grammars
> 
> LICENSE=	LGPL21+
>@@ -15,14 +16,10 @@
> 
> BUILD_DEPENDS=	menhir:devel/menhir
> 
>+USES=		ocaml
>+USE_OCAML=	findlib:plist wash ocamlbuild
> USE_GITHUB=	yes
> GH_ACCOUNT=	mmottl
>-
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-USE_OCAML_WASH=	yes
>-
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples
> MAKE_JOBS_UNSAFE=yes
>@@ -29,7 +26,6 @@
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>@@ -37,9 +33,11 @@
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS.txt CHANGES.txt README.md ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS.txt \
>+	    CHANGES.txt README.md ${STAGEDIR}${DOCSDIR}
> 
> post-install-EXAMPLES-on:
>-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
>+	cd ${WRKSRC}/examples && \
>+	    ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-classes/Makefile
>===================================================================
>--- devel/ocaml-classes/Makefile	(revision 442522)
>+++ devel/ocaml-classes/Makefile	(working copy)
>@@ -1,21 +1,21 @@
>-# Created by: Michaël Grünewald
>+# Created by: MichaÃ«Ã¬ GrÃ¼Ã®ewald
> # $FreeBSD$
> 
> PORTNAME=	classes
> PORTVERSION=	4.00
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	ocaml-${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Ocaml Object interface for ocaml's standard library modules
> 
> LICENSE=	LGPL21
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		ocaml
>+USE_OCAML=	findlib:plist
> MAKE_ENV=	INSTALL="${INSTALL_DATA}"
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-cmdliner/Makefile
>===================================================================
>--- devel/ocaml-cmdliner/Makefile	(revision 442522)
>+++ devel/ocaml-cmdliner/Makefile	(working copy)
>@@ -2,28 +2,32 @@
> 
> PORTNAME=	cmdliner
> PORTVERSION=	0.9.8
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://erratique.ch/software/cmdliner/releases/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml module for handling of command line interfaces
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=			tar:tbz
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>+USES=		tar:tbz ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
> 
> do-build:
>-	cd ${WRKSRC} && ocamlbuild cmdliner.cmxs cmdliner.cma cmdliner.a
>+	cd ${WRKSRC} && ${OCAMLBUILD} cmdliner.cmxs cmdliner.cma cmdliner.a
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/cmdliner
>-	cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib cmdliner pkg/META _build/src/cmdliner.a _build/src/cmdliner.cma _build/src/cmdliner.cmi _build/src/cmdliner.cmx _build/src/cmdliner.cmxa _build/src/cmdliner.cmxs _build/src/cmdliner.mli
>+	cd ${WRKSRC} && \
>+	    ${OCAMLFIND} install \
>+	    -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib \
>+	    cmdliner pkg/META _build/src/cmdliner.a \
>+	    _build/src/cmdliner.cma _build/src/cmdliner.cmi \
>+	    _build/src/cmdliner.cmx _build/src/cmdliner.cmxa \
>+	    _build/src/cmdliner.cmxs _build/src/cmdliner.mli
> 	${INSTALL_LIB} ${WRKSRC}/_build/src/cmdliner.cmxs \
>-		${STAGEDIR}${OCAMLFIND_DESTDIR}/cmdliner
>+	    ${STAGEDIR}${OCAMLFIND_DESTDIR}/cmdliner
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-cppo/Makefile
>===================================================================
>--- devel/ocaml-cppo/Makefile	(revision 442522)
>+++ devel/ocaml-cppo/Makefile	(working copy)
>@@ -2,16 +2,28 @@
> # $FreeBSD$
> 
> PORTNAME=	cppo
>-PORTVERSION=	0.9.2
>+PORTVERSION=	1.4.1
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	devel
>-MASTER_SITES=	http://martin.jambon.free.fr/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Simple preprocessor for OCaml
> 
>-USES=		gmake
>-USE_OCAML=	yes
>+LICENSE=	BSD3CLAUSE
>+
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ocamlbuild
>+OCAML_PKGDIRS=	cppo_ocamlbuild
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mjambon
>+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
> MAKE_JOBS_UNSAFE=	yes
>+ALL_TARGET=	default
>+PLIST_FILES=	bin/cppo
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cppo \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild/ocamlbuild_cppo.cmxs
>+
> .include <bsd.port.mk>
>Index: devel/ocaml-cppo/distinfo
>===================================================================
>--- devel/ocaml-cppo/distinfo	(revision 442522)
>+++ devel/ocaml-cppo/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (cppo-0.9.2.tar.gz) = ee4693b16e82e0d7f9b955dc6d935c518958fdd87b8e9402cc54a52e6e03897f
>-SIZE (cppo-0.9.2.tar.gz) = 20234
>+TIMESTAMP = 1489431909
>+SHA256 (mjambon-cppo-v1.4.1_GH0.tar.gz) = 5b7efc30256e1568a0f39ddeadc54ff57c4ec1b183ae034db36e27c0ad51f509
>+SIZE (mjambon-cppo-v1.4.1_GH0.tar.gz) = 26547
>Index: devel/ocaml-cppo/files/patch-Makefile
>===================================================================
>--- devel/ocaml-cppo/files/patch-Makefile	(revision 442522)
>+++ devel/ocaml-cppo/files/patch-Makefile	(nonexistent)
>@@ -1,13 +0,0 @@
>---- Makefile.orig	2014-07-10 23:43:16.837117715 +0800
>-+++ Makefile	2014-07-10 23:43:35.518127751 +0800
>-@@ -33,8 +33,8 @@ opt: $(ML)
>- 	ocamlopt -o cppo -dtypes unix.cmxa $(ML)
>- 
>- install:
>--	install -m 0755 cppo $(BINDIR) || \
>--		install -m 0755 cppo.exe $(BINDIR)
>-+	install -m 0755 cppo $(DESTDIR)$(BINDIR) || \
>-+		install -m 0755 cppo.exe $(DESTDOR)$(BINDIR)
>- 
>- cppo_version.ml: Makefile
>- 	echo 'let cppo_version = "$(VERSION)"' > cppo_version.ml
>
>Property changes on: devel/ocaml-cppo/files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/ocaml-cppo/pkg-plist
>===================================================================
>--- devel/ocaml-cppo/pkg-plist	(revision 442522)
>+++ devel/ocaml-cppo/pkg-plist	(working copy)
>@@ -1 +0,0 @@
>-bin/cppo
>Index: devel/ocaml-cudf/Makefile
>===================================================================
>--- devel/ocaml-cudf/Makefile	(nonexistent)
>+++ devel/ocaml-cudf/Makefile	(working copy)
>@@ -0,0 +1,27 @@
>+# $FreeBSD$
>+
>+PORTNAME=	cudf
>+PORTVERSION=	0.8
>+CATEGORIES=	devel
>+MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/34659/
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	CUDF (Common Upgradeability Description Format) library
>+
>+LICENSE=	LGPL3+
>+
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib/META:devel/ocaml-extlib \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/oUnit/META:devel/ocaml-ounit
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+USES=		gmake ocaml perl5
>+USE_OCAML=	findlib:plist camlp4 ldconfig ocamlbuild
>+ALL_TARGET=	all opt
>+PLIST_FILES=	bin/cudf-check bin/cudf-parse-822
>+
>+post-install:
>+	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
>+	    bin/cudf-check bin/cudf-parse-822
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-cudf/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-cudf/distinfo
>===================================================================
>--- devel/ocaml-cudf/distinfo	(nonexistent)
>+++ devel/ocaml-cudf/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1491075679
>+SHA256 (cudf-0.8.tar.gz) = 06f8ce019c87893e27d545b5cf8dc38041657a4c4856c02be4e99e8175874229
>+SIZE (cudf-0.8.tar.gz) = 55147
>
>Property changes on: devel/ocaml-cudf/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-cudf/files/patch-Makefile
>===================================================================
>--- devel/ocaml-cudf/files/patch-Makefile	(nonexistent)
>+++ devel/ocaml-cudf/files/patch-Makefile	(working copy)
>@@ -0,0 +1,26 @@
>+--- Makefile.orig	2015-03-30 17:37:15 UTC
>++++ Makefile
>+@@ -18,13 +18,8 @@ OCAMLBUILD = ocamlbuild
>+ OBFLAGS =
>+ OCAMLFIND = ocamlfind
>+ 
>+-ifeq ($(DESTDIR),)
>+ INSTALL = $(OCAMLFIND) install
>+ UNINSTALL = $(OCAMLFIND) remove
>+-else
>+-INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIBDIR)
>+-UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)/$(OCAMLLIBDIR)
>+-endif
>+ 
>+ DIST_DIR = $(NAME)-$(VERSION)
>+ DIST_TARBALL = $(DIST_DIR).tar.gz
>+@@ -79,9 +74,7 @@ INSTALL_STUFF += $(wildcard _build/cudf_
>+ INSTALL_STUFF += $(wildcard _build/cudf.o _build/cudf.cmx _build/cudf.cmi)
>+ 
>+ install:
>+-	test -d $(DESTDIR)/$(OCAMLLIBDIR) || mkdir -p $(DESTDIR)/$(OCAMLLIBDIR)
>+ 	$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
>+-	test -d $(DESTDIR)/$(BINDIR) || mkdir -p $(DESTDIR)/$(BINDIR)
>+ 	for p in $(notdir $(PROGS)) ; do \
>+ 		tgt=`echo $$p | sed -e 's/^main.//' -e 's/_/-/g'` ; \
>+ 		if [ -f _build/$$p.native ] ; then \
>
>Property changes on: devel/ocaml-cudf/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-cudf/files/patch-Makefile.config
>===================================================================
>--- devel/ocaml-cudf/files/patch-Makefile.config	(nonexistent)
>+++ devel/ocaml-cudf/files/patch-Makefile.config	(working copy)
>@@ -0,0 +1,16 @@
>+--- Makefile.config.orig	2015-03-30 17:37:15 UTC
>++++ Makefile.config
>+@@ -4,8 +4,8 @@ export DESTDIR =
>+ 
>+ # all the following variables will be prepended by $(DESTDIR) upon install
>+ 
>+-export OCAMLLIBDIR := $(shell ocamlc -where)
>+-export BINDIR  = /usr/bin
>+-export LIBDIR = /usr/lib
>+-export INCDIR = /usr/include
>+-export PCDIR   = $(LIBDIR)/pkgconfig
>++export OCAMLLIBDIR := $(shell ocamlfind printconf destdir)
>++export BINDIR  = ${LOCALBASE}/bin
>++export LIBDIR = ${LOCALBASE}/lib
>++export INCDIR = ${LOCALBASE}/include
>++export PCDIR   = ${LOCALBASE}/libdata/pkgconfig
>
>Property changes on: devel/ocaml-cudf/files/patch-Makefile.config
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-cudf/pkg-descr
>===================================================================
>--- devel/ocaml-cudf/pkg-descr	(nonexistent)
>+++ devel/ocaml-cudf/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+libCUDF is a library to manipulate so called CUDF documents. A CUDF
>+(Common Upgradeability Description Format) document describes an
>+"upgrade scenario", as faced by package managers in popular
>+package-based FOSS (Free and Open Source Software) distributions.
>
>Property changes on: devel/ocaml-cudf/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-deriving-ocsigen/Makefile
>===================================================================
>--- devel/ocaml-deriving-ocsigen/Makefile	(revision 442522)
>+++ devel/ocaml-deriving-ocsigen/Makefile	(working copy)
>@@ -2,27 +2,33 @@
> # $FreeBSD$
> 
> PORTNAME=	deriving-ocsigen
>-PORTVERSION=	0.3c
>-PORTREVISION=	1
>+PORTVERSION=	0.7.1
> CATEGORIES=	devel www
>-MASTER_SITES=	http://ocsigen.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Function derivation library
> 
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>+BUILD_DEPENDS=	optcomp-o:devel/ocaml-optcomp
> 
>-USES=		gmake
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig
>+OCAML_PKGDIRS=	deriving
>+OCAML_LDLIBS=	${OCAML_SITELIBDIR}/deriving
>+USE_GITHUB=	yes
>+GH_TUPLE=	ocsigen:deriving:
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--destdir ${STAGEDIR} \
>+		--docdir ${STAGEDIR}${DOCSDIR}
>+PORTDOCS=	api
> 
>+pre-configure:
>+	cd ${WRKSRC} && ${MAKE_CMD} ./setup.exe
>+
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/deriving-ocsigen/*.cmxs
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/deriving/*.cmxs
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-deriving-ocsigen/distinfo
>===================================================================
>--- devel/ocaml-deriving-ocsigen/distinfo	(revision 442522)
>+++ devel/ocaml-deriving-ocsigen/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (deriving-ocsigen-0.3c.tar.gz) = eb6e7e647b6f2effcc65c9b32076fbc12e366e16035447a762a93e5e1cba94c7
>-SIZE (deriving-ocsigen-0.3c.tar.gz) = 61242
>+TIMESTAMP = 1488718047
>+SHA256 (ocsigen-deriving-0.7.1_GH0.tar.gz) = 4794d455cb65d053fbbd49f94b1eb70c1b577dad9e4c277e5292086e13ea299b
>+SIZE (ocsigen-deriving-0.7.1_GH0.tar.gz) = 68550
>Index: devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
>===================================================================
>--- devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile	(revision 442522)
>+++ devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile	(nonexistent)
>@@ -1,15 +0,0 @@
>---- syntax/Makefile.orig	2011-12-08 04:46:54 UTC
>-+++ syntax/Makefile
>-@@ -39,9 +39,9 @@ ifneq (${TYPECONV},)
>- MAIN_TC := pa_deriving_tc.ml
>- endif
>- 
>--CLASSES_CMO := $(patsubst %.ml,classes/%.cmo$,${CLASSES})
>--CLASSES_CMX := $(patsubst %.ml,classes/%.cmx$,${CLASSES})
>--CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps$,${CLASSES})
>-+CLASSES_CMO := $(patsubst %.ml,classes/%.cmo,${CLASSES})
>-+CLASSES_CMX := $(patsubst %.ml,classes/%.cmx,${CLASSES})
>-+CLASSES_DEPS := $(patsubst %.ml,classes/.%.ml.deps,${CLASSES})
>- 
>- ${CLASSES_CMO} ${CLASSES_CMX} ${CLASSES_DEPS}: \
>- 	LIBS+=-syntax camlp4o -package camlp4.quotations.o -I classes
>
>Property changes on: devel/ocaml-deriving-ocsigen/files/patch-syntax-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/Makefile
>===================================================================
>--- devel/ocaml-dose3/Makefile	(nonexistent)
>+++ devel/ocaml-dose3/Makefile	(working copy)
>@@ -0,0 +1,35 @@
>+# $FreeBSD$
>+
>+PORTNAME=	dose3
>+PORTVERSION=	5.0.1
>+CATEGORIES=	devel
>+MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/35957/
>+PKGNAMEPREFIX=	ocaml-
>+DISTNAME=	${PORTNAME}-5.0~rc2
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Dependency toolkit
>+
>+LICENSE=	LGPL3+
>+
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib/META:devel/ocaml-extlib \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/ocamlgraph/META:math/ocaml-ocamlgraph \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/cudf/META:devel/ocaml-cudf \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/re/META:devel/ocaml-re \
>+		cppo:devel/ocaml-cppo
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+USES=		gmake ocaml perl5
>+USE_OCAML=	findlib:plist ocamlbuild
>+USE_PERL5=	build
>+GNU_CONFIGURE=	yes
>+MAKE_JOBS_UNSAFE=	yes
>+PLIST_FILES=	bin/apt-cudf bin/ceve bin/challenged \
>+		bin/deb-buildcheck bin/deb-coinstall \
>+		bin/debcheck bin/distcheck bin/eclipsecheck \
>+		bin/outdated bin/rpmcheck
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-dose3/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/distinfo
>===================================================================
>--- devel/ocaml-dose3/distinfo	(nonexistent)
>+++ devel/ocaml-dose3/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1491076873
>+SHA256 (dose3-5.0~rc2.tar.gz) = c7ff6f13f95f7aa5ded8f2fe273cea5f47399b7a4ed7d4537b309a5fc9b676a4
>+SIZE (dose3-5.0~rc2.tar.gz) = 297350
>
>Property changes on: devel/ocaml-dose3/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-Makefile
>===================================================================
>--- devel/ocaml-dose3/files/patch-Makefile	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-Makefile	(working copy)
>@@ -0,0 +1,24 @@
>+--- Makefile.orig	2016-06-15 10:23:22 UTC
>++++ Makefile
>+@@ -230,8 +230,6 @@ exclude_cudf = $(wildcard _build/doselib
>+ INSTALL_STUFF = $(filter-out $(exclude_cudf), $(INSTALL_STUFF_))
>+ 
>+ installlib: META installcudf
>+-	@test -d $(LIBDIR) || mkdir -p $(LIBDIR)
>+-	@test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs
>+ 	@$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
>+ 	@echo "Install dose librairies to $(LIBDIR)"
>+ 
>+@@ -241,9 +239,9 @@ install: installlib
>+ 	for f in $$(ls *.$(OCAMLEXT)) ; do \
>+ 		install $(INSTALLOPTS) $$f $(BINDIR)/$${f%.$(OCAMLEXT)}$(EXE) ; \
>+ 	done
>+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/debcheck$(EXE)
>+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/rpmcheck$(EXE)
>+-	@$(LN) $(BINDIR)/distcheck $(BINDIR)/eclipsecheck$(EXE)
>++	cd $(BINDIR) && $(LN) distcheck debcheck$(EXE)
>++	cd $(BINDIR) && $(LN) distcheck rpmcheck$(EXE)
>++	cd $(BINDIR) && $(LN) distcheck eclipsecheck$(EXE)
>+ 	@echo "Install dose binaries to $(BINDIR)"
>+ 
>+ uninstalllib:
>
>Property changes on: devel/ocaml-dose3/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-Makefile.config.in
>===================================================================
>--- devel/ocaml-dose3/files/patch-Makefile.config.in	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-Makefile.config.in	(working copy)
>@@ -0,0 +1,19 @@
>+--- Makefile.config.in.orig	2016-06-15 10:23:22 UTC
>++++ Makefile.config.in
>+@@ -25,12 +25,12 @@ endif
>+ # if DESTDIR is specified, we ignore the prefix and we use the 
>+ # default debian location
>+ ifneq ($(DESTDIR),)
>+-  BINDIR = $(DESTDIR)@bindir@
>+-  LIBDIR = $(DESTDIR)@libdir@/ocaml
>++  BINDIR = $(DESTDIR)@prefix@@bindir@
>++  LIBDIR = $(DESTDIR)$(shell ocamlfind printconf destdir)
>+ endif
>+ 
>+-INSTALL=$(OCAMLFIND) install -destdir $(LIBDIR)
>+-UNINSTALL=$(OCAMLFIND) remove -destdir $(LIBDIR)
>++INSTALL=$(OCAMLFIND) install
>++UNINSTALL=$(OCAMLFIND) remove
>+ 
>+ printconf:
>+ 	@echo
>
>Property changes on: devel/ocaml-dose3/files/patch-Makefile.config.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-algo_dominators.ml
>===================================================================
>--- devel/ocaml-dose3/files/patch-algo_dominators.ml	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-algo_dominators.ml	(working copy)
>@@ -0,0 +1,14 @@
>+--- algo/dominators.ml.orig	2017-04-01 20:53:42 UTC
>++++ algo/dominators.ml
>+@@ -101,11 +101,7 @@ let dominators_tarjan graph =
>+   ) graph;
>+ 
>+   Util.Timer.start tjntimer;
>+-#if OCAMLGRAPHVERSION <= 186
>+   let module Dom = Dominator.Make_graph(G) in
>+-#else
>+-  let module Dom = Dominator.Make(G) in
>+-#endif
>+   let idom = Dom.compute_all graph start_pkg in
>+   let domgr = idom.Dom.dom_graph () in
>+   Util.Timer.stop tjntimer ();
>
>Property changes on: devel/ocaml-dose3/files/patch-algo_dominators.ml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-configure
>===================================================================
>--- devel/ocaml-dose3/files/patch-configure	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-configure	(working copy)
>@@ -0,0 +1,8 @@
>+--- configure.orig	2016-06-15 10:23:22 UTC
>++++ configure
>+@@ -6554,4 +6554,4 @@ $as_echo "$as_me: WARNING: unrecognized 
>+ fi
>+ 
>+ 
>+-make printconf
>++gmake printconf
>
>Property changes on: devel/ocaml-dose3/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-deb_debian.mlpack
>===================================================================
>--- devel/ocaml-dose3/files/patch-deb_debian.mlpack	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-deb_debian.mlpack	(working copy)
>@@ -0,0 +1,10 @@
>+--- deb/debian.mlpack.orig	2016-06-15 10:23:22 UTC
>++++ deb/debian.mlpack
>+@@ -1,6 +1,7 @@
>+ Packages
>+ Apt
>+ Sources
>++Version
>+ Debcudf
>+ Release
>+ Architecture
>
>Property changes on: devel/ocaml-dose3/files/patch-deb_debian.mlpack
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-deb_version.ml
>===================================================================
>--- devel/ocaml-dose3/files/patch-deb_version.ml	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-deb_version.ml	(working copy)
>@@ -0,0 +1,245 @@
>+--- deb/version.ml.orig	2017-04-01 20:53:10 UTC
>++++ deb/version.ml
>+@@ -0,0 +1,242 @@
>++(******************************************************************************)
>++(*  This file is part of the Dose library http://www.irill.org/software/dose  *)
>++(*                                                                            *)
>++(*  Copyright (C) 2011 Ralf Treinen <ralf.treinen@pps.jussieu.fr>             *)
>++(*                                                                            *)
>++(*  This library is free software: you can redistribute it and/or modify      *)
>++(*  it under the terms of the GNU Lesser General Public License as            *)
>++(*  published by the Free Software Foundation, either version 3 of the        *)
>++(*  License, or (at your option) any later version.  A special linking        *)
>++(*  exception to the GNU Lesser General Public License applies to this        *)
>++(*  library, see the COPYING file for more information.                       *)
>++(*                                                                            *)
>++(*  Work developed with the support of the Mancoosi Project                   *)
>++(*  http://www.mancoosi.org                                                   *)
>++(*                                                                            *)
>++(******************************************************************************)
>++
>++open Common
>++module Pcre = Re_pcre
>++
>++let is_digit = function
>++  | '0'..'9' -> true
>++  | _ -> false
>++;;
>++
>++(* [skip_while_from i f w m] yields the index of the leftmost character
>++ * in the string [s], starting from [i], end ending at  [m], that does 
>++ * not satisfy the predicate [f], or [length w] if no such index exists.  *)
>++let skip_while_from i f w m =
>++  let rec loop i =
>++    if i = m then i
>++    else if f w.[i] then loop (i + 1) else i
>++  in loop i
>++;;
>++
>++(* splits a version into (epoch,rest), without the separating ':'. The
>++ * epoch is delimited by the leftmost occurrence of ':' in x, and is ""
>++ * in case there is no ':' in x.  *)
>++let extract_epoch x =
>++  try
>++    let ci = String.index x ':' in
>++    let epoch = String.sub x 0 ci
>++    and rest = String.sub x (ci + 1) (String.length x - ci - 1)
>++    in (epoch,rest)
>++  with
>++    | Not_found -> ("",x)
>++;;
>++
>++(* splits a version into (prefix,revision). The revision starts on the
>++ * right-most occurrence of '-', or is empty in case the version does
>++ * not contain '-'.  *)
>++let extract_revision x =
>++  try
>++    let di = String.rindex x '-' in
>++    let before = String.sub x 0 di in
>++    let after = String.sub x (di+1) (String.length x - di -1) in
>++    (before,after)
>++  with
>++    | Not_found -> (x,"")
>++;;
>++
>++(* character comparison uses a modified character ordering: '~' first,
>++   then letters, then anything else *)
>++let compare_chars c1 c2 = match c1 with
>++  | '~' -> (match c2 with
>++      | '~' -> 0
>++      | _ -> -1)
>++  | 'a'..'z'|'A'..'Z' -> (match c2 with
>++      | '~' -> 1
>++      | 'a'..'z'|'A'..'Z' -> Char.compare c1 c2
>++      | _ -> -1)
>++  | _ -> (match c2 with
>++      | '~'|'a'..'z'|'A'..'Z' -> 1
>++      | _ -> Char.compare c1 c2)
>++;;
>++
>++(* return the first index of x, starting from xi, of a nun-null
>++ * character in x.  or (length x) in case x contains only 0's starting
>++ * from xi on.  *)
>++let skip_zeros x xi xl = skip_while_from xi (fun c -> c = '0') x xl;;
>++
>++(* compare versions chunks, that is parts of version strings that are
>++ * epoch, upstream version, or revisision. Alternates string comparison
>++ * and numerical comaprison.  *)
>++let compare_chunks x y =
>++  (* x and y may be empty *)
>++  let xl = String.length x
>++  and yl = String.length y
>++  in
>++  let rec loop_lexical xi yi =
>++    assert (xi <= xl && yi <= yl);
>++    match (xi=xl,yi=yl) with (* which of x and y is exhausted? *)
>++      | true,true -> 0 
>++      | true,false -> 
>++	(* if y continues numerically than we have to continue by
>++	 * comparing numerically. In this case the x part is
>++	 * interpreted as 0 (since empty). If the y part consists
>++	 * only of 0's then both parts are equal, otherwise the y
>++	 * part is larger. If y continues non-numerically then y is
>++	 * larger anyway, so we only have to skip 0's in the y part
>++	 * and check whether this exhausts the y part.  *)
>++	let ys = skip_zeros y yi yl in
>++	if ys = yl then 0 else if y.[ys]='~' then 1 else -1
>++      | false,true -> (* symmetric to the preceding case *)
>++	let xs = skip_zeros x xi xl in
>++	if xs = xl then 0 else if x.[xs]='~' then -1 else 1
>++      | false,false -> (* which of x and y continues numerically? *)
>++	match (is_digit x.[xi], is_digit y.[yi]) with 
>++	  | true,true ->
>++	    (* both continue numerically. Skip leading zeros in the
>++	     * remaining parts, and then continue by
>++	     * comparing numerically. *)
>++	    compare_numerical (skip_zeros x xi xl) (skip_zeros y yi yl)
>++	  | true,false -> (* '~' is smaller than any numeric part *)
>++	    if y.[yi]='~' then 1 else -1
>++	  | false,true -> (* '~' is smaller than any numeric part *)
>++	    if x.[xi]='~' then -1 else 1
>++	  | false,false -> (* continue comparing lexically *)
>++	    let comp = compare_chars x.[xi] y.[yi]
>++	    in if comp = 0 then loop_lexical (xi+1) (yi+1) else comp
>++  and compare_numerical xi yi =
>++    assert (xi = xl || (xi < xl && x.[xi] <> '0'));
>++    (* leading zeros have been stripped *) 
>++    assert (yi = yl || (yi < yl && y.[yi] <> '0'));
>++    (* leading zeros have been stripped *) 
>++    let xn = skip_while_from xi is_digit x xl (* length of numerical part *)
>++    and yn = skip_while_from yi is_digit y yl (* length of numerical part *)
>++    in 
>++    let comp = compare (xn-xi) (yn-yi)
>++    in if comp = 0
>++      then (* both numerical parts have same length: compare digit by digit *)
>++	loop_numerical xi yi yn
>++      else
>++	(* if one numerical part is longer than the other we have found the
>++	 * answer since leading 0 have been striped when switching
>++	 * to numerical comparison.  *)
>++	comp
>++  and loop_numerical xi yi yn =
>++    assert (xi <= xl && yi <= yn && yn <= yl);
>++    (* invariant: the two numerical parts that remain to compare are
>++       of the same length *)
>++    if yi=yn
>++    then
>++      (* both numerical parts are exhausted, we switch to lexical
>++	 comparison *)
>++      loop_lexical xi yi
>++    else
>++      (* both numerical parts are not exhausted, we continue comparing
>++	 digit by digit *)
>++      let comp = Char.compare x.[xi] y.[yi] 
>++      in if comp = 0 then loop_numerical (xi+1) (yi+1) yn else comp
>++  in loop_lexical 0 0
>++;;
>++
>++let compare (x : string) (y : string) =
>++  let normalize_comp_result x = if x=0 then 0 else if x < 0 then -1 else 1
>++  in
>++  if x = y then 0
>++  else
>++    let (e1,rest1) = extract_epoch x 
>++    and (e2,rest2) = extract_epoch y in
>++    let e_comp = compare_chunks e1 e2 in 
>++    if e_comp <> 0 then normalize_comp_result e_comp
>++    else
>++      let (u1,r1) = extract_revision rest1
>++      and (u2,r2) = extract_revision rest2 in
>++      let u_comp = compare_chunks u1 u2 in
>++      if u_comp <> 0 then normalize_comp_result u_comp
>++      else normalize_comp_result (compare_chunks r1 r2)
>++;;
>++
>++let equal (x : string) (y : string) =
>++  if x = y then true else (compare x y) = 0
>++;;
>++
>++(************** splitting and recomposing version strings *******************)
>++
>++type version_analysis =
>++  | Native of string*string*string
>++    (* epoch,upstream,binnmu *)
>++  | NonNative of string*string*string*string
>++    (* epoch,upstream,revision,binnmu *)
>++;;
>++
>++let binnmu_regexp = Pcre.regexp "^(.*)\\+(b[\\d]+)$" ;;
>++let extract_binnmu v =
>++  try
>++    let subs = Pcre.extract ~rex:binnmu_regexp v
>++    in (subs.(1),subs.(2))
>++  with Not_found -> (v,"")
>++;;
>++
>++let decompose v =
>++  let epoch,rest = extract_epoch v in
>++  let upstream_complete,revision_complete = extract_revision rest in
>++  if revision_complete = ""
>++  then let upstream,binnmu = extract_binnmu upstream_complete in
>++       Native(epoch,upstream,binnmu)
>++  else let revision,binnmu = extract_binnmu revision_complete in
>++       NonNative(epoch,upstream_complete,revision,binnmu)
>++;;
>++
>++let compose = function 
>++  | Native("",upstream,"") -> upstream
>++  | Native(epoch,upstream,"") -> epoch^":"^upstream
>++  | Native("",upstream,binnmu) -> upstream^"+"^binnmu
>++  | Native(epoch,upstream,binnmu) -> epoch^":"^upstream^"+"^binnmu
>++  | NonNative("",upstream,revision,"") -> upstream^"-"^revision
>++  | NonNative(epoch,upstream,revision,"") -> epoch^":"^upstream^"-"^revision
>++  | NonNative("",upstream,revision,binnmu) -> upstream^"-"^revision^"+"^binnmu
>++  | NonNative(epoch,upstream,revision,binnmu) ->
>++    epoch^":"^upstream^"-"^revision^"+"^binnmu
>++;;
>++
>++let strip_epoch_binnmu v =
>++  match decompose v with
>++    | Native(_,upstream,_) -> upstream
>++    | NonNative(_,upstream,revision,_) -> upstream^"-"^revision
>++;;
>++
>++(****************************************************************************)
>++(* for the deprecated interface  *)
>++ 
>++let split s = match decompose s with
>++    | Native(e,u,b) -> (e,u,"",b)
>++    | NonNative(e,u,r,b) -> (e,u,r,b)
>++;;
>++
>++let concat = function
>++  |("",u,"","") -> Printf.sprintf "%s" u (* 1.1 *)
>++  |("",u,r,"") -> Printf.sprintf "%s-%s" u r (* 1.1-1 *)
>++  |("",u,"",b) -> Printf.sprintf "%s+%s" u b (* 1.1+b1 *)
>++  |("",u,r,b) -> Printf.sprintf "%s-%s+%s" u r b (* 1.1-1+b1 *)
>++  |(e,u,"","") -> Printf.sprintf "%s:%s" e u (* 1:1.1 *)
>++  |(e,u,"",b) -> Printf.sprintf "%s:%s+%s" e u b (* 1:1.1+b1 *)
>++  |(e,u,r,"") -> Printf.sprintf "%s:%s-%s" e u r (* 1:1.1-1 *)
>++  |(e,u,r,b) -> Printf.sprintf "%s:%s-%s+%s" e u r b (* 1:1.1-1+b1 *)
>++;;
>++
>++let normalize = strip_epoch_binnmu
>++
>++
>
>Property changes on: devel/ocaml-dose3/files/patch-deb_version.ml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/files/patch-deb_version.mli
>===================================================================
>--- devel/ocaml-dose3/files/patch-deb_version.mli	(nonexistent)
>+++ devel/ocaml-dose3/files/patch-deb_version.mli	(working copy)
>@@ -0,0 +1,101 @@
>+--- deb/version.mli.orig	2017-04-01 20:53:10 UTC
>++++ deb/version.mli
>+@@ -0,0 +1,98 @@
>++(******************************************************************************)
>++(*  This file is part of the Dose library http://www.irill.org/software/dose  *)
>++(*                                                                            *)
>++(*  Copyright (C) 2009-2011 Pietro Abate <pietro.abate@pps.jussieu.fr>        *)
>++(*                                                                            *)
>++(*  This library is free software: you can redistribute it and/or modify      *)
>++(*  it under the terms of the GNU Lesser General Public License as            *)
>++(*  published by the Free Software Foundation, either version 3 of the        *)
>++(*  License, or (at your option) any later version.  A special linking        *)
>++(*  exception to the GNU Lesser General Public License applies to this        *)
>++(*  library, see the COPYING file for more information.                       *)
>++(*                                                                            *)
>++(*  Work developed with the support of the Mancoosi Project                   *)
>++(*  http://www.mancoosi.org                                                   *)
>++(*                                                                            *)
>++(******************************************************************************)
>++
>++
>++(** Functions for manipulating and comparing Debian version strings.
>++    Compliant with Debian policy version 3.9.2. and Debian developers
>++    reference version 3.4.6 *)
>++
>++(** {2 Comparing debian version strings} *)
>++
>++(** The following functions compare any two strings, that is these
>++    functions do not check whether the arguments are really legal
>++    debian versions. If the arguments are debian version strings, then
>++    the result is as required by debian policy. Note that two strings
>++    may be equivalent, that is denote the same debian version, even
>++    when they differ in syntax, as for instance "0:1.2.00" and
>++    "1.02-0".
>++*)
>++
>++(** @return [true] iff the two strings define the same version. Hence,
>++    the result may be true even when the two string differ
>++    syntactically. *)
>++val equal : string -> string -> bool
>++
>++(** [compare x y] returns 0 if x is eqivalent to y, -1 if x is smaller
>++    than y, and 1 if x is greater than y. This is consistent with
>++    [Pervasives.compare]. *)
>++val compare : string -> string -> int
>++
>++(** {2 Decomposing and recomposing debian version strings} *)
>++
>++(** Version strings may be the decomposed into epoch, upstream, and
>++    revision as described in debian policy section 5.6.12. An epoch is
>++    present if the version string contains a colon ':', in this case
>++    the leftmost colon separates the epoch from the rest. A revision
>++    is present if the string contains a dash '-', in this case the
>++    rightmost dash separates the rest from the revision.
>++
>++    A version string that contains no dash (hence, no revision) is
>++    called native. Otherwise it is called non-native, in this case the
>++    revision may be empty (example: "1.2-") or not.
>++
>++    A suffix of the upstream part of a native version, or the suffix
>++    of the revision part of a non-native version, may contain a part
>++    indicating a binary NMU (Debian Developers Reference, section
>++    5.10.2.1). A binary NMU part is of the form "+bN" where N is an
>++    unsigned integer.
>++*)
>++
>++(** result type of the analysis of a version string. The binNMU part,
>++    if present, has been removed from the upstream (if native version)
>++    or revision (if non-native vesion).
>++*)
>++type version_analysis =
>++  | Native of string*string*string            (** epoch,upstream,binnmu *)
>++  | NonNative of string*string*string*string  (** epoch,upstream,revision,binnmu *)
>++
>++(** decompose a version string *)
>++val decompose: string -> version_analysis
>++
>++(** recompose a decomposed version string. For all v:
>++    [equal(v,compose(decompose v)) = true].  There may, however, be
>++    small syntactic differences between [v] and [compose(decompose v)] *)
>++val compose: version_analysis -> string 
>++
>++(** return a version without its epoch and without its binNMU part *)
>++val  strip_epoch_binnmu: string -> string
>++
>++(** {2 Decomposing and recomposing version strings (deprecated interface)} *)
>++
>++(** split the debian version into its components.
>++    (epoch,upstream,revision,binnmu) = split v
>++    v = epoch ^ ":" ^ upstream ^ "-" ^ revision ^ binnmu.
>++
>++    @deprecated [decompose] should be used instead. *)
>++val split : string -> (string * string * string * string)
>++
>++(** @deprecated [recompose] should be used instead. *)
>++val concat : (string * string * string * string) -> string
>++
>++(** chop the epoch and binnmu component from a version.
>++
>++    @deprecated [strip_epoch_binnmu] should be used instead. *)
>++val normalize : string -> string
>
>Property changes on: devel/ocaml-dose3/files/patch-deb_version.mli
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-dose3/pkg-descr
>===================================================================
>--- devel/ocaml-dose3/pkg-descr	(nonexistent)
>+++ devel/ocaml-dose3/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+Dose is a library and a collection of tools to perform la large
>+spectrum of analysis on package repositories.  Dose manipulates
>+packages repositories from different sources such as Debian, Rpm,
>+Eclipse/Osgi and OpenCSW / Solaris .
>+
>+WWW: http://gforge.inria.fr/projects/dose/
>
>Property changes on: devel/ocaml-dose3/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-easy-format/Makefile
>===================================================================
>--- devel/ocaml-easy-format/Makefile	(nonexistent)
>+++ devel/ocaml-easy-format/Makefile	(working copy)
>@@ -0,0 +1,23 @@
>+# $FreeBSD$
>+
>+PORTNAME=	easy-format
>+PORTVERSION=	1.2.0
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	devel www
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Indent and format library in OCaml
>+
>+LICENSE=	BSD3CLAUSE
>+
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mjambon
>+ALL_TARGET=	default
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/easy-format/easy_format.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-easy-format/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-easy-format/distinfo
>===================================================================
>--- devel/ocaml-easy-format/distinfo	(nonexistent)
>+++ devel/ocaml-easy-format/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489429005
>+SHA256 (mjambon-easy-format-v1.2.0_GH0.tar.gz) = a288fabcdc19c2262e76cf93e0fd987fe1b21493edd13309522fbae405329ffd
>+SIZE (mjambon-easy-format-v1.2.0_GH0.tar.gz) = 15632
>
>Property changes on: devel/ocaml-easy-format/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-easy-format/pkg-descr
>===================================================================
>--- devel/ocaml-easy-format/pkg-descr	(nonexistent)
>+++ devel/ocaml-easy-format/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+Easy-format: indentation made easy
>+
>+WWW: https://github.com/mjambon/easy-format
>
>Property changes on: devel/ocaml-easy-format/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-extlib/Makefile
>===================================================================
>--- devel/ocaml-extlib/Makefile	(revision 442522)
>+++ devel/ocaml-extlib/Makefile	(working copy)
>@@ -3,10 +3,11 @@
> 
> PORTNAME=	extlib
> PORTVERSION=	1.7.1
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Complete - yet small - standard library for OCaml
> 
> LICENSE=	LGPL21
>@@ -14,24 +15,17 @@
> 
> BUILD_DEPENDS=	cppo:devel/ocaml-cppo
> 
>-WRKSRC_SUBDIR=	src
>-
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4
> USE_GITHUB=	yes
> GH_ACCOUNT=	ygrek
> GH_PROJECT=	ocaml-extlib
>-
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-
>-USES=		gmake
>+WRKSRC_SUBDIR=	src
> MAKE_ARGS=	VERSION="${PORTVERSION}"
> ALL_TARGET=	all opt doc
> MAKE_JOBS_UNSAFE=	yes
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>-
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
>@@ -38,6 +32,6 @@
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
>+	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-findlib/Makefile
>===================================================================
>--- devel/ocaml-findlib/Makefile	(revision 442522)
>+++ devel/ocaml-findlib/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	findlib
> PORTVERSION=	1.7.1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
>@@ -13,10 +14,8 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>-USE_OCAML_FINDLIB=yes
>+USES=		gmake ocaml
>+USE_OCAML=	camlp4 findlib ocamlbuild
> OCAMLFIND_DEPEND=	# Avoid dependency loop
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
>@@ -36,9 +35,20 @@
> TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
> TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == amd64 || \
>+    ${ARCH} == sparc64 || \
>+    ${ARCH} == powerpc64 || \
>+    ${ARCH} == aarch64 || \
>+    ${ARCH} == ia64 || \
>+    ${ARCH} == mips64
>+PLIST_SUB+=	N64=
>+.else
>+PLIST_SUB+=	N64="@comment "
>+.endif
>+
> post-install:
>-	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
>-	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
> 	cd ${STAGEDIR}${PREFIX} && \
> 	    ${STRIP_CMD} bin/ocamlfind \
> 	    ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
>@@ -50,4 +60,4 @@
> 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
> 	    "! -regex .*ref-man.*"
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: devel/ocaml-findlib/files/patch-Makefile
>===================================================================
>--- devel/ocaml-findlib/files/patch-Makefile	(revision 442522)
>+++ devel/ocaml-findlib/files/patch-Makefile	(working copy)
>@@ -18,15 +18,6 @@
>  	fi
>  	$(MAKE) install-doc
>  
>-@@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in
>- 	USE_CYGPATH="$(USE_CYGPATH)"; \
>- 	export USE_CYGPATH; \
>- 	cat findlib.conf.in | \
>--		tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
>-+		tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf
>- 	if ./tools/cmd_from_same_dir ocamlc; then \
>- 		echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
>- 	fi
> @@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
>  
>  .PHONY: install-doc
>Index: devel/ocaml-findlib/pkg-plist
>===================================================================
>--- devel/ocaml-findlib/pkg-plist	(revision 442522)
>+++ devel/ocaml-findlib/pkg-plist	(working copy)
>@@ -40,8 +40,8 @@
> %%OCAML_SITELIBDIR%%/num-top/num_top.cmi
> %%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
> %%OCAML_SITELIBDIR%%/num/META
>-%%OCAML_SITELIBDIR%%/ocamlbuild/META
> %%OCAML_SITELIBDIR%%/ocamldoc/META
>+%%N64%%%%OCAML_SITELIBDIR%%/raw_spacetime/META
> %%OCAML_SITELIBDIR%%/stdlib/META
> %%OCAML_SITELIBDIR%%/str/META
> %%OCAML_SITELIBDIR%%/threads/META
>Index: devel/ocaml-lwt/Makefile
>===================================================================
>--- devel/ocaml-lwt/Makefile	(revision 442522)
>+++ devel/ocaml-lwt/Makefile	(working copy)
>@@ -3,10 +3,11 @@
> 
> PORTNAME=	lwt
> PORTVERSION=	2.5.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Cooperative threading library for OCaml
> 
> LICENSE=	LGPL21
>@@ -16,32 +17,25 @@
> RUN_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
> 		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
> 
>+USES=		gmake ocaml
> USE_GITHUB=	yes
> GH_ACCOUNT=	ocsigen
>-
>+USE_OCAML=	findlib:plist camlp4 ldconfig ocamlbuild
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--destdir "${STAGEDIR}" \
>+		--prefix "${PREFIX}" \
>+		--enable-camlp4 \
>+		--enable-ssl \
>+		--enable-react \
>+		--disable-libev \
>+		--disable-glib
> MAKE_JOBS_UNSAFE=	yes
> 
>-USES=			gmake
>-USE_OCAML=		yes
>-OCAMLC_DEPEND=		ocaml>=3.11:${OCAMLC_PORT}
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>-HAS_CONFIGURE=		yes
>-CONFIGURE_ARGS=		--destdir "${STAGEDIR}" \
>-			--prefix "${PREFIX}" \
>-			--enable-camlp4 \
>-			--enable-ssl \
>-			--enable-react \
>-			--disable-libev \
>-			--disable-glib
>+DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
>+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
> 
>-DOCSDIR=		${PREFIX}/share/doc/ocaml/${PORTNAME}
>-SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
>+OPTIONS_DEFINE=	DOCS
> 
>-OPTIONS_DEFINE=		DOCS
>-
> DOCS_CONFIGURE_ENABLE=	docs
> DOCS_CONFIGURE_ON=	--docdir ${STAGEDIR}${DOCSDIR}
> # For some reason, ocaml-text is needed when building documentation
>@@ -58,10 +52,10 @@
> 		${WRKSRC}/setup.data
> 
> do-build:
>-	cd ${WRKSRC}; ocaml setup.ml -build
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -build
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
>-	cd ${WRKSRC}; ocaml setup.ml -install
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -install
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-magic/Makefile
>===================================================================
>--- devel/ocaml-magic/Makefile	(revision 442522)
>+++ devel/ocaml-magic/Makefile	(working copy)
>@@ -3,28 +3,23 @@
> 
> PORTNAME=	magic
> PORTVERSION=	0.7.3
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	SF/ocaml-${PORTNAME}/ocaml-${PORTNAME}/0.7
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml binding for libmagic(3)
> 
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-
>-MAKE_JOBS_UNSAFE=	yes
>-
>-USES=		gmake
>+USES=		gmake ocaml
>+USE_OCAML=	findlib ldconfig
> GNU_CONFIGURE=	yes
>-
> ALL_TARGET=	doc examples
>+MAKE_JOBS_UNSAFE=	yes
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
> 
>Index: devel/ocaml-ocamlbuild/Makefile
>===================================================================
>--- devel/ocaml-ocamlbuild/Makefile	(nonexistent)
>+++ devel/ocaml-ocamlbuild/Makefile	(working copy)
>@@ -0,0 +1,30 @@
>+# $FreeBSD$
>+
>+PORTNAME=	ocamlbuild
>+PORTVERSION=	4.03
>+CATEGORIES=	devel
>+PKGNAMEPREFIX=	ocaml-
>+DIST_SUBDIR=	${PKGBASE}
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Build tool for OCaml library and programs
>+
>+LICENSE=	LGPL20
>+
>+USES=		gmake tar:tgz ocaml
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ocaml
>+GH_TAGNAME=	0eb62b7
>+HAS_CONFIGURE=	yes
>+MAKE_ENV=	CHECK_IF_PREINSTALLED=false
>+
>+CONFLICT_INSTALL=	ocaml-4.02.[0-9]*
>+
>+do-configure:
>+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} configure
>+
>+post-install:
>+	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
>+	    bin/ocamlbuild bin/ocamlbuild.native
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-ocamlbuild/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-ocamlbuild/distinfo
>===================================================================
>--- devel/ocaml-ocamlbuild/distinfo	(nonexistent)
>+++ devel/ocaml-ocamlbuild/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1484419649
>+SHA256 (ocaml-ocamlbuild/ocaml-ocamlbuild-4.03-0eb62b7_GH0.tar.gz) = 9111269325932b33912f9a96c99e7ded3f8a0f65acbe082ba8eb73f176976a53
>+SIZE (ocaml-ocamlbuild/ocaml-ocamlbuild-4.03-0eb62b7_GH0.tar.gz) = 193459
>
>Property changes on: devel/ocaml-ocamlbuild/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-ocamlbuild/pkg-descr
>===================================================================
>--- devel/ocaml-ocamlbuild/pkg-descr	(nonexistent)
>+++ devel/ocaml-ocamlbuild/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+OCamlbuild is a generic build tool, that has built-in rules for
>+building OCaml library and programs.
>+
>+WWW: https://github.com/ocaml/ocamlbuild
>
>Property changes on: devel/ocaml-ocamlbuild/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-ocamlbuild/pkg-plist
>===================================================================
>--- devel/ocaml-ocamlbuild/pkg-plist	(nonexistent)
>+++ devel/ocaml-ocamlbuild/pkg-plist	(working copy)
>@@ -0,0 +1,23 @@
>+bin/ocamlbuild
>+bin/ocamlbuild.byte
>+bin/ocamlbuild.native
>+%%OCAML_SITELIBDIR%%/ocamlbuild/META
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild.cmo
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild.cmx
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild.o
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_executor.cmi
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_executor.cmx
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_executor.o
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_pack.cmi
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_pack.cmx
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_plugin.cmi
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_plugin.cmx
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_plugin.o
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_unix_plugin.cmi
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_unix_plugin.cmx
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuild_unix_plugin.o
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuildlib.a
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuildlib.cma
>+%%OCAML_SITELIBDIR%%/ocamlbuild/ocamlbuildlib.cmxa
>+%%OCAML_SITELIBDIR%%/ocamlbuild/signatures.mli
>+man/man1/ocamlbuild.1.gz
>
>Property changes on: devel/ocaml-ocamlbuild/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-optcomp/Makefile
>===================================================================
>--- devel/ocaml-optcomp/Makefile	(nonexistent)
>+++ devel/ocaml-optcomp/Makefile	(working copy)
>@@ -0,0 +1,27 @@
>+# $FreeBSD$
>+
>+PORTNAME=	optcomp
>+PORTVERSION=	1.6
>+CATEGORIES=	devel
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Optional compilation with cpp-like directives in OCaml
>+
>+LICENSE=	LGPL20
>+
>+USES=		gmake ocaml
>+USE_OCAML=	ocamlbuild camlp4 findlib:plist ldconfig
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	diml
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--destdir ${STAGEDIR}
>+PORTDOCS=	api
>+PLIST_FILES=	bin/optcomp-o bin/optcomp-r
>+
>+post-install:
>+	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} optcomp-o optcomp-r
>+	cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/optcomp && \
>+	    ${STRIP_CMD} optcomp.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-optcomp/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-optcomp/distinfo
>===================================================================
>--- devel/ocaml-optcomp/distinfo	(nonexistent)
>+++ devel/ocaml-optcomp/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489420405
>+SHA256 (diml-optcomp-1.6_GH0.tar.gz) = 5022d80e4d7dba4ada3aa57156503fad75fcd6d7b13cfa8580012a1d9f581042
>+SIZE (diml-optcomp-1.6_GH0.tar.gz) = 56370
>
>Property changes on: devel/ocaml-optcomp/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-optcomp/pkg-descr
>===================================================================
>--- devel/ocaml-optcomp/pkg-descr	(nonexistent)
>+++ devel/ocaml-optcomp/pkg-descr	(working copy)
>@@ -0,0 +1,14 @@
>+Optcomp is a syntax extension which handles `#if`, `#else`,
>+... directives in ocaml source files.
>+
>+Optcomp is more OCaml-friendly than cpp:
>+
>+* it does not interpret `//`, `/*`, and `*/` as comment delimiters
>+* it does not complains about missing `'`
>+* it is easier to integrate in the build process when using other
>+  camlp4 syntax extensions
>+
>+By the way optcomp does not do macro expansion while cpp does.
>+
>+WWW: https://forge.ocamlcore.org/projects/optcomp/
>+WWW: https://github.com/diml/optcomp
>
>Property changes on: devel/ocaml-optcomp/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-ounit/Makefile
>===================================================================
>--- devel/ocaml-ounit/Makefile	(revision 442522)
>+++ devel/ocaml-ounit/Makefile	(working copy)
>@@ -3,21 +3,19 @@
> 
> PORTNAME=	ounit
> PORTVERSION=	1.0.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml unit test framework
> 
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENCE
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
> OCAML_PKGDIRS=	oUnit
> ALL_TARGET=	all allopt testall doc
> MAKE_ENV=	OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib
>Index: devel/ocaml-parmap/Makefile
>===================================================================
>--- devel/ocaml-parmap/Makefile	(revision 442522)
>+++ devel/ocaml-parmap/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	parmap
> DISTVERSION=	1.0-rc6
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -15,14 +16,12 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	rdicosmo
> 
>-USES=			gmake
>+USES=			gmake ocaml
>+USE_OCAML=		findlib ldconfig ocamlbuild
> GNU_CONFIGURE=		yes
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so
>+	cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME} && \
>+	    ${STRIP_CMD} *.cmxs *.so
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-parmap/distinfo
>===================================================================
>--- devel/ocaml-parmap/distinfo	(revision 442522)
>+++ devel/ocaml-parmap/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1496236894
> SHA256 (rdicosmo-parmap-1.0-rc6_GH0.tar.gz) = 25e2eeb2ec8b1dedc8067443ddcddf4ab0ff2e3821da888338146af69e8fd9e6
> SIZE (rdicosmo-parmap-1.0-rc6_GH0.tar.gz) = 97083
>Index: devel/ocaml-parmap/files/patch-Makefile.in
>===================================================================
>--- devel/ocaml-parmap/files/patch-Makefile.in	(revision 442522)
>+++ devel/ocaml-parmap/files/patch-Makefile.in	(working copy)
>@@ -1,15 +1,36 @@
> --- Makefile.in.orig	2015-02-09 10:42:28 UTC
> +++ Makefile.in
>-@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install
>+@@ -12,21 +12,11 @@ datarootdir = @datarootdir@
>+ prefix = @prefix@
>+ exec_prefix = @exec_prefix@
>+ 
>+-ifeq ($(DESTDIR),)
>+-LIBDIR=$(shell ocamlfind printconf destdir)
>+-BINDIR=@bindir@
>+-MANDIR=@mandir@/man3
>++LIBDIR=$(DESTDIR)/$(shell ocamlfind printconf destdir)
>++BINDIR=$(DESTDIR)$(exec_prefix)/bin
>++MANDIR=$(DESTDIR)$(prefix)/man/man3
>+ INSTALL = $(OCAMLFIND) install
>  UNINSTALL = $(OCAMLFIND) remove
>- else
>- export OCAMLLIBDIR := lib/ocaml
>+-else
>+-export OCAMLLIBDIR := lib/ocaml
> -LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR)
> -BINDIR=$(DESTDIR)/bin
> -MANDIR=$(DESTDIR)/man/man3
>-+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR)
>-+BINDIR=$(DESTDIR)$(exec_prefix)/bin
>-+MANDIR=$(DESTDIR)$(prefix)/man/man3
>- INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
>- UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
>- endif
>+-INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
>+-UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
>+-endif
>+-
>+ 
>+ ifeq ("@OCAMLBEST@","opt")
>+   OCAMLBEST=native
>+@@ -81,8 +71,6 @@ INSTALL_STUFF += $(filter-out $(wildcard
>+ INSTALL_STUFF += $(wildcard _build/*.so _build/*.a)
>+ 
>+ install: $(LIBS) META
>+-	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
>+-	test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs
>+ 	$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
>+ 	(cd _build; ocamldoc -man -man-mini parmap.ml parmap.mli)
>+ 	test -d $(MANDIR) || mkdir -p $(MANDIR)
>Index: devel/ocaml-parmap/pkg-plist
>===================================================================
>--- devel/ocaml-parmap/pkg-plist	(revision 442522)
>+++ devel/ocaml-parmap/pkg-plist	(working copy)
>@@ -1,18 +1,16 @@
>-lib/ocaml/parmap/META
>-lib/ocaml/parmap/bytearray.cmi
>-lib/ocaml/parmap/bytearray.mli
>-lib/ocaml/parmap/libparmap_stubs.a
>-lib/ocaml/parmap/parmap.a
>-lib/ocaml/parmap/parmap.cma
>-lib/ocaml/parmap/parmap.cmi
>-lib/ocaml/parmap/parmap.cmxa
>-lib/ocaml/parmap/parmap.cmxs
>-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
>-lib/ocaml/stublibs/dllparmap_stubs.so.owner
>+%%OCAML_SITELIBDIR%%/parmap/META
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi
>+%%OCAML_SITELIBDIR%%/parmap/bytearray.mli
>+%%OCAML_SITELIBDIR%%/parmap/dllparmap_stubs.so
>+%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a
>+%%OCAML_SITELIBDIR%%/parmap/parmap.a
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cma
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmi
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa
>+%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs
>+%%OCAML_SITELIBDIR%%/parmap/parmap.mli
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi
>+%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli
>+%%OCAML_SITELIBDIR%%/parmap/setcore.cmi
>+%%OCAML_SITELIBDIR%%/parmap/setcore.mli
> man/man3/Parmap.3o.gz
>-@dir %%OCAML_SITELIBDIR%%
>Index: devel/ocaml-pcre/Makefile
>===================================================================
>--- devel/ocaml-pcre/Makefile	(revision 442522)
>+++ devel/ocaml-pcre/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	pcre
> PORTVERSION=	7.2.3
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -15,12 +15,11 @@
> 
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>+USES=		ocaml
>+USE_OCAML=	findlib ldconfig ocamlbuild
> USE_GITHUB=	yes
> GH_ACCOUNT=	mmottl
> GH_PROJECT=	${PORTNAME}-ocaml
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
> PORTEXAMPLES=	cloc count_hash pcregrep subst
> DOCSDIR=	${PREFIX}/share/doc/pcre-ocaml
>Index: devel/ocaml-pomap/Makefile
>===================================================================
>--- devel/ocaml-pomap/Makefile	(revision 442522)
>+++ devel/ocaml-pomap/Makefile	(working copy)
>@@ -4,23 +4,20 @@
> PORTNAME=	pomap
> PORTVERSION=	3.0.7
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml library to maintain a list of partially ordered elements
> 
> LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING.txt
> 
>+USES=		ocaml
> USE_GITHUB=	yes
> GH_ACCOUNT=	mmottl
>-
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-USE_OCAML_WASH=	yes
>-
>+USE_OCAML=	findlib:plist ocamlbuild wash
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples
> MAKE_JOBS_UNSAFE=yes
>@@ -27,7 +24,6 @@
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>@@ -38,13 +34,13 @@
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for i in AUTHORS.txt CHANGES.txt README.md
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>-.endfor
>+	cd ${WRKSRC} && ${INSTALL_DATA} \
>+	    AUTHORS.txt CHANGES.txt README.md \
>+	    ${STAGEDIR}${DOCSDIR}
> 
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	@(cd ${WRKSRC}/examples && \
>-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
>+	cd ${WRKSRC}/examples && \
>+	    ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-ppx-tools/Makefile
>===================================================================
>--- devel/ocaml-ppx-tools/Makefile	(revision 442522)
>+++ devel/ocaml-ppx-tools/Makefile	(working copy)
>@@ -2,23 +2,20 @@
> # $FreeBSD$
> 
> PORTNAME=	ppx-tools
>-PORTVERSION=	0.99.2
>-DISTVERSIONPREFIX=	${GH_PROJECT}_
>+PORTVERSION=	5.0
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	michipili@gmail.com
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Tools for authors of ppx rewriters
> 
> LICENSE=	MIT
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib
> MAKE_JOBS_UNSAFE=yes
> USE_GITHUB=	yes
>-GH_ACCOUNT=	alainfrisch
>-GH_PROJECT=	${PORTNAME:C/-/_/}
>+GH_TUPLE=	alainfrisch:${PORTNAME:C,-,_,}:49c08e2
> 
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/ppx_tools/ppx_tools.cmxs
>Index: devel/ocaml-ppx-tools/distinfo
>===================================================================
>--- devel/ocaml-ppx-tools/distinfo	(revision 442522)
>+++ devel/ocaml-ppx-tools/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (alainfrisch-ppx_tools-ppx_tools_0.99.2_GH0.tar.gz) = 98128022ea0574d769a263eb9b73be06200eec4bac9adb8dc44df289a77c4dec
>-SIZE (alainfrisch-ppx_tools-ppx_tools_0.99.2_GH0.tar.gz) = 15877
>+TIMESTAMP = 1488666602
>+SHA256 (alainfrisch-ppx_tools-5.0-49c08e2_GH0.tar.gz) = d07bf279b5e40f484716da966c7d3206bb64d88983cf702d3aa4fed1c5d781fc
>+SIZE (alainfrisch-ppx_tools-5.0-49c08e2_GH0.tar.gz) = 17758
>Index: devel/ocaml-ppx-tools/pkg-plist
>===================================================================
>--- devel/ocaml-ppx-tools/pkg-plist	(revision 442522)
>+++ devel/ocaml-ppx-tools/pkg-plist	(working copy)
>@@ -1,8 +1,14 @@
> %%OCAML_SITELIBDIR%%/ppx_tools/META
> %%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmi
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmt
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmti
> %%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmx
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.mli
> %%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmi
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmt
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmti
> %%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmx
>+%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.mli
> %%OCAML_SITELIBDIR%%/ppx_tools/dumpast
> %%OCAML_SITELIBDIR%%/ppx_tools/genlifter
> %%OCAML_SITELIBDIR%%/ppx_tools/ppx_metaquot
>Index: devel/ocaml-re/Makefile
>===================================================================
>--- devel/ocaml-re/Makefile	(revision 442522)
>+++ devel/ocaml-re/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	re
> PORTVERSION=	1.4.1
> DISTVERSIONPREFIX=	${PKGNAMEPREFIX}${PORTNAME}-
>+PORTREVISION=	1
> CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>@@ -12,7 +13,8 @@
> 
> LICENSE=	LGPL21
> 
>-USES=	gmake
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ocamlbuild
> HAS_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -20,13 +22,9 @@
> GH_ACCOUNT=	ocaml
> GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
> CONFIGURE_ARGS=		--destdir "${DESTDIRNAME}"
> 
> do-configure:
>-	cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -configure ${CONFIGURE_ARGS}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-react/Makefile
>===================================================================
>--- devel/ocaml-react/Makefile	(revision 442522)
>+++ devel/ocaml-react/Makefile	(working copy)
>@@ -3,39 +3,37 @@
> 
> PORTNAME=	react
> PORTVERSION=	1.2.1
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://erratique.ch/software/react/releases/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml module for functional reactive programming
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=		tar:tbz
>-USE_OCAML=		yes
>+USES=		ocaml tar:tbz
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
>+
> OPTIONS_DEFINE=	X11
>-OPTIONS_DEFAULT=	X11
>+OPTIONS_DEFAULT=X11
>+X11_USE=	OCAML=x11
> 
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MX11)
>-OCAMLC_DEPEND=		ocaml-notk>=3.11:${OCAMLC_PORT}
>-.else
>-OCAMLC_DEPEND=		ocaml>=3.11:${OCAMLC_PORT}
>-.endif
>-
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>-
> do-build:
>-	cd ${WRKSRC} && ocamlbuild react.cmxs react.cma react.a
>+	cd ${WRKSRC} && ${OCAMLBUILD} react.cmxs react.cma react.a
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/react
>-	cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib react pkg/META _build/src/react.a _build/src/react.cma _build/src/react.cmi _build/src/react.cmx _build/src/react.cmxa _build/src/react.cmxs _build/src/react.mli
>+	cd ${WRKSRC} && \
>+	    ${OCAMLFIND} install \
>+	    -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib \
>+	    react pkg/META \
>+	    _build/src/react.a _build/src/react.cma \
>+	    _build/src/react.cmi _build/src/react.cmx \
>+	    _build/src/react.cmxa _build/src/react.cmxs \
>+	    _build/src/react.mli
> 	${INSTALL_LIB} ${WRKSRC}/_build/src/react.cmxs \
>-		${STAGEDIR}${OCAMLFIND_DESTDIR}/react
>+	    ${STAGEDIR}${OCAMLFIND_DESTDIR}/react
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-res/Makefile
>===================================================================
>--- devel/ocaml-res/Makefile	(revision 442522)
>+++ devel/ocaml-res/Makefile	(working copy)
>@@ -3,21 +3,19 @@
> 
> PORTNAME=	res
> PORTVERSION=	4.0.4
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://cdn.bitbucket.org/mmottl/res/downloads/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Automatically Resizing Contiguous Memory for OCaml
> 
> LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING.txt
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-USE_OCAML_WASH=	yes
>-
>+USES=		ocaml
>+USE_OCAML=	findlib:plist ocamlbuild wash
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples
> MAKE_JOBS_UNSAFE=yes
>@@ -24,7 +22,6 @@
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>@@ -32,9 +29,9 @@
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for i in AUTHORS.txt CHANGES.txt README.md TODO.md
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>-.endfor
>+	cd ${WRKSRC} && ${INSTALL_DATA} \
>+	    AUTHORS.txt CHANGES.txt README.md TODO.md \
>+	    ${STAGEDIR}${DOCSDIR}
> 
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>Index: devel/ocaml-result/Makefile
>===================================================================
>--- devel/ocaml-result/Makefile	(nonexistent)
>+++ devel/ocaml-result/Makefile	(working copy)
>@@ -0,0 +1,22 @@
>+# $FreeBSD$
>+
>+PORTNAME=	result
>+PORTVERSION=	1.2
>+CATEGORIES=	devel
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	OCaml result compatibility module
>+
>+LICENSE=	BSD3CLAUSE
>+
>+USES=		ocaml
>+USE_OCAML=	findlib:plist
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	janestreet
>+MAKE_JOBS_UNSAFE=	yes
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-result/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-result/distinfo
>===================================================================
>--- devel/ocaml-result/distinfo	(nonexistent)
>+++ devel/ocaml-result/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1491081129
>+SHA256 (janestreet-result-1.2_GH0.tar.gz) = 7cf7909f902994dc885ceae1983e4cda3665914c774f774604d076b89f76f7dd
>+SIZE (janestreet-result-1.2_GH0.tar.gz) = 2100
>
>Property changes on: devel/ocaml-result/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-result/pkg-descr
>===================================================================
>--- devel/ocaml-result/pkg-descr	(nonexistent)
>+++ devel/ocaml-result/pkg-descr	(working copy)
>@@ -0,0 +1,3 @@
>+Projects that want to use the new result type defined in OCaml >= 4.03
>+while staying compatible with older version of OCaml should use the
>+`Result` module defined in this library.
>
>Property changes on: devel/ocaml-result/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-sdl/Makefile
>===================================================================
>--- devel/ocaml-sdl/Makefile	(revision 442522)
>+++ devel/ocaml-sdl/Makefile	(working copy)
>@@ -3,13 +3,13 @@
> 
> PORTNAME=	sdl
> PORTVERSION=	0.9.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	ocamlsdl-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml interface to the SDL
> 
> LICENSE=	LGPL20+ # source says LGPL20+, COPYING says LGPL21
>@@ -17,20 +17,14 @@
> 
> BUILD_DEPENDS=	ocaml-lablgl>0:graphics/ocaml-lablgl
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-USE_OCAML_LDCONFIG=yes
>-
>-USES=		gmake
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist ldconfig
> USE_SDL=	sdl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-lablgldir=${LOCALBASE} \
> 		--with-sdl-prefix=${LOCALBASE} \
> 		--with-installdir=${PREFIX}
>-
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>-
> INFO=		ocamlsdl
> PORTDOCS=	*
> 
>@@ -55,7 +49,7 @@
> SDL_TTF_CONFIGURE_OFF=	--disable-sdl-ttf
> 
> post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/sdl/*.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sdl/*.so
> 	${INSTALL_DATA} ${WRKSRC}/doc/ocamlsdl.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
> 
> post-install-DOCS-on:
>Index: devel/ocaml-sem/Makefile
>===================================================================
>--- devel/ocaml-sem/Makefile	(revision 442522)
>+++ devel/ocaml-sem/Makefile	(working copy)
>@@ -3,22 +3,20 @@
> 
> PORTNAME=	sem
> PORTVERSION=	0.0.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	http://ocaml-sem.sourceforge.net/files/ \
> 		SF/ocaml-${PORTNAME}/${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	POSIX semaphores for OCaml
> 
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		gmake tar:bzip2
>-USE_OCAML=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_FINDLIB=	yes
>+USES=		gmake tar:bzip2 ocaml
>+USE_OCAML=	findlib ldconfig
> MAKE_ENV=	OCAML_LIB_INSTALL="${PREFIX}/lib/ocaml/site-lib/sem" \
> 		INCDIRS="${LOCALBASE}/include" LIBDIRS="${LOCALBASE}/lib"
> MAKE_JOBS_UNSAFE=	yes
>Index: devel/ocaml-sexplib/Makefile
>===================================================================
>--- devel/ocaml-sexplib/Makefile	(revision 442522)
>+++ devel/ocaml-sexplib/Makefile	(working copy)
>@@ -2,12 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	sexplib
>-PORTVERSION=	113.00.00
>+PORTVERSION=	113.33.00
>+DISTVERSIONSUFFIX=	+4.03
>+CATEGORIES=	devel
> MASTER_SITES=	https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/
>-CATEGORIES=	devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml library for working with S-expressions
> 
> LICENSE=	APACHE20 BSD3CLAUSE
>@@ -18,26 +19,23 @@
> BUILD_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
> RUN_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
> 
>-OPTIONS_DEFINE=	DOCS
>-
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ocamlbuild
>+OCAML_PKGDIRS=	${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix
>+HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-docs --prefix ${PREFIX}
>-HAS_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USES=		gmake
>-
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>-OCAML_PKGDIRS=	${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix
> PORTDOCS=	*
> 
>+OPTIONS_DEFINE=	DOCS
>+
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib*/*.cmxs
> 
> post-install-DOCS-on:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
>-	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC}/ && ${INSTALL_DATA} \
>+	    CHANGES.md README.org ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-sexplib/distinfo
>===================================================================
>--- devel/ocaml-sexplib/distinfo	(revision 442522)
>+++ devel/ocaml-sexplib/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (sexplib-113.00.00.tar.gz) = df91f1b4aae3936856cbb00a621a2c40f6b56c06670e1513b2b60698ab8240e4
>-SIZE (sexplib-113.00.00.tar.gz) = 136960
>+TIMESTAMP = 1488724873
>+SHA256 (sexplib-113.33.00+4.03.tar.gz) = 83de1e9f1c10e5d65d30ef78cf45ddec7dd7ae759fedf001aae80ffd546e39b6
>+SIZE (sexplib-113.33.00+4.03.tar.gz) = 115878
>Index: devel/ocaml-sexplib/files/patch-Makefile
>===================================================================
>--- devel/ocaml-sexplib/files/patch-Makefile	(nonexistent)
>+++ devel/ocaml-sexplib/files/patch-Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2017-04-01 19:16:57 UTC
>++++ Makefile
>+@@ -29,7 +29,7 @@ $(NAME).install: js-utils/gen_install.ml
>+ 	ocaml -I js-utils js-utils/gen_install.ml
>+ 
>+ install: $(NAME).install
>+-	opam-installer -i --prefix $(PREFIX) $(NAME).install
>++	ocaml setup.ml -install
>+ 
>+ uninstall: $(NAME).install
>+ 	opam-installer -u --prefix $(PREFIX) $(NAME).install
>
>Property changes on: devel/ocaml-sexplib/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-topkg/Makefile
>===================================================================
>--- devel/ocaml-topkg/Makefile	(nonexistent)
>+++ devel/ocaml-topkg/Makefile	(working copy)
>@@ -0,0 +1,39 @@
>+# $FreeBSD$
>+
>+PORTNAME=	topkg
>+PORTVERSION=	0.9.0
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	devel
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Transitory OCaml software packager
>+
>+LICENSE=	MIT
>+
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/result/META:devel/ocaml-result \
>+		opam-installer:devel/ocaml-opam
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	dbuenzli
>+PORTDOCS=	*
>+
>+do-build:
>+	cd ${WRKSRC} && \
>+	    ${OCAML_CMD} pkg/pkg.ml build --pkg-name ${PORTNAME}
>+
>+do-install:
>+	cd ${WRKSRC} && \
>+	    ${LOCALBASE}/bin/opam-installer -i \
>+	    --prefix=${STAGEDIR}${PREFIX} \
>+	    --libdir=${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR} \
>+	    --docdir=${STAGEDIR}${PREFIX}/share/doc \
>+	    topkg.install
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/*.cmxs
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-topkg/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-topkg/distinfo
>===================================================================
>--- devel/ocaml-topkg/distinfo	(nonexistent)
>+++ devel/ocaml-topkg/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1491074824
>+SHA256 (dbuenzli-topkg-v0.9.0_GH0.tar.gz) = 1f9a718d49151ac4e914404e78865cc74e361d7befea2167fb8daa78a68fba11
>+SIZE (dbuenzli-topkg-v0.9.0_GH0.tar.gz) = 120352
>
>Property changes on: devel/ocaml-topkg/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-topkg/pkg-descr
>===================================================================
>--- devel/ocaml-topkg/pkg-descr	(nonexistent)
>+++ devel/ocaml-topkg/pkg-descr	(working copy)
>@@ -0,0 +1,2 @@
>+ocaml-ipaddr
>+A library for manipulation of IP (and MAC) address representations.
>
>Property changes on: devel/ocaml-topkg/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-type_conv/Makefile
>===================================================================
>--- devel/ocaml-type_conv/Makefile	(revision 442522)
>+++ devel/ocaml-type_conv/Makefile	(working copy)
>@@ -3,27 +3,25 @@
> 
> PORTNAME=	type_conv
> PORTVERSION=	113.00.02
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Type conversion routines for OCaml
> 
> LICENSE=	APACHE20 BSD3CLAUSE
> LICENSE_COMB=	multi
> 
>-OPTIONS_DEFINE=	DOCS
>-
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ocamlbuild
>+HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-docs --prefix ${PREFIX}
>-HAS_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USES=		gmake
> 
>+OPTIONS_DEFINE=	DOCS
>+
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> PORTDOCS=	*
> 
>@@ -31,7 +29,8 @@
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/type_conv/pa_type_conv.cmxs
> 
> post-install-DOCS-on:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
>-	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} \
>+	    CHANGES.md README.md ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-type_conv/distinfo
>===================================================================
>--- devel/ocaml-type_conv/distinfo	(revision 442522)
>+++ devel/ocaml-type_conv/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1488695179
> SHA256 (type_conv-113.00.02.tar.gz) = d305d0032be314916ac3ec37617e0c8d3aadab9bcee14e746e567d8405f5289c
> SIZE (type_conv-113.00.02.tar.gz) = 64174
>Index: devel/ocaml-uchar/Makefile
>===================================================================
>--- devel/ocaml-uchar/Makefile	(nonexistent)
>+++ devel/ocaml-uchar/Makefile	(working copy)
>@@ -0,0 +1,33 @@
>+# $FreeBSD$
>+
>+PORTNAME=	uchar
>+PORTVERSION=	0.0.1
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	devel www
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	Compatibility library for OCaml's Uchar module
>+
>+LICENSE=	LGPL20
>+
>+USES=		gmake ocaml
>+USE_OCAML=	ocamlbuild
>+#OCAML_PKGDIRS=	deriving
>+#OCAML_LDLIBS=	${OCAML_SITELIBDIR}/deriving
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ocaml
>+#MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
>+#MAKE_JOBS_UNSAFE=	yes
>+#ALL_TARGET=	all ydump
>+PLIST_FILES=	${OCAML_SITELIBDIR}/${PORTNAME}/META
>+
>+do-build:
>+	cd ${WRKSRC} && ${OCAML} pkg/build.ml native=true native-dynlink=true
>+
>+do-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}
>+	${INSTALL_DATA} ${WRKSRC}/_build/pkg/META.empty \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/META
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-uchar/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-uchar/distinfo
>===================================================================
>--- devel/ocaml-uchar/distinfo	(nonexistent)
>+++ devel/ocaml-uchar/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489455645
>+SHA256 (ocaml-uchar-v0.0.1_GH0.tar.gz) = ac94116a35cbcf346c94b4326d03d382560fbae337b7a59794ad6e1a1a84c140
>+SIZE (ocaml-uchar-v0.0.1_GH0.tar.gz) = 23471
>
>Property changes on: devel/ocaml-uchar/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-uchar/pkg-descr
>===================================================================
>--- devel/ocaml-uchar/pkg-descr	(nonexistent)
>+++ devel/ocaml-uchar/pkg-descr	(working copy)
>@@ -0,0 +1,4 @@
>+The `uchar` package provides a compatibility library for the
>+Uchar module introduced in OCaml 4.03.
>+
>+WWW: https://github.com/ocaml/uchar
>
>Property changes on: devel/ocaml-uchar/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-ulex/Makefile
>===================================================================
>--- devel/ocaml-ulex/Makefile	(revision 442522)
>+++ devel/ocaml-ulex/Makefile	(working copy)
>@@ -3,21 +3,18 @@
> 
> PORTNAME=	ulex
> PORTVERSION=	1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://www.cduce.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Lexer generator for Unicode and OCaml
> 
>-USES=		gmake
>-USE_OCAML=	true
>-USE_OCAML_FINDLIB=	true
>-USE_OCAML_CAMLP4=	true
>-USE_OCAML_LDCONFIG=	true
>-USE_OCAMLFIND_PLIST=	yes
>+LICENSE=	MIT
> 
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig ocamlbuild
> ALL_TARGET=	all all.opt
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -26,10 +23,10 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>-DOCS_ALL_TARGET=	doc
>+DOCS_ALL_TARGET=doc
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.css ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} *.html *.css ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-uutf/Makefile
>===================================================================
>--- devel/ocaml-uutf/Makefile	(revision 442522)
>+++ devel/ocaml-uutf/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	uutf
> PORTVERSION=	0.9.4
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://erratique.ch/software/uutf/releases/
> PKGNAMEPREFIX=	ocaml-
>@@ -12,19 +13,15 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=	tar:tbz
>-USE_OCAML=		yes
>+USES=	tar:tbz ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
> 
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_LDCONFIG=	yes
>-
> do-build:
>-	cd ${WRKSRC} && ocamlbuild uutf.cmxs uutf.cma uutf.a
>+	cd ${WRKSRC} && ${OCAMLBUILD} uutf.cmxs uutf.cma uutf.a
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}/uutf
>-	cd ${WRKSRC} && ocamlfind install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib uutf pkg/META _build/src/uutf.a _build/src/uutf.cma _build/src/uutf.cmi _build/src/uutf.cmx _build/src/uutf.cmxa _build/src/uutf.cmxs _build/src/uutf.mli
>+	cd ${WRKSRC} && ${OCAMLFIND} install -destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib uutf pkg/META _build/src/uutf.a _build/src/uutf.cma _build/src/uutf.cmi _build/src/uutf.cmx _build/src/uutf.cmxa _build/src/uutf.cmxs _build/src/uutf.mli
> 	${INSTALL_LIB} ${WRKSRC}/_build/src/uutf.cmxs \
> 		${STAGEDIR}${OCAMLFIND_DESTDIR}/uutf
> 
>Index: devel/ocaml-xstr/Makefile
>===================================================================
>--- devel/ocaml-xstr/Makefile	(revision 442522)
>+++ devel/ocaml-xstr/Makefile	(working copy)
>@@ -3,23 +3,19 @@
> 
> PORTNAME=	xstr
> PORTVERSION=	0.2.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Thread-safe implementation of string searching/matching
> 
> LICENSE=	MIT
> 
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
>+ALL_TARGET=	all opt
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-
>-USES=		gmake
>-ALL_TARGET=	all opt
>-
> .include <bsd.port.mk>
>Index: devel/ocaml-xstrp4/Makefile
>===================================================================
>--- devel/ocaml-xstrp4/Makefile	(revision 442522)
>+++ devel/ocaml-xstrp4/Makefile	(working copy)
>@@ -3,29 +3,27 @@
> 
> PORTNAME=	xstrp4
> PORTVERSION=	1.8.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml extension to expands brace expansions
> 
> LICENSE=	MIT
> 
>-OPTIONS_DEFINE=	EXAMPLES
>-
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4
> HAS_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> PORTEXAMPLES=	*
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
> 
>+OPTIONS_DEFINE=	EXAMPLES
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	(cd ${WRKSRC} && ${INSTALL_DATA} sample.* ${STAGEDIR}${EXAMPLESDIR})
>+	cd ${WRKSRC} && ${INSTALL_DATA} sample.* ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-yojson/Makefile
>===================================================================
>--- devel/ocaml-yojson/Makefile	(nonexistent)
>+++ devel/ocaml-yojson/Makefile	(working copy)
>@@ -0,0 +1,33 @@
>+# $FreeBSD$
>+
>+PORTNAME=	yojson
>+PORTVERSION=	1.3.3
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	devel www
>+PKGNAMEPREFIX=	ocaml-
>+
>+MAINTAINER=	hrs@FreeBSD.org
>+COMMENT=	JSON library for OCaml
>+
>+LICENSE=	BSD3CLAUSE
>+
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/easy-format/easy_format.cmx:devel/ocaml-easy-format \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/biniou/biniou.cmxs:devel/ocaml-biniou \
>+		cppo:devel/ocaml-cppo
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig
>+#OCAML_PKGDIRS=	deriving
>+#OCAML_LDLIBS=	${OCAML_SITELIBDIR}/deriving
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	mjambon
>+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
>+MAKE_JOBS_UNSAFE=	yes
>+ALL_TARGET=	all ydump
>+PLIST_FILES=	bin/ydump
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ydump
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/ocaml-yojson/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-yojson/distinfo
>===================================================================
>--- devel/ocaml-yojson/distinfo	(nonexistent)
>+++ devel/ocaml-yojson/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1489423623
>+SHA256 (mjambon-yojson-v1.3.3_GH0.tar.gz) = de5ad4fd681f58ae5a670f0a43684873cc6ca50bdf52e63ac0c4b8a8bbe1d51a
>+SIZE (mjambon-yojson-v1.3.3_GH0.tar.gz) = 26940
>
>Property changes on: devel/ocaml-yojson/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ocaml-yojson/pkg-descr
>===================================================================
>--- devel/ocaml-yojson/pkg-descr	(nonexistent)
>+++ devel/ocaml-yojson/pkg-descr	(working copy)
>@@ -0,0 +1,5 @@
>+Yojson: JSON library for OCaml
>+
>+Yojson supersedes json-wheel.
>+
>+WWW: http://mjambon.com/yojson.html
>
>Property changes on: devel/ocaml-yojson/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/omake/Makefile
>===================================================================
>--- devel/omake/Makefile	(revision 442522)
>+++ devel/omake/Makefile	(working copy)
>@@ -3,21 +3,19 @@
> 
> PORTNAME=	omake
> DISTVERSION=	0.9.8.6-0.rc1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \
> 		http://download.camlcity.org/download/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Flexible build system
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+USES=		ncurses ocaml:build readline
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
>-USE_OCAML=	yes
>-NO_OCAML_RUNDEPENDS=yes
>-USES=		ncurses readline
> MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
> MAKE_JOBS_UNSAFE=	yes
> 
>Index: ftp/ocaml-ocurl/Makefile
>===================================================================
>--- ftp/ocaml-ocurl/Makefile	(revision 442522)
>+++ ftp/ocaml-ocurl/Makefile	(working copy)
>@@ -3,29 +3,27 @@
> 
> PORTNAME=	ocurl
> PORTVERSION=	0.7.9
>+PORTREVISION=	1
> CATEGORIES=	ftp
> MASTER_SITES=	http://ygrek.org.ua/p/release/ocurl/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Interface for OCaml to the curl lib
> 
>-BUILD_DEPENDS=	ocamlc:lang/ocaml \
>-		ocamlfind:devel/ocaml-findlib
>+LICENSE=	MIT
>+
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> LIB_DEPENDS=	libcurl.so:ftp/curl
> 
>-USES=		gmake
>+USES=		gmake ocaml
>+USE_OCAML=	findlib camlp4 ldconfig
>+OCAML_PKGDIRS=	curl
>+OCAML_LDLIBS=	${OCAML_SITELIBDIR}/curl
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+="--with-findlib"
>+CONFIGURE_ARGS=	--with-findlib
> MAKE_JOBS_UNSAFE=	yes
> 
>-USE_OCAML=		yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-OCAML_PKGDIRS=		curl
>-
> OPTIONS_DEFINE=	LWT
> OPTIONS_DEFAULT=LWT
> OPTIONS_SUB=	yes
>@@ -36,13 +34,9 @@
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/curl/dllcurl-helper.so
> 
>-.include <bsd.port.options.mk>
>-
>-.if ! ${PORT_OPTIONS:MLWT}
> # Override auto-detection
>-post-configure:
>+post-configure-LWT-off:
> 	${REINPLACE_CMD} 's/(lwt,no)/(no,no)/' ${WRKSRC}/Makefile \
> 		${WRKSRC}/examples/Makefile
>-.endif
> 
> .include <bsd.port.mk>
>Index: graphics/llpp/Makefile
>===================================================================
>--- graphics/llpp/Makefile	(revision 442522)
>+++ graphics/llpp/Makefile	(working copy)
>@@ -30,9 +30,8 @@
> RUN_DEPENDS=	xsel:x11/xsel-conrad
> 
> STRIP=	# Stripping renders the executable unusable, so don't do it for now
>-USES=		desktop-file-utils gmake jpeg ssl
>+USES=		desktop-file-utils gmake jpeg ocaml ssl
> USE_GL=		gl
>-USE_OCAML=	yes
> NO_OCAML_RUNDEPENDS=	yes
> USE_OPENGL=	yes
> USE_XORG=	x11 xext
>Index: graphics/ocaml-images/Makefile
>===================================================================
>--- graphics/ocaml-images/Makefile	(revision 442522)
>+++ graphics/ocaml-images/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	images
> PORTVERSION=	4.0.1
>-PORTREVISION=	8
>+PORTREVISION=	9
> PORTEPOCH=	2
> CATEGORIES=	graphics
> MASTER_SITES=	https://bitbucket.org/camlspotter/camlimages/get/
>@@ -11,27 +11,25 @@
> DISTNAME=	v${PORTVERSION}
> DIST_SUBDIR=	ocaml-images
> 
>-MAINTAINER=	michael.grunewald@laposte.net
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Objective Caml image processing library
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
>-BUILD_DEPENDS+=	omake:devel/omake
>+LICENSE=	LGPL20
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-OCAMLFIND_DESTDIR=	${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
>+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf \
>+		omake:devel/omake
> 
>+USES=		ocaml
>+USE_OCAML=	findlib
> OCAML_PKGDIRS=	camlimages
> OCAML_LDLIBS=	${OCAML_SITELIBDIR}/camlimages
>-
>+WRKSRC=		${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
> OMAKESUBS+=	-e s@%%INCLUDESPORTS%%@${LOCALBASE}/include@
> OMAKESUBS+=	-e s@%%INCLUDESX11%%@${LOCALBASE}/include/X11@
> OMAKESUBS+=	-e s@%%INCLUDESPNG%%@${LOCALBASE}/include/libpng15@
> OMAKESUBS+=	-e s@%%LDFLAGSPORTS%%@-L${LOCALBASE}/lib@
>-
> OMAKE=		omake 'PREFIX=${STAGEDIR}${PREFIX}'
> OMARGS=		--dotomake .omake --force-dotomake
>-WRKSRC=		${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -64,18 +62,14 @@
> GTK2_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
> GTK2_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
> 
>-.include <bsd.port.options.mk>
>+XPM_USE=	XORG=xpm
> 
>-.if ${PORT_OPTIONS:MXPM}
>-USE_XORG=	xpm
>-.endif
>-
> do-configure:
>-	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
>-	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)
>+	cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile
>+	cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure
> 
> do-build:
>-	(cd ${WRKSRC} && ${OMAKE} ${OMARGS})
>+	cd ${WRKSRC} && ${OMAKE} ${OMARGS}
> 
> ocaml-findlib:
> 	# Overriding ocaml-findlib target which does not support stage
>@@ -83,6 +77,6 @@
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}
>-	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} install)
>+	cd ${WRKSRC} && ${OMAKE} ${OMARGS} install
> 
> .include <bsd.port.mk>
>Index: graphics/ocaml-images/files/patch-OMakefile
>===================================================================
>--- graphics/ocaml-images/files/patch-OMakefile	(revision 442522)
>+++ graphics/ocaml-images/files/patch-OMakefile	(working copy)
>@@ -1,6 +1,6 @@
>---- OMakefile.orig	2012-11-07 22:03:19.000000000 +0100
>-+++ OMakefile	2012-11-07 22:04:26.000000000 +0100
>-@@ -22,13 +22,13 @@
>+--- OMakefile.orig	2011-06-22 18:04:32 UTC
>++++ OMakefile
>+@@ -22,13 +22,13 @@ if $(defined WithOMyApt)
>  
>  # Specify non standard include directories
>  INCLUDES[]=
>Index: graphics/ocaml-images/files/patch-src_OMakefile
>===================================================================
>--- graphics/ocaml-images/files/patch-src_OMakefile	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_OMakefile	(working copy)
>@@ -1,6 +1,6 @@
>---- src/OMakefile.orig	2012-11-07 22:43:27.000000000 +0100
>-+++ src/OMakefile	2012-11-07 22:44:22.000000000 +0100
>-@@ -262,10 +262,10 @@
>+--- src/OMakefile.orig	2011-06-22 18:04:32 UTC
>++++ src/OMakefile
>+@@ -262,10 +262,10 @@ INSTALL_TARGETS()=
>        $(glob i, *.so)
>  
>  INSTALL()=
>Index: graphics/ocaml-images/files/patch-src_gifwrite.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_gifwrite.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_gifwrite.c	(working copy)
>@@ -9,7 +9,7 @@
>  {
>    CAMLparam1(list);
>    CAMLlocal1(l);
>-@@ -52,7 +52,11 @@ ColorMapObject *ColorMapObject_val( valu
>+@@ -52,7 +52,11 @@ ColorMapObject *ColorMapObject_val( value cmap )
>  fprintf(stderr, "Creating map with length = %d ...\n", len);
>  fflush(stderr);
>  */
>Index: graphics/ocaml-images/files/patch-src_jpegread.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_jpegread.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_jpegread.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/jpegread.c.orig	2011-06-22 20:04:32.000000000 +0200
>+--- src/jpegread.c.orig	2011-06-22 18:04:32 UTC
> +++ src/jpegread.c
>-@@ -417,7 +417,7 @@
>+@@ -417,7 +417,7 @@ value read_jpeg_scanlines( value jpegh, value buf, val
>      jpeg_read_scanlines( cinfop, row, 1 );
>      row[0] += scanline_bytes;
>    }
>Index: graphics/ocaml-images/files/patch-src_pngread.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_pngread.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_pngread.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/pngread.c.orig	2009-10-26 13:42:03.000000000 +0100
>-+++ src/pngread.c	2012-05-05 07:08:53.000000000 +0200
>-@@ -69,7 +69,7 @@
>+--- src/pngread.c.orig	2011-06-22 18:04:32 UTC
>++++ src/pngread.c
>+@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
>    }
>  
>    /* error handling */
>@@ -9,7 +9,7 @@
>      /* Free all of the memory associated with the png_ptr and info_ptr */
>      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
>      fclose(fp);
>-@@ -134,7 +134,7 @@
>+@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name )
>      png_set_rows(png_ptr, info_ptr, row_pointers);
>  
>      /* Later, we can return something */
>@@ -18,7 +18,7 @@
>        /* Free all of the memory associated with the png_ptr and info_ptr */
>        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
>        fclose(fp);
>-@@ -243,7 +243,7 @@
>+@@ -243,7 +243,7 @@ value read_png_file( name )
>    }
>  
>    /* error handling */
>@@ -27,7 +27,7 @@
>      /* Free all of the memory associated with the png_ptr and info_ptr */
>      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
>      fclose(fp);
>-@@ -302,7 +302,7 @@
>+@@ -302,7 +302,7 @@ value read_png_file( name )
>      png_set_rows(png_ptr, info_ptr, row_pointers);
>  
>      /* Later, we can return something */
>Index: graphics/ocaml-images/files/patch-src_pngwrite.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_pngwrite.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_pngwrite.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/pngwrite.c.orig	2009-10-26 13:42:03.000000000 +0100
>-+++ src/pngwrite.c	2012-05-06 13:01:28.000000000 +0200
>-@@ -62,7 +62,7 @@
>+--- src/pngwrite.c.orig	2011-06-22 18:04:32 UTC
>++++ src/pngwrite.c
>+@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, width, height,
>    }
>  
>    /* error handling */
>@@ -9,7 +9,7 @@
>      /* Free all of the memory associated with the png_ptr and info_ptr */
>      png_destroy_write_struct(&png_ptr, &info_ptr);
>      fclose(fp);
>-@@ -171,7 +171,7 @@
>+@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer, cmap, width,
>    }
>  
>    /* error handling */
>Index: graphics/ocaml-images/files/patch-src_tiffread.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_tiffread.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_tiffread.c	(working copy)
>@@ -1,4 +1,4 @@
>---- src/tiffread.c.orig	2011-06-22 20:04:32.000000000 +0200
>+--- src/tiffread.c.orig	2011-06-22 18:04:32 UTC
> +++ src/tiffread.c
> @@ -23,14 +23,22 @@
>  
>@@ -23,14 +23,14 @@
>  extern value *imglib_error;
>  
>  value open_tiff_file_for_read( name )
>-@@ -70,6 +78,10 @@
>+@@ -68,6 +76,10 @@ value open_tiff_file_for_read( name )
>+ 
>+     if (oversized (imagewidth, imagelength)) {
>        failwith_oversized("tiff");
>++    }
>++
>++    if (oversized (imagewidth, imagelength)) {
>++	failwith_oversized("tiff");
>      }
>  
>-+    if (oversized (imagewidth, imagelength)) {
>-+	failwith_oversized("tiff");
>-+    }
>-+
>      if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
>-       if( imagebits != 8 ){
>- 	failwith("Sorry, tiff rgb file must be 24bit-color");
>Index: graphics/ocaml-images/files/patch-src_tiffwrite.c
>===================================================================
>--- graphics/ocaml-images/files/patch-src_tiffwrite.c	(revision 442522)
>+++ graphics/ocaml-images/files/patch-src_tiffwrite.c	(working copy)
>@@ -1,4 +1,4 @@
>---- src/tiffwrite.c.orig	2011-06-22 20:04:32.000000000 +0200
>+--- src/tiffwrite.c.orig	2011-06-22 18:04:32 UTC
> +++ src/tiffwrite.c
> @@ -20,11 +20,16 @@
>  #include <caml/memory.h>
>@@ -26,3 +26,14 @@
>  
>  extern value *imglib_error;
>  
>+@@ -56,8 +63,8 @@ value open_tiff_file_for_write( value file,
>+     /* Resolution */
>+     /* FillOrder */
>+     
>+-    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32) image_width);
>+-    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32) image_height);
>++    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32_t) image_width);
>++    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32_t) image_height);
>+     TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
>+     TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
>+     TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
>Index: graphics/ocaml-images/pkg-plist
>===================================================================
>--- graphics/ocaml-images/pkg-plist	(revision 442522)
>+++ graphics/ocaml-images/pkg-plist	(working copy)
>@@ -1,146 +1,146 @@
>-lib/ocaml/site-lib/camlimages/META
>-lib/ocaml/site-lib/camlimages/bitmap.cmi
>-lib/ocaml/site-lib/camlimages/bitmap.mli
>-lib/ocaml/site-lib/camlimages/blend.cmi
>-lib/ocaml/site-lib/camlimages/blend.mli
>-lib/ocaml/site-lib/camlimages/bmp.cmi
>-lib/ocaml/site-lib/camlimages/bmp.mli
>-lib/ocaml/site-lib/camlimages/camlimages.cmi
>-lib/ocaml/site-lib/camlimages/camlimages_all.a
>-lib/ocaml/site-lib/camlimages/camlimages_all.cma
>-lib/ocaml/site-lib/camlimages/camlimages_all.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_core.a
>-lib/ocaml/site-lib/camlimages/camlimages_core.cma
>-lib/ocaml/site-lib/camlimages/camlimages_core.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_freetype.a
>-lib/ocaml/site-lib/camlimages/camlimages_freetype.cma
>-lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa
>-%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.a
>-%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cma
>-%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_graphics.a
>-lib/ocaml/site-lib/camlimages/camlimages_graphics.cma
>-lib/ocaml/site-lib/camlimages/camlimages_graphics.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_jpeg.a
>-lib/ocaml/site-lib/camlimages/camlimages_jpeg.cma
>-lib/ocaml/site-lib/camlimages/camlimages_jpeg.cmxa
>-%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.a
>-%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cma
>-%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_png.a
>-lib/ocaml/site-lib/camlimages/camlimages_png.cma
>-lib/ocaml/site-lib/camlimages/camlimages_png.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_ps.a
>-lib/ocaml/site-lib/camlimages/camlimages_ps.cma
>-lib/ocaml/site-lib/camlimages/camlimages_ps.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_supported.a
>-lib/ocaml/site-lib/camlimages/camlimages_supported.cma
>-lib/ocaml/site-lib/camlimages/camlimages_supported.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_tiff.a
>-lib/ocaml/site-lib/camlimages/camlimages_tiff.cma
>-lib/ocaml/site-lib/camlimages/camlimages_tiff.cmxa
>-lib/ocaml/site-lib/camlimages/camlimages_xpm.a
>-lib/ocaml/site-lib/camlimages/camlimages_xpm.cma
>-lib/ocaml/site-lib/camlimages/camlimages_xpm.cmxa
>-lib/ocaml/site-lib/camlimages/cmyk32.cmi
>-lib/ocaml/site-lib/camlimages/cmyk32.mli
>-lib/ocaml/site-lib/camlimages/color.cmi
>-lib/ocaml/site-lib/camlimages/color.mli
>-lib/ocaml/site-lib/camlimages/colorhist.cmi
>-lib/ocaml/site-lib/camlimages/colorhist.mli
>-lib/ocaml/site-lib/camlimages/dllcamlimages_all.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_freetype.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_gif.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_jpeg.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_png.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_supported.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_tiff.so
>-lib/ocaml/site-lib/camlimages/dllcamlimages_xpm.so
>-lib/ocaml/site-lib/camlimages/freetype.cmi
>-lib/ocaml/site-lib/camlimages/freetype.mli
>-lib/ocaml/site-lib/camlimages/ftlow.cmi
>-lib/ocaml/site-lib/camlimages/ftlow.mli
>-lib/ocaml/site-lib/camlimages/fttext.cmi
>-lib/ocaml/site-lib/camlimages/fttext.mli
>-lib/ocaml/site-lib/camlimages/genimage.cmi
>-lib/ocaml/site-lib/camlimages/genimage.mli
>-lib/ocaml/site-lib/camlimages/geometry.cmi
>-lib/ocaml/site-lib/camlimages/geometry.mli
>-lib/ocaml/site-lib/camlimages/gif.cmi
>-lib/ocaml/site-lib/camlimages/gif.mli
>-lib/ocaml/site-lib/camlimages/graphic_image.cmi
>-lib/ocaml/site-lib/camlimages/graphic_image.mli
>-lib/ocaml/site-lib/camlimages/image_intf.cmi
>-lib/ocaml/site-lib/camlimages/image_intf.mli
>-%%GTK2%%lib/ocaml/site-lib/camlimages/imagegdk.cmi
>-lib/ocaml/site-lib/camlimages/imagegdk.mli
>-lib/ocaml/site-lib/camlimages/images.cmi
>-lib/ocaml/site-lib/camlimages/images.mli
>-lib/ocaml/site-lib/camlimages/index16.cmi
>-lib/ocaml/site-lib/camlimages/index16.mli
>-lib/ocaml/site-lib/camlimages/index8.cmi
>-lib/ocaml/site-lib/camlimages/index8.mli
>-lib/ocaml/site-lib/camlimages/info.cmi
>-lib/ocaml/site-lib/camlimages/info.mli
>-lib/ocaml/site-lib/camlimages/jis_table.cmi
>-lib/ocaml/site-lib/camlimages/jis_unicode.cmi
>-lib/ocaml/site-lib/camlimages/jis_unicode.mli
>-lib/ocaml/site-lib/camlimages/jpeg.cmi
>-lib/ocaml/site-lib/camlimages/jpeg.mli
>-lib/ocaml/site-lib/camlimages/libcamlimages_all.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_gif.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_jpeg.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_png.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_supported.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_tiff.a
>-lib/ocaml/site-lib/camlimages/libcamlimages_xpm.a
>-lib/ocaml/site-lib/camlimages/mstring.cmi
>-lib/ocaml/site-lib/camlimages/mstring.mli
>-lib/ocaml/site-lib/camlimages/oBmp.cmi
>-lib/ocaml/site-lib/camlimages/oColor.cmi
>-lib/ocaml/site-lib/camlimages/oColor.mli
>-lib/ocaml/site-lib/camlimages/oFreetype.cmi
>-lib/ocaml/site-lib/camlimages/oGif.cmi
>-lib/ocaml/site-lib/camlimages/oGraphic.cmi
>-lib/ocaml/site-lib/camlimages/oImages.cmi
>-lib/ocaml/site-lib/camlimages/oImages.mli
>-lib/ocaml/site-lib/camlimages/oJpeg.cmi
>-lib/ocaml/site-lib/camlimages/oJpeg.mli
>-lib/ocaml/site-lib/camlimages/oPng.cmi
>-lib/ocaml/site-lib/camlimages/oPng.mli
>-lib/ocaml/site-lib/camlimages/oPpm.cmi
>-lib/ocaml/site-lib/camlimages/oPs.cmi
>-lib/ocaml/site-lib/camlimages/oTiff.cmi
>-%%GTK2%%lib/ocaml/site-lib/camlimages/oXimage.cmi
>-lib/ocaml/site-lib/camlimages/oXimage.mli
>-%%GTK2%%lib/ocaml/site-lib/camlimages/oXimage2.cmi
>-lib/ocaml/site-lib/camlimages/oXpm.cmi
>-lib/ocaml/site-lib/camlimages/oXvthumb.cmi
>-lib/ocaml/site-lib/camlimages/oXvthumb.mli
>-lib/ocaml/site-lib/camlimages/png.cmi
>-lib/ocaml/site-lib/camlimages/png.mli
>-lib/ocaml/site-lib/camlimages/ppm.cmi
>-lib/ocaml/site-lib/camlimages/ppm.mli
>-lib/ocaml/site-lib/camlimages/ps.cmi
>-lib/ocaml/site-lib/camlimages/ps.mli
>-lib/ocaml/site-lib/camlimages/reduce.cmi
>-lib/ocaml/site-lib/camlimages/reduce.mli
>-lib/ocaml/site-lib/camlimages/region.cmi
>-lib/ocaml/site-lib/camlimages/region.mli
>-lib/ocaml/site-lib/camlimages/rgb24.cmi
>-lib/ocaml/site-lib/camlimages/rgb24.mli
>-lib/ocaml/site-lib/camlimages/rgba32.cmi
>-lib/ocaml/site-lib/camlimages/rgba32.mli
>-lib/ocaml/site-lib/camlimages/tiff.cmi
>-lib/ocaml/site-lib/camlimages/tiff.mli
>-lib/ocaml/site-lib/camlimages/tmpfile.cmi
>-lib/ocaml/site-lib/camlimages/tmpfile.mli
>-lib/ocaml/site-lib/camlimages/units.cmi
>-%%GTK2%%lib/ocaml/site-lib/camlimages/ximage.cmi
>-lib/ocaml/site-lib/camlimages/ximage.mli
>-%%GTK2%%lib/ocaml/site-lib/camlimages/ximage2.cmi
>-lib/ocaml/site-lib/camlimages/xpm.cmi
>-lib/ocaml/site-lib/camlimages/xpm.mli
>-lib/ocaml/site-lib/camlimages/xvthumb.cmi
>-lib/ocaml/site-lib/camlimages/xvthumb.mli
>+%%OCAML_SITELIBDIR%%/camlimages/META
>+%%OCAML_SITELIBDIR%%/camlimages/bitmap.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/bitmap.mli
>+%%OCAML_SITELIBDIR%%/camlimages/blend.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/blend.mli
>+%%OCAML_SITELIBDIR%%/camlimages/bmp.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/bmp.mli
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_all.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_all.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_all.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_core.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_core.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_core.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_freetype.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_freetype.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_freetype.cmxa
>+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_gif.a
>+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_gif.cma
>+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_gif.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_graphics.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_graphics.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_graphics.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_jpeg.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_jpeg.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_jpeg.cmxa
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_lablgtk2.a
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_lablgtk2.cma
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/camlimages_lablgtk2.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_png.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_png.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_png.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_ps.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_ps.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_ps.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_supported.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_supported.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_supported.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_tiff.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_tiff.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_tiff.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_xpm.a
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_xpm.cma
>+%%OCAML_SITELIBDIR%%/camlimages/camlimages_xpm.cmxa
>+%%OCAML_SITELIBDIR%%/camlimages/cmyk32.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/cmyk32.mli
>+%%OCAML_SITELIBDIR%%/camlimages/color.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/color.mli
>+%%OCAML_SITELIBDIR%%/camlimages/colorhist.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/colorhist.mli
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_all.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_freetype.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_gif.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_jpeg.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_png.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_supported.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_tiff.so
>+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_xpm.so
>+%%OCAML_SITELIBDIR%%/camlimages/freetype.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/freetype.mli
>+%%OCAML_SITELIBDIR%%/camlimages/ftlow.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/ftlow.mli
>+%%OCAML_SITELIBDIR%%/camlimages/fttext.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/fttext.mli
>+%%OCAML_SITELIBDIR%%/camlimages/genimage.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/genimage.mli
>+%%OCAML_SITELIBDIR%%/camlimages/geometry.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/geometry.mli
>+%%OCAML_SITELIBDIR%%/camlimages/gif.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/gif.mli
>+%%OCAML_SITELIBDIR%%/camlimages/graphic_image.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/graphic_image.mli
>+%%OCAML_SITELIBDIR%%/camlimages/image_intf.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/image_intf.mli
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/imagegdk.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/imagegdk.mli
>+%%OCAML_SITELIBDIR%%/camlimages/images.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/images.mli
>+%%OCAML_SITELIBDIR%%/camlimages/index16.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/index16.mli
>+%%OCAML_SITELIBDIR%%/camlimages/index8.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/index8.mli
>+%%OCAML_SITELIBDIR%%/camlimages/info.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/info.mli
>+%%OCAML_SITELIBDIR%%/camlimages/jis_table.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/jis_unicode.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/jis_unicode.mli
>+%%OCAML_SITELIBDIR%%/camlimages/jpeg.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/jpeg.mli
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_all.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_freetype.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_gif.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_jpeg.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_png.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_supported.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_tiff.a
>+%%OCAML_SITELIBDIR%%/camlimages/libcamlimages_xpm.a
>+%%OCAML_SITELIBDIR%%/camlimages/mstring.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/mstring.mli
>+%%OCAML_SITELIBDIR%%/camlimages/oBmp.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oColor.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oColor.mli
>+%%OCAML_SITELIBDIR%%/camlimages/oFreetype.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oGif.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oGraphic.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oImages.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oImages.mli
>+%%OCAML_SITELIBDIR%%/camlimages/oJpeg.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oJpeg.mli
>+%%OCAML_SITELIBDIR%%/camlimages/oPng.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oPng.mli
>+%%OCAML_SITELIBDIR%%/camlimages/oPpm.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oPs.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oTiff.cmi
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/oXimage.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oXimage.mli
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/oXimage2.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oXpm.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oXvthumb.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/oXvthumb.mli
>+%%OCAML_SITELIBDIR%%/camlimages/png.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/png.mli
>+%%OCAML_SITELIBDIR%%/camlimages/ppm.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/ppm.mli
>+%%OCAML_SITELIBDIR%%/camlimages/ps.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/ps.mli
>+%%OCAML_SITELIBDIR%%/camlimages/reduce.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/reduce.mli
>+%%OCAML_SITELIBDIR%%/camlimages/region.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/region.mli
>+%%OCAML_SITELIBDIR%%/camlimages/rgb24.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/rgb24.mli
>+%%OCAML_SITELIBDIR%%/camlimages/rgba32.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/rgba32.mli
>+%%OCAML_SITELIBDIR%%/camlimages/tiff.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/tiff.mli
>+%%OCAML_SITELIBDIR%%/camlimages/tmpfile.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/tmpfile.mli
>+%%OCAML_SITELIBDIR%%/camlimages/units.cmi
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/ximage.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/ximage.mli
>+%%GTK2%%%%OCAML_SITELIBDIR%%/camlimages/ximage2.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/xpm.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/xpm.mli
>+%%OCAML_SITELIBDIR%%/camlimages/xvthumb.cmi
>+%%OCAML_SITELIBDIR%%/camlimages/xvthumb.mli
>Index: graphics/ocaml-lablgl/Makefile
>===================================================================
>--- graphics/ocaml-lablgl/Makefile	(revision 442522)
>+++ graphics/ocaml-lablgl/Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	lablgl
> PORTVERSION=	1.05
>-PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
>@@ -20,10 +19,7 @@
> USES=		gmake tk:84,85
> USE_XORG=	x11 xext xmu
> USE_GL=		glut
>-USE_OCAML=	yes
>-USE_OCAML_WASH=	yes
>-USE_OCAML_CAMLP4=yes
>-USE_OCAML_TK=	yes
>+USE_OCAML=	camlp4 wash tk
> ALL_TARGET=	all opt
> MAKE_JOBS_UNSAFE=	yes
> 
>Index: lang/js_of_ocaml/Makefile
>===================================================================
>--- lang/js_of_ocaml/Makefile	(revision 442522)
>+++ lang/js_of_ocaml/Makefile	(working copy)
>@@ -2,41 +2,46 @@
> # $FreeBSD$
> 
> PORTNAME=	js_of_ocaml
>-PORTVERSION=	2.5
>+PORTVERSION=	2.8.4
> CATEGORIES=	lang
>+PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml to JavaScript compiler
> 
>+LICENSE=	LGPL20
>+
> BUILD_DEPENDS=	ocaml-lwt>=2.3.0:devel/ocaml-lwt \
> 		menhir:devel/menhir \
>-		${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \
>-		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner
>-RUN_DEPENDS=	ocaml-lwt>=2.3.0:devel/ocaml-lwt \
>-		${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \
>-		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner
>+		${SA_DIR}/deriving/deriving.a:devel/ocaml-deriving-ocsigen \
>+		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner \
>+		${SA_DIR}/uchar/META:devel/ocaml-uchar \
>+		${SA_DIR}/base64/META:converters/ocaml-base64 \
>+		${SA_DIR}/yojson/META:devel/ocaml-yojson \
>+		${SA_DIR}/ppx_tools/META:devel/ocaml-ppx-tools
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
> 
>-USES=			gmake
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ocsigen
>+MAKE_ENV=	BINDIR=${STAGEDIR}${PREFIX}/bin \
>+		PREFIX=${PREFIX} \
>+		DESTDIR=${STAGEDIR} \
>+		OCAML_SITELIBDIR=${OCAML_SITELIBDIR}
>+PROG=		bin/js_of_ocaml bin/jsoo_minify bin/jsoo_link \
>+		bin/jsoo_mktop bin/jsoo_mkcmis bin/jsoo_listunits
>+PLIST_FILES=	${PROG}
>+MAKE_JOBS_UNSAFE=yes
> 
>-USE_GITHUB=		yes
>-GH_ACCOUNT=		ocsigen
>+post-patch:
>+	${REINPLACE_CMD} -e '/^BINDIR/d' ${WRKSRC}/Makefile.conf
> 
>-PLIST_FILES+=		bin/js_of_ocaml bin/jsoo_minify bin/jsoo_mkcmis \
>-			bin/jsoo_mktop
>+post-install:
>+	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${PROG}
>+	cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME} && \
>+	    ${STRIP_CMD} *.cmxs *.so ppx_js
> 
>-MAKE_JOBS_UNSAFE=	yes
>-MAKE_ENV+=		BINDIR=${STAGEDIR}${PREFIX}/bin \
>-			DESTDIR=${STAGEDIR} \
>-			OCAML_SITELIBDIR=${PREFIX}/lib/ocaml/site-lib
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e '/^BINDIR/d' ${WRKSRC}/Makefile.conf
>-
> .include <bsd.port.mk>
>Index: lang/js_of_ocaml/distinfo
>===================================================================
>--- lang/js_of_ocaml/distinfo	(revision 442522)
>+++ lang/js_of_ocaml/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 5bea34f47210791b8bb89adb158ec9d47816ba074bfb11ee68f56be42c0235df
>-SIZE (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 1249680
>+TIMESTAMP = 1489419694
>+SHA256 (ocsigen-js_of_ocaml-2.8.4_GH0.tar.gz) = 74edd38a964fcee930778a908c896b5c9795f64fc34a3c58361ccfa441811725
>+SIZE (ocsigen-js_of_ocaml-2.8.4_GH0.tar.gz) = 1344082
>Index: lang/js_of_ocaml/files/patch-Makefile
>===================================================================
>--- lang/js_of_ocaml/files/patch-Makefile	(revision 442522)
>+++ lang/js_of_ocaml/files/patch-Makefile	(working copy)
>@@ -1,11 +1,11 @@
>---- Makefile.orig	2014-09-30 14:40:37 UTC
>-+++ Makefile
>-@@ -47,7 +47,7 @@ VERSION := $(shell head -n 1 VERSION)
>+--- Makefile.orig	2017-03-14 00:42:18.941740000 +0900
>++++ Makefile	2017-03-14 00:42:46.268272000 +0900
>+@@ -47,7 +47,7 @@
>  install: install-lib install-bin
>  
>  install-lib:
>--	ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL)
>-+	ocamlfind install -ldconf ignore -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL)
>+-	ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) ${OCAMLFIND_BIN}
>++	ocamlfind install -ldconf ignore -destdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) ${OCAMLFIND_BIN}
>  
>  install-bin:
>  	install -d -m 755 $(BINDIR)
>Index: lang/mtasc/Makefile
>===================================================================
>--- lang/mtasc/Makefile	(revision 442522)
>+++ lang/mtasc/Makefile	(working copy)
>@@ -12,9 +12,8 @@
> 
> BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/extlib/IO.cmi:devel/ocaml-extlib
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAML_CAMLP4=yes
>+USES=		ocaml
>+USE_OCAML=	findlib camlp4
> OCAML_PKGDIRS=	# This port uses ocaml-findlib but doesn't install one
> 
> OCAMLLEX?=	${LOCALBASE}/bin/ocamllex
>Index: lang/ocaml/Makefile
>===================================================================
>--- lang/ocaml/Makefile	(revision 442522)
>+++ lang/ocaml/Makefile	(working copy)
>@@ -3,13 +3,13 @@
> # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
> 
> PORTNAME=	ocaml
>-PORTVERSION=	4.02.3
>+PORTVERSION=	4.04.1
> CATEGORIES=	lang
> MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
> 		http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
>-PKGNAMESUFFIX=	${SFX}
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> 
>-MAINTAINER=	michipili@gmail.com
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Objective Caml compiler and programming environment
> 
> LICENSE=		QPL10 LGPL20
>@@ -25,142 +25,85 @@
> BROKEN_mips=	No ASM support
> 
> USES=		cpe gmake tar:xz
>-USE_LDCONFIG=	yes
>+USE_LDCONFIG=	${PREFIX}/lib/ocaml
> CPE_VENDOR=	inria
>-REINPLACE_ARGS=	-i ""
> HAS_CONFIGURE=	yes
>-ALL_TARGET=	world.opt
> STRIP=
> SSP_UNSAFE=	yes
>-MAKE_JOBS_UNSAFE=	yes
>-
>-MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
>-CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
>-		-cc "${CC} ${CFLAGS}" \
>+MAKE_ENV=	STAGEDIR="${STAGEDIR}"
>+CONFIGURE_ARGS=	-verbose \
>+		-prefix "${PREFIX}" \
>+		-cc "${CC}" \
> 		-as "${AS} ${ASFLAGS}" \
> 		-aspp "${CC} -c" \
> 		-partialld "${LD} -r"
>+ALL_TARGET=	world.opt
>+MAKE_JOBS_UNSAFE=	yes
>+PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
>+		${DOCSDISTNAME}-refman.pdf
>+CONFLICTS=	metaocaml-[0-9]*
> 
> OPTIONS_DEFINE=	X11 THREADS DOCS EXAMPLES
> OPTIONS_DEFAULT=X11 THREADS
>-CMP_LIB_DESC=	Install compiler libraries
>-PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
>-		${DOCSDISTNAME}-refman.pdf
>+OPTIONS_SUB=	yes
> 
>-MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
>-PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$$CP$|cp)([[:space:]]
>-DOCSDISTNAME=	${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
>+X11_CONFIGURE_ON= -x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
>+X11_CONFIGURE_OFF=-no-graph
>+X11_USE=	XORG=x11
>+X11_VARS=	CONFLICTS+=ocaml-nox11-[0-9]*
>+X11_VARS_OFF=	CONFLICTS+=ocaml-[0-9]* \
>+		PKGNAMESUFFIX=-nox11
> 
>-CONFLICTS=	metaocaml-[0-9]*
>+THREADS_CONFIGURE_OFF=	-no-pthread
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-DISTFILES:=	${DISTNAME}${EXTRACT_SUFX} \
>-		${DOCSDISTNAME}-refman-html.tar.gz:docs \
>+DOCS_DISTFILES= ${DOCSDISTNAME}-refman-html.tar.gz:docs \
> 		${DOCSDISTNAME}-refman.ps.gz:docs \
> 		${DOCSDISTNAME}-refman.pdf:docs
>-EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX} \
>+DOCS_EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
> 		${DOCSDISTNAME}-refman-html.tar.gz
>-PLIST_SUB+=	DOC=""
>-PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
>-.else
>-PLIST_SUB+=	DOC="@comment "
>-.endif
> 
>-.if ${ARCH} == armv6
>-CONFIGURE_ARGS+=	-as "${AS} ${ASFLAGS} -meabi=5"
>-.else
>-CONFIGURE_ARGS+=	-as "${AS} ${ASFLAGS}"
>-.endif
>+MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
>+PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$$CP$|cp)([[:space:]]
>+DOCSDISTNAME=	${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
> 
>-.if ${PORT_OPTIONS:MTHREADS}
>-PLIST_SUB+=	THREADS=""
>-THR_LD=		-lpthread
>-.else
>-PLIST_SUB+=	THREADS="@comment "
>-THR_LD=		#empty
>-CONFIGURE_ARGS+=-no-pthread
>-.endif
>+.include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MX11}
>-PLIST_SUB+=	X11=""
>-USE_XORG=	x11
>-CONFLICTS+=	ocaml-nox11-[0-9]*
>-CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
>+.if ${ARCH} == amd64 || \
>+    ${ARCH} == sparc64 || \
>+    ${ARCH} == powerpc64 || \
>+    ${ARCH} == aarch64 || \
>+    ${ARCH} == ia64 || \
>+    ${ARCH} == mips64
>+PLIST_SUB+=	N64=
> .else
>-PLIST_SUB+=	X11="@comment "
>-SFX=		-nox11
>-CONFLICTS+=	ocaml-[0-9]*
>-CONFIGURE_ARGS+=-no-graph
>+PLIST_SUB+=	N64="@comment "
> .endif
>+.if ${ARCH} == armv6
>+ASFLAGS+=	-meabi=5
>+.endif
> 
>-.include <bsd.port.pre.mk>
>-.include "${FILESDIR}/manfiles"
>-
> OCAML_ARCH=	${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}
> 
>-.if defined(NO_PROFILE) || ${OCAML_ARCH:Mpower} || ${OCAML_ARCH:Mamd64}
>-
>-PLIST_SUB+=	PROF="@comment "
>-.else
>-PLIST_SUB+=	PROF=""
>-.endif
>-
>-post-extract:
>-.if ${PORT_OPTIONS:MDOCS}
>-	@if ! (cd ${WRKDIR} && \
>-	  ${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \
>-	) \
>-	then \
>-	  exit 1; \
>-	fi;
>-.endif
>-
> post-patch:
>-	@${REINPLACE_CMD} \
>-		-e '\|MKLIB=|s|ar rc|${AR} rc|' \
>-		-e '\|RANLIB|s|ranlib|${RANLIB}|' \
>-		-e '\|bytecclinkopts=|s|""|"${LDFLAGS}"|' \
>-		-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \
>-		-e '\|mksharedlib=|s|$$bytecc|& $$bytecclinkopts|' \
>-		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
>-		${WRKSRC}/configure
>-# don't hardcode gcc for depend target
>-
>-post-configure:
>-# CFLAGS safeness
>-	@${REINPLACE_CMD} -E \
>-		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
>-		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
>-		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
>-		${WRKSRC}/config/Makefile
>-
>-# INSTALL* safeness (which preserves the correct permissions despite
>-# user's umask(1)
> 	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
>-		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
>-		-e 's,\$$$ARCH$,${OCAML_ARCH},g'	\
>-		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
>-		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
>-		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
>-		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
>+	    ${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
>+	    -e 's,\$$$ARCH$,${OCAML_ARCH},g'	\
>+	    -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
>+	    -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
>+	    -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
>+	    -e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
> 
> check-test: do-install
>-	@cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \
>-	2>&1 | tee -a _log || ${TRUE} ; done ; \
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
>+	cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \
>+	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \
>+	    2>&1 | tee -a _log || ${TRUE} ; done ; \
>+	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
> 
>-post-install:
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
>-	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
>-.endif
>+post-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz \
>+	    ${_DISTDIR}${DOCSDISTNAME}-refman.pdf \
>+	    ${STAGEDIR}${DOCSDIR}
> 
>-# Fix permissions for ld.conf
>-	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf
>-
> .include <bsd.port.post.mk>
>Index: lang/ocaml/distinfo
>===================================================================
>--- lang/ocaml/distinfo	(revision 442522)
>+++ lang/ocaml/distinfo	(working copy)
>@@ -1,8 +1,9 @@
>-SHA256 (ocaml-4.02.3.tar.xz) = 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3
>-SIZE (ocaml-4.02.3.tar.xz) = 2058552
>-SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8
>-SIZE (ocaml-4.02-refman-html.tar.gz) = 612839
>-SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a
>-SIZE (ocaml-4.02-refman.ps.gz) = 1111960
>-SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8
>-SIZE (ocaml-4.02-refman.pdf) = 1519190
>+TIMESTAMP = 1496735772
>+SHA256 (ocaml-4.04.1.tar.xz) = 222cc494b4eea45011234f2cc6620045ec4d4b539985086381a9a9db289bc285
>+SIZE (ocaml-4.04.1.tar.xz) = 2377664
>+SHA256 (ocaml-4.04-refman-html.tar.gz) = 1cb4afcdb64359eea2501c63085f62eda4bbac51fd89b7d5dbf56670ec1b88ba
>+SIZE (ocaml-4.04-refman-html.tar.gz) = 833166
>+SHA256 (ocaml-4.04-refman.ps.gz) = 2c395ea161bd7d1a7fbbbee66095605d55e47f46945068a5dd7e3d9718d553c3
>+SIZE (ocaml-4.04-refman.ps.gz) = 1171679
>+SHA256 (ocaml-4.04-refman.pdf) = 1ebdb863860274378459ffb78ff3d9c3d7bd1792912a69bc8641ffceda8f72d4
>+SIZE (ocaml-4.04-refman.pdf) = 1625902
>Index: lang/ocaml/files/manfiles
>===================================================================
>--- lang/ocaml/files/manfiles	(revision 442522)
>+++ lang/ocaml/files/manfiles	(nonexistent)
>@@ -1,101 +0,0 @@
>-MAN1=	ocaml.1 \
>-	ocamlbuild.1 \
>-	ocamlc.1 \
>-	ocamlcp.1 \
>-	ocamldebug.1 \
>-	ocamldep.1 \
>-	ocamldoc.1 \
>-	ocamllex.1 \
>-	ocamlmktop.1 \
>-	ocamlopt.1 \
>-	ocamloptp.1 \
>-	ocamlprof.1 \
>-	ocamlrun.1 \
>-	ocamlyacc.1
>-
>-MANN=	Arg.3o \
>-	Array.3o \
>-	ArrayLabels.3o \
>-	Bigarray.3o \
>-	Bigarray.Array1.3o \
>-	Bigarray.Array2.3o \
>-	Bigarray.Array3.3o \
>-	Bigarray.Genarray.3o \
>-	Buffer.3o \
>-	Callback.3o \
>-	CamlinternalLazy.3o \
>-	CamlinternalMod.3o \
>-	CamlinternalOO.3o \
>-	Complex.3o \
>-	Digest.3o \
>-	Filename.3o \
>-	Format.3o \
>-	Gc.3o \
>-	Genlex.3o \
>-	Hashtbl.3o \
>-	Hashtbl.HashedType.3o \
>-	Hashtbl.Make.3o \
>-	Hashtbl.MakeSeeded.3o \
>-	Hashtbl.S.3o \
>-	Hashtbl.SeededHashedType.3o \
>-	Hashtbl.SeededS.3o \
>-	Int32.3o \
>-	Int64.3o \
>-	Lexing.3o \
>-	List.3o \
>-	ListLabels.3o \
>-	Map.3o \
>-	Map.Make.3o \
>-	Map.OrderedType.3o \
>-	Map.S.3o \
>-	Marshal.3o \
>-	MoreLabels.3o \
>-	MoreLabels.Hashtbl.3o \
>-	MoreLabels.Hashtbl.HashedType.3o \
>-	MoreLabels.Hashtbl.Make.3o \
>-	MoreLabels.Hashtbl.MakeSeeded.3o \
>-	MoreLabels.Hashtbl.S.3o \
>-	MoreLabels.Hashtbl.SeededHashedType.3o \
>-	MoreLabels.Hashtbl.SeededS.3o \
>-	MoreLabels.Map.3o \
>-	MoreLabels.Map.Make.3o \
>-	MoreLabels.Map.OrderedType.3o \
>-	MoreLabels.Map.S.3o \
>-	MoreLabels.Set.3o \
>-	MoreLabels.Set.Make.3o \
>-	MoreLabels.Set.OrderedType.3o \
>-	MoreLabels.Set.S.3o \
>-	Nativeint.3o \
>-	Num.3o \
>-	Obj.3o \
>-	Oo.3o \
>-	Parsing.3o \
>-	Pervasives.3o \
>-	Pervasives.LargeFile.3o \
>-	Printexc.3o \
>-	Printf.3o \
>-	Queue.3o \
>-	Random.3o \
>-	Random.State.3o \
>-	Scanf.3o \
>-	Scanf.Scanning.3o \
>-	Set.Make.3o \
>-	Set.OrderedType.3o \
>-	Set.S.3o \
>-	Sort.3o \
>-	Stack.3o \
>-	StdLabels.3o \
>-	StdLabels.Array.3o \
>-	StdLabels.List.3o \
>-	StdLabels.String.3o \
>-	Str.3o \
>-	Stream.3o \
>-	StringLabels.3o \
>-	Sys.3o \
>-	Unix.3o \
>-	Unix.LargeFile.3o \
>-	Weak.3o \
>-	Weak.Make.3o \
>-	Weak.S.3o
>-
>-MLINKS=	ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1
>
>Property changes on: lang/ocaml/files/manfiles
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: lang/ocaml/files/patch-Changes
>===================================================================
>--- lang/ocaml/files/patch-Changes	(nonexistent)
>+++ lang/ocaml/files/patch-Changes	(working copy)
>@@ -0,0 +1,17 @@
>+--- Changes.orig	2016-11-04 16:08:24 UTC
>++++ Changes
>+@@ -2567,6 +2567,14 @@ Tools:
>+   (Guillaume Melquiond, Alain Frisch)
>+ 
>+ 
>++Next version (4.04.1):
>++----------------------
>++
>++### Standard library:
>++
>++- PR#7403, GPR#894: fix a bug in Set.map as introduced in 4.04.0
>++  (Gabriel Scherer, report by Thomas Leonard)
>++
>+ OCaml 4.00.1 (5 Oct 2012):
>+ --------------------------
>+ 
>
>Property changes on: lang/ocaml/files/patch-Changes
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/ocaml/files/patch-configure
>===================================================================
>--- lang/ocaml/files/patch-configure	(revision 442522)
>+++ lang/ocaml/files/patch-configure	(working copy)
>@@ -1,158 +1,160 @@
>---- configure.orig	2015-05-12 14:46:37 UTC
>-+++ configure
>-@@ -446,7 +446,7 @@ esac
>+--- configure.orig	2016-11-05 01:08:24.000000000 +0900
>++++ configure	2017-01-15 01:54:50.124245000 +0900
>+@@ -346,7 +346,7 @@
>  
>- # Configure compiler to use in further tests
>+ case "$ccfamily" in
>+   clang-*)
>+-    bytecccompopts="-O2 -fno-strict-aliasing -fwrapv $gcc_warnings";;
>++    bytecccompopts="-fno-strict-aliasing -fwrapv $gcc_warnings";;
>+   gcc-[012]-*)
>+     # Some versions known to miscompile OCaml, e,g, 2.7.2.1, some 2.96.
>+     # Plus: C99 support unknown.
>+@@ -356,12 +356,13 @@
>+     # Known problems with -fwrapv fixed in 4.2 only.
>+     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="-std=gnu99 $gcc_warnings";;
>+   gcc-*)
>+-    bytecccompopts="-std=gnu99 -O2 -fno-strict-aliasing -fwrapv $gcc_warnings";;
>++    bytecccompopts="-std=gnu99 -fno-strict-aliasing -fwrapv $gcc_warnings";;
>+   *)
>+     bytecccompopts="-O";;
>+ esac
>++bytecccompopts="$bytecccompopts ${CFLAGS}"
>  
>--cc="$bytecc -O $bytecclinkopts"
>-+cc="$bytecc $bytecclinkopts"
>- export cc cclibs verbose
>+ # Adjust according to target
>  
>- # Check C compiler
>-@@ -688,9 +688,9 @@ if test $with_sharedlibs = "yes"; then
>-       mksharedlib="$flexlink"
>-       mkmaindll="$flexlink -maindll"
>-       shared_libraries_supported=true;;
>--    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
>-+    *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
>+@@ -700,7 +701,7 @@
>+     *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
>+     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*)
>        sharedcccompopts="-fPIC"
> -      mksharedlib="$bytecc -shared"
>-+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
>++      mksharedlib="$bytecc -shared ${LDFLAGS}"
>        bytecclinkopts="$bytecclinkopts -Wl,-E"
>        byteccrpath="-Wl,-rpath,"
>        mksharedlibrpath="-Wl,-rpath,"
>-@@ -700,7 +700,7 @@ if test $with_sharedlibs = "yes"; then
>+@@ -710,7 +711,7 @@
>        case "$bytecc" in
>          *gcc*)
>            sharedcccompopts="-fPIC"
> -          mksharedlib="$bytecc -shared"
>-+          mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
>++          mksharedlib="$bytecc $bytecclinkopts -shared"
>            byteccrpath="-Wl,-rpath,"
>            mksharedlibrpath="-Wl,-rpath,"
>            shared_libraries_supported=true;;
>-@@ -716,11 +716,11 @@ if test $with_sharedlibs = "yes"; then
>-         *gcc*)
>-           sharedcccompopts="-fPIC"
>-           if sh ./solaris-ld; then
>--            mksharedlib="$bytecc -shared"
>-+            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
>+@@ -730,7 +731,7 @@
>              byteccrpath="-R"
>              mksharedlibrpath="-R"
>            else
> -            mksharedlib="$bytecc -shared"
>-+            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
>++            mksharedlib="$bytecc $bytecclinkopts -shared"
>              bytecclinkopts="$bytecclinkopts -Wl,-E"
>              natdynlinkopts="-Wl,-E"
>              byteccrpath="-Wl,-rpath,"
>-@@ -744,12 +744,12 @@ if test $with_sharedlibs = "yes"; then
>+@@ -754,13 +755,13 @@
>        mksharedlibrpath="-rpath "
>        shared_libraries_supported=true;;
>      i[3456]86-*-darwin[89].*)
>--      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
>-+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
>+-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
>++      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress \
>+                    -read_only_relocs suppress"
>        bytecccompopts="$dl_defs $bytecccompopts"
>        dl_needs_underscore=false
>        shared_libraries_supported=true;;
>      *-apple-darwin*)
>--      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
>-+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
>+-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
>++      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress \
>+                    -Wl,-no_compact_unwind"
>        bytecccompopts="$dl_defs $bytecccompopts"
>        dl_needs_underscore=false
>-       shared_libraries_supported=true;;
>-@@ -759,7 +759,7 @@ if test $with_sharedlibs = "yes"; then
>+@@ -771,7 +772,7 @@
>        shared_libraries_supported=false;;
>      *-*-openbsd*)
>        sharedcccompopts="-fPIC"
> -      mksharedlib="$bytecc -shared"
>-+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
>++      mksharedlib="$bytecc $bytecclinkopts -shared"
>        bytecclinkopts="$bytecclinkopts -Wl,-E"
>        natdynlinkopts="-Wl,-E"
>        byteccrpath="-Wl,-rpath,"
>-@@ -790,9 +790,11 @@ if test $with_sharedlibs = "yes"; then
>-       fi;;
>+@@ -803,6 +804,7 @@
>      x86_64-*-darwin*)             natdynlink=true;;
>+     s390x*-*-linux*)              natdynlink=true;;
>      powerpc*-*-linux*)            natdynlink=true;;
> +    powerpc*-*-freebsd*)          natdynlink=true;;
>      sparc*-*-linux*)              natdynlink=true;;
>      i686-*-kfreebsd*)             natdynlink=true;;
>      x86_64-*-kfreebsd*)           natdynlink=true;;
>-+    x86_64-*-dragonfly*)          natdynlink=true;;
>-     i[3456]86-*-freebsd*)         natdynlink=true;;
>-     x86_64-*-freebsd*)            natdynlink=true;;
>-     i[3456]86-*-openbsd*)         natdynlink=true;;
>-@@ -844,6 +846,7 @@ case "$target" in
>-   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
>-   i[3456]86-*-mingw*)           arch=i386; system=mingw;;
>-   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
>-+  powerpc-*-freebsd*)           arch=power; model=ppc; system=bsd_elf;;
>+@@ -819,6 +821,7 @@
>+     arm*-*-freebsd*)              natdynlink=true;;
>+     earm*-*-netbsd*)              natdynlink=true;;
>+     aarch64-*-linux*)             natdynlink=true;;
>++    aarch64-*-freebsd*)           natdynlink=true;;
>+   esac
>+ fi
>+ 
>+@@ -862,6 +865,9 @@
>+   powerpc*-*-linux*)            arch=power;
>+                                 if $arch64; then model=ppc64; else model=ppc; fi
>+                                 system=elf;;
>++  powerpc*-*-freebsd*)          arch=power;
>++                                if $arch64; then model=ppc64; else model=ppc; fi
>++                                system=elf;;
>    powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
>    powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
>-   powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
>-@@ -862,6 +865,7 @@ case "$target" in
>-   zaurus*-*-openbsd*)           arch=arm; system=bsd;;
>-   x86_64-*-linux*)              arch=amd64; system=linux;;
>-   x86_64-*-gnu*)                arch=amd64; system=gnu;;
>-+  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
>-   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
>-   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
>-   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
>-@@ -889,7 +893,7 @@ else
>- fi
>+   s390x*-*-linux*)              arch=s390x; model=z10; system=elf;;
>+@@ -914,7 +920,7 @@
>  
>- nativecccompopts=''
>+ nativecccompopts="$bytecccompopts"
>+ nativeccprofopts=''
> -nativecclinkopts=''
> +nativecclinkopts=""
>  # FIXME the naming of nativecclinkopts is broken: these are options for
>  # ld (for shared libs), not for cc
>  nativeccrpath="$byteccrpath"
>-@@ -932,6 +936,8 @@ case "$arch,$system" in
>-                   esac;;
>-   arm,freebsd)    as="${TOOLPREF}cc -c"
>-                   aspp="${TOOLPREF}cc -c";;
>-+  *,dragonfly)    as="${TOOLPREF}as"
>-+                  aspp="${TOOLPREF}cc -c";;
>-   *,freebsd)      as="${TOOLPREF}as"
>-                   aspp="${TOOLPREF}cc -c";;
>-   amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
>-@@ -955,9 +961,11 @@ case "$arch,$system" in
>-     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
>+@@ -985,10 +991,12 @@
>    amd64,linux) profiling='prof';;
>    amd64,openbsd) profiling='prof';;
>+   amd64,freebsd) profiling='prof';;
> +  amd64,dragonfly) profiling='prof';;
>-   amd64,freebsd) profiling='prof';;
>    amd64,netbsd) profiling='prof';;
>+   arm,netbsd) profiling='prof';;
>    amd64,gnu) profiling='prof';;
>+   arm,linux*) profiling='prof';;
> +  arm,freebsd) profiling='prof';;
>-   arm,linux*) profiling='prof';;
>    power,elf) profiling='prof';;
>    power,bsd*) profiling='prof';;
>-@@ -1415,6 +1423,8 @@ if test "$pthread_wanted" = "yes"; then
>-   case "$target" in
>-     *-*-solaris*)  pthread_link="-lpthread -lposix4"
>+   *) profiling='noprof';;
>+@@ -996,15 +1004,8 @@
>+ 
>+ # Where is ranlib?
>+ 
>+-if sh ./searchpath ${TOOLPREF}ranlib; then
>+-  inf "ranlib found"
>+-  echo "RANLIB=${TOOLPREF}ranlib" >> Makefile
>+-  echo "RANLIBCMD=${TOOLPREF}ranlib" >> Makefile
>+-else
>+-  inf "ranlib not used"
>+-  echo "RANLIB=${TOOLPREF}ar rs" >> Makefile
>+-  echo "RANLIBCMD=" >> Makefile
>+-fi
>++echo RANLIB=/usr/bin/ranlib >> Makefile
>++echo RANLIBCMD=/usr/bin/ranlib >> Makefile
>+ 
>+ echo "ARCMD=${TOOLPREF}ar" >> Makefile
>+ 
>+@@ -1494,8 +1495,8 @@
>                     pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
>-+    *-*-dragon*)   pthread_link="-pthread"
>-+                   pthread_caml_link="-cclib -pthread";;
>-     *-*-freebsd*)  pthread_link="-pthread"
>+     *-*-dragon*)   pthread_link="-pthread"
>                     pthread_caml_link="-cclib -pthread";;
>+-    *-*-freebsd*)  pthread_link="-pthread"
>+-                   pthread_caml_link="-cclib -pthread";;
>++    *-*-freebsd*)  pthread_link="-lpthread"
>++                   pthread_caml_link="-cclib -lpthread";;
>      *-*-openbsd*)  pthread_link="-pthread"
>-@@ -1431,7 +1441,7 @@ if test "$pthread_wanted" = "yes"; then
>-     bytecccompopts="$bytecccompopts -D_REENTRANT"
>-     nativecccompopts="$nativecccompopts -D_REENTRANT"
>-     case "$target" in
>--      *-*-freebsd*)
>-+      *-*-freebsd*|*-*-dragonfly*)
>-           bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
>-           nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
>-       *-*-openbsd*)
>-@@ -1601,6 +1611,7 @@ if test "$x11_include" = "not found"; th
>-       else
>-         x11_libs="-L$dir"
>-         case "$target" in
>-+          *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
>-           *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
>-           *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
>-           *) x11_link="-L$dir -lX11";;
>-@@ -1644,10 +1655,10 @@ echo "X11_LINK=$x11_link" >> Makefile
>+                    pthread_caml_link="-cclib -pthread";;
>+     *-*-haiku*)    pthread_link=""
>+@@ -1724,19 +1725,19 @@
>  # Look for BFD library
>  
>  if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
>@@ -162,19 +164,26 @@
>    echo "#define HAS_LIBBFD" >> s.h
> -  echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
> +  echo "LIBBFD_LINK=-lbfd $dllib -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 \
>++     sh ./hasgot -DPACKAGE=ocaml -L/opt/local/lib -lbfd $dllib \
>+                  -liberty -lz -lintl bfd_openr
>+ then
>+   # MacOSX with binutils from MacPorts
>+   inf "BFD library found."
>+   echo "#define HAS_LIBBFD" >> s.h
>+-  echo "LIBBFD_LINK=-L/opt/local/lib -lbfd -ldl -liberty -lz -lintl" >> Makefile
>++  echo "LIBBFD_LINK=-L/opt/local/lib -lbfd $dllib -liberty -lz -lintl" >> Makefile
>+   echo LIBBFD_INCLUDE=-I/opt/local/include >>Makefile
>  else
>-   wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
>-   echo "LIBBFD_LINK=" >> Makefile
>-@@ -1686,12 +1697,6 @@ if $no_naked_pointers; then
>-   echo "#define NO_NAKED_POINTERS" >> m.h
>- fi
>+   wrn "BFD library not found, 'objinfo' will be unable to display info" \
>+@@ -1921,7 +1922,7 @@
>+ #ml let syslib x = "-l"^x;;
>  
>--# Add Unix-style optimization flag
>--bytecccompopts="-O $bytecccompopts"
>--dllcccompopts="-O $dllcccompopts"
>--nativecccompopts="-O $nativecccompopts"
>--sharedcccompopts="-O $sharedcccompopts"
>--
>- # Final twiddling of compiler options to work around known bugs
>- 
>- nativeccprofopts="$nativecccompopts"
>+ ### How to build a static library
>+-MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1)
>++MKLIB=${AR} rc \$(1) \$(2); ranlib \$(1)
>+ #ml let mklib out files opts =      (* "" *)
>+ #ml   Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s"
>+ #ml                  out opts files out;;
>Index: lang/ocaml/files/patch-testsuite_tests_lib-set_testset.ml
>===================================================================
>--- lang/ocaml/files/patch-testsuite_tests_lib-set_testset.ml	(nonexistent)
>+++ lang/ocaml/files/patch-testsuite_tests_lib-set_testset.ml	(working copy)
>@@ -0,0 +1,24 @@
>+--- testsuite/tests/lib-set/testset.ml.orig	2016-11-04 16:08:24 UTC
>++++ testsuite/tests/lib-set/testset.ml
>+@@ -167,3 +167,21 @@ let () =
>+   for i = 1 to 10 do s1 := S.add i !s1 done;
>+   let s2 = S.filter (fun e -> e >= 0) !s1 in
>+   assert (s2 == !s1)
>++
>++let valid_structure s =
>++  (* this test should return 'true' for all set,
>++     but it can detect sets that are ill-structured,
>++     for example incorrectly ordered, as the S.mem
>++     function will make assumptions about the set ordering.
>++
>++     (This trick was used to exhibit the bug in PR#7403)
>++  *)
>++  List.for_all (fun n -> S.mem n s) (S.elements s)
>++
>++let () =
>++  (* PR#7403: map buggily orders elements according to the input
>++     set order, not the output set order. Mapping functions that
>++     change the value ordering thus break the set structure. *)
>++  let test = S.of_list [1; 3; 5] in
>++  let f = function 3 -> 8 | n -> n in
>++  assert (valid_structure (S.map f test))
>
>Property changes on: lang/ocaml/files/patch-testsuite_tests_lib-set_testset.ml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/ocaml/pkg-descr
>===================================================================
>--- lang/ocaml/pkg-descr	(revision 442522)
>+++ lang/ocaml/pkg-descr	(working copy)
>@@ -16,4 +16,4 @@
> the generated programs deliver excellent performance, while retaining
> the moderate memory requirements of the bytecode compiler.
> 
>-WWW: http://caml.inria.fr/ocaml/
>+WWW: http://ocaml.org
>Index: lang/ocaml/pkg-plist
>===================================================================
>--- lang/ocaml/pkg-plist	(revision 442522)
>+++ lang/ocaml/pkg-plist	(working copy)
>@@ -1,111 +1,37 @@
>-%%PROF%%lib/ocaml/arg.p.cmx
>-%%PROF%%lib/ocaml/arrayLabels.p.cmx
>-%%PROF%%lib/ocaml/array.p.cmx
>-%%PROF%%lib/ocaml/buffer.p.cmx
>-%%PROF%%lib/ocaml/bytesLabels.p.cmx
>-%%PROF%%lib/ocaml/bytes.p.cmx
>-%%PROF%%lib/ocaml/callback.p.cmx
>-%%PROF%%lib/ocaml/camlinternalFormatBasics.p.cmx
>-%%PROF%%lib/ocaml/camlinternalFormat.p.cmx
>-%%PROF%%lib/ocaml/camlinternalLazy.p.cmx
>-%%PROF%%lib/ocaml/camlinternalMod.p.cmx
>-%%PROF%%lib/ocaml/camlinternalOO.p.cmx
>-%%PROF%%lib/ocaml/char.p.cmx
>-%%PROF%%lib/ocaml/complex.p.cmx
>-%%PROF%%lib/ocaml/digest.p.cmx
>-%%PROF%%lib/ocaml/filename.p.cmx
>-%%PROF%%lib/ocaml/format.p.cmx
>-%%PROF%%lib/ocaml/gc.p.cmx
>-%%PROF%%lib/ocaml/genlex.p.cmx
>-%%PROF%%lib/ocaml/hashtbl.p.cmx
>-%%PROF%%lib/ocaml/int32.p.cmx
>-%%PROF%%lib/ocaml/int64.p.cmx
>-%%PROF%%lib/ocaml/lazy.p.cmx
>-%%PROF%%lib/ocaml/lexing.p.cmx
>-%%PROF%%lib/ocaml/listLabels.p.cmx
>-%%PROF%%lib/ocaml/list.p.cmx
>-%%PROF%%lib/ocaml/map.p.cmx
>-%%PROF%%lib/ocaml/marshal.p.cmx
>-%%PROF%%lib/ocaml/moreLabels.p.cmx
>-%%PROF%%lib/ocaml/nativeint.p.cmx
>-%%PROF%%lib/ocaml/obj.p.cmx
>-%%PROF%%lib/ocaml/oo.p.cmx
>-%%PROF%%lib/ocaml/parsing.p.cmx
>-%%PROF%%lib/ocaml/pervasives.p.cmx
>-%%PROF%%lib/ocaml/printexc.p.cmx
>-%%PROF%%lib/ocaml/printf.p.cmx
>-%%PROF%%lib/ocaml/queue.p.cmx
>-%%PROF%%lib/ocaml/random.p.cmx
>-%%PROF%%lib/ocaml/scanf.p.cmx
>-%%PROF%%lib/ocaml/set.p.cmx
>-%%PROF%%lib/ocaml/sort.p.cmx
>-%%PROF%%lib/ocaml/stack.p.cmx
>-%%PROF%%lib/ocaml/stdLabels.p.cmx
>-%%PROF%%lib/ocaml/std_exit.p.cmx
>-%%PROF%%lib/ocaml/std_exit.p.o
>-%%PROF%%lib/ocaml/stdlib.p.a
>-%%PROF%%lib/ocaml/stdlib.p.cmxa
>-%%PROF%%lib/ocaml/stream.p.cmx
>-%%PROF%%lib/ocaml/stringLabels.p.cmx
>-%%PROF%%lib/ocaml/string.p.cmx
>-%%PROF%%lib/ocaml/sys.p.cmx
>-%%PROF%%lib/ocaml/weak.p.cmx
>-%%THREADS%%@dir lib/ocaml/threads
>-%%THREADS%%lib/ocaml/caml/threads.h
>-%%THREADS%%lib/ocaml/condition.mli
>-%%THREADS%%lib/ocaml/event.mli
>-%%THREADS%%lib/ocaml/libthreads.a
>-%%THREADS%%lib/ocaml/libthreadsnat.a
>-%%THREADS%%lib/ocaml/mutex.mli
>-%%THREADS%%lib/ocaml/stublibs/dllthreads.so
>-%%THREADS%%lib/ocaml/threadUnix.mli
>-%%THREADS%%lib/ocaml/thread.mli
>-%%THREADS%%lib/ocaml/threads/condition.cmi
>-%%THREADS%%lib/ocaml/threads/condition.cmx
>-%%THREADS%%lib/ocaml/threads/event.cmi
>-%%THREADS%%lib/ocaml/threads/event.cmx
>-%%THREADS%%lib/ocaml/threads/mutex.cmi
>-%%THREADS%%lib/ocaml/threads/mutex.cmx
>-%%THREADS%%lib/ocaml/threads/threadUnix.cmi
>-%%THREADS%%lib/ocaml/threads/threadUnix.cmx
>-%%THREADS%%lib/ocaml/threads/thread.cmi
>-%%THREADS%%lib/ocaml/threads/thread.cmx
>-%%THREADS%%lib/ocaml/threads/threads.a
>-%%THREADS%%lib/ocaml/threads/threads.cma
>-%%THREADS%%lib/ocaml/threads/threads.cmxa
>-%%X11%%lib/ocaml/graphicsX11.cmi
>-%%X11%%lib/ocaml/graphicsX11.cmx
>-%%X11%%lib/ocaml/graphicsX11.mli
>-%%X11%%lib/ocaml/graphics.a
>-%%X11%%lib/ocaml/graphics.cma
>-%%X11%%lib/ocaml/graphics.cmi
>-%%X11%%lib/ocaml/graphics.cmx
>-%%X11%%lib/ocaml/graphics.cmxa
>-%%X11%%lib/ocaml/graphics.cmxs
>-%%X11%%lib/ocaml/graphics.mli
>-%%X11%%lib/ocaml/libgraphics.a
>-%%X11%%lib/ocaml/stublibs/dllgraphics.so
> bin/ocaml
>-bin/ocamlbuild
>-bin/ocamlbuild.byte
>-bin/ocamlbuild.native
> bin/ocamlc
>+bin/ocamlc.byte
> bin/ocamlc.opt
> bin/ocamlcp
>+bin/ocamlcp.byte
>+bin/ocamlcp.opt
> bin/ocamldebug
> bin/ocamldep
>+bin/ocamldep.byte
> bin/ocamldep.opt
> bin/ocamldoc
> bin/ocamldoc.opt
> bin/ocamllex
>+bin/ocamllex.byte
> bin/ocamllex.opt
> bin/ocamlmklib
>+bin/ocamlmklib.byte
>+bin/ocamlmklib.opt
> bin/ocamlmktop
>+bin/ocamlmktop.byte
>+bin/ocamlmktop.opt
> bin/ocamlobjinfo
>+bin/ocamlobjinfo.byte
>+bin/ocamlobjinfo.opt
> bin/ocamlopt
>+bin/ocamlopt.byte
> bin/ocamlopt.opt
> bin/ocamloptp
>+bin/ocamloptp.byte
>+bin/ocamloptp.opt
> bin/ocamlprof
>+bin/ocamlprof.byte
>+bin/ocamlprof.opt
> bin/ocamlrun
> bin/ocamlyacc
> lib/ocaml/Makefile.config
>@@ -117,10 +43,19 @@
> lib/ocaml/arg.ml
> lib/ocaml/arg.mli
> lib/ocaml/arg.p.cmt
>+lib/ocaml/arg.p.cmx
> lib/ocaml/arith_flags.cmx
> lib/ocaml/arith_status.cmi
> lib/ocaml/arith_status.cmx
> lib/ocaml/arith_status.mli
>+lib/ocaml/array.cmi
>+lib/ocaml/array.cmt
>+lib/ocaml/array.cmti
>+lib/ocaml/array.cmx
>+lib/ocaml/array.ml
>+lib/ocaml/array.mli
>+lib/ocaml/array.p.cmt
>+lib/ocaml/array.p.cmx
> lib/ocaml/arrayLabels.cmi
> lib/ocaml/arrayLabels.cmt
> lib/ocaml/arrayLabels.cmti
>@@ -128,13 +63,10 @@
> lib/ocaml/arrayLabels.ml
> lib/ocaml/arrayLabels.mli
> lib/ocaml/arrayLabels.p.cmt
>-lib/ocaml/array.cmi
>-lib/ocaml/array.cmt
>-lib/ocaml/array.cmti
>-lib/ocaml/array.cmx
>-lib/ocaml/array.ml
>-lib/ocaml/array.mli
>-lib/ocaml/array.p.cmt
>+lib/ocaml/arrayLabels.p.cmx
>+lib/ocaml/big_int.cmi
>+lib/ocaml/big_int.cmx
>+lib/ocaml/big_int.mli
> lib/ocaml/bigarray.a
> lib/ocaml/bigarray.cma
> lib/ocaml/bigarray.cmi
>@@ -142,9 +74,6 @@
> lib/ocaml/bigarray.cmxa
> lib/ocaml/bigarray.cmxs
> lib/ocaml/bigarray.mli
>-lib/ocaml/big_int.cmi
>-lib/ocaml/big_int.cmx
>-lib/ocaml/big_int.mli
> lib/ocaml/buffer.cmi
> lib/ocaml/buffer.cmt
> lib/ocaml/buffer.cmti
>@@ -152,6 +81,15 @@
> lib/ocaml/buffer.ml
> lib/ocaml/buffer.mli
> lib/ocaml/buffer.p.cmt
>+lib/ocaml/buffer.p.cmx
>+lib/ocaml/bytes.cmi
>+lib/ocaml/bytes.cmt
>+lib/ocaml/bytes.cmti
>+lib/ocaml/bytes.cmx
>+lib/ocaml/bytes.ml
>+lib/ocaml/bytes.mli
>+lib/ocaml/bytes.p.cmt
>+lib/ocaml/bytes.p.cmx
> lib/ocaml/bytesLabels.cmi
> lib/ocaml/bytesLabels.cmt
> lib/ocaml/bytesLabels.cmti
>@@ -159,13 +97,7 @@
> lib/ocaml/bytesLabels.ml
> lib/ocaml/bytesLabels.mli
> lib/ocaml/bytesLabels.p.cmt
>-lib/ocaml/bytes.cmi
>-lib/ocaml/bytes.cmt
>-lib/ocaml/bytes.cmti
>-lib/ocaml/bytes.cmx
>-lib/ocaml/bytes.ml
>-lib/ocaml/bytes.mli
>-lib/ocaml/bytes.p.cmt
>+lib/ocaml/bytesLabels.p.cmx
> lib/ocaml/callback.cmi
> lib/ocaml/callback.cmt
> lib/ocaml/callback.cmti
>@@ -173,18 +105,73 @@
> lib/ocaml/callback.ml
> lib/ocaml/callback.mli
> lib/ocaml/callback.p.cmt
>+lib/ocaml/callback.p.cmx
> lib/ocaml/caml/address_class.h
> lib/ocaml/caml/alloc.h
>+lib/ocaml/caml/backtrace.h
>+lib/ocaml/caml/backtrace_prim.h
> lib/ocaml/caml/bigarray.h
> lib/ocaml/caml/callback.h
>+lib/ocaml/caml/compact.h
>+lib/ocaml/caml/compare.h
> lib/ocaml/caml/compatibility.h
> lib/ocaml/caml/config.h
> lib/ocaml/caml/custom.h
>+lib/ocaml/caml/debugger.h
>+lib/ocaml/caml/dynlink.h
>+lib/ocaml/caml/exec.h
> lib/ocaml/caml/fail.h
>+lib/ocaml/caml/finalise.h
>+lib/ocaml/caml/fix_code.h
>+lib/ocaml/caml/freelist.h
> lib/ocaml/caml/gc.h
>+lib/ocaml/caml/gc_ctrl.h
>+lib/ocaml/caml/globroots.h
> lib/ocaml/caml/hash.h
>+lib/ocaml/caml/hooks.h
>+lib/ocaml/caml/instrtrace.h
>+lib/ocaml/caml/instruct.h
>+lib/ocaml/caml/int64_emul.h
>+lib/ocaml/caml/int64_format.h
>+lib/ocaml/caml/int64_native.h
>+lib/ocaml/caml/interp.h
>+lib/ocaml/caml/intext.h
>+lib/ocaml/caml/io.h
>+lib/ocaml/caml/jumptbl.h
>+lib/ocaml/caml/major_gc.h
>+lib/ocaml/caml/md5.h
>+lib/ocaml/caml/memory.h
>+lib/ocaml/caml/minor_gc.h
>+lib/ocaml/caml/misc.h
>+lib/ocaml/caml/mlvalues.h
>+lib/ocaml/caml/osdeps.h
>+lib/ocaml/caml/prims.h
>+lib/ocaml/caml/printexc.h
>+lib/ocaml/caml/reverse.h
>+lib/ocaml/caml/roots.h
>+lib/ocaml/caml/signals.h
>+lib/ocaml/caml/signals_machdep.h
>+lib/ocaml/caml/socketaddr.h
>+lib/ocaml/caml/stack.h
>+lib/ocaml/caml/stacks.h
>+lib/ocaml/caml/startup.h
>+lib/ocaml/caml/startup_aux.h
>+lib/ocaml/caml/sys.h
>+%%THREADS%%lib/ocaml/caml/threads.h
>+lib/ocaml/caml/ui.h
>+lib/ocaml/caml/unixsupport.h
>+lib/ocaml/caml/version.h
>+lib/ocaml/caml/weak.h
> lib/ocaml/camlheader
> lib/ocaml/camlheader_ur
>+lib/ocaml/camlinternalFormat.cmi
>+lib/ocaml/camlinternalFormat.cmt
>+lib/ocaml/camlinternalFormat.cmti
>+lib/ocaml/camlinternalFormat.cmx
>+lib/ocaml/camlinternalFormat.ml
>+lib/ocaml/camlinternalFormat.mli
>+lib/ocaml/camlinternalFormat.p.cmt
>+lib/ocaml/camlinternalFormat.p.cmx
> lib/ocaml/camlinternalFormatBasics.cmi
> lib/ocaml/camlinternalFormatBasics.cmt
> lib/ocaml/camlinternalFormatBasics.cmti
>@@ -192,13 +179,7 @@
> lib/ocaml/camlinternalFormatBasics.ml
> lib/ocaml/camlinternalFormatBasics.mli
> lib/ocaml/camlinternalFormatBasics.p.cmt
>-lib/ocaml/camlinternalFormat.cmi
>-lib/ocaml/camlinternalFormat.cmt
>-lib/ocaml/camlinternalFormat.cmti
>-lib/ocaml/camlinternalFormat.cmx
>-lib/ocaml/camlinternalFormat.ml
>-lib/ocaml/camlinternalFormat.mli
>-lib/ocaml/camlinternalFormat.p.cmt
>+lib/ocaml/camlinternalFormatBasics.p.cmx
> lib/ocaml/camlinternalLazy.cmi
> lib/ocaml/camlinternalLazy.cmt
> lib/ocaml/camlinternalLazy.cmti
>@@ -206,6 +187,7 @@
> lib/ocaml/camlinternalLazy.ml
> lib/ocaml/camlinternalLazy.mli
> lib/ocaml/camlinternalLazy.p.cmt
>+lib/ocaml/camlinternalLazy.p.cmx
> lib/ocaml/camlinternalMod.cmi
> lib/ocaml/camlinternalMod.cmt
> lib/ocaml/camlinternalMod.cmti
>@@ -213,6 +195,7 @@
> lib/ocaml/camlinternalMod.ml
> lib/ocaml/camlinternalMod.mli
> lib/ocaml/camlinternalMod.p.cmt
>+lib/ocaml/camlinternalMod.p.cmx
> lib/ocaml/camlinternalOO.cmi
> lib/ocaml/camlinternalOO.cmt
> lib/ocaml/camlinternalOO.cmti
>@@ -220,15 +203,7 @@
> lib/ocaml/camlinternalOO.ml
> lib/ocaml/camlinternalOO.mli
> lib/ocaml/camlinternalOO.p.cmt
>-lib/ocaml/caml/intext.h
>-lib/ocaml/caml/memory.h
>-lib/ocaml/caml/misc.h
>-lib/ocaml/caml/mlvalues.h
>-lib/ocaml/caml/printexc.h
>-lib/ocaml/caml/signals.h
>-lib/ocaml/caml/socketaddr.h
>-lib/ocaml/caml/unixsupport.h
>-lib/ocaml/caml/version.h
>+lib/ocaml/camlinternalOO.p.cmx
> lib/ocaml/char.cmi
> lib/ocaml/char.cmt
> lib/ocaml/char.cmti
>@@ -236,193 +211,408 @@
> lib/ocaml/char.ml
> lib/ocaml/char.mli
> 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
> 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/alias_analysis.cmi
>+lib/ocaml/compiler-libs/alias_analysis.cmt
>+lib/ocaml/compiler-libs/alias_analysis.cmti
>+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/annot.cmi
> lib/ocaml/compiler-libs/annot.cmti
> lib/ocaml/compiler-libs/arch.cmi
> lib/ocaml/compiler-libs/arch.cmt
>+lib/ocaml/compiler-libs/arch.cmx
>+lib/ocaml/compiler-libs/arg_helper.cmi
>+lib/ocaml/compiler-libs/arg_helper.cmt
>+lib/ocaml/compiler-libs/arg_helper.cmti
>+lib/ocaml/compiler-libs/arg_helper.cmx
> 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/asmlibrarian.cmi
> lib/ocaml/compiler-libs/asmlibrarian.cmt
> lib/ocaml/compiler-libs/asmlibrarian.cmti
>+lib/ocaml/compiler-libs/asmlibrarian.cmx
> 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/asmpackager.cmi
> lib/ocaml/compiler-libs/asmpackager.cmt
> lib/ocaml/compiler-libs/asmpackager.cmti
>+lib/ocaml/compiler-libs/asmpackager.cmx
> lib/ocaml/compiler-libs/ast_helper.cmi
> lib/ocaml/compiler-libs/ast_helper.cmt
> lib/ocaml/compiler-libs/ast_helper.cmti
>+lib/ocaml/compiler-libs/ast_helper.cmx
>+lib/ocaml/compiler-libs/ast_invariants.cmi
>+lib/ocaml/compiler-libs/ast_invariants.cmt
>+lib/ocaml/compiler-libs/ast_invariants.cmti
>+lib/ocaml/compiler-libs/ast_invariants.cmx
>+lib/ocaml/compiler-libs/ast_iterator.cmi
>+lib/ocaml/compiler-libs/ast_iterator.cmt
>+lib/ocaml/compiler-libs/ast_iterator.cmti
>+lib/ocaml/compiler-libs/ast_iterator.cmx
> lib/ocaml/compiler-libs/ast_mapper.cmi
> lib/ocaml/compiler-libs/ast_mapper.cmt
> lib/ocaml/compiler-libs/ast_mapper.cmti
>+lib/ocaml/compiler-libs/ast_mapper.cmx
> lib/ocaml/compiler-libs/asttypes.cmi
> lib/ocaml/compiler-libs/asttypes.cmti
>+lib/ocaml/compiler-libs/attr_helper.cmi
>+lib/ocaml/compiler-libs/attr_helper.cmt
>+lib/ocaml/compiler-libs/attr_helper.cmti
>+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/backend_intf.cmi
>+lib/ocaml/compiler-libs/backend_intf.cmti
> 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_intf.cmi
> lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
>+lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
> lib/ocaml/compiler-libs/btype.cmi
> lib/ocaml/compiler-libs/btype.cmt
> lib/ocaml/compiler-libs/btype.cmti
>+lib/ocaml/compiler-libs/btype.cmx
>+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/builtin_attributes.cmi
>+lib/ocaml/compiler-libs/builtin_attributes.cmt
>+lib/ocaml/compiler-libs/builtin_attributes.cmti
>+lib/ocaml/compiler-libs/builtin_attributes.cmx
> lib/ocaml/compiler-libs/bytegen.cmi
> lib/ocaml/compiler-libs/bytegen.cmt
> lib/ocaml/compiler-libs/bytegen.cmti
>+lib/ocaml/compiler-libs/bytegen.cmx
> lib/ocaml/compiler-libs/bytelibrarian.cmi
> lib/ocaml/compiler-libs/bytelibrarian.cmt
> lib/ocaml/compiler-libs/bytelibrarian.cmti
>+lib/ocaml/compiler-libs/bytelibrarian.cmx
> lib/ocaml/compiler-libs/bytelink.cmi
> lib/ocaml/compiler-libs/bytelink.cmt
> lib/ocaml/compiler-libs/bytelink.cmti
>+lib/ocaml/compiler-libs/bytelink.cmx
> lib/ocaml/compiler-libs/bytepackager.cmi
> lib/ocaml/compiler-libs/bytepackager.cmt
> lib/ocaml/compiler-libs/bytepackager.cmti
>+lib/ocaml/compiler-libs/bytepackager.cmx
> lib/ocaml/compiler-libs/bytesections.cmi
> lib/ocaml/compiler-libs/bytesections.cmt
> lib/ocaml/compiler-libs/bytesections.cmti
>+lib/ocaml/compiler-libs/bytesections.cmx
> lib/ocaml/compiler-libs/ccomp.cmi
> lib/ocaml/compiler-libs/ccomp.cmt
> lib/ocaml/compiler-libs/ccomp.cmti
>+lib/ocaml/compiler-libs/ccomp.cmx
> 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/clflags.cmi
> lib/ocaml/compiler-libs/clflags.cmt
> lib/ocaml/compiler-libs/clflags.cmti
>+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_conversion.cmi
>+lib/ocaml/compiler-libs/closure_conversion.cmt
>+lib/ocaml/compiler-libs/closure_conversion.cmti
>+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_element.cmi
>+lib/ocaml/compiler-libs/closure_element.cmt
>+lib/ocaml/compiler-libs/closure_element.cmti
>+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_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/cmi_format.cmi
> lib/ocaml/compiler-libs/cmi_format.cmt
> lib/ocaml/compiler-libs/cmi_format.cmti
>+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/cmmgen.cmi
> lib/ocaml/compiler-libs/cmmgen.cmt
> lib/ocaml/compiler-libs/cmmgen.cmti
>+lib/ocaml/compiler-libs/cmmgen.cmx
> lib/ocaml/compiler-libs/cmo_format.cmi
> lib/ocaml/compiler-libs/cmo_format.cmti
> lib/ocaml/compiler-libs/cmt_format.cmi
> lib/ocaml/compiler-libs/cmt_format.cmt
> lib/ocaml/compiler-libs/cmt_format.cmti
>+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/coloring.cmi
> lib/ocaml/compiler-libs/coloring.cmt
> lib/ocaml/compiler-libs/coloring.cmti
>+lib/ocaml/compiler-libs/coloring.cmx
> 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/compdynlink.cmi
>+lib/ocaml/compiler-libs/compdynlink.cmt
>+lib/ocaml/compiler-libs/compdynlink.cmti
>+lib/ocaml/compiler-libs/compdynlink.cmx
> lib/ocaml/compiler-libs/compenv.cmi
> lib/ocaml/compiler-libs/compenv.cmt
> lib/ocaml/compiler-libs/compenv.cmti
>+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/compile.cmi
> lib/ocaml/compiler-libs/compile.cmt
> lib/ocaml/compiler-libs/compile.cmti
>+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/compmisc.cmi
> lib/ocaml/compiler-libs/compmisc.cmt
> lib/ocaml/compiler-libs/compmisc.cmti
>+lib/ocaml/compiler-libs/compmisc.cmx
>+lib/ocaml/compiler-libs/compplugin.cmi
>+lib/ocaml/compiler-libs/compplugin.cmt
>+lib/ocaml/compiler-libs/compplugin.cmti
>+lib/ocaml/compiler-libs/compplugin.cmx
> lib/ocaml/compiler-libs/config.cmi
> lib/ocaml/compiler-libs/config.cmt
> lib/ocaml/compiler-libs/config.cmti
>+lib/ocaml/compiler-libs/config.cmx
> lib/ocaml/compiler-libs/consistbl.cmi
> lib/ocaml/compiler-libs/consistbl.cmt
> lib/ocaml/compiler-libs/consistbl.cmti
>+lib/ocaml/compiler-libs/consistbl.cmx
> lib/ocaml/compiler-libs/ctype.cmi
> lib/ocaml/compiler-libs/ctype.cmt
> lib/ocaml/compiler-libs/ctype.cmti
>+lib/ocaml/compiler-libs/ctype.cmx
> lib/ocaml/compiler-libs/datarepr.cmi
> lib/ocaml/compiler-libs/datarepr.cmt
> lib/ocaml/compiler-libs/datarepr.cmti
>+lib/ocaml/compiler-libs/datarepr.cmx
> 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.cmi
> lib/ocaml/compiler-libs/debuginfo.cmt
> lib/ocaml/compiler-libs/debuginfo.cmti
>+lib/ocaml/compiler-libs/depend.cmi
>+lib/ocaml/compiler-libs/depend.cmt
>+lib/ocaml/compiler-libs/depend.cmti
>+lib/ocaml/compiler-libs/depend.cmx
> lib/ocaml/compiler-libs/dll.cmi
> lib/ocaml/compiler-libs/dll.cmt
> lib/ocaml/compiler-libs/dll.cmti
>+lib/ocaml/compiler-libs/dll.cmx
> lib/ocaml/compiler-libs/docstrings.cmi
> lib/ocaml/compiler-libs/docstrings.cmt
> lib/ocaml/compiler-libs/docstrings.cmti
>+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/emit.cmi
>+lib/ocaml/compiler-libs/emit.cmt
>+lib/ocaml/compiler-libs/emit.cmti
>+lib/ocaml/compiler-libs/emit.cmx
> lib/ocaml/compiler-libs/emitaux.cmi
> lib/ocaml/compiler-libs/emitaux.cmt
> lib/ocaml/compiler-libs/emitaux.cmti
>-lib/ocaml/compiler-libs/emit.cmi
>-lib/ocaml/compiler-libs/emit.cmt
>-lib/ocaml/compiler-libs/emit.cmti
>+lib/ocaml/compiler-libs/emitaux.cmx
> lib/ocaml/compiler-libs/emitcode.cmi
> lib/ocaml/compiler-libs/emitcode.cmt
> lib/ocaml/compiler-libs/emitcode.cmti
>+lib/ocaml/compiler-libs/emitcode.cmx
>+lib/ocaml/compiler-libs/env.cmi
>+lib/ocaml/compiler-libs/env.cmt
>+lib/ocaml/compiler-libs/env.cmti
>+lib/ocaml/compiler-libs/env.cmx
> lib/ocaml/compiler-libs/envaux.cmi
> lib/ocaml/compiler-libs/envaux.cmt
> lib/ocaml/compiler-libs/envaux.cmti
>-lib/ocaml/compiler-libs/env.cmi
>-lib/ocaml/compiler-libs/env.cmt
>-lib/ocaml/compiler-libs/env.cmti
>+lib/ocaml/compiler-libs/envaux.cmx
> lib/ocaml/compiler-libs/errors.cmi
> lib/ocaml/compiler-libs/errors.cmt
> lib/ocaml/compiler-libs/errors.cmti
>+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_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_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/expunge.cmi
> lib/ocaml/compiler-libs/expunge.cmt
>+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/find_recursive_functions.cmi
>+lib/ocaml/compiler-libs/find_recursive_functions.cmt
>+lib/ocaml/compiler-libs/find_recursive_functions.cmti
>+lib/ocaml/compiler-libs/flambda.cmi
>+lib/ocaml/compiler-libs/flambda.cmt
>+lib/ocaml/compiler-libs/flambda.cmti
>+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_iterators.cmi
>+lib/ocaml/compiler-libs/flambda_iterators.cmt
>+lib/ocaml/compiler-libs/flambda_iterators.cmti
>+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_utils.cmi
>+lib/ocaml/compiler-libs/flambda_utils.cmt
>+lib/ocaml/compiler-libs/flambda_utils.cmti
>+lib/ocaml/compiler-libs/freshening.cmi
>+lib/ocaml/compiler-libs/freshening.cmt
>+lib/ocaml/compiler-libs/freshening.cmti
> lib/ocaml/compiler-libs/genprintval.cmi
> lib/ocaml/compiler-libs/genprintval.cmt
> lib/ocaml/compiler-libs/genprintval.cmti
>+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/ident.cmi
> lib/ocaml/compiler-libs/ident.cmt
> lib/ocaml/compiler-libs/ident.cmti
>+lib/ocaml/compiler-libs/ident.cmx
>+lib/ocaml/compiler-libs/identifiable.cmi
>+lib/ocaml/compiler-libs/identifiable.cmt
>+lib/ocaml/compiler-libs/identifiable.cmti
>+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/includeclass.cmi
> lib/ocaml/compiler-libs/includeclass.cmt
> lib/ocaml/compiler-libs/includeclass.cmti
>+lib/ocaml/compiler-libs/includeclass.cmx
> lib/ocaml/compiler-libs/includecore.cmi
> lib/ocaml/compiler-libs/includecore.cmt
> lib/ocaml/compiler-libs/includecore.cmti
>+lib/ocaml/compiler-libs/includecore.cmx
> lib/ocaml/compiler-libs/includemod.cmi
> lib/ocaml/compiler-libs/includemod.cmt
> lib/ocaml/compiler-libs/includemod.cmti
>+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/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/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_aux.cmi
>+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
>+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
>+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_decision.cmi
>+lib/ocaml/compiler-libs/inlining_decision.cmt
>+lib/ocaml/compiler-libs/inlining_decision.cmti
>+lib/ocaml/compiler-libs/inlining_decision_intf.cmi
>+lib/ocaml/compiler-libs/inlining_decision_intf.cmti
>+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_types.cmi
>+lib/ocaml/compiler-libs/inlining_stats_types.cmt
>+lib/ocaml/compiler-libs/inlining_stats_types.cmti
>+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/instruct.cmi
> lib/ocaml/compiler-libs/instruct.cmt
> lib/ocaml/compiler-libs/instruct.cmti
>+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/invariant_params.cmi
>+lib/ocaml/compiler-libs/invariant_params.cmt
>+lib/ocaml/compiler-libs/invariant_params.cmti
> lib/ocaml/compiler-libs/lambda.cmi
> lib/ocaml/compiler-libs/lambda.cmt
> lib/ocaml/compiler-libs/lambda.cmti
>+lib/ocaml/compiler-libs/lambda.cmx
> lib/ocaml/compiler-libs/lexer.cmi
> lib/ocaml/compiler-libs/lexer.cmt
> lib/ocaml/compiler-libs/lexer.cmti
>+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_constants.cmi
>+lib/ocaml/compiler-libs/lift_constants.cmt
>+lib/ocaml/compiler-libs/lift_constants.cmti
>+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/linearize.cmi
> lib/ocaml/compiler-libs/linearize.cmt
> lib/ocaml/compiler-libs/linearize.cmti
>+lib/ocaml/compiler-libs/linearize.cmx
>+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/liveness.cmi
> lib/ocaml/compiler-libs/liveness.cmt
> lib/ocaml/compiler-libs/liveness.cmti
>+lib/ocaml/compiler-libs/liveness.cmx
> lib/ocaml/compiler-libs/location.cmi
> lib/ocaml/compiler-libs/location.cmt
> lib/ocaml/compiler-libs/location.cmti
>+lib/ocaml/compiler-libs/location.cmx
> lib/ocaml/compiler-libs/longident.cmi
> lib/ocaml/compiler-libs/longident.cmt
> lib/ocaml/compiler-libs/longident.cmti
>+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/main_args.cmi
>-lib/ocaml/compiler-libs/main_args.cmt
>-lib/ocaml/compiler-libs/main_args.cmti
>+lib/ocaml/compiler-libs/mach.cmx
> lib/ocaml/compiler-libs/main.cmi
> lib/ocaml/compiler-libs/main.cmo
> lib/ocaml/compiler-libs/main.cmt
>@@ -429,18 +619,36 @@
> lib/ocaml/compiler-libs/main.cmti
> lib/ocaml/compiler-libs/main.cmx
> lib/ocaml/compiler-libs/main.o
>+lib/ocaml/compiler-libs/main_args.cmi
>+lib/ocaml/compiler-libs/main_args.cmt
>+lib/ocaml/compiler-libs/main_args.cmti
>+lib/ocaml/compiler-libs/main_args.cmx
> lib/ocaml/compiler-libs/matching.cmi
> lib/ocaml/compiler-libs/matching.cmt
> lib/ocaml/compiler-libs/matching.cmti
>+lib/ocaml/compiler-libs/matching.cmx
> lib/ocaml/compiler-libs/meta.cmi
> lib/ocaml/compiler-libs/meta.cmt
> lib/ocaml/compiler-libs/meta.cmti
>+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/misc.cmi
> lib/ocaml/compiler-libs/misc.cmt
> lib/ocaml/compiler-libs/misc.cmti
>+lib/ocaml/compiler-libs/misc.cmx
> lib/ocaml/compiler-libs/mtype.cmi
> lib/ocaml/compiler-libs/mtype.cmt
> lib/ocaml/compiler-libs/mtype.cmti
>+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/numbers.cmi
>+lib/ocaml/compiler-libs/numbers.cmt
>+lib/ocaml/compiler-libs/numbers.cmti
>+lib/ocaml/compiler-libs/numbers.cmx
> lib/ocaml/compiler-libs/ocamlbytecomp.a
> lib/ocaml/compiler-libs/ocamlbytecomp.cma
> lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
>@@ -453,15 +661,19 @@
> lib/ocaml/compiler-libs/ocamltoplevel.cma
> lib/ocaml/compiler-libs/opcodes.cmi
> lib/ocaml/compiler-libs/opcodes.cmt
>+lib/ocaml/compiler-libs/opcodes.cmx
> lib/ocaml/compiler-libs/oprint.cmi
> lib/ocaml/compiler-libs/oprint.cmt
> lib/ocaml/compiler-libs/oprint.cmti
>+lib/ocaml/compiler-libs/oprint.cmx
> lib/ocaml/compiler-libs/optcompile.cmi
> lib/ocaml/compiler-libs/optcompile.cmt
> lib/ocaml/compiler-libs/optcompile.cmti
>+lib/ocaml/compiler-libs/optcompile.cmx
> lib/ocaml/compiler-libs/opterrors.cmi
> lib/ocaml/compiler-libs/opterrors.cmt
> lib/ocaml/compiler-libs/opterrors.cmti
>+lib/ocaml/compiler-libs/opterrors.cmx
> lib/ocaml/compiler-libs/optmain.cmi
> lib/ocaml/compiler-libs/optmain.cmo
> lib/ocaml/compiler-libs/optmain.cmt
>@@ -473,116 +685,225 @@
> lib/ocaml/compiler-libs/parmatch.cmi
> lib/ocaml/compiler-libs/parmatch.cmt
> lib/ocaml/compiler-libs/parmatch.cmti
>+lib/ocaml/compiler-libs/parmatch.cmx
> lib/ocaml/compiler-libs/parse.cmi
> lib/ocaml/compiler-libs/parse.cmt
> lib/ocaml/compiler-libs/parse.cmti
>+lib/ocaml/compiler-libs/parse.cmx
> lib/ocaml/compiler-libs/parser.cmi
> lib/ocaml/compiler-libs/parser.cmt
> lib/ocaml/compiler-libs/parser.cmti
>+lib/ocaml/compiler-libs/parser.cmx
> lib/ocaml/compiler-libs/parsetree.cmi
> lib/ocaml/compiler-libs/parsetree.cmti
>+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/path.cmi
> lib/ocaml/compiler-libs/path.cmt
> lib/ocaml/compiler-libs/path.cmti
>+lib/ocaml/compiler-libs/path.cmx
> lib/ocaml/compiler-libs/pparse.cmi
> lib/ocaml/compiler-libs/pparse.cmt
> lib/ocaml/compiler-libs/pparse.cmti
>+lib/ocaml/compiler-libs/pparse.cmx
> lib/ocaml/compiler-libs/pprintast.cmi
> lib/ocaml/compiler-libs/pprintast.cmt
> lib/ocaml/compiler-libs/pprintast.cmti
>+lib/ocaml/compiler-libs/pprintast.cmx
> lib/ocaml/compiler-libs/predef.cmi
> lib/ocaml/compiler-libs/predef.cmt
> lib/ocaml/compiler-libs/predef.cmti
>+lib/ocaml/compiler-libs/predef.cmx
> lib/ocaml/compiler-libs/primitive.cmi
> lib/ocaml/compiler-libs/primitive.cmt
> lib/ocaml/compiler-libs/primitive.cmti
>+lib/ocaml/compiler-libs/primitive.cmx
> lib/ocaml/compiler-libs/printast.cmi
> lib/ocaml/compiler-libs/printast.cmt
> lib/ocaml/compiler-libs/printast.cmti
>+lib/ocaml/compiler-libs/printast.cmx
> 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/printcmm.cmi
> lib/ocaml/compiler-libs/printcmm.cmt
> lib/ocaml/compiler-libs/printcmm.cmti
>+lib/ocaml/compiler-libs/printcmm.cmx
> lib/ocaml/compiler-libs/printinstr.cmi
> lib/ocaml/compiler-libs/printinstr.cmt
> lib/ocaml/compiler-libs/printinstr.cmti
>+lib/ocaml/compiler-libs/printinstr.cmx
> lib/ocaml/compiler-libs/printlambda.cmi
> lib/ocaml/compiler-libs/printlambda.cmt
> lib/ocaml/compiler-libs/printlambda.cmti
>+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/printmach.cmi
> lib/ocaml/compiler-libs/printmach.cmt
> lib/ocaml/compiler-libs/printmach.cmti
>+lib/ocaml/compiler-libs/printmach.cmx
> lib/ocaml/compiler-libs/printtyp.cmi
> lib/ocaml/compiler-libs/printtyp.cmt
> lib/ocaml/compiler-libs/printtyp.cmti
>+lib/ocaml/compiler-libs/printtyp.cmx
> lib/ocaml/compiler-libs/printtyped.cmi
> lib/ocaml/compiler-libs/printtyped.cmt
> lib/ocaml/compiler-libs/printtyped.cmti
>+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/projection.cmi
>+lib/ocaml/compiler-libs/projection.cmt
>+lib/ocaml/compiler-libs/projection.cmti
>+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/reg.cmi
> lib/ocaml/compiler-libs/reg.cmt
> lib/ocaml/compiler-libs/reg.cmti
>+lib/ocaml/compiler-libs/reg.cmx
> 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/reloadgen.cmi
> lib/ocaml/compiler-libs/reloadgen.cmt
> lib/ocaml/compiler-libs/reloadgen.cmti
>+lib/ocaml/compiler-libs/reloadgen.cmx
>+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_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_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_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/runtimedef.cmi
> lib/ocaml/compiler-libs/runtimedef.cmt
> lib/ocaml/compiler-libs/runtimedef.cmti
>+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/scheduling.cmi
> lib/ocaml/compiler-libs/scheduling.cmt
> lib/ocaml/compiler-libs/scheduling.cmti
>+lib/ocaml/compiler-libs/scheduling.cmx
> 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/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/semantics_of_primitives.cmt
>+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_origin.cmi
>+lib/ocaml/compiler-libs/set_of_closures_origin.cmt
>+lib/ocaml/compiler-libs/set_of_closures_origin.cmti
>+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/simple_value_approx.cmi
>+lib/ocaml/compiler-libs/simple_value_approx.cmt
>+lib/ocaml/compiler-libs/simple_value_approx.cmti
> lib/ocaml/compiler-libs/simplif.cmi
> lib/ocaml/compiler-libs/simplif.cmt
> lib/ocaml/compiler-libs/simplif.cmti
>+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_intf.cmi
>+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
>+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_primitives.cmi
>+lib/ocaml/compiler-libs/simplify_primitives.cmt
>+lib/ocaml/compiler-libs/simplify_primitives.cmti
>+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/spill.cmi
> lib/ocaml/compiler-libs/spill.cmt
> lib/ocaml/compiler-libs/spill.cmti
>+lib/ocaml/compiler-libs/spill.cmx
> 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/static_exception.cmi
>+lib/ocaml/compiler-libs/static_exception.cmt
>+lib/ocaml/compiler-libs/static_exception.cmti
> 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/strongly_connected_components.cmi
>+lib/ocaml/compiler-libs/strongly_connected_components.cmt
>+lib/ocaml/compiler-libs/strongly_connected_components.cmti
>+lib/ocaml/compiler-libs/strongly_connected_components.cmx
> lib/ocaml/compiler-libs/stypes.cmi
> lib/ocaml/compiler-libs/stypes.cmt
> lib/ocaml/compiler-libs/stypes.cmti
>+lib/ocaml/compiler-libs/stypes.cmx
> lib/ocaml/compiler-libs/subst.cmi
> lib/ocaml/compiler-libs/subst.cmt
> lib/ocaml/compiler-libs/subst.cmti
>+lib/ocaml/compiler-libs/subst.cmx
> lib/ocaml/compiler-libs/switch.cmi
> lib/ocaml/compiler-libs/switch.cmt
> lib/ocaml/compiler-libs/switch.cmti
>+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/symtable.cmi
> lib/ocaml/compiler-libs/symtable.cmt
> lib/ocaml/compiler-libs/symtable.cmti
>+lib/ocaml/compiler-libs/symtable.cmx
> lib/ocaml/compiler-libs/syntaxerr.cmi
> lib/ocaml/compiler-libs/syntaxerr.cmt
> lib/ocaml/compiler-libs/syntaxerr.cmti
>+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/tast_mapper.cmi
>+lib/ocaml/compiler-libs/tast_mapper.cmt
>+lib/ocaml/compiler-libs/tast_mapper.cmti
>+lib/ocaml/compiler-libs/tast_mapper.cmx
> lib/ocaml/compiler-libs/tbl.cmi
> lib/ocaml/compiler-libs/tbl.cmt
> lib/ocaml/compiler-libs/tbl.cmti
>+lib/ocaml/compiler-libs/tbl.cmx
> lib/ocaml/compiler-libs/terminfo.cmi
> lib/ocaml/compiler-libs/terminfo.cmt
> lib/ocaml/compiler-libs/terminfo.cmti
>+lib/ocaml/compiler-libs/terminfo.cmx
>+lib/ocaml/compiler-libs/timings.cmi
>+lib/ocaml/compiler-libs/timings.cmt
>+lib/ocaml/compiler-libs/timings.cmti
>+lib/ocaml/compiler-libs/timings.cmx
> lib/ocaml/compiler-libs/topdirs.cmi
> lib/ocaml/compiler-libs/topdirs.cmt
> lib/ocaml/compiler-libs/topdirs.cmti
>@@ -598,51 +919,111 @@
> lib/ocaml/compiler-libs/trace.cmi
> lib/ocaml/compiler-libs/trace.cmt
> lib/ocaml/compiler-libs/trace.cmti
>+lib/ocaml/compiler-libs/translattribute.cmi
>+lib/ocaml/compiler-libs/translattribute.cmt
>+lib/ocaml/compiler-libs/translattribute.cmti
>+lib/ocaml/compiler-libs/translattribute.cmx
> lib/ocaml/compiler-libs/translclass.cmi
> lib/ocaml/compiler-libs/translclass.cmt
> lib/ocaml/compiler-libs/translclass.cmti
>+lib/ocaml/compiler-libs/translclass.cmx
> lib/ocaml/compiler-libs/translcore.cmi
> lib/ocaml/compiler-libs/translcore.cmt
> lib/ocaml/compiler-libs/translcore.cmti
>+lib/ocaml/compiler-libs/translcore.cmx
> lib/ocaml/compiler-libs/translmod.cmi
> lib/ocaml/compiler-libs/translmod.cmt
> lib/ocaml/compiler-libs/translmod.cmti
>+lib/ocaml/compiler-libs/translmod.cmx
> lib/ocaml/compiler-libs/translobj.cmi
> lib/ocaml/compiler-libs/translobj.cmt
> lib/ocaml/compiler-libs/translobj.cmti
>+lib/ocaml/compiler-libs/translobj.cmx
> lib/ocaml/compiler-libs/typeclass.cmi
> lib/ocaml/compiler-libs/typeclass.cmt
> lib/ocaml/compiler-libs/typeclass.cmti
>+lib/ocaml/compiler-libs/typeclass.cmx
> lib/ocaml/compiler-libs/typecore.cmi
> lib/ocaml/compiler-libs/typecore.cmt
> lib/ocaml/compiler-libs/typecore.cmti
>+lib/ocaml/compiler-libs/typecore.cmx
> lib/ocaml/compiler-libs/typedecl.cmi
> lib/ocaml/compiler-libs/typedecl.cmt
> lib/ocaml/compiler-libs/typedecl.cmti
>+lib/ocaml/compiler-libs/typedecl.cmx
>+lib/ocaml/compiler-libs/typedtree.cmi
>+lib/ocaml/compiler-libs/typedtree.cmt
>+lib/ocaml/compiler-libs/typedtree.cmti
>+lib/ocaml/compiler-libs/typedtree.cmx
> lib/ocaml/compiler-libs/typedtreeIter.cmi
> lib/ocaml/compiler-libs/typedtreeIter.cmt
> lib/ocaml/compiler-libs/typedtreeIter.cmti
>+lib/ocaml/compiler-libs/typedtreeIter.cmx
> lib/ocaml/compiler-libs/typedtreeMap.cmi
> lib/ocaml/compiler-libs/typedtreeMap.cmt
> lib/ocaml/compiler-libs/typedtreeMap.cmti
>-lib/ocaml/compiler-libs/typedtree.cmi
>-lib/ocaml/compiler-libs/typedtree.cmt
>-lib/ocaml/compiler-libs/typedtree.cmti
>+lib/ocaml/compiler-libs/typedtreeMap.cmx
> lib/ocaml/compiler-libs/typemod.cmi
> lib/ocaml/compiler-libs/typemod.cmt
> lib/ocaml/compiler-libs/typemod.cmti
>+lib/ocaml/compiler-libs/typemod.cmx
> lib/ocaml/compiler-libs/typeopt.cmi
> lib/ocaml/compiler-libs/typeopt.cmt
> lib/ocaml/compiler-libs/typeopt.cmti
>+lib/ocaml/compiler-libs/typeopt.cmx
> lib/ocaml/compiler-libs/types.cmi
> lib/ocaml/compiler-libs/types.cmt
> lib/ocaml/compiler-libs/types.cmti
>+lib/ocaml/compiler-libs/types.cmx
> lib/ocaml/compiler-libs/typetexp.cmi
> lib/ocaml/compiler-libs/typetexp.cmt
> lib/ocaml/compiler-libs/typetexp.cmti
>+lib/ocaml/compiler-libs/typetexp.cmx
>+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/unbox_closures.cmi
>+lib/ocaml/compiler-libs/unbox_closures.cmt
>+lib/ocaml/compiler-libs/unbox_closures.cmti
>+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_specialised_args.cmi
>+lib/ocaml/compiler-libs/unbox_specialised_args.cmt
>+lib/ocaml/compiler-libs/unbox_specialised_args.cmti
>+lib/ocaml/compiler-libs/untypeast.cmi
>+lib/ocaml/compiler-libs/untypeast.cmt
>+lib/ocaml/compiler-libs/untypeast.cmti
>+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/variable.cmi
>+lib/ocaml/compiler-libs/variable.cmt
>+lib/ocaml/compiler-libs/variable.cmti
> lib/ocaml/compiler-libs/warnings.cmi
> lib/ocaml/compiler-libs/warnings.cmt
> lib/ocaml/compiler-libs/warnings.cmti
>+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_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_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_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_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.cmi
> lib/ocaml/complex.cmt
> lib/ocaml/complex.cmti
>@@ -650,6 +1031,8 @@
> lib/ocaml/complex.ml
> lib/ocaml/complex.mli
> lib/ocaml/complex.p.cmt
>+lib/ocaml/complex.p.cmx
>+%%THREADS%%lib/ocaml/condition.mli
> lib/ocaml/digest.cmi
> lib/ocaml/digest.cmt
> lib/ocaml/digest.cmti
>@@ -657,6 +1040,7 @@
> lib/ocaml/digest.ml
> lib/ocaml/digest.mli
> lib/ocaml/digest.p.cmt
>+lib/ocaml/digest.p.cmx
> lib/ocaml/dynlink.a
> lib/ocaml/dynlink.cma
> lib/ocaml/dynlink.cmi
>@@ -663,6 +1047,17 @@
> lib/ocaml/dynlink.cmx
> lib/ocaml/dynlink.cmxa
> lib/ocaml/dynlink.mli
>+lib/ocaml/ephemeron.cmi
>+lib/ocaml/ephemeron.cmt
>+lib/ocaml/ephemeron.cmti
>+lib/ocaml/ephemeron.cmx
>+lib/ocaml/ephemeron.ml
>+lib/ocaml/ephemeron.mli
>+lib/ocaml/ephemeron.p.cmt
>+lib/ocaml/ephemeron.p.cmx
>+%%THREADS%%lib/ocaml/event.mli
>+@(,,0555) lib/ocaml/expunge
>+@(,,0555) lib/ocaml/extract_crc
> lib/ocaml/filename.cmi
> lib/ocaml/filename.cmt
> lib/ocaml/filename.cmti
>@@ -670,6 +1065,7 @@
> lib/ocaml/filename.ml
> lib/ocaml/filename.mli
> lib/ocaml/filename.p.cmt
>+lib/ocaml/filename.p.cmx
> lib/ocaml/format.cmi
> lib/ocaml/format.cmt
> lib/ocaml/format.cmti
>@@ -677,6 +1073,7 @@
> lib/ocaml/format.ml
> lib/ocaml/format.mli
> lib/ocaml/format.p.cmt
>+lib/ocaml/format.p.cmx
> lib/ocaml/gc.cmi
> lib/ocaml/gc.cmt
> lib/ocaml/gc.cmti
>@@ -684,6 +1081,7 @@
> lib/ocaml/gc.ml
> lib/ocaml/gc.mli
> lib/ocaml/gc.p.cmt
>+lib/ocaml/gc.p.cmx
> lib/ocaml/genlex.cmi
> lib/ocaml/genlex.cmt
> lib/ocaml/genlex.cmti
>@@ -691,6 +1089,17 @@
> lib/ocaml/genlex.ml
> lib/ocaml/genlex.mli
> lib/ocaml/genlex.p.cmt
>+lib/ocaml/genlex.p.cmx
>+%%X11%%lib/ocaml/graphics.a
>+%%X11%%lib/ocaml/graphics.cma
>+%%X11%%lib/ocaml/graphics.cmi
>+%%X11%%lib/ocaml/graphics.cmx
>+%%X11%%lib/ocaml/graphics.cmxa
>+%%X11%%lib/ocaml/graphics.cmxs
>+%%X11%%lib/ocaml/graphics.mli
>+%%X11%%lib/ocaml/graphicsX11.cmi
>+%%X11%%lib/ocaml/graphicsX11.cmx
>+%%X11%%lib/ocaml/graphicsX11.mli
> lib/ocaml/hashtbl.cmi
> lib/ocaml/hashtbl.cmt
> lib/ocaml/hashtbl.cmti
>@@ -698,6 +1107,7 @@
> lib/ocaml/hashtbl.ml
> lib/ocaml/hashtbl.mli
> lib/ocaml/hashtbl.p.cmt
>+lib/ocaml/hashtbl.p.cmx
> lib/ocaml/int32.cmi
> lib/ocaml/int32.cmt
> lib/ocaml/int32.cmti
>@@ -705,6 +1115,7 @@
> lib/ocaml/int32.ml
> lib/ocaml/int32.mli
> lib/ocaml/int32.p.cmt
>+lib/ocaml/int32.p.cmx
> lib/ocaml/int64.cmi
> lib/ocaml/int64.cmt
> lib/ocaml/int64.cmti
>@@ -712,6 +1123,7 @@
> lib/ocaml/int64.ml
> lib/ocaml/int64.mli
> lib/ocaml/int64.p.cmt
>+lib/ocaml/int64.p.cmx
> lib/ocaml/int_misc.cmx
> lib/ocaml/lazy.cmi
> lib/ocaml/lazy.cmt
>@@ -720,6 +1132,7 @@
> lib/ocaml/lazy.ml
> lib/ocaml/lazy.mli
> lib/ocaml/lazy.p.cmt
>+lib/ocaml/lazy.p.cmx
> lib/ocaml/ld.conf
> lib/ocaml/lexing.cmi
> lib/ocaml/lexing.cmt
>@@ -728,17 +1141,29 @@
> lib/ocaml/lexing.ml
> lib/ocaml/lexing.mli
> lib/ocaml/lexing.p.cmt
>+lib/ocaml/lexing.p.cmx
> lib/ocaml/libasmrun.a
>-lib/ocaml/libasmrunp.a
> lib/ocaml/libasmrun_pic.a
> lib/ocaml/libasmrun_shared.so
>+lib/ocaml/libasmrunp.a
> lib/ocaml/libbigarray.a
> lib/ocaml/libcamlrun.a
> lib/ocaml/libcamlrun_pic.a
> lib/ocaml/libcamlrun_shared.so
> lib/ocaml/libcamlstr.a
>+%%X11%%lib/ocaml/libgraphics.a
> lib/ocaml/libnums.a
>+%%THREADS%%lib/ocaml/libthreads.a
>+%%THREADS%%lib/ocaml/libthreadsnat.a
> lib/ocaml/libunix.a
>+lib/ocaml/list.cmi
>+lib/ocaml/list.cmt
>+lib/ocaml/list.cmti
>+lib/ocaml/list.cmx
>+lib/ocaml/list.ml
>+lib/ocaml/list.mli
>+lib/ocaml/list.p.cmt
>+lib/ocaml/list.p.cmx
> lib/ocaml/listLabels.cmi
> lib/ocaml/listLabels.cmt
> lib/ocaml/listLabels.cmti
>@@ -746,13 +1171,7 @@
> lib/ocaml/listLabels.ml
> lib/ocaml/listLabels.mli
> lib/ocaml/listLabels.p.cmt
>-lib/ocaml/list.cmi
>-lib/ocaml/list.cmt
>-lib/ocaml/list.cmti
>-lib/ocaml/list.cmx
>-lib/ocaml/list.ml
>-lib/ocaml/list.mli
>-lib/ocaml/list.p.cmt
>+lib/ocaml/listLabels.p.cmx
> lib/ocaml/map.cmi
> lib/ocaml/map.cmt
> lib/ocaml/map.cmti
>@@ -760,6 +1179,7 @@
> lib/ocaml/map.ml
> lib/ocaml/map.mli
> lib/ocaml/map.p.cmt
>+lib/ocaml/map.p.cmx
> lib/ocaml/marshal.cmi
> lib/ocaml/marshal.cmt
> lib/ocaml/marshal.cmti
>@@ -767,6 +1187,7 @@
> lib/ocaml/marshal.ml
> lib/ocaml/marshal.mli
> lib/ocaml/marshal.p.cmt
>+lib/ocaml/marshal.p.cmx
> lib/ocaml/moreLabels.cmi
> lib/ocaml/moreLabels.cmt
> lib/ocaml/moreLabels.cmti
>@@ -774,8 +1195,11 @@
> lib/ocaml/moreLabels.ml
> lib/ocaml/moreLabels.mli
> lib/ocaml/moreLabels.p.cmt
>+lib/ocaml/moreLabels.p.cmx
>+%%THREADS%%lib/ocaml/mutex.mli
> lib/ocaml/nat.cmi
> lib/ocaml/nat.cmx
>+lib/ocaml/nat.mli
> lib/ocaml/nativeint.cmi
> lib/ocaml/nativeint.cmt
> lib/ocaml/nativeint.cmti
>@@ -783,7 +1207,7 @@
> lib/ocaml/nativeint.ml
> lib/ocaml/nativeint.mli
> lib/ocaml/nativeint.p.cmt
>-lib/ocaml/nat.mli
>+lib/ocaml/nativeint.p.cmx
> lib/ocaml/num.cmi
> lib/ocaml/num.cmx
> lib/ocaml/num.mli
>@@ -795,80 +1219,112 @@
> lib/ocaml/obj.cmt
> lib/ocaml/obj.cmti
> lib/ocaml/obj.cmx
>-lib/ocaml/objinfo_helper
> lib/ocaml/obj.ml
> lib/ocaml/obj.mli
> lib/ocaml/obj.p.cmt
>-lib/ocaml/ocamlbuild/ocamlbuild.cmo
>-lib/ocaml/ocamlbuild/ocamlbuild.cmx
>-lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
>-lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
>-lib/ocaml/ocamlbuild/ocamlbuild_executor.o
>-lib/ocaml/ocamlbuild/ocamlbuildlib.a
>-lib/ocaml/ocamlbuild/ocamlbuildlib.cma
>-lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
>-lib/ocaml/ocamlbuild/ocamlbuild.o
>-lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
>-lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
>-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
>-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
>-lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
>-lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
>-lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
>-lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
>+lib/ocaml/obj.p.cmx
>+lib/ocaml/objinfo_helper
>+@dir lib/ocaml/ocamldoc/custom
> lib/ocaml/ocamldoc/ocamldoc.hva
>+lib/ocaml/ocamldoc/odoc.cmi
>+lib/ocaml/ocamldoc/odoc.cmx
> lib/ocaml/ocamldoc/odoc_analyse.cmi
>+lib/ocaml/ocamldoc/odoc_analyse.cmx
> lib/ocaml/ocamldoc/odoc_args.cmi
>+lib/ocaml/ocamldoc/odoc_args.cmx
> lib/ocaml/ocamldoc/odoc_ast.cmi
>+lib/ocaml/ocamldoc/odoc_ast.cmx
> lib/ocaml/ocamldoc/odoc_class.cmi
>-lib/ocaml/ocamldoc/odoc.cmi
>+lib/ocaml/ocamldoc/odoc_class.cmx
> lib/ocaml/ocamldoc/odoc_comments.cmi
>+lib/ocaml/ocamldoc/odoc_comments.cmx
> lib/ocaml/ocamldoc/odoc_comments_global.cmi
>+lib/ocaml/ocamldoc/odoc_comments_global.cmx
> lib/ocaml/ocamldoc/odoc_config.cmi
>+lib/ocaml/ocamldoc/odoc_config.cmx
> lib/ocaml/ocamldoc/odoc_control.cmi
>+lib/ocaml/ocamldoc/odoc_control.cmx
> lib/ocaml/ocamldoc/odoc_cross.cmi
>+lib/ocaml/ocamldoc/odoc_cross.cmx
> lib/ocaml/ocamldoc/odoc_dag2html.cmi
>+lib/ocaml/ocamldoc/odoc_dag2html.cmx
> lib/ocaml/ocamldoc/odoc_dep.cmi
>+lib/ocaml/ocamldoc/odoc_dep.cmx
> lib/ocaml/ocamldoc/odoc_dot.cmi
>+lib/ocaml/ocamldoc/odoc_dot.cmx
> lib/ocaml/ocamldoc/odoc_env.cmi
>+lib/ocaml/ocamldoc/odoc_env.cmx
> lib/ocaml/ocamldoc/odoc_exception.cmi
>+lib/ocaml/ocamldoc/odoc_exception.cmx
> lib/ocaml/ocamldoc/odoc_extension.cmi
>+lib/ocaml/ocamldoc/odoc_extension.cmx
> lib/ocaml/ocamldoc/odoc_gen.cmi
>+lib/ocaml/ocamldoc/odoc_gen.cmx
> lib/ocaml/ocamldoc/odoc_global.cmi
>+lib/ocaml/ocamldoc/odoc_global.cmx
> lib/ocaml/ocamldoc/odoc_html.cmi
>+lib/ocaml/ocamldoc/odoc_html.cmx
> lib/ocaml/ocamldoc/odoc_info.a
> lib/ocaml/ocamldoc/odoc_info.cma
> lib/ocaml/ocamldoc/odoc_info.cmi
>+lib/ocaml/ocamldoc/odoc_info.cmx
> lib/ocaml/ocamldoc/odoc_info.cmxa
> lib/ocaml/ocamldoc/odoc_info.mli
> lib/ocaml/ocamldoc/odoc_inherit.cmi
>+lib/ocaml/ocamldoc/odoc_inherit.cmx
> lib/ocaml/ocamldoc/odoc_latex.cmi
>+lib/ocaml/ocamldoc/odoc_latex.cmx
> lib/ocaml/ocamldoc/odoc_latex_style.cmi
>+lib/ocaml/ocamldoc/odoc_latex_style.cmx
> lib/ocaml/ocamldoc/odoc_lexer.cmi
>+lib/ocaml/ocamldoc/odoc_lexer.cmx
> lib/ocaml/ocamldoc/odoc_man.cmi
>+lib/ocaml/ocamldoc/odoc_man.cmx
> lib/ocaml/ocamldoc/odoc_merge.cmi
>+lib/ocaml/ocamldoc/odoc_merge.cmx
> lib/ocaml/ocamldoc/odoc_messages.cmi
>+lib/ocaml/ocamldoc/odoc_messages.cmx
> lib/ocaml/ocamldoc/odoc_misc.cmi
>+lib/ocaml/ocamldoc/odoc_misc.cmx
> lib/ocaml/ocamldoc/odoc_module.cmi
>+lib/ocaml/ocamldoc/odoc_module.cmx
> lib/ocaml/ocamldoc/odoc_name.cmi
>+lib/ocaml/ocamldoc/odoc_name.cmx
> lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
>+lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
> lib/ocaml/ocamldoc/odoc_parameter.cmi
>+lib/ocaml/ocamldoc/odoc_parameter.cmx
> lib/ocaml/ocamldoc/odoc_parser.cmi
>+lib/ocaml/ocamldoc/odoc_parser.cmx
> lib/ocaml/ocamldoc/odoc_print.cmi
>+lib/ocaml/ocamldoc/odoc_print.cmx
> lib/ocaml/ocamldoc/odoc_scan.cmi
>+lib/ocaml/ocamldoc/odoc_scan.cmx
> lib/ocaml/ocamldoc/odoc_search.cmi
>+lib/ocaml/ocamldoc/odoc_search.cmx
> lib/ocaml/ocamldoc/odoc_see_lexer.cmi
>+lib/ocaml/ocamldoc/odoc_see_lexer.cmx
> lib/ocaml/ocamldoc/odoc_sig.cmi
>+lib/ocaml/ocamldoc/odoc_sig.cmx
> lib/ocaml/ocamldoc/odoc_str.cmi
>+lib/ocaml/ocamldoc/odoc_str.cmx
> lib/ocaml/ocamldoc/odoc_test.cmi
> lib/ocaml/ocamldoc/odoc_texi.cmi
>+lib/ocaml/ocamldoc/odoc_texi.cmx
> lib/ocaml/ocamldoc/odoc_text.cmi
>+lib/ocaml/ocamldoc/odoc_text.cmx
> lib/ocaml/ocamldoc/odoc_text_lexer.cmi
>+lib/ocaml/ocamldoc/odoc_text_lexer.cmx
> lib/ocaml/ocamldoc/odoc_text_parser.cmi
>+lib/ocaml/ocamldoc/odoc_text_parser.cmx
> lib/ocaml/ocamldoc/odoc_to_text.cmi
>+lib/ocaml/ocamldoc/odoc_to_text.cmx
> lib/ocaml/ocamldoc/odoc_type.cmi
>+lib/ocaml/ocamldoc/odoc_type.cmx
> lib/ocaml/ocamldoc/odoc_types.cmi
>+lib/ocaml/ocamldoc/odoc_types.cmx
> lib/ocaml/ocamldoc/odoc_value.cmi
>+lib/ocaml/ocamldoc/odoc_value.cmx
> lib/ocaml/oo.cmi
> lib/ocaml/oo.cmt
> lib/ocaml/oo.cmti
>@@ -876,6 +1332,7 @@
> lib/ocaml/oo.ml
> lib/ocaml/oo.mli
> lib/ocaml/oo.p.cmt
>+lib/ocaml/oo.p.cmx
> lib/ocaml/parsing.cmi
> lib/ocaml/parsing.cmt
> lib/ocaml/parsing.cmti
>@@ -883,6 +1340,7 @@
> lib/ocaml/parsing.ml
> lib/ocaml/parsing.mli
> lib/ocaml/parsing.p.cmt
>+lib/ocaml/parsing.p.cmx
> lib/ocaml/pervasives.cmi
> lib/ocaml/pervasives.cmt
> lib/ocaml/pervasives.cmti
>@@ -890,6 +1348,7 @@
> lib/ocaml/pervasives.ml
> lib/ocaml/pervasives.mli
> lib/ocaml/pervasives.p.cmt
>+lib/ocaml/pervasives.p.cmx
> lib/ocaml/printexc.cmi
> lib/ocaml/printexc.cmt
> lib/ocaml/printexc.cmti
>@@ -897,6 +1356,7 @@
> lib/ocaml/printexc.ml
> lib/ocaml/printexc.mli
> lib/ocaml/printexc.p.cmt
>+lib/ocaml/printexc.p.cmx
> lib/ocaml/printf.cmi
> lib/ocaml/printf.cmt
> lib/ocaml/printf.cmti
>@@ -904,6 +1364,7 @@
> lib/ocaml/printf.ml
> lib/ocaml/printf.mli
> lib/ocaml/printf.p.cmt
>+lib/ocaml/printf.p.cmx
> lib/ocaml/profiling.cmi
> lib/ocaml/profiling.cmo
> lib/ocaml/profiling.cmx
>@@ -915,6 +1376,7 @@
> lib/ocaml/queue.ml
> lib/ocaml/queue.mli
> lib/ocaml/queue.p.cmt
>+lib/ocaml/queue.p.cmx
> lib/ocaml/random.cmi
> lib/ocaml/random.cmt
> lib/ocaml/random.cmti
>@@ -922,9 +1384,17 @@
> lib/ocaml/random.ml
> lib/ocaml/random.mli
> lib/ocaml/random.p.cmt
>+lib/ocaml/random.p.cmx
> lib/ocaml/ratio.cmi
> lib/ocaml/ratio.cmx
> lib/ocaml/ratio.mli
>+%%N64%%lib/ocaml/raw_spacetime_lib.a
>+%%N64%%lib/ocaml/raw_spacetime_lib.cma
>+%%N64%%lib/ocaml/raw_spacetime_lib.cmi
>+%%N64%%lib/ocaml/raw_spacetime_lib.cmx
>+%%N64%%lib/ocaml/raw_spacetime_lib.cmxa
>+%%N64%%lib/ocaml/raw_spacetime_lib.cmxs
>+%%N64%%lib/ocaml/raw_spacetime_lib.mli
> lib/ocaml/scanf.cmi
> lib/ocaml/scanf.cmt
> lib/ocaml/scanf.cmti
>@@ -932,6 +1402,7 @@
> lib/ocaml/scanf.ml
> lib/ocaml/scanf.mli
> lib/ocaml/scanf.p.cmt
>+lib/ocaml/scanf.p.cmx
> lib/ocaml/set.cmi
> lib/ocaml/set.cmt
> lib/ocaml/set.cmti
>@@ -939,6 +1410,7 @@
> lib/ocaml/set.ml
> lib/ocaml/set.mli
> lib/ocaml/set.p.cmt
>+lib/ocaml/set.p.cmx
> lib/ocaml/sort.cmi
> lib/ocaml/sort.cmt
> lib/ocaml/sort.cmti
>@@ -946,6 +1418,15 @@
> lib/ocaml/sort.ml
> lib/ocaml/sort.mli
> lib/ocaml/sort.p.cmt
>+lib/ocaml/sort.p.cmx
>+lib/ocaml/spacetime.cmi
>+lib/ocaml/spacetime.cmt
>+lib/ocaml/spacetime.cmti
>+lib/ocaml/spacetime.cmx
>+lib/ocaml/spacetime.ml
>+lib/ocaml/spacetime.mli
>+lib/ocaml/spacetime.p.cmt
>+lib/ocaml/spacetime.p.cmx
> lib/ocaml/stack.cmi
> lib/ocaml/stack.cmt
> lib/ocaml/stack.cmti
>@@ -953,6 +1434,7 @@
> lib/ocaml/stack.ml
> lib/ocaml/stack.mli
> lib/ocaml/stack.p.cmt
>+lib/ocaml/stack.p.cmx
> lib/ocaml/stdLabels.cmi
> lib/ocaml/stdLabels.cmt
> lib/ocaml/stdLabels.cmti
>@@ -960,6 +1442,7 @@
> lib/ocaml/stdLabels.ml
> lib/ocaml/stdLabels.mli
> lib/ocaml/stdLabels.p.cmt
>+lib/ocaml/stdLabels.p.cmx
> lib/ocaml/std_exit.cmi
> lib/ocaml/std_exit.cmo
> lib/ocaml/std_exit.cmt
>@@ -967,9 +1450,13 @@
> lib/ocaml/std_exit.ml
> 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.cma
> lib/ocaml/stdlib.cmxa
>+lib/ocaml/stdlib.p.a
>+lib/ocaml/stdlib.p.cmxa
> lib/ocaml/str.a
> lib/ocaml/str.cma
> lib/ocaml/str.cmi
>@@ -976,6 +1463,7 @@
> lib/ocaml/str.cmx
> lib/ocaml/str.cmxa
> lib/ocaml/str.cmxs
>+lib/ocaml/str.mli
> lib/ocaml/stream.cmi
> lib/ocaml/stream.cmt
> lib/ocaml/stream.cmti
>@@ -983,6 +1471,15 @@
> lib/ocaml/stream.ml
> lib/ocaml/stream.mli
> lib/ocaml/stream.p.cmt
>+lib/ocaml/stream.p.cmx
>+lib/ocaml/string.cmi
>+lib/ocaml/string.cmt
>+lib/ocaml/string.cmti
>+lib/ocaml/string.cmx
>+lib/ocaml/string.ml
>+lib/ocaml/string.mli
>+lib/ocaml/string.p.cmt
>+lib/ocaml/string.p.cmx
> lib/ocaml/stringLabels.cmi
> lib/ocaml/stringLabels.cmt
> lib/ocaml/stringLabels.cmti
>@@ -990,17 +1487,12 @@
> lib/ocaml/stringLabels.ml
> lib/ocaml/stringLabels.mli
> lib/ocaml/stringLabels.p.cmt
>-lib/ocaml/string.cmi
>-lib/ocaml/string.cmt
>-lib/ocaml/string.cmti
>-lib/ocaml/string.cmx
>-lib/ocaml/string.ml
>-lib/ocaml/string.mli
>-lib/ocaml/string.p.cmt
>-lib/ocaml/str.mli
>+lib/ocaml/stringLabels.p.cmx
> lib/ocaml/stublibs/dllbigarray.so
> lib/ocaml/stublibs/dllcamlstr.so
>+%%X11%%lib/ocaml/stublibs/dllgraphics.so
> lib/ocaml/stublibs/dllnums.so
>+%%THREADS%%lib/ocaml/stublibs/dllthreads.so
> lib/ocaml/stublibs/dllunix.so
> lib/ocaml/stublibs/dllvmthreads.so
> lib/ocaml/sys.cmi
>@@ -1010,10 +1502,31 @@
> lib/ocaml/sys.ml
> lib/ocaml/sys.mli
> lib/ocaml/sys.p.cmt
>+lib/ocaml/sys.p.cmx
>+%%THREADS%%lib/ocaml/thread.mli
>+%%THREADS%%lib/ocaml/threadUnix.mli
>+%%THREADS%%lib/ocaml/threads/condition.cmi
>+%%THREADS%%lib/ocaml/threads/condition.cmx
>+%%THREADS%%lib/ocaml/threads/event.cmi
>+%%THREADS%%lib/ocaml/threads/event.cmx
>+%%THREADS%%lib/ocaml/threads/mutex.cmi
>+%%THREADS%%lib/ocaml/threads/mutex.cmx
>+%%THREADS%%lib/ocaml/threads/thread.cmi
>+%%THREADS%%lib/ocaml/threads/thread.cmx
>+%%THREADS%%lib/ocaml/threads/threadUnix.cmi
>+%%THREADS%%lib/ocaml/threads/threadUnix.cmx
>+%%THREADS%%lib/ocaml/threads/threads.a
>+%%THREADS%%lib/ocaml/threads/threads.cma
>+%%THREADS%%lib/ocaml/threads/threads.cmxa
> lib/ocaml/topdirs.cmi
>-lib/ocaml/unixLabels.cmi
>-lib/ocaml/unixLabels.cmx
>-lib/ocaml/unixLabels.mli
>+lib/ocaml/uchar.cmi
>+lib/ocaml/uchar.cmt
>+lib/ocaml/uchar.cmti
>+lib/ocaml/uchar.cmx
>+lib/ocaml/uchar.ml
>+lib/ocaml/uchar.mli
>+lib/ocaml/uchar.p.cmt
>+lib/ocaml/uchar.p.cmx
> lib/ocaml/unix.a
> lib/ocaml/unix.cma
> lib/ocaml/unix.cmi
>@@ -1021,6 +1534,9 @@
> lib/ocaml/unix.cmxa
> lib/ocaml/unix.cmxs
> lib/ocaml/unix.mli
>+lib/ocaml/unixLabels.cmi
>+lib/ocaml/unixLabels.cmx
>+lib/ocaml/unixLabels.mli
> lib/ocaml/vmthreads/condition.cmi
> lib/ocaml/vmthreads/condition.mli
> lib/ocaml/vmthreads/event.cmi
>@@ -1029,10 +1545,10 @@
> lib/ocaml/vmthreads/mutex.cmi
> lib/ocaml/vmthreads/mutex.mli
> lib/ocaml/vmthreads/stdlib.cma
>+lib/ocaml/vmthreads/thread.cmi
>+lib/ocaml/vmthreads/thread.mli
> lib/ocaml/vmthreads/threadUnix.cmi
> lib/ocaml/vmthreads/threadUnix.mli
>-lib/ocaml/vmthreads/thread.cmi
>-lib/ocaml/vmthreads/thread.mli
> lib/ocaml/vmthreads/threads.cma
> lib/ocaml/vmthreads/unix.cma
> lib/ocaml/weak.cmi
>@@ -1042,9 +1558,7 @@
> lib/ocaml/weak.ml
> lib/ocaml/weak.mli
> lib/ocaml/weak.p.cmt
>-@(,,0555) lib/ocaml/expunge
>-@(,,0555) lib/ocaml/extract_crc
>-@dir lib/ocaml/ocamldoc/custom
>+lib/ocaml/weak.p.cmx
> man/man1/ocaml.1.gz
> man/man1/ocamlc.1.gz
> man/man1/ocamlc.opt.1.gz
>@@ -1067,6 +1581,7 @@
> man/man3/Ast_helper.Cf.3o.gz
> man/man3/Ast_helper.Ci.3o.gz
> man/man3/Ast_helper.Cl.3o.gz
>+man/man3/Ast_helper.Const.3o.gz
> man/man3/Ast_helper.Csig.3o.gz
> man/man3/Ast_helper.Cstr.3o.gz
> man/man3/Ast_helper.Ctf.3o.gz
>@@ -1087,8 +1602,11 @@
> man/man3/Ast_helper.Type.3o.gz
> man/man3/Ast_helper.Val.3o.gz
> man/man3/Ast_helper.Vb.3o.gz
>+man/man3/Ast_invariants.3o.gz
>+man/man3/Ast_iterator.3o.gz
> man/man3/Ast_mapper.3o.gz
> man/man3/Asttypes.3o.gz
>+man/man3/Attr_helper.3o.gz
> man/man3/Bigarray.3o.gz
> man/man3/Bigarray.Array1.3o.gz
> man/man3/Bigarray.Array2.3o.gz
>@@ -1095,6 +1613,7 @@
> man/man3/Bigarray.Array3.3o.gz
> man/man3/Bigarray.Genarray.3o.gz
> man/man3/Buffer.3o.gz
>+man/man3/Builtin_attributes.3o.gz
> man/man3/Bytes.3o.gz
> man/man3/BytesLabels.3o.gz
> man/man3/Callback.3o.gz
>@@ -1105,8 +1624,25 @@
> man/man3/CamlinternalOO.3o.gz
> man/man3/Char.3o.gz
> man/man3/Complex.3o.gz
>+man/man3/Depend.3o.gz
>+man/man3/Depend.StringMap.3o.gz
>+man/man3/Depend.StringSet.3o.gz
> man/man3/Digest.3o.gz
> man/man3/Docstrings.3o.gz
>+man/man3/Ephemeron.3o.gz
>+man/man3/Ephemeron.GenHashTable.3o.gz
>+man/man3/Ephemeron.GenHashTable.MakeSeeded.3o.gz
>+man/man3/Ephemeron.K1.3o.gz
>+man/man3/Ephemeron.K1.Make.3o.gz
>+man/man3/Ephemeron.K1.MakeSeeded.3o.gz
>+man/man3/Ephemeron.K2.3o.gz
>+man/man3/Ephemeron.K2.Make.3o.gz
>+man/man3/Ephemeron.K2.MakeSeeded.3o.gz
>+man/man3/Ephemeron.Kn.3o.gz
>+man/man3/Ephemeron.Kn.Make.3o.gz
>+man/man3/Ephemeron.Kn.MakeSeeded.3o.gz
>+man/man3/Ephemeron.S.3o.gz
>+man/man3/Ephemeron.SeededS.3o.gz
> man/man3/Filename.3o.gz
> man/man3/Format.3o.gz
> man/man3/Gc.3o.gz
>@@ -1151,6 +1687,7 @@
> man/man3/Nativeint.3o.gz
> man/man3/Num.3o.gz
> man/man3/Obj.3o.gz
>+man/man3/Obj.Ephemeron.3o.gz
> man/man3/Oo.3o.gz
> man/man3/Parse.3o.gz
> man/man3/Parser.3o.gz
>@@ -1159,7 +1696,6 @@
> man/man3/Pervasives.3o.gz
> man/man3/Pervasives.LargeFile.3o.gz
> man/man3/Pprintast.3o.gz
>-man/man3/Pprintast.printer.3o.gz
> man/man3/Printast.3o.gz
> man/man3/Printexc.3o.gz
> man/man3/Printexc.Slot.3o.gz
>@@ -1174,6 +1710,9 @@
> man/man3/Set.OrderedType.3o.gz
> man/man3/Set.S.3o.gz
> man/man3/Sort.3o.gz
>+man/man3/Spacetime.3o.gz
>+man/man3/Spacetime.Series.3o.gz
>+man/man3/Spacetime.Snapshot.3o.gz
> man/man3/Stack.3o.gz
> man/man3/StdLabels.3o.gz
> man/man3/StdLabels.Array.3o.gz
>@@ -1186,6 +1725,7 @@
> man/man3/StringLabels.3o.gz
> man/man3/Syntaxerr.3o.gz
> man/man3/Sys.3o.gz
>+man/man3/Uchar.3o.gz
> man/man3/Unix.3o.gz
> man/man3/Unix.LargeFile.3o.gz
> man/man3/Weak.3o.gz
>Index: lang/ocaml-autoconf/Makefile
>===================================================================
>--- lang/ocaml-autoconf/Makefile	(revision 442522)
>+++ lang/ocaml-autoconf/Makefile	(working copy)
>@@ -3,17 +3,18 @@
> 
> PORTNAME=	autoconf
> PORTVERSION=	1.1
>+PORTREVISION=	1
> CATEGORIES=	lang
>-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/181/
>+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/282/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Autoconf module for ocaml
> 
>+LICENSE=	BSD3CLAUSE
>+
> NO_BUILD=	yes
>-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-1.0
>-
> DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
> AC_SUBDIR=	${PREFIX}/share/aclocal
> PLIST_FILES=	share/aclocal/ocaml.m4
>@@ -21,9 +22,9 @@
> PORTDOCS=	*
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${AC_SUBDIR}/
>-	${INSTALL_DATA} ${WRKSRC}/ocaml.m4 ${STAGEDIR}${AC_SUBDIR}/
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
>-	${INSTALL_DATA} ${WRKSRC}/ocaml.m4.txt ${STAGEDIR}${DOCSDIR}/
>+	@${MKDIR} ${STAGEDIR}${AC_SUBDIR}
>+	${INSTALL_DATA} ${WRKSRC}/ocaml.m4 ${STAGEDIR}${AC_SUBDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/ocaml.m4.txt ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: lang/ocaml-autoconf/distinfo
>===================================================================
>--- lang/ocaml-autoconf/distinfo	(revision 442522)
>+++ lang/ocaml-autoconf/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ocaml-autoconf-1.1.tar.gz) = 67e85520f65c033c86e99e5438e51657e777579034570527c1b2c62096ecb004
>-SIZE (ocaml-autoconf-1.1.tar.gz) = 11337
>+TIMESTAMP = 1488718509
>+SHA256 (ocaml-autoconf-1.1.tar.gz) = dca81a55d755912b229de33fd4fed93ead9319e9bb9c545bc745eee98a7884ae
>+SIZE (ocaml-autoconf-1.1.tar.gz) = 10987
>Index: math/alt-ergo/Makefile
>===================================================================
>--- math/alt-ergo/Makefile	(revision 442522)
>+++ math/alt-ergo/Makefile	(working copy)
>@@ -7,7 +7,7 @@
> CATEGORIES=	math
> MASTER_SITES=	http://alt-ergo.ocamlpro.com/http/alt-ergo-${PORTVERSION}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Automatic solver of mathematical formulas for program verification
> 
> LICENSE=	CeCILL-C
>@@ -17,11 +17,11 @@
> 
> BUILD_DEPENDS=	ocaml-zarith>1.2:math/ocaml-zarith \
> 		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
>+LIB_DEPENDS=	libgmp.so:math/gmp
> RUN_DEPENDS=	ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
> 
>+USES=		gmake gettext-runtime ocaml
> GNU_CONFIGURE=	yes
>-USES=		gmake
>-USE_OCAML=	yes
> ALL_TARGET=	opt pack xpack META
> INSTALL_TARGET=	install install-pack-opt install-pack-byte
> 
>@@ -29,18 +29,18 @@
> OPTIONS_DEFAULT=GUI
> OPTIONS_SUB=	yes
> 
>-.include <bsd.port.options.mk>
>+GUI_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
>+GUI_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
>+		 libfreetype.so:print/freetype2
>+GUI_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
>+GUI_USE=	GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,gtksourceview2,pango
>+GUI_ALL_TARGET=	gui
>+GUI_INSTALL_TARGET+= install-gui
> 
>-.if ${PORT_OPTIONS:MGUI}
>-BUILD_DEPENDS +=	lablgtk2:x11-toolkits/ocaml-lablgtk2
>-RUN_DEPENDS+=		lablgtk2:x11-toolkits/ocaml-lablgtk2
>-ALL_TARGET+=		gui
>-INSTALL_TARGET+=	install-gui
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e '\|^# installation|,\|^# documentation|{ \
>-		\|cp -f.*$$(BINDIR)|s|cp -f|${INSTALL_SCRIPT}|; \
>+		\|cp -f.*\.byte.*$$(BINDIR)|s|cp -f|${INSTALL_SCRIPT}|; \
>+		\|cp -f.*$$(BINDIR)|s|cp -f|${INSTALL_PROGRAM}|; \
> 		\|cp -f.*$$(MANDIR)|s|cp -f|${INSTALL_MAN}|; \
> 		\|cp -f.*$$(LIBDIR)|s|cp -f|${INSTALL_DATA}|; }' \
> 		-e 's|make -C|${MAKE_CMD} -C|' \
>@@ -48,13 +48,11 @@
> 	@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
> 		${WRKSRC}/configure
> 
>-.if ${PORT_OPTIONS:MGUI}
>-pre-configure:
>+pre-configure-GUI-on:
> 	@(if [ ! -e ${LOCALBASE}/${OCAML_SITELIBDIR}/lablgtk2/lablgtksourceview2.cmxa ] ; then \
> 	${ECHO_MSG} "==> The WITH_GUI option for ${PKGNAME} requires" ; \
> 	${ECHO_MSG} "==> x11-toolkits/ocaml-lablgtk2 to be built" ; \
> 	${ECHO_MSG} "==> WITH_GTKSOURCEVIEW2" ; \
> 	exit 1; fi)
>-.endif
> 
> .include <bsd.port.mk>
>Index: math/alt-ergo/pkg-plist
>===================================================================
>--- math/alt-ergo/pkg-plist	(revision 442522)
>+++ math/alt-ergo/pkg-plist	(working copy)
>@@ -6,4 +6,4 @@
> lib/ocaml/alt-ergo/altErgo.cmx
> lib/ocaml/alt-ergo/altErgo.o
> man/man1/alt-ergo.1.gz
>-share/gtksourceview-2.0/language-specs/alt-ergo.lang
>+%%GUI%%share/gtksourceview-2.0/language-specs/alt-ergo.lang
>Index: math/coq/Makefile
>===================================================================
>--- math/coq/Makefile	(revision 442737)
>+++ math/coq/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	coq
> PORTVERSION=	8.6
>+PORTREVISION=	1
> PORTEPOCH=	3
> CATEGORIES=	math
> MASTER_SITES=	http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \
>@@ -13,8 +14,6 @@
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	camlp5:devel/ocaml-camlp5 \
>-		ocamlfind:devel/ocaml-findlib
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2
> 
>@@ -21,17 +20,17 @@
> BROKEN_armv6=		fails to compile: Fatal error: exception Invalid_argument("index out of bounds")
> BROKEN_powerpc=		fails to link
> 
>-USES=		gmake gettext-runtime
>+USES=		gmake gettext-runtime ocaml
>+USE_OCAML=	camlp5 findlib
> USE_EMACS=	yes
> USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 pango
> USE_LDCONFIG=	${PREFIX}/lib/coq
>-USE_OCAML=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	-prefix ${PREFIX} \
> 		-mandir ${PREFIX}/man \
> 		-emacslib ${PREFIX}/share/emacs/site-lisp/coq \
>-		-usecamlp5 \
>-		-byteonly
>+		-ocamlfind ${LOCALBASE}/bin/ocamlfind \
>+		-usecamlp5
> MAKE_ENV=	VERBOSE=1
> ALL_TARGET=	world
> 
>@@ -52,11 +51,4 @@
> add-plist-post:
> 	@${DO_NADA}
> 
>-post-patch:
>-	${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' \
>-	    ${WRKSRC}/Makefile.doc
>-
>-post-install:
>-	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${STRIP_FILES}
>-
> .include <bsd.port.mk>
>Index: math/coq/files/patch-Makefile.common
>===================================================================
>--- math/coq/files/patch-Makefile.common	(nonexistent)
>+++ math/coq/files/patch-Makefile.common	(working copy)
>@@ -0,0 +1,14 @@
>+--- Makefile.common.orig	2016-12-08 15:13:52 UTC
>++++ Makefile.common
>+@@ -47,8 +47,9 @@ else
>+   DEPNATDYN:=-natdynlink no
>+ endif
>+ 
>+-INSTALLBIN:=install
>+-INSTALLLIB:=install -m 644 
>++INSTALLBIN:=${BSD_INSTALL_PROGRAM}
>++INSTALLLIB:=${BSD_INSTALL_LIB}
>++INSTALLDATA:=${BSD_INSTALL_DATA}
>+ INSTALLSH:=./install.sh
>+ MKDIR:=install -d
>+ 
>
>Property changes on: math/coq/files/patch-Makefile.common
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: math/coq/files/patch-Makefile.ide
>===================================================================
>--- math/coq/files/patch-Makefile.ide	(nonexistent)
>+++ math/coq/files/patch-Makefile.ide	(working copy)
>@@ -0,0 +1,31 @@
>+--- Makefile.ide.orig	2016-12-08 15:13:52 UTC
>++++ Makefile.ide
>+@@ -130,9 +130,9 @@ install-ide-bin:
>+ 
>+ install-ide-toploop:
>+ 	$(MKDIR) $(FULLCOQLIB)/toploop
>+-	$(INSTALLBIN) $(IDETOPLOOPCMA) $(FULLCOQLIB)/toploop/
>++	$(INSTALLDATA) $(IDETOPLOOPCMA) $(FULLCOQLIB)/toploop/
>+ ifeq ($(BEST),opt)
>+-	$(INSTALLBIN) $(IDETOPLOOPCMA:.cma=.cmxs) $(FULLCOQLIB)/toploop/
>++	$(INSTALLLIB) $(IDETOPLOOPCMA:.cma=.cmxs) $(FULLCOQLIB)/toploop/
>+ endif
>+ 
>+ install-ide-devfiles:
>+@@ -145,13 +145,13 @@ endif
>+ 
>+ install-ide-files: #Please update $(COQIDEAPP)/Contents/Resources/ at the same time
>+ 	$(MKDIR) $(FULLDATADIR)
>+-	$(INSTALLLIB) ide/coq.png ide/*.lang ide/coq_style.xml $(FULLDATADIR)
>++	$(INSTALLDATA) ide/coq.png ide/*.lang ide/coq_style.xml $(FULLDATADIR)
>+ 	$(MKDIR) $(FULLCONFIGDIR)
>+-	if [ $(IDEINT) = QUARTZ ] ; then $(INSTALLLIB) ide/mac_default_accel_map $(FULLCONFIGDIR)/coqide.keys ; fi
>++	if [ $(IDEINT) = QUARTZ ] ; then $(INSTALLDATA) ide/mac_default_accel_map $(FULLCONFIGDIR)/coqide.keys ; fi
>+ 
>+ install-ide-info:
>+ 	$(MKDIR) $(FULLDOCDIR)
>+-	$(INSTALLLIB) ide/FAQ $(FULLDOCDIR)/FAQ-CoqIde
>++	$(INSTALLDATA) ide/FAQ $(FULLDOCDIR)/FAQ-CoqIde
>+ 
>+ ###########################################################################
>+ # CoqIde MacOS special targets
>
>Property changes on: math/coq/files/patch-Makefile.ide
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: math/coq/files/patch-Makefile.install
>===================================================================
>--- math/coq/files/patch-Makefile.install	(revision 442737)
>+++ math/coq/files/patch-Makefile.install	(working copy)
>@@ -9,3 +9,55 @@
>  #OLDROOT=
>  
>    # Can be changed for a local installation (to make packages).
>+@@ -64,11 +64,12 @@ install-coq: install-binaries install-li
>+ 
>+ install-binaries: install-tools
>+ 	$(MKDIR) $(FULLBINDIR)
>+-	$(INSTALLBIN) $(COQC) $(COQTOPBYTE) $(COQTOPEXE) $(CHICKEN) $(FULLBINDIR)
>++	$(INSTALLBIN) $(COQC) $(COQTOPEXE) $(CHICKEN) $(FULLBINDIR)
>++	$(INSTALLDATA) $(COQTOPBYTE) $(FULLBINDIR)
>+ 	$(MKDIR) $(FULLCOQLIB)/toploop
>+-	$(INSTALLBIN) $(TOPLOOPCMA) $(FULLCOQLIB)/toploop/
>++	$(INSTALLDATA) $(TOPLOOPCMA) $(FULLCOQLIB)/toploop/
>+ ifeq ($(BEST),opt)
>+-	$(INSTALLBIN) $(TOPLOOPCMA:.cma=.cmxs) $(FULLCOQLIB)/toploop/
>++	$(INSTALLLIB) $(TOPLOOPCMA:.cma=.cmxs) $(FULLCOQLIB)/toploop/
>+ endif
>+ 
>+ 
>+@@ -77,7 +78,7 @@ install-tools:
>+ 	# recopie des fichiers de style pour coqide
>+ 	$(MKDIR) $(FULLCOQLIB)/tools/coqdoc
>+ 	touch $(FULLCOQLIB)/tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc/coqdoc.css # to have the mode according to umask (bug #1715)
>+-	$(INSTALLLIB) tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
>++	$(INSTALLDATA) tools/coqdoc/coqdoc.css tools/coqdoc/coqdoc.sty $(FULLCOQLIB)/tools/coqdoc
>+ 	$(INSTALLBIN) $(TOOLS) $(FULLBINDIR)
>+ 
>+ # The list of .cmi to install, including in particular
>+@@ -127,22 +128,22 @@ MANPAGES:=man/coq-tex.1 man/coqdep.1 man
>+ 
>+ install-coq-manpages:
>+ 	$(MKDIR) $(FULLMANDIR)/man1
>+-	$(INSTALLLIB) $(MANPAGES) $(FULLMANDIR)/man1
>++	$(INSTALLDATA) $(MANPAGES) $(FULLMANDIR)/man1
>+ 
>+ install-emacs:
>+ 	$(MKDIR) $(FULLEMACSLIB)
>+-	$(INSTALLLIB) tools/gallina-db.el tools/coq-font-lock.el tools/gallina-syntax.el tools/gallina.el tools/coq-inferior.el $(FULLEMACSLIB)
>++	$(INSTALLDATA) tools/gallina-db.el tools/coq-font-lock.el tools/gallina-syntax.el tools/gallina.el tools/coq-inferior.el $(FULLEMACSLIB)
>+ 
>+ # command to update TeX' kpathsea database
>+ #UPDATETEX = $(MKTEXLSR) /usr/share/texmf /var/spool/texmf $(BASETEXDIR) > /dev/null
>+ 
>+ install-latex:
>+ 	$(MKDIR) $(FULLCOQDOCDIR)
>+-	$(INSTALLLIB) tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)
>++	$(INSTALLDATA) tools/coqdoc/coqdoc.sty $(FULLCOQDOCDIR)
>+ #	-$(UPDATETEX)
>+ 
>+ install-meta: META.coq
>+-	$(INSTALLLIB) META.coq $(FULLCOQLIB)/META
>++	$(INSTALLDATA) META.coq $(FULLCOQLIB)/META
>+ 
>+ # For emacs:
>+ # Local Variables:
>Index: math/coq/files/patch-install.sh
>===================================================================
>--- math/coq/files/patch-install.sh	(nonexistent)
>+++ math/coq/files/patch-install.sh	(working copy)
>@@ -0,0 +1,11 @@
>+--- install.sh.orig	2016-12-08 15:13:52 UTC
>++++ install.sh
>+@@ -8,7 +8,7 @@ for f; do
>+   dn=`dirname $f`
>+   install -d "$dest/$dn"
>+   case $bn in
>+-      *.cmxs) install -m 755 $f "$dest/$dn/$bn"
>++      *.cmxs) install -s -m 755 $f "$dest/$dn/$bn"
>+ 	      ;;
>+       *) install -m 644 $f "$dest/$dn/$bn"
>+ 	 ;;
>
>Property changes on: math/coq/files/patch-install.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: math/coq/pkg-plist
>===================================================================
>--- math/coq/pkg-plist	(revision 442737)
>+++ math/coq/pkg-plist	(working copy)
>@@ -14,7 +14,9 @@
> lib/coq/META
> lib/coq/config/coq_config.cmi
> lib/coq/dllcoqrun.so
>+lib/coq/engine/engine.a
> lib/coq/engine/engine.cma
>+lib/coq/engine/engine.cmxa
> lib/coq/engine/evarutil.cmi
> lib/coq/engine/evd.cmi
> lib/coq/engine/ftactic.cmi
>@@ -39,7 +41,9 @@
> %%IDE%%lib/coq/ide/document.cmi
> %%IDE%%lib/coq/ide/fileOps.cmi
> %%IDE%%lib/coq/ide/gtk_parsing.cmi
>+%%IDE%%lib/coq/ide/ide.a
> %%IDE%%lib/coq/ide/ide.cma
>+%%IDE%%lib/coq/ide/ide.cmxa
> %%IDE%%lib/coq/ide/ideutils.cmi
> %%IDE%%lib/coq/ide/minilib.cmi
> %%IDE%%lib/coq/ide/nanoPG.cmi
>@@ -80,7 +84,9 @@
> lib/coq/interp/dumpglob.cmi
> lib/coq/interp/genintern.cmi
> lib/coq/interp/implicit_quantifiers.cmi
>+lib/coq/interp/interp.a
> lib/coq/interp/interp.cma
>+lib/coq/interp/interp.cmxa
> lib/coq/interp/modintern.cmi
> lib/coq/interp/notation.cmi
> lib/coq/interp/notation_ops.cmi
>@@ -121,7 +127,9 @@
> lib/coq/kernel/fast_typeops.cmi
> lib/coq/kernel/indtypes.cmi
> lib/coq/kernel/inductive.cmi
>+lib/coq/kernel/kernel.a
> lib/coq/kernel/kernel.cma
>+lib/coq/kernel/kernel.cmxa
> lib/coq/kernel/mod_subst.cmi
> lib/coq/kernel/mod_typing.cmi
> lib/coq/kernel/modops.cmi
>@@ -168,7 +176,9 @@
> lib/coq/lib/cUnix.cmi
> lib/coq/lib/cWarnings.cmi
> lib/coq/lib/canary.cmi
>+lib/coq/lib/clib.a
> lib/coq/lib/clib.cma
>+lib/coq/lib/clib.cmxa
> lib/coq/lib/control.cmi
> lib/coq/lib/deque.cmi
> lib/coq/lib/dyn.cmi
>@@ -186,7 +196,9 @@
> lib/coq/lib/hook.cmi
> lib/coq/lib/iStream.cmi
> lib/coq/lib/int.cmi
>+lib/coq/lib/lib.a
> lib/coq/lib/lib.cma
>+lib/coq/lib/lib.cmxa
> lib/coq/lib/loc.cmi
> lib/coq/lib/minisys.cmi
> lib/coq/lib/monad.cmi
>@@ -211,6 +223,7 @@
> lib/coq/lib/unionfind.cmi
> lib/coq/lib/util.cmi
> lib/coq/lib/xml_datatype.cmi
>+lib/coq/libcoqrun.a
> lib/coq/library/declare.cmi
> lib/coq/library/declaremods.cmi
> lib/coq/library/decls.cmi
>@@ -225,8 +238,10 @@
> lib/coq/library/lib.cmi
> lib/coq/library/libnames.cmi
> lib/coq/library/libobject.cmi
>+lib/coq/library/library.a
> lib/coq/library/library.cma
> lib/coq/library/library.cmi
>+lib/coq/library/library.cmxa
> lib/coq/library/loadpath.cmi
> lib/coq/library/nameops.cmi
> lib/coq/library/nametab.cmi
>@@ -243,7 +258,9 @@
> lib/coq/ltac/g_ltac.cmi
> lib/coq/ltac/g_obligations.cmi
> lib/coq/ltac/g_rewrite.cmi
>+lib/coq/ltac/ltac.a
> lib/coq/ltac/ltac.cma
>+lib/coq/ltac/ltac.cmxa
> lib/coq/ltac/profile_ltac.cmi
> lib/coq/ltac/profile_ltac_tactics.cmi
> lib/coq/ltac/rewrite.cmi
>@@ -265,16 +282,26 @@
> lib/coq/parsing/g_proofs.cmi
> lib/coq/parsing/g_tactic.cmi
> lib/coq/parsing/g_vernac.cmi
>+lib/coq/parsing/highparsing.a
> lib/coq/parsing/highparsing.cma
>+lib/coq/parsing/highparsing.cmxa
>+lib/coq/parsing/parsing.a
> lib/coq/parsing/parsing.cma
>+lib/coq/parsing/parsing.cmxa
> lib/coq/parsing/pcoq.cmi
> lib/coq/parsing/tok.cmi
> lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Algebra.cmi
>-lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Algebra.cmo
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Algebra.cmx
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Algebra.cmxs
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Algebra.o
> lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Btauto.cmi
>-lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Btauto.cmo
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Btauto.cmx
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Btauto.cmxs
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Btauto.o
> lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Reflect.cmi
>-lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Reflect.cmo
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Reflect.cmx
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Reflect.cmxs
>+lib/coq/plugins/btauto/.coq-native/NCoq_btauto_Reflect.o
> lib/coq/plugins/btauto/Algebra.glob
> lib/coq/plugins/btauto/Algebra.v
> lib/coq/plugins/btauto/Algebra.vo
>@@ -286,8 +313,10 @@
> lib/coq/plugins/btauto/Reflect.vo
> lib/coq/plugins/btauto/btauto_plugin.cmi
> lib/coq/plugins/btauto/btauto_plugin.cmo
>+lib/coq/plugins/btauto/btauto_plugin.cmxs
> lib/coq/plugins/cc/cc_plugin.cmi
> lib/coq/plugins/cc/cc_plugin.cmo
>+lib/coq/plugins/cc/cc_plugin.cmxs
> lib/coq/plugins/cc/ccalgo.cmi
> lib/coq/plugins/cc/ccproof.cmi
> lib/coq/plugins/cc/cctac.cmi
>@@ -296,10 +325,13 @@
> lib/coq/plugins/decl_mode/decl_mode.cmi
> lib/coq/plugins/decl_mode/decl_mode_plugin.cmi
> lib/coq/plugins/decl_mode/decl_mode_plugin.cmo
>+lib/coq/plugins/decl_mode/decl_mode_plugin.cmxs
> lib/coq/plugins/decl_mode/decl_proof_instr.cmi
> lib/coq/plugins/decl_mode/ppdecl_proof.cmi
> lib/coq/plugins/derive/.coq-native/NCoq_derive_Derive.cmi
>-lib/coq/plugins/derive/.coq-native/NCoq_derive_Derive.cmo
>+lib/coq/plugins/derive/.coq-native/NCoq_derive_Derive.cmx
>+lib/coq/plugins/derive/.coq-native/NCoq_derive_Derive.cmxs
>+lib/coq/plugins/derive/.coq-native/NCoq_derive_Derive.o
> lib/coq/plugins/derive/Derive.glob
> lib/coq/plugins/derive/Derive.v
> lib/coq/plugins/derive/Derive.vo
>@@ -306,38 +338,71 @@
> lib/coq/plugins/derive/derive.cmi
> lib/coq/plugins/derive/derive_plugin.cmi
> lib/coq/plugins/derive/derive_plugin.cmo
>+lib/coq/plugins/derive/derive_plugin.cmxs
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellBasic.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellBasic.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellBasic.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellBasic.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellBasic.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInt.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInteger.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInteger.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInteger.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInteger.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatInteger.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatNum.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatNum.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatNum.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatNum.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellNatNum.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellString.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellString.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellString.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellString.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellString.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInt.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInteger.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInteger.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInteger.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInteger.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZInteger.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZNum.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZNum.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZNum.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZNum.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrHaskellZNum.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBasic.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBasic.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBasic.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBasic.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBasic.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBigIntConv.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBigIntConv.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBigIntConv.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBigIntConv.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlBigIntConv.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlIntConv.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlIntConv.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlIntConv.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlIntConv.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlIntConv.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatBigInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatBigInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatBigInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatBigInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatBigInt.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlNatInt.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlString.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlString.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlString.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlString.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlString.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZBigInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZBigInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZBigInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZBigInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZBigInt.o
> lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZInt.cmi
>-lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZInt.cmo
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZInt.cmx
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZInt.cmxs
>+lib/coq/plugins/extraction/.coq-native/NCoq_extraction_ExtrOcamlZInt.o
> lib/coq/plugins/extraction/ExtrHaskellBasic.glob
> lib/coq/plugins/extraction/ExtrHaskellBasic.v
> lib/coq/plugins/extraction/ExtrHaskellBasic.vo
>@@ -391,6 +456,7 @@
> lib/coq/plugins/extraction/extraction.cmi
> lib/coq/plugins/extraction/extraction_plugin.cmi
> lib/coq/plugins/extraction/extraction_plugin.cmo
>+lib/coq/plugins/extraction/extraction_plugin.cmxs
> lib/coq/plugins/extraction/haskell.cmi
> lib/coq/plugins/extraction/json.cmi
> lib/coq/plugins/extraction/miniml.cmi
>@@ -403,14 +469,19 @@
> lib/coq/plugins/firstorder/ground.cmi
> lib/coq/plugins/firstorder/ground_plugin.cmi
> lib/coq/plugins/firstorder/ground_plugin.cmo
>+lib/coq/plugins/firstorder/ground_plugin.cmxs
> lib/coq/plugins/firstorder/instances.cmi
> lib/coq/plugins/firstorder/rules.cmi
> lib/coq/plugins/firstorder/sequent.cmi
> lib/coq/plugins/firstorder/unify.cmi
> lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier.cmi
>-lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier.cmo
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier.cmx
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier.cmxs
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier.o
> lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier_util.cmi
>-lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier_util.cmo
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier_util.cmx
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier_util.cmxs
>+lib/coq/plugins/fourier/.coq-native/NCoq_fourier_Fourier_util.o
> lib/coq/plugins/fourier/Fourier.glob
> lib/coq/plugins/fourier/Fourier.v
> lib/coq/plugins/fourier/Fourier.vo
>@@ -419,8 +490,11 @@
> lib/coq/plugins/fourier/Fourier_util.vo
> lib/coq/plugins/fourier/fourier_plugin.cmi
> lib/coq/plugins/fourier/fourier_plugin.cmo
>+lib/coq/plugins/fourier/fourier_plugin.cmxs
> lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmi
>-lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmo
>+lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmx
>+lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmxs
>+lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.o
> lib/coq/plugins/funind/Recdef.glob
> lib/coq/plugins/funind/Recdef.v
> lib/coq/plugins/funind/Recdef.vo
>@@ -433,36 +507,67 @@
> lib/coq/plugins/funind/recdef.cmi
> lib/coq/plugins/funind/recdef_plugin.cmi
> lib/coq/plugins/funind/recdef_plugin.cmo
>+lib/coq/plugins/funind/recdef_plugin.cmxs
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lia.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lia.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lia.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lia.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lia.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lqa.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lqa.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lqa.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lqa.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lqa.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lra.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lra.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lra.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lra.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Lra.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_OrderedRing.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_OrderedRing.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_OrderedRing.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_OrderedRing.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_OrderedRing.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Psatz.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Psatz.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Psatz.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Psatz.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Psatz.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_QMicromega.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_QMicromega.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_QMicromega.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_QMicromega.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_QMicromega.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RMicromega.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RMicromega.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RMicromega.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RMicromega.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RMicromega.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Refl.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Refl.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Refl.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Refl.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Refl.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RingMicromega.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RingMicromega.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RingMicromega.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RingMicromega.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_RingMicromega.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Tauto.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Tauto.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Tauto.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Tauto.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Tauto.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_VarMap.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_VarMap.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_VarMap.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_VarMap.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_VarMap.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZCoeff.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZCoeff.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZCoeff.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZCoeff.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZCoeff.o
> lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZMicromega.cmi
>-lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZMicromega.cmo
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZMicromega.cmx
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZMicromega.cmxs
>+lib/coq/plugins/micromega/.coq-native/NCoq_micromega_ZMicromega.o
> lib/coq/plugins/micromega/Env.glob
> lib/coq/plugins/micromega/Env.v
> lib/coq/plugins/micromega/Env.vo
>@@ -512,9 +617,12 @@
> lib/coq/plugins/micromega/micromega.cmi
> lib/coq/plugins/micromega/micromega_plugin.cmi
> lib/coq/plugins/micromega/micromega_plugin.cmo
>+lib/coq/plugins/micromega/micromega_plugin.cmxs
> lib/coq/plugins/micromega/sos.cmi
> lib/coq/plugins/nsatz/.coq-native/NCoq_nsatz_Nsatz.cmi
>-lib/coq/plugins/nsatz/.coq-native/NCoq_nsatz_Nsatz.cmo
>+lib/coq/plugins/nsatz/.coq-native/NCoq_nsatz_Nsatz.cmx
>+lib/coq/plugins/nsatz/.coq-native/NCoq_nsatz_Nsatz.cmxs
>+lib/coq/plugins/nsatz/.coq-native/NCoq_nsatz_Nsatz.o
> lib/coq/plugins/nsatz/Nsatz.glob
> lib/coq/plugins/nsatz/Nsatz.v
> lib/coq/plugins/nsatz/Nsatz.vo
>@@ -522,18 +630,29 @@
> lib/coq/plugins/nsatz/nsatz.cmi
> lib/coq/plugins/nsatz/nsatz_plugin.cmi
> lib/coq/plugins/nsatz/nsatz_plugin.cmo
>+lib/coq/plugins/nsatz/nsatz_plugin.cmxs
> lib/coq/plugins/nsatz/polynom.cmi
> lib/coq/plugins/nsatz/utile.cmi
> lib/coq/plugins/omega/.coq-native/NCoq_omega_Omega.cmi
>-lib/coq/plugins/omega/.coq-native/NCoq_omega_Omega.cmo
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_Omega.cmx
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_Omega.cmxs
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_Omega.o
> lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaLemmas.cmi
>-lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaLemmas.cmo
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaLemmas.cmx
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaLemmas.cmxs
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaLemmas.o
> lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaPlugin.cmi
>-lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaPlugin.cmo
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaPlugin.cmx
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaPlugin.cmxs
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaPlugin.o
> lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaTactic.cmi
>-lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaTactic.cmo
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaTactic.cmx
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaTactic.cmxs
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_OmegaTactic.o
> lib/coq/plugins/omega/.coq-native/NCoq_omega_PreOmega.cmi
>-lib/coq/plugins/omega/.coq-native/NCoq_omega_PreOmega.cmo
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_PreOmega.cmx
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_PreOmega.cmxs
>+lib/coq/plugins/omega/.coq-native/NCoq_omega_PreOmega.o
> lib/coq/plugins/omega/Omega.glob
> lib/coq/plugins/omega/Omega.v
> lib/coq/plugins/omega/Omega.vo
>@@ -551,17 +670,25 @@
> lib/coq/plugins/omega/PreOmega.vo
> lib/coq/plugins/omega/omega_plugin.cmi
> lib/coq/plugins/omega/omega_plugin.cmo
>+lib/coq/plugins/omega/omega_plugin.cmxs
> lib/coq/plugins/quote/.coq-native/NCoq_quote_Quote.cmi
>-lib/coq/plugins/quote/.coq-native/NCoq_quote_Quote.cmo
>+lib/coq/plugins/quote/.coq-native/NCoq_quote_Quote.cmx
>+lib/coq/plugins/quote/.coq-native/NCoq_quote_Quote.cmxs
>+lib/coq/plugins/quote/.coq-native/NCoq_quote_Quote.o
> lib/coq/plugins/quote/Quote.glob
> lib/coq/plugins/quote/Quote.v
> lib/coq/plugins/quote/Quote.vo
> lib/coq/plugins/quote/quote_plugin.cmi
> lib/coq/plugins/quote/quote_plugin.cmo
>+lib/coq/plugins/quote/quote_plugin.cmxs
> lib/coq/plugins/romega/.coq-native/NCoq_romega_ROmega.cmi
>-lib/coq/plugins/romega/.coq-native/NCoq_romega_ROmega.cmo
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ROmega.cmx
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ROmega.cmxs
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ROmega.o
> lib/coq/plugins/romega/.coq-native/NCoq_romega_ReflOmegaCore.cmi
>-lib/coq/plugins/romega/.coq-native/NCoq_romega_ReflOmegaCore.cmo
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ReflOmegaCore.cmx
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ReflOmegaCore.cmxs
>+lib/coq/plugins/romega/.coq-native/NCoq_romega_ReflOmegaCore.o
> lib/coq/plugins/romega/ROmega.glob
> lib/coq/plugins/romega/ROmega.v
> lib/coq/plugins/romega/ROmega.vo
>@@ -571,10 +698,15 @@
> lib/coq/plugins/romega/const_omega.cmi
> lib/coq/plugins/romega/romega_plugin.cmi
> lib/coq/plugins/romega/romega_plugin.cmo
>+lib/coq/plugins/romega/romega_plugin.cmxs
> lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Bintree.cmi
>-lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Bintree.cmo
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Bintree.cmx
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Bintree.cmxs
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Bintree.o
> lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Rtauto.cmi
>-lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Rtauto.cmo
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Rtauto.cmx
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Rtauto.cmxs
>+lib/coq/plugins/rtauto/.coq-native/NCoq_rtauto_Rtauto.o
> lib/coq/plugins/rtauto/Bintree.glob
> lib/coq/plugins/rtauto/Bintree.v
> lib/coq/plugins/rtauto/Bintree.vo
>@@ -585,54 +717,103 @@
> lib/coq/plugins/rtauto/refl_tauto.cmi
> lib/coq/plugins/rtauto/rtauto_plugin.cmi
> lib/coq/plugins/rtauto/rtauto_plugin.cmo
>+lib/coq/plugins/rtauto/rtauto_plugin.cmxs
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Algebra_syntax.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Algebra_syntax.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Algebra_syntax.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Algebra_syntax.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Algebra_syntax.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ArithRing.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ArithRing.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ArithRing.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ArithRing.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ArithRing.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_BinList.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_BinList.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_BinList.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_BinList.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_BinList.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Cring.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Cring.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Cring.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Cring.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Cring.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_tac.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_tac.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_tac.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_tac.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_tac.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_theory.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_theory.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_theory.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_theory.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Field_theory.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_InitialRing.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_InitialRing.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_InitialRing.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_InitialRing.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_InitialRing.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Integral_domain.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Integral_domain.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Integral_domain.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Integral_domain.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Integral_domain.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_NArithRing.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_NArithRing.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_NArithRing.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_NArithRing.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_NArithRing.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_initial.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_initial.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_initial.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_initial.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_initial.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_polynom.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_polynom.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_polynom.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_polynom.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_polynom.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_tac.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_tac.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_tac.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_tac.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ncring_tac.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_RealField.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_RealField.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_RealField.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_RealField.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_RealField.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_base.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_base.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_base.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_base.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_base.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_polynom.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_polynom.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_polynom.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_polynom.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_polynom.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_tac.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_tac.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_tac.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_tac.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_tac.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_theory.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_theory.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_theory.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_theory.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Ring_theory.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Q.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Q.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Q.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Q.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Q.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_R.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_R.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_R.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_R.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_R.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Z.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Z.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Z.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Z.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_Rings_Z.o
> lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ZArithRing.cmi
>-lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ZArithRing.cmo
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ZArithRing.cmx
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ZArithRing.cmxs
>+lib/coq/plugins/setoid_ring/.coq-native/NCoq_setoid_ring_ZArithRing.o
> lib/coq/plugins/setoid_ring/Algebra_syntax.glob
> lib/coq/plugins/setoid_ring/Algebra_syntax.v
> lib/coq/plugins/setoid_ring/Algebra_syntax.vo
>@@ -709,8 +890,11 @@
> lib/coq/plugins/setoid_ring/newring_ast.cmi
> lib/coq/plugins/setoid_ring/newring_plugin.cmi
> lib/coq/plugins/setoid_ring/newring_plugin.cmo
>+lib/coq/plugins/setoid_ring/newring_plugin.cmxs
> lib/coq/plugins/ssrmatching/.coq-native/NCoq_ssrmatching_ssrmatching.cmi
>-lib/coq/plugins/ssrmatching/.coq-native/NCoq_ssrmatching_ssrmatching.cmo
>+lib/coq/plugins/ssrmatching/.coq-native/NCoq_ssrmatching_ssrmatching.cmx
>+lib/coq/plugins/ssrmatching/.coq-native/NCoq_ssrmatching_ssrmatching.cmxs
>+lib/coq/plugins/ssrmatching/.coq-native/NCoq_ssrmatching_ssrmatching.o
> lib/coq/plugins/ssrmatching/ssrmatching.cmi
> lib/coq/plugins/ssrmatching/ssrmatching.glob
> lib/coq/plugins/ssrmatching/ssrmatching.v
>@@ -717,18 +901,25 @@
> lib/coq/plugins/ssrmatching/ssrmatching.vo
> lib/coq/plugins/ssrmatching/ssrmatching_plugin.cmi
> lib/coq/plugins/ssrmatching/ssrmatching_plugin.cmo
>+lib/coq/plugins/ssrmatching/ssrmatching_plugin.cmxs
> lib/coq/plugins/syntax/ascii_syntax_plugin.cmi
> lib/coq/plugins/syntax/ascii_syntax_plugin.cmo
>+lib/coq/plugins/syntax/ascii_syntax_plugin.cmxs
> lib/coq/plugins/syntax/nat_syntax_plugin.cmi
> lib/coq/plugins/syntax/nat_syntax_plugin.cmo
>+lib/coq/plugins/syntax/nat_syntax_plugin.cmxs
> lib/coq/plugins/syntax/numbers_syntax_plugin.cmi
> lib/coq/plugins/syntax/numbers_syntax_plugin.cmo
>+lib/coq/plugins/syntax/numbers_syntax_plugin.cmxs
> lib/coq/plugins/syntax/r_syntax_plugin.cmi
> lib/coq/plugins/syntax/r_syntax_plugin.cmo
>+lib/coq/plugins/syntax/r_syntax_plugin.cmxs
> lib/coq/plugins/syntax/string_syntax_plugin.cmi
> lib/coq/plugins/syntax/string_syntax_plugin.cmo
>+lib/coq/plugins/syntax/string_syntax_plugin.cmxs
> lib/coq/plugins/syntax/z_syntax_plugin.cmi
> lib/coq/plugins/syntax/z_syntax_plugin.cmo
>+lib/coq/plugins/syntax/z_syntax_plugin.cmxs
> lib/coq/pretyping/arguments_renaming.cmi
> lib/coq/pretyping/cases.cmi
> lib/coq/pretyping/cbv.cmi
>@@ -748,8 +939,10 @@
> lib/coq/pretyping/nativenorm.cmi
> lib/coq/pretyping/patternops.cmi
> lib/coq/pretyping/pretype_errors.cmi
>+lib/coq/pretyping/pretyping.a
> lib/coq/pretyping/pretyping.cma
> lib/coq/pretyping/pretyping.cmi
>+lib/coq/pretyping/pretyping.cmxa
> lib/coq/pretyping/program.cmi
> lib/coq/pretyping/recordops.cmi
> lib/coq/pretyping/redops.cmi
>@@ -773,7 +966,9 @@
> lib/coq/printing/ppvernacsig.cmi
> lib/coq/printing/prettyp.cmi
> lib/coq/printing/printer.cmi
>+lib/coq/printing/printing.a
> lib/coq/printing/printing.cma
>+lib/coq/printing/printing.cmxa
> lib/coq/printing/printmod.cmi
> lib/coq/printing/printmodsig.cmi
> lib/coq/proofs/clenv.cmi
>@@ -786,7 +981,9 @@
> lib/coq/proofs/proof_global.cmi
> lib/coq/proofs/proof_type.cmi
> lib/coq/proofs/proof_using.cmi
>+lib/coq/proofs/proofs.a
> lib/coq/proofs/proofs.cma
>+lib/coq/proofs/proofs.cmxa
> lib/coq/proofs/redexpr.cmi
> lib/coq/proofs/refine.cmi
> lib/coq/proofs/refiner.cmi
>@@ -797,8 +994,10 @@
> lib/coq/stm/lemmas.cmi
> lib/coq/stm/proofBlockDelimiter.cmi
> lib/coq/stm/spawned.cmi
>+lib/coq/stm/stm.a
> lib/coq/stm/stm.cma
> lib/coq/stm/stm.cmi
>+lib/coq/stm/stm.cmxa
> lib/coq/stm/tQueue.cmi
> lib/coq/stm/vcs.cmi
> lib/coq/stm/vernac_classifier.cmi
>@@ -823,53 +1022,99 @@
> lib/coq/tactics/leminv.cmi
> lib/coq/tactics/tactic_matching.cmi
> lib/coq/tactics/tacticals.cmi
>+lib/coq/tactics/tactics.a
> lib/coq/tactics/tactics.cma
> lib/coq/tactics/tactics.cmi
>+lib/coq/tactics/tactics.cmxa
> lib/coq/tactics/term_dnet.cmi
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith_base.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith_base.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith_base.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith_base.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Arith_base.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Between.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Between.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Between.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Between.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Between.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Bool_nat.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Bool_nat.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Bool_nat.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Bool_nat.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Bool_nat.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare_dec.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare_dec.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare_dec.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare_dec.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Compare_dec.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Div2.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Div2.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Div2.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Div2.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Div2.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_EqNat.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_EqNat.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_EqNat.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_EqNat.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_EqNat.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Euclid.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Euclid.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Euclid.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Euclid.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Euclid.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Even.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Even.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Even.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Even.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Even.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Factorial.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Factorial.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Factorial.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Factorial.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Factorial.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Gt.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Gt.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Gt.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Gt.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Gt.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Le.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Le.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Le.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Le.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Le.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Lt.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Lt.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Lt.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Lt.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Lt.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Max.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Max.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Max.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Max.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Max.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Min.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Min.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Min.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Min.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Min.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Minus.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Minus.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Minus.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Minus.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Minus.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Mult.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Mult.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Mult.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Mult.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Mult.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_PeanoNat.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_PeanoNat.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_PeanoNat.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_PeanoNat.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_PeanoNat.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Peano_dec.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Peano_dec.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Peano_dec.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Peano_dec.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Peano_dec.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Plus.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Plus.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Plus.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Plus.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Plus.o
> lib/coq/theories/Arith/.coq-native/NCoq_Arith_Wf_nat.cmi
>-lib/coq/theories/Arith/.coq-native/NCoq_Arith_Wf_nat.cmo
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Wf_nat.cmx
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Wf_nat.cmxs
>+lib/coq/theories/Arith/.coq-native/NCoq_Arith_Wf_nat.o
> lib/coq/theories/Arith/Arith.glob
> lib/coq/theories/Arith/Arith.v
> lib/coq/theories/Arith/Arith.vo
>@@ -937,19 +1182,33 @@
> lib/coq/theories/Arith/Wf_nat.v
> lib/coq/theories/Arith/Wf_nat.vo
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bool.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bool.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bool.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bool.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bool.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_BoolEq.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_BoolEq.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_BoolEq.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_BoolEq.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_BoolEq.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bvector.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bvector.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bvector.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bvector.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Bvector.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_DecBool.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_DecBool.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_DecBool.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_DecBool.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_DecBool.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_IfProp.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_IfProp.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_IfProp.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_IfProp.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_IfProp.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_Sumbool.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_Sumbool.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Sumbool.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Sumbool.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Sumbool.o
> lib/coq/theories/Bool/.coq-native/NCoq_Bool_Zerob.cmi
>-lib/coq/theories/Bool/.coq-native/NCoq_Bool_Zerob.cmo
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Zerob.cmx
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Zerob.cmxs
>+lib/coq/theories/Bool/.coq-native/NCoq_Bool_Zerob.o
> lib/coq/theories/Bool/Bool.glob
> lib/coq/theories/Bool/Bool.v
> lib/coq/theories/Bool/Bool.vo
>@@ -972,35 +1231,65 @@
> lib/coq/theories/Bool/Zerob.v
> lib/coq/theories/Bool/Zerob.vo
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_CEquivalence.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_CEquivalence.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CEquivalence.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CEquivalence.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CEquivalence.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_CMorphisms.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_CMorphisms.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CMorphisms.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CMorphisms.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CMorphisms.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_CRelationClasses.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_CRelationClasses.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CRelationClasses.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CRelationClasses.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_CRelationClasses.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_DecidableClass.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_DecidableClass.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_DecidableClass.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_DecidableClass.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_DecidableClass.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_EquivDec.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_EquivDec.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_EquivDec.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_EquivDec.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_EquivDec.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_Equivalence.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_Equivalence.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Equivalence.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Equivalence.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Equivalence.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_Init.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_Init.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Init.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Init.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Init.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Prop.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Prop.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Prop.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Prop.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Prop.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Relations.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Relations.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Relations.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Relations.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_Morphisms_Relations.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationClasses.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationClasses.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationClasses.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationClasses.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationClasses.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationPairs.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationPairs.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationPairs.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationPairs.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_RelationPairs.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidClass.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidClass.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidClass.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidClass.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidClass.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidDec.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidDec.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidDec.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidDec.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidDec.o
> lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidTactics.cmi
>-lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidTactics.cmo
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidTactics.cmx
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidTactics.cmxs
>+lib/coq/theories/Classes/.coq-native/NCoq_Classes_SetoidTactics.o
> lib/coq/theories/Classes/CEquivalence.glob
> lib/coq/theories/Classes/CEquivalence.v
> lib/coq/theories/Classes/CEquivalence.vo
>@@ -1047,13 +1336,21 @@
> lib/coq/theories/Classes/SetoidTactics.v
> lib/coq/theories/Classes/SetoidTactics.vo
> lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmi
>-lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmo
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmx
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmxs
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.o
> lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq84.cmi
>-lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq84.cmo
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq84.cmx
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq84.cmxs
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq84.o
> lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmi
>-lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmo
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmx
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmxs
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.o
> lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmi
>-lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmo
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmx
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmxs
>+lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.o
> lib/coq/theories/Compat/AdmitAxiom.glob
> lib/coq/theories/Compat/AdmitAxiom.v
> lib/coq/theories/Compat/AdmitAxiom.vo
>@@ -1067,47 +1364,89 @@
> lib/coq/theories/Compat/Coq86.v
> lib/coq/theories/Compat/Coq86.vo
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapAVL.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapAVL.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapAVL.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapAVL.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapAVL.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFacts.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFacts.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFacts.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFacts.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFacts.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFullAVL.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFullAVL.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFullAVL.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFullAVL.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapFullAVL.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapInterface.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapInterface.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapInterface.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapInterface.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapInterface.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapList.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapList.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapList.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapList.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapList.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapPositive.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapPositive.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapPositive.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapPositive.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapPositive.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapWeakList.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapWeakList.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapWeakList.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapWeakList.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMapWeakList.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMaps.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMaps.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMaps.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMaps.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FMaps.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetAVL.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetAVL.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetAVL.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetAVL.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetAVL.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetBridge.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetBridge.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetBridge.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetBridge.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetBridge.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetCompat.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetCompat.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetCompat.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetCompat.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetCompat.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetDecide.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetDecide.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetDecide.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetDecide.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetDecide.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetEqProperties.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetEqProperties.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetEqProperties.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetEqProperties.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetEqProperties.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetFacts.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetFacts.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetFacts.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetFacts.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetFacts.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetInterface.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetInterface.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetInterface.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetInterface.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetInterface.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetList.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetList.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetList.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetList.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetList.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetPositive.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetPositive.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetPositive.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetPositive.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetPositive.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetProperties.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetProperties.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetProperties.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetProperties.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetProperties.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetToFiniteSet.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetToFiniteSet.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetToFiniteSet.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetToFiniteSet.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetToFiniteSet.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetWeakList.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetWeakList.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetWeakList.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetWeakList.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSetWeakList.o
> lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSets.cmi
>-lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSets.cmo
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSets.cmx
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSets.cmxs
>+lib/coq/theories/FSets/.coq-native/NCoq_FSets_FSets.o
> lib/coq/theories/FSets/FMapAVL.glob
> lib/coq/theories/FSets/FMapAVL.v
> lib/coq/theories/FSets/FMapAVL.vo
>@@ -1172,27 +1511,49 @@
> lib/coq/theories/FSets/FSets.v
> lib/coq/theories/FSets/FSets.vo
> lib/coq/theories/Init/.coq-native/NCoq_Init_Datatypes.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Datatypes.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Datatypes.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Datatypes.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Datatypes.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Logic.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Logic.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Logic_Type.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Logic_Type.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic_Type.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic_Type.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Logic_Type.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Nat.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Nat.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Nat.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Nat.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Nat.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Notations.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Notations.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Notations.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Notations.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Notations.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Peano.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Peano.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Peano.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Peano.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Peano.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Prelude.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Prelude.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Prelude.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Prelude.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Prelude.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Specif.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Specif.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Specif.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Specif.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Specif.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Tactics.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Tactics.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tactics.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tactics.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tactics.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Tauto.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Tauto.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tauto.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tauto.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Tauto.o
> lib/coq/theories/Init/.coq-native/NCoq_Init_Wf.cmi
>-lib/coq/theories/Init/.coq-native/NCoq_Init_Wf.cmo
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Wf.cmx
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Wf.cmxs
>+lib/coq/theories/Init/.coq-native/NCoq_Init_Wf.o
> lib/coq/theories/Init/Datatypes.glob
> lib/coq/theories/Init/Datatypes.v
> lib/coq/theories/Init/Datatypes.vo
>@@ -1227,21 +1588,37 @@
> lib/coq/theories/Init/Wf.v
> lib/coq/theories/Init/Wf.vo
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_List.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_List.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_List.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_List.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_List.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListDec.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListDec.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListDec.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListDec.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListDec.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListSet.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListSet.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListSet.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListSet.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListSet.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListTactics.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListTactics.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListTactics.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListTactics.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_ListTactics.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidList.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidList.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidList.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidList.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidList.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidPermutation.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidPermutation.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidPermutation.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidPermutation.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_SetoidPermutation.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_StreamMemo.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_StreamMemo.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_StreamMemo.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_StreamMemo.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_StreamMemo.o
> lib/coq/theories/Lists/.coq-native/NCoq_Lists_Streams.cmi
>-lib/coq/theories/Lists/.coq-native/NCoq_Lists_Streams.cmo
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_Streams.cmx
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_Streams.cmxs
>+lib/coq/theories/Lists/.coq-native/NCoq_Lists_Streams.o
> lib/coq/theories/Lists/List.glob
> lib/coq/theories/Lists/List.v
> lib/coq/theories/Lists/List.vo
>@@ -1267,65 +1644,125 @@
> lib/coq/theories/Lists/Streams.v
> lib/coq/theories/Lists/Streams.vo
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Berardi.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Berardi.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Berardi.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Berardi.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Berardi.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ChoiceFacts.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ChoiceFacts.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ChoiceFacts.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ChoiceFacts.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ChoiceFacts.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalChoice.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalChoice.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalChoice.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalChoice.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalChoice.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalDescription.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalDescription.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalDescription.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalDescription.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalDescription.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalEpsilon.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalEpsilon.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalEpsilon.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalEpsilon.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalEpsilon.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalFacts.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalFacts.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalFacts.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalFacts.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalFacts.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalUniqueChoice.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalUniqueChoice.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalUniqueChoice.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalUniqueChoice.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ClassicalUniqueChoice.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Pred_Type.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Pred_Type.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Pred_Type.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Pred_Type.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Pred_Type.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Prop.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Prop.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Prop.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Prop.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Classical_Prop.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ConstructiveEpsilon.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ConstructiveEpsilon.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ConstructiveEpsilon.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ConstructiveEpsilon.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ConstructiveEpsilon.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Decidable.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Decidable.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Decidable.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Decidable.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Decidable.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Description.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Description.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Description.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Description.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Description.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Diaconescu.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Diaconescu.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Diaconescu.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Diaconescu.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Diaconescu.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Epsilon.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Epsilon.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Epsilon.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Epsilon.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Epsilon.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_EqdepFacts.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_EqdepFacts.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_EqdepFacts.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_EqdepFacts.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_EqdepFacts.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep_dec.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep_dec.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep_dec.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep_dec.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Eqdep_dec.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ExtensionalityFacts.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ExtensionalityFacts.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ExtensionalityFacts.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ExtensionalityFacts.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ExtensionalityFacts.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_FinFun.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_FinFun.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FinFun.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FinFun.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FinFun.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_FunctionalExtensionality.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_FunctionalExtensionality.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FunctionalExtensionality.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FunctionalExtensionality.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_FunctionalExtensionality.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_Hurkens.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_Hurkens.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Hurkens.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Hurkens.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_Hurkens.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_IndefiniteDescription.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_IndefiniteDescription.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_IndefiniteDescription.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_IndefiniteDescription.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_IndefiniteDescription.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_JMeq.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_JMeq.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_JMeq.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_JMeq.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_JMeq.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevance.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevance.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevance.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevance.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevance.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevanceFacts.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevanceFacts.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevanceFacts.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevanceFacts.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_ProofIrrelevanceFacts.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_RelationalChoice.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_RelationalChoice.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_RelationalChoice.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_RelationalChoice.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_RelationalChoice.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_SetIsType.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_SetIsType.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_SetIsType.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_SetIsType.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_SetIsType.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_WKL.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_WKL.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WKL.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WKL.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WKL.o
> lib/coq/theories/Logic/.coq-native/NCoq_Logic_WeakFan.cmi
>-lib/coq/theories/Logic/.coq-native/NCoq_Logic_WeakFan.cmo
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WeakFan.cmx
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WeakFan.cmxs
>+lib/coq/theories/Logic/.coq-native/NCoq_Logic_WeakFan.o
> lib/coq/theories/Logic/Berardi.glob
> lib/coq/theories/Logic/Berardi.v
> lib/coq/theories/Logic/Berardi.vo
>@@ -1417,31 +1854,57 @@
> lib/coq/theories/Logic/WeakFan.v
> lib/coq/theories/Logic/WeakFan.vo
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetAVL.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetAVL.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetAVL.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetAVL.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetAVL.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetDecide.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetDecide.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetDecide.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetDecide.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetDecide.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetEqProperties.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetEqProperties.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetEqProperties.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetEqProperties.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetEqProperties.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetFacts.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetFacts.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetFacts.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetFacts.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetFacts.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetGenTree.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetGenTree.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetGenTree.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetGenTree.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetGenTree.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetInterface.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetInterface.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetInterface.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetInterface.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetInterface.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetList.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetList.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetList.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetList.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetList.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetPositive.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetPositive.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetPositive.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetPositive.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetPositive.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetProperties.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetProperties.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetProperties.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetProperties.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetProperties.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetRBT.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetRBT.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetRBT.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetRBT.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetRBT.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetToFiniteSet.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetToFiniteSet.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetToFiniteSet.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetToFiniteSet.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetToFiniteSet.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetWeakList.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetWeakList.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetWeakList.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetWeakList.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSetWeakList.o
> lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSets.cmi
>-lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSets.cmo
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSets.cmx
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSets.cmxs
>+lib/coq/theories/MSets/.coq-native/NCoq_MSets_MSets.o
> lib/coq/theories/MSets/MSetAVL.glob
> lib/coq/theories/MSets/MSetAVL.v
> lib/coq/theories/MSets/MSetAVL.vo
>@@ -1482,25 +1945,45 @@
> lib/coq/theories/MSets/MSets.v
> lib/coq/theories/MSets/MSets.vo
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNat.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNat.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNat.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNat.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNat.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNatDef.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNatDef.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNatDef.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNatDef.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_BinNatDef.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_NArith.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_NArith.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_NArith.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_NArith.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_NArith.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndec.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndec.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndec.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndec.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndec.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndigits.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndigits.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndigits.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndigits.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndigits.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndist.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndist.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndist.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndist.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndist.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndiv_def.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndiv_def.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndiv_def.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndiv_def.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ndiv_def.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ngcd_def.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ngcd_def.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ngcd_def.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ngcd_def.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Ngcd_def.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nnat.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nnat.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nnat.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nnat.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nnat.o
> lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nsqrt_def.cmi
>-lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nsqrt_def.cmo
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nsqrt_def.cmx
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nsqrt_def.cmxs
>+lib/coq/theories/NArith/.coq-native/NCoq_NArith_Nsqrt_def.o
> lib/coq/theories/NArith/BinNat.glob
> lib/coq/theories/NArith/BinNat.v
> lib/coq/theories/NArith/BinNat.vo
>@@ -1532,13 +2015,21 @@
> lib/coq/theories/NArith/Nsqrt_def.v
> lib/coq/theories/NArith/Nsqrt_def.vo
> lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BigNumPrelude.cmi
>-lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BigNumPrelude.cmo
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BigNumPrelude.cmx
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BigNumPrelude.cmxs
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BigNumPrelude.o
> lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BinNums.cmi
>-lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BinNums.cmo
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BinNums.cmx
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BinNums.cmxs
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_BinNums.o
> lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NaryFunctions.cmi
>-lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NaryFunctions.cmo
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NaryFunctions.cmx
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NaryFunctions.cmxs
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NaryFunctions.o
> lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NumPrelude.cmi
>-lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NumPrelude.cmo
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NumPrelude.cmx
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NumPrelude.cmxs
>+lib/coq/theories/Numbers/.coq-native/NCoq_Numbers_NumPrelude.o
> lib/coq/theories/Numbers/BigNumPrelude.glob
> lib/coq/theories/Numbers/BigNumPrelude.v
> lib/coq/theories/Numbers/BigNumPrelude.vo
>@@ -1546,9 +2037,13 @@
> lib/coq/theories/Numbers/BinNums.v
> lib/coq/theories/Numbers/BinNums.vo
> lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_CyclicAxioms.cmi
>-lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_CyclicAxioms.cmo
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_CyclicAxioms.cmx
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_CyclicAxioms.cmxs
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_CyclicAxioms.o
> lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_NZCyclic.cmi
>-lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_NZCyclic.cmo
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_NZCyclic.cmx
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_NZCyclic.cmxs
>+lib/coq/theories/Numbers/Cyclic/Abstract/.coq-native/NCoq_Numbers_Cyclic_Abstract_NZCyclic.o
> lib/coq/theories/Numbers/Cyclic/Abstract/CyclicAxioms.glob
> lib/coq/theories/Numbers/Cyclic/Abstract/CyclicAxioms.v
> lib/coq/theories/Numbers/Cyclic/Abstract/CyclicAxioms.vo
>@@ -1556,25 +2051,45 @@
> lib/coq/theories/Numbers/Cyclic/Abstract/NZCyclic.v
> lib/coq/theories/Numbers/Cyclic/Abstract/NZCyclic.vo
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleAdd.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleAdd.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleAdd.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleAdd.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleAdd.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleBase.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleBase.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleBase.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleBase.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleBase.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleCyclic.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleCyclic.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleCyclic.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleCyclic.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleCyclic.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDiv.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDiv.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDiv.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDiv.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDiv.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDivn1.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDivn1.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDivn1.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDivn1.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleDivn1.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleLift.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleLift.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleLift.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleLift.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleLift.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleMul.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleMul.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleMul.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleMul.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleMul.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSqrt.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSqrt.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSqrt.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSqrt.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSqrt.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSub.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSub.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSub.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSub.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleSub.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleType.cmi
>-lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleType.cmo
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleType.cmx
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleType.cmxs
>+lib/coq/theories/Numbers/Cyclic/DoubleCyclic/.coq-native/NCoq_Numbers_Cyclic_DoubleCyclic_DoubleType.o
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/DoubleAdd.glob
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/DoubleAdd.v
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/DoubleAdd.vo
>@@ -1606,11 +2121,17 @@
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/DoubleType.v
> lib/coq/theories/Numbers/Cyclic/DoubleCyclic/DoubleType.vo
> lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Cyclic31.cmi
>-lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Cyclic31.cmo
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Cyclic31.cmx
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Cyclic31.cmxs
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Cyclic31.o
> lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Int31.cmi
>-lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Int31.cmo
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Int31.cmx
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Int31.cmxs
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Int31.o
> lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Ring31.cmi
>-lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Ring31.cmo
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Ring31.cmx
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Ring31.cmxs
>+lib/coq/theories/Numbers/Cyclic/Int31/.coq-native/NCoq_Numbers_Cyclic_Int31_Ring31.o
> lib/coq/theories/Numbers/Cyclic/Int31/Cyclic31.glob
> lib/coq/theories/Numbers/Cyclic/Int31/Cyclic31.v
> lib/coq/theories/Numbers/Cyclic/Int31/Cyclic31.vo
>@@ -1621,46 +2142,84 @@
> lib/coq/theories/Numbers/Cyclic/Int31/Ring31.v
> lib/coq/theories/Numbers/Cyclic/Int31/Ring31.vo
> lib/coq/theories/Numbers/Cyclic/ZModulo/.coq-native/NCoq_Numbers_Cyclic_ZModulo_ZModulo.cmi
>-lib/coq/theories/Numbers/Cyclic/ZModulo/.coq-native/NCoq_Numbers_Cyclic_ZModulo_ZModulo.cmo
>+lib/coq/theories/Numbers/Cyclic/ZModulo/.coq-native/NCoq_Numbers_Cyclic_ZModulo_ZModulo.cmx
>+lib/coq/theories/Numbers/Cyclic/ZModulo/.coq-native/NCoq_Numbers_Cyclic_ZModulo_ZModulo.cmxs
>+lib/coq/theories/Numbers/Cyclic/ZModulo/.coq-native/NCoq_Numbers_Cyclic_ZModulo_ZModulo.o
> lib/coq/theories/Numbers/Cyclic/ZModulo/ZModulo.glob
> lib/coq/theories/Numbers/Cyclic/ZModulo/ZModulo.v
> lib/coq/theories/Numbers/Cyclic/ZModulo/ZModulo.vo
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAdd.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAdd.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAdd.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAdd.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAdd.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAddOrder.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAddOrder.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAddOrder.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAddOrder.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAddOrder.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAxioms.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAxioms.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAxioms.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAxioms.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZAxioms.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBase.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBase.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBase.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBase.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBase.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBits.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBits.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBits.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBits.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZBits.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivEucl.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivEucl.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivEucl.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivEucl.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivEucl.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivFloor.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivFloor.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivFloor.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivFloor.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivFloor.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivTrunc.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivTrunc.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivTrunc.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivTrunc.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZDivTrunc.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZGcd.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZGcd.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZGcd.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZGcd.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZGcd.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLcm.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLcm.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLcm.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLcm.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLcm.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLt.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLt.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLt.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLt.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZLt.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMaxMin.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMaxMin.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMaxMin.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMaxMin.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMaxMin.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMul.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMul.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMul.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMul.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMul.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMulOrder.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMulOrder.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMulOrder.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMulOrder.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZMulOrder.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZParity.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZParity.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZParity.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZParity.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZParity.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZPow.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZPow.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZPow.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZPow.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZPow.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZProperties.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZProperties.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZProperties.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZProperties.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZProperties.o
> lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZSgnAbs.cmi
>-lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZSgnAbs.cmo
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZSgnAbs.cmx
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZSgnAbs.cmxs
>+lib/coq/theories/Numbers/Integer/Abstract/.coq-native/NCoq_Numbers_Integer_Abstract_ZSgnAbs.o
> lib/coq/theories/Numbers/Integer/Abstract/ZAdd.glob
> lib/coq/theories/Numbers/Integer/Abstract/ZAdd.v
> lib/coq/theories/Numbers/Integer/Abstract/ZAdd.vo
>@@ -1716,9 +2275,13 @@
> lib/coq/theories/Numbers/Integer/Abstract/ZSgnAbs.v
> lib/coq/theories/Numbers/Integer/Abstract/ZSgnAbs.vo
> lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_BigZ.cmi
>-lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_BigZ.cmo
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_BigZ.cmx
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_BigZ.cmxs
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_BigZ.o
> lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_ZMake.cmi
>-lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_ZMake.cmo
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_ZMake.cmx
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_ZMake.cmxs
>+lib/coq/theories/Numbers/Integer/BigZ/.coq-native/NCoq_Numbers_Integer_BigZ_ZMake.o
> lib/coq/theories/Numbers/Integer/BigZ/BigZ.glob
> lib/coq/theories/Numbers/Integer/BigZ/BigZ.v
> lib/coq/theories/Numbers/Integer/BigZ/BigZ.vo
>@@ -1726,19 +2289,27 @@
> lib/coq/theories/Numbers/Integer/BigZ/ZMake.v
> lib/coq/theories/Numbers/Integer/BigZ/ZMake.vo
> lib/coq/theories/Numbers/Integer/Binary/.coq-native/NCoq_Numbers_Integer_Binary_ZBinary.cmi
>-lib/coq/theories/Numbers/Integer/Binary/.coq-native/NCoq_Numbers_Integer_Binary_ZBinary.cmo
>+lib/coq/theories/Numbers/Integer/Binary/.coq-native/NCoq_Numbers_Integer_Binary_ZBinary.cmx
>+lib/coq/theories/Numbers/Integer/Binary/.coq-native/NCoq_Numbers_Integer_Binary_ZBinary.cmxs
>+lib/coq/theories/Numbers/Integer/Binary/.coq-native/NCoq_Numbers_Integer_Binary_ZBinary.o
> lib/coq/theories/Numbers/Integer/Binary/ZBinary.glob
> lib/coq/theories/Numbers/Integer/Binary/ZBinary.v
> lib/coq/theories/Numbers/Integer/Binary/ZBinary.vo
> lib/coq/theories/Numbers/Integer/NatPairs/.coq-native/NCoq_Numbers_Integer_NatPairs_ZNatPairs.cmi
>-lib/coq/theories/Numbers/Integer/NatPairs/.coq-native/NCoq_Numbers_Integer_NatPairs_ZNatPairs.cmo
>+lib/coq/theories/Numbers/Integer/NatPairs/.coq-native/NCoq_Numbers_Integer_NatPairs_ZNatPairs.cmx
>+lib/coq/theories/Numbers/Integer/NatPairs/.coq-native/NCoq_Numbers_Integer_NatPairs_ZNatPairs.cmxs
>+lib/coq/theories/Numbers/Integer/NatPairs/.coq-native/NCoq_Numbers_Integer_NatPairs_ZNatPairs.o
> lib/coq/theories/Numbers/Integer/NatPairs/ZNatPairs.glob
> lib/coq/theories/Numbers/Integer/NatPairs/ZNatPairs.v
> lib/coq/theories/Numbers/Integer/NatPairs/ZNatPairs.vo
> lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSig.cmi
>-lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSig.cmo
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSig.cmx
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSig.cmxs
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSig.o
> lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSigZAxioms.cmi
>-lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSigZAxioms.cmo
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSigZAxioms.cmx
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSigZAxioms.cmxs
>+lib/coq/theories/Numbers/Integer/SpecViaZ/.coq-native/NCoq_Numbers_Integer_SpecViaZ_ZSigZAxioms.o
> lib/coq/theories/Numbers/Integer/SpecViaZ/ZSig.glob
> lib/coq/theories/Numbers/Integer/SpecViaZ/ZSig.v
> lib/coq/theories/Numbers/Integer/SpecViaZ/ZSig.vo
>@@ -1749,37 +2320,69 @@
> lib/coq/theories/Numbers/NaryFunctions.v
> lib/coq/theories/Numbers/NaryFunctions.vo
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAdd.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAdd.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAdd.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAdd.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAdd.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAddOrder.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAddOrder.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAddOrder.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAddOrder.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAddOrder.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAxioms.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAxioms.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAxioms.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAxioms.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZAxioms.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBase.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBase.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBase.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBase.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBase.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBits.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBits.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBits.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBits.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZBits.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDiv.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDiv.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDiv.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDiv.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDiv.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDomain.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDomain.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDomain.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDomain.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZDomain.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZGcd.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZGcd.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZGcd.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZGcd.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZGcd.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZLog.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZLog.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZLog.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZLog.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZLog.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMul.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMul.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMul.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMul.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMul.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMulOrder.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMulOrder.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMulOrder.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMulOrder.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZMulOrder.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZOrder.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZOrder.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZOrder.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZOrder.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZOrder.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZParity.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZParity.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZParity.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZParity.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZParity.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZPow.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZPow.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZPow.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZPow.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZPow.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZProperties.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZProperties.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZProperties.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZProperties.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZProperties.o
> lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZSqrt.cmi
>-lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZSqrt.cmo
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZSqrt.cmx
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZSqrt.cmxs
>+lib/coq/theories/Numbers/NatInt/.coq-native/NCoq_Numbers_NatInt_NZSqrt.o
> lib/coq/theories/Numbers/NatInt/NZAdd.glob
> lib/coq/theories/Numbers/NatInt/NZAdd.v
> lib/coq/theories/Numbers/NatInt/NZAdd.vo
>@@ -1829,45 +2432,85 @@
> lib/coq/theories/Numbers/NatInt/NZSqrt.v
> lib/coq/theories/Numbers/NatInt/NZSqrt.vo
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAdd.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAdd.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAdd.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAdd.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAdd.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAddOrder.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAddOrder.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAddOrder.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAddOrder.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAddOrder.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAxioms.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAxioms.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAxioms.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAxioms.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NAxioms.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBase.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBase.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBase.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBase.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBase.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBits.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBits.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBits.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBits.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NBits.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDefOps.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDefOps.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDefOps.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDefOps.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDefOps.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDiv.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDiv.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDiv.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDiv.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NDiv.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NGcd.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NGcd.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NGcd.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NGcd.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NGcd.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NIso.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NIso.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NIso.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NIso.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NIso.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLcm.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLcm.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLcm.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLcm.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLcm.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLog.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLog.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLog.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLog.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NLog.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMaxMin.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMaxMin.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMaxMin.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMaxMin.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMaxMin.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMulOrder.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMulOrder.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMulOrder.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMulOrder.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NMulOrder.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NOrder.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NOrder.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NOrder.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NOrder.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NOrder.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NParity.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NParity.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NParity.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NParity.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NParity.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NPow.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NPow.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NPow.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NPow.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NPow.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NProperties.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NProperties.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NProperties.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NProperties.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NProperties.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSqrt.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSqrt.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSqrt.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSqrt.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSqrt.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NStrongRec.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NStrongRec.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NStrongRec.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NStrongRec.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NStrongRec.o
> lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSub.cmi
>-lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSub.cmo
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSub.cmx
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSub.cmxs
>+lib/coq/theories/Numbers/Natural/Abstract/.coq-native/NCoq_Numbers_Natural_Abstract_NSub.o
> lib/coq/theories/Numbers/Natural/Abstract/NAdd.glob
> lib/coq/theories/Numbers/Natural/Abstract/NAdd.v
> lib/coq/theories/Numbers/Natural/Abstract/NAdd.vo
>@@ -1929,13 +2572,21 @@
> lib/coq/theories/Numbers/Natural/Abstract/NSub.v
> lib/coq/theories/Numbers/Natural/Abstract/NSub.vo
> lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_BigN.cmi
>-lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_BigN.cmo
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_BigN.cmx
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_BigN.cmxs
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_BigN.o
> lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake.cmi
>-lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake.cmo
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake.cmx
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake.cmxs
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake.o
> lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake_gen.cmi
>-lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake_gen.cmo
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake_gen.cmx
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake_gen.cmxs
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_NMake_gen.o
> lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_Nbasic.cmi
>-lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_Nbasic.cmo
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_Nbasic.cmx
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_Nbasic.cmxs
>+lib/coq/theories/Numbers/Natural/BigN/.coq-native/NCoq_Numbers_Natural_BigN_Nbasic.o
> lib/coq/theories/Numbers/Natural/BigN/BigN.glob
> lib/coq/theories/Numbers/Natural/BigN/BigN.v
> lib/coq/theories/Numbers/Natural/BigN/BigN.vo
>@@ -1949,19 +2600,27 @@
> lib/coq/theories/Numbers/Natural/BigN/Nbasic.v
> lib/coq/theories/Numbers/Natural/BigN/Nbasic.vo
> lib/coq/theories/Numbers/Natural/Binary/.coq-native/NCoq_Numbers_Natural_Binary_NBinary.cmi
>-lib/coq/theories/Numbers/Natural/Binary/.coq-native/NCoq_Numbers_Natural_Binary_NBinary.cmo
>+lib/coq/theories/Numbers/Natural/Binary/.coq-native/NCoq_Numbers_Natural_Binary_NBinary.cmx
>+lib/coq/theories/Numbers/Natural/Binary/.coq-native/NCoq_Numbers_Natural_Binary_NBinary.cmxs
>+lib/coq/theories/Numbers/Natural/Binary/.coq-native/NCoq_Numbers_Natural_Binary_NBinary.o
> lib/coq/theories/Numbers/Natural/Binary/NBinary.glob
> lib/coq/theories/Numbers/Natural/Binary/NBinary.v
> lib/coq/theories/Numbers/Natural/Binary/NBinary.vo
> lib/coq/theories/Numbers/Natural/Peano/.coq-native/NCoq_Numbers_Natural_Peano_NPeano.cmi
>-lib/coq/theories/Numbers/Natural/Peano/.coq-native/NCoq_Numbers_Natural_Peano_NPeano.cmo
>+lib/coq/theories/Numbers/Natural/Peano/.coq-native/NCoq_Numbers_Natural_Peano_NPeano.cmx
>+lib/coq/theories/Numbers/Natural/Peano/.coq-native/NCoq_Numbers_Natural_Peano_NPeano.cmxs
>+lib/coq/theories/Numbers/Natural/Peano/.coq-native/NCoq_Numbers_Natural_Peano_NPeano.o
> lib/coq/theories/Numbers/Natural/Peano/NPeano.glob
> lib/coq/theories/Numbers/Natural/Peano/NPeano.v
> lib/coq/theories/Numbers/Natural/Peano/NPeano.vo
> lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSig.cmi
>-lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSig.cmo
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSig.cmx
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSig.cmxs
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSig.o
> lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSigNAxioms.cmi
>-lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSigNAxioms.cmo
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSigNAxioms.cmx
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSigNAxioms.cmxs
>+lib/coq/theories/Numbers/Natural/SpecViaZ/.coq-native/NCoq_Numbers_Natural_SpecViaZ_NSigNAxioms.o
> lib/coq/theories/Numbers/Natural/SpecViaZ/NSig.glob
> lib/coq/theories/Numbers/Natural/SpecViaZ/NSig.v
> lib/coq/theories/Numbers/Natural/SpecViaZ/NSig.vo
>@@ -1972,9 +2631,13 @@
> lib/coq/theories/Numbers/NumPrelude.v
> lib/coq/theories/Numbers/NumPrelude.vo
> lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_BigQ.cmi
>-lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_BigQ.cmo
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_BigQ.cmx
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_BigQ.cmxs
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_BigQ.o
> lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_QMake.cmi
>-lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_QMake.cmo
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_QMake.cmx
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_QMake.cmxs
>+lib/coq/theories/Numbers/Rational/BigQ/.coq-native/NCoq_Numbers_Rational_BigQ_QMake.o
> lib/coq/theories/Numbers/Rational/BigQ/BigQ.glob
> lib/coq/theories/Numbers/Rational/BigQ/BigQ.v
> lib/coq/theories/Numbers/Rational/BigQ/BigQ.vo
>@@ -1982,20 +2645,32 @@
> lib/coq/theories/Numbers/Rational/BigQ/QMake.v
> lib/coq/theories/Numbers/Rational/BigQ/QMake.vo
> lib/coq/theories/Numbers/Rational/SpecViaQ/.coq-native/NCoq_Numbers_Rational_SpecViaQ_QSig.cmi
>-lib/coq/theories/Numbers/Rational/SpecViaQ/.coq-native/NCoq_Numbers_Rational_SpecViaQ_QSig.cmo
>+lib/coq/theories/Numbers/Rational/SpecViaQ/.coq-native/NCoq_Numbers_Rational_SpecViaQ_QSig.cmx
>+lib/coq/theories/Numbers/Rational/SpecViaQ/.coq-native/NCoq_Numbers_Rational_SpecViaQ_QSig.cmxs
>+lib/coq/theories/Numbers/Rational/SpecViaQ/.coq-native/NCoq_Numbers_Rational_SpecViaQ_QSig.o
> lib/coq/theories/Numbers/Rational/SpecViaQ/QSig.glob
> lib/coq/theories/Numbers/Rational/SpecViaQ/QSig.v
> lib/coq/theories/Numbers/Rational/SpecViaQ/QSig.vo
> lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPos.cmi
>-lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPos.cmo
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPos.cmx
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPos.cmxs
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPos.o
> lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPosDef.cmi
>-lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPosDef.cmo
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPosDef.cmx
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPosDef.cmxs
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_BinPosDef.o
> lib/coq/theories/PArith/.coq-native/NCoq_PArith_PArith.cmi
>-lib/coq/theories/PArith/.coq-native/NCoq_PArith_PArith.cmo
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_PArith.cmx
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_PArith.cmxs
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_PArith.o
> lib/coq/theories/PArith/.coq-native/NCoq_PArith_POrderedType.cmi
>-lib/coq/theories/PArith/.coq-native/NCoq_PArith_POrderedType.cmo
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_POrderedType.cmx
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_POrderedType.cmxs
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_POrderedType.o
> lib/coq/theories/PArith/.coq-native/NCoq_PArith_Pnat.cmi
>-lib/coq/theories/PArith/.coq-native/NCoq_PArith_Pnat.cmo
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_Pnat.cmx
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_Pnat.cmxs
>+lib/coq/theories/PArith/.coq-native/NCoq_PArith_Pnat.o
> lib/coq/theories/PArith/BinPos.glob
> lib/coq/theories/PArith/BinPos.v
> lib/coq/theories/PArith/BinPos.vo
>@@ -2012,23 +2687,41 @@
> lib/coq/theories/PArith/Pnat.v
> lib/coq/theories/PArith/Pnat.vo
> lib/coq/theories/Program/.coq-native/NCoq_Program_Basics.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Basics.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Basics.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Basics.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Basics.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Combinators.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Combinators.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Combinators.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Combinators.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Combinators.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Equality.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Equality.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Equality.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Equality.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Equality.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Program.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Program.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Program.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Program.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Program.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Subset.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Subset.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Subset.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Subset.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Subset.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Syntax.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Syntax.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Syntax.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Syntax.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Syntax.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Tactics.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Tactics.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Tactics.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Tactics.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Tactics.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Utils.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Utils.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Utils.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Utils.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Utils.o
> lib/coq/theories/Program/.coq-native/NCoq_Program_Wf.cmi
>-lib/coq/theories/Program/.coq-native/NCoq_Program_Wf.cmo
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Wf.cmx
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Wf.cmxs
>+lib/coq/theories/Program/.coq-native/NCoq_Program_Wf.o
> lib/coq/theories/Program/Basics.glob
> lib/coq/theories/Program/Basics.v
> lib/coq/theories/Program/Basics.vo
>@@ -2057,31 +2750,57 @@
> lib/coq/theories/Program/Wf.v
> lib/coq/theories/Program/Wf.vo
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith_base.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith_base.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith_base.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith_base.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QArith_base.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_QOrderedType.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_QOrderedType.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QOrderedType.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QOrderedType.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_QOrderedType.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qabs.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qabs.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qabs.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qabs.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qabs.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcabs.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcabs.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcabs.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcabs.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcabs.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcanon.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcanon.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcanon.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcanon.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qcanon.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qfield.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qfield.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qfield.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qfield.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qfield.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qminmax.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qminmax.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qminmax.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qminmax.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qminmax.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qpower.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qpower.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qpower.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qpower.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qpower.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreals.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreals.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreals.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreals.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreals.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreduction.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreduction.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreduction.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreduction.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qreduction.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qring.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qring.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qring.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qring.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qring.o
> lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qround.cmi
>-lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qround.cmo
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qround.cmx
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qround.cmxs
>+lib/coq/theories/QArith/.coq-native/NCoq_QArith_Qround.o
> lib/coq/theories/QArith/QArith.glob
> lib/coq/theories/QArith/QArith.v
> lib/coq/theories/QArith/QArith.vo
>@@ -2122,129 +2841,253 @@
> lib/coq/theories/QArith/Qround.v
> lib/coq/theories/QArith/Qround.vo
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Alembert.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Alembert.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Alembert.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Alembert.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Alembert.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_AltSeries.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_AltSeries.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_AltSeries.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_AltSeries.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_AltSeries.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_ArithProp.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_ArithProp.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ArithProp.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ArithProp.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ArithProp.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Binomial.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Binomial.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Binomial.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Binomial.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Binomial.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cauchy_prod.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cauchy_prod.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cauchy_prod.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cauchy_prod.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cauchy_prod.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_plus.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_plus.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_plus.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_plus.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_plus.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_rel.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_rel.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_rel.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_rel.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Cos_rel.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_DiscrR.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_DiscrR.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_DiscrR.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_DiscrR.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_DiscrR.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Exp_prop.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Exp_prop.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Exp_prop.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Exp_prop.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Exp_prop.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Integration.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Integration.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Integration.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Integration.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Integration.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_MVT.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_MVT.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_MVT.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_MVT.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_MVT.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Machin.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Machin.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Machin.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Machin.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Machin.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_NewtonInt.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_NewtonInt.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_NewtonInt.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_NewtonInt.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_NewtonInt.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_PSeries_reg.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_PSeries_reg.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PSeries_reg.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PSeries_reg.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PSeries_reg.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_PartSum.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_PartSum.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PartSum.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PartSum.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_PartSum.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_RIneq.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_RIneq.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RIneq.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RIneq.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RIneq.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_RList.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_RList.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RList.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RList.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RList.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_ROrderedType.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_ROrderedType.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ROrderedType.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ROrderedType.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_ROrderedType.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_Ifp.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_Ifp.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_Ifp.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_Ifp.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_Ifp.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqr.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqr.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqr.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqr.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqr.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqrt.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqrt.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqrt.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqrt.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_R_sqrt.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis1.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis1.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis1.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis1.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis1.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis2.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis2.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis2.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis2.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis2.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis3.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis3.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis3.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis3.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis3.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis4.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis4.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis4.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis4.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis4.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis5.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis5.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis5.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis5.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis5.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis_reg.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis_reg.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis_reg.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis_reg.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ranalysis_reg.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ratan.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ratan.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ratan.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ratan.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Ratan.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Raxioms.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Raxioms.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Raxioms.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Raxioms.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Raxioms.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbase.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbase.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbase.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbase.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbase.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbasic_fun.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbasic_fun.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbasic_fun.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbasic_fun.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rbasic_fun.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rcomplete.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rcomplete.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rcomplete.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rcomplete.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rcomplete.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rdefinitions.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rdefinitions.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rdefinitions.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rdefinitions.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rdefinitions.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rderiv.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rderiv.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rderiv.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rderiv.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rderiv.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Reals.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Reals.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Reals.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Reals.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Reals.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rfunctions.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rfunctions.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rfunctions.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rfunctions.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rfunctions.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rgeom.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rgeom.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rgeom.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rgeom.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rgeom.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt_SF.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt_SF.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt_SF.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt_SF.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_RiemannInt_SF.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlimit.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlimit.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlimit.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlimit.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlimit.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlogic.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlogic.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlogic.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlogic.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rlogic.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rminmax.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rminmax.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rminmax.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rminmax.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rminmax.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpow_def.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpow_def.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpow_def.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpow_def.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpow_def.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpower.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpower.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpower.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpower.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rpower.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rprod.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rprod.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rprod.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rprod.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rprod.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rseries.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rseries.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rseries.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rseries.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rseries.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsigma.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsigma.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsigma.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsigma.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsigma.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsqrt_def.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsqrt_def.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsqrt_def.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsqrt_def.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rsqrt_def.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtopology.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtopology.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtopology.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtopology.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtopology.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo1.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo1.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo1.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo1.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo1.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_alt.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_alt.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_alt.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_alt.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_alt.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_calc.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_calc.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_calc.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_calc.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_calc.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_def.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_def.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_def.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_def.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_def.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_fun.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_fun.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_fun.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_fun.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_fun.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_reg.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_reg.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_reg.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_reg.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Rtrigo_reg.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqProp.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqProp.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqProp.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqProp.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqProp.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqSeries.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqSeries.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqSeries.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqSeries.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SeqSeries.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitAbsolu.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitAbsolu.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitAbsolu.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitAbsolu.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitAbsolu.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitRmult.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitRmult.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitRmult.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitRmult.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_SplitRmult.o
> lib/coq/theories/Reals/.coq-native/NCoq_Reals_Sqrt_reg.cmi
>-lib/coq/theories/Reals/.coq-native/NCoq_Reals_Sqrt_reg.cmo
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Sqrt_reg.cmx
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Sqrt_reg.cmxs
>+lib/coq/theories/Reals/.coq-native/NCoq_Reals_Sqrt_reg.o
> lib/coq/theories/Reals/Alembert.glob
> lib/coq/theories/Reals/Alembert.v
> lib/coq/theories/Reals/Alembert.vo
>@@ -2432,13 +3275,21 @@
> lib/coq/theories/Reals/Sqrt_reg.v
> lib/coq/theories/Reals/Sqrt_reg.vo
> lib/coq/theories/Relations/.coq-native/NCoq_Relations_Operators_Properties.cmi
>-lib/coq/theories/Relations/.coq-native/NCoq_Relations_Operators_Properties.cmo
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Operators_Properties.cmx
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Operators_Properties.cmxs
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Operators_Properties.o
> lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Definitions.cmi
>-lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Definitions.cmo
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Definitions.cmx
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Definitions.cmxs
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Definitions.o
> lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Operators.cmi
>-lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Operators.cmo
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Operators.cmx
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Operators.cmxs
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relation_Operators.o
> lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relations.cmi
>-lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relations.cmo
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relations.cmx
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relations.cmxs
>+lib/coq/theories/Relations/.coq-native/NCoq_Relations_Relations.o
> lib/coq/theories/Relations/Operators_Properties.glob
> lib/coq/theories/Relations/Operators_Properties.v
> lib/coq/theories/Relations/Operators_Properties.vo
>@@ -2452,54 +3303,100 @@
> lib/coq/theories/Relations/Relations.v
> lib/coq/theories/Relations/Relations.vo
> lib/coq/theories/Setoids/.coq-native/NCoq_Setoids_Setoid.cmi
>-lib/coq/theories/Setoids/.coq-native/NCoq_Setoids_Setoid.cmo
>+lib/coq/theories/Setoids/.coq-native/NCoq_Setoids_Setoid.cmx
>+lib/coq/theories/Setoids/.coq-native/NCoq_Setoids_Setoid.cmxs
>+lib/coq/theories/Setoids/.coq-native/NCoq_Setoids_Setoid.o
> lib/coq/theories/Setoids/Setoid.glob
> lib/coq/theories/Setoids/Setoid.v
> lib/coq/theories/Setoids/Setoid.vo
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Classical_sets.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Classical_sets.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Classical_sets.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Classical_sets.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Classical_sets.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Constructive_sets.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Constructive_sets.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Constructive_sets.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Constructive_sets.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Constructive_sets.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Cpo.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Cpo.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Cpo.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Cpo.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Cpo.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Ensembles.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Ensembles.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Ensembles.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Ensembles.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Ensembles.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Finite_sets_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Image.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Image.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Image.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Image.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Image.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Infinite_sets.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Infinite_sets.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Infinite_sets.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Infinite_sets.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Infinite_sets.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Integers.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Integers.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Integers.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Integers.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Integers.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Multiset.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Multiset.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Multiset.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Multiset.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Multiset.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Partial_Order.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Partial_Order.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Partial_Order.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Partial_Order.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Partial_Order.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Permut.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Permut.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Permut.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Permut.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Permut.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_Classical_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_Classical_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_Classical_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_Classical_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_Classical_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Powerset_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_1_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_2_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3_facts.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3_facts.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3_facts.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3_facts.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Relations_3_facts.o
> lib/coq/theories/Sets/.coq-native/NCoq_Sets_Uniset.cmi
>-lib/coq/theories/Sets/.coq-native/NCoq_Sets_Uniset.cmo
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Uniset.cmx
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Uniset.cmxs
>+lib/coq/theories/Sets/.coq-native/NCoq_Sets_Uniset.o
> lib/coq/theories/Sets/Classical_sets.glob
> lib/coq/theories/Sets/Classical_sets.v
> lib/coq/theories/Sets/Classical_sets.vo
>@@ -2567,19 +3464,33 @@
> lib/coq/theories/Sets/Uniset.v
> lib/coq/theories/Sets/Uniset.vo
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Heap.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Heap.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Heap.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Heap.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Heap.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Mergesort.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Mergesort.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Mergesort.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Mergesort.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Mergesort.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutEq.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutEq.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutEq.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutEq.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutEq.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutSetoid.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutSetoid.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutSetoid.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutSetoid.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_PermutSetoid.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Permutation.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Permutation.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Permutation.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Permutation.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Permutation.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorted.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorted.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorted.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorted.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorted.o
> lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorting.cmi
>-lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorting.cmo
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorting.cmx
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorting.cmxs
>+lib/coq/theories/Sorting/.coq-native/NCoq_Sorting_Sorting.o
> lib/coq/theories/Sorting/Heap.glob
> lib/coq/theories/Sorting/Heap.v
> lib/coq/theories/Sorting/Heap.vo
>@@ -2602,9 +3513,13 @@
> lib/coq/theories/Sorting/Sorting.v
> lib/coq/theories/Sorting/Sorting.vo
> lib/coq/theories/Strings/.coq-native/NCoq_Strings_Ascii.cmi
>-lib/coq/theories/Strings/.coq-native/NCoq_Strings_Ascii.cmo
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_Ascii.cmx
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_Ascii.cmxs
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_Ascii.o
> lib/coq/theories/Strings/.coq-native/NCoq_Strings_String.cmi
>-lib/coq/theories/Strings/.coq-native/NCoq_Strings_String.cmo
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_String.cmx
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_String.cmxs
>+lib/coq/theories/Strings/.coq-native/NCoq_Strings_String.o
> lib/coq/theories/Strings/Ascii.glob
> lib/coq/theories/Strings/Ascii.v
> lib/coq/theories/Strings/Ascii.vo
>@@ -2612,33 +3527,61 @@
> lib/coq/theories/Strings/String.v
> lib/coq/theories/Strings/String.vo
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableType.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableType.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableType.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableType.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableType.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableTypeEx.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableTypeEx.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableTypeEx.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableTypeEx.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_DecidableTypeEx.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_Equalities.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_Equalities.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Equalities.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Equalities.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Equalities.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_EqualitiesFacts.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_EqualitiesFacts.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_EqualitiesFacts.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_EqualitiesFacts.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_EqualitiesFacts.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_GenericMinMax.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_GenericMinMax.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_GenericMinMax.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_GenericMinMax.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_GenericMinMax.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedType.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedType.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedType.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedType.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedType.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeAlt.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeAlt.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeAlt.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeAlt.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeAlt.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeEx.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeEx.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeEx.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeEx.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrderedTypeEx.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_Orders.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_Orders.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Orders.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Orders.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_Orders.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersAlt.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersAlt.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersAlt.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersAlt.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersAlt.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersEx.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersEx.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersEx.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersEx.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersEx.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersFacts.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersFacts.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersFacts.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersFacts.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersFacts.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersLists.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersLists.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersLists.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersLists.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersLists.o
> lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersTac.cmi
>-lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersTac.cmo
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersTac.cmx
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersTac.cmxs
>+lib/coq/theories/Structures/.coq-native/NCoq_Structures_OrdersTac.o
> lib/coq/theories/Structures/DecidableType.glob
> lib/coq/theories/Structures/DecidableType.v
> lib/coq/theories/Structures/DecidableType.vo
>@@ -2682,9 +3625,13 @@
> lib/coq/theories/Structures/OrdersTac.v
> lib/coq/theories/Structures/OrdersTac.vo
> lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8.cmi
>-lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8.cmo
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8.cmx
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8.cmxs
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8.o
> lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8_core.cmi
>-lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8_core.cmo
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8_core.cmx
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8_core.cmxs
>+lib/coq/theories/Unicode/.coq-native/NCoq_Unicode_Utf8_core.o
> lib/coq/theories/Unicode/Utf8.glob
> lib/coq/theories/Unicode/Utf8.v
> lib/coq/theories/Unicode/Utf8.vo
>@@ -2692,15 +3639,25 @@
> lib/coq/theories/Unicode/Utf8_core.v
> lib/coq/theories/Unicode/Utf8_core.vo
> lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Fin.cmi
>-lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Fin.cmo
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Fin.cmx
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Fin.cmxs
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Fin.o
> lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Vector.cmi
>-lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Vector.cmo
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Vector.cmx
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Vector.cmxs
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_Vector.o
> lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorDef.cmi
>-lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorDef.cmo
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorDef.cmx
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorDef.cmxs
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorDef.o
> lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorEq.cmi
>-lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorEq.cmo
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorEq.cmx
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorEq.cmxs
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorEq.o
> lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorSpec.cmi
>-lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorSpec.cmo
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorSpec.cmx
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorSpec.cmxs
>+lib/coq/theories/Vectors/.coq-native/NCoq_Vectors_VectorSpec.o
> lib/coq/theories/Vectors/Fin.glob
> lib/coq/theories/Vectors/Fin.v
> lib/coq/theories/Vectors/Fin.vo
>@@ -2717,23 +3674,41 @@
> lib/coq/theories/Vectors/VectorSpec.v
> lib/coq/theories/Vectors/VectorSpec.vo
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Disjoint_Union.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Disjoint_Union.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Disjoint_Union.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Disjoint_Union.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Disjoint_Union.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inclusion.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inclusion.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inclusion.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inclusion.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inclusion.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inverse_Image.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inverse_Image.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inverse_Image.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inverse_Image.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Inverse_Image.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Exponentiation.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Exponentiation.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Exponentiation.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Exponentiation.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Exponentiation.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Product.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Product.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Product.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Product.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Lexicographic_Product.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Transitive_Closure.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Transitive_Closure.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Transitive_Closure.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Transitive_Closure.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Transitive_Closure.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Union.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Union.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Union.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Union.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Union.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Well_Ordering.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Well_Ordering.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Well_Ordering.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Well_Ordering.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Well_Ordering.o
> lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Wellfounded.cmi
>-lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Wellfounded.cmo
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Wellfounded.cmx
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Wellfounded.cmxs
>+lib/coq/theories/Wellfounded/.coq-native/NCoq_Wellfounded_Wellfounded.o
> lib/coq/theories/Wellfounded/Disjoint_Union.glob
> lib/coq/theories/Wellfounded/Disjoint_Union.v
> lib/coq/theories/Wellfounded/Disjoint_Union.vo
>@@ -2762,71 +3737,137 @@
> lib/coq/theories/Wellfounded/Wellfounded.v
> lib/coq/theories/Wellfounded/Wellfounded.vo
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinInt.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinInt.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinInt.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinInt.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinInt.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinIntDef.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinIntDef.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinIntDef.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinIntDef.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_BinIntDef.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Int.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Int.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Int.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Int.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Int.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Wf_Z.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Wf_Z.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Wf_Z.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Wf_Z.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Wf_Z.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_base.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_base.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_base.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_base.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_base.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_dec.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_dec.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_dec.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_dec.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_ZArith_dec.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zabs.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zabs.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zabs.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zabs.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zabs.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zbool.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zbool.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zbool.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zbool.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zbool.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcompare.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcompare.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcompare.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcompare.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcompare.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcomplements.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcomplements.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcomplements.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcomplements.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zcomplements.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdigits.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdigits.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdigits.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdigits.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdigits.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdiv.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdiv.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdiv.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdiv.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zdiv.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeuclid.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeuclid.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeuclid.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeuclid.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeuclid.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeven.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeven.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeven.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeven.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zeven.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zgcd_alt.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zgcd_alt.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zgcd_alt.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zgcd_alt.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zgcd_alt.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zhints.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zhints.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zhints.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zhints.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zhints.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zlogarithm.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zlogarithm.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zlogarithm.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zlogarithm.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zlogarithm.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmax.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmax.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmax.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmax.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmax.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmin.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmin.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmin.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmin.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmin.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zminmax.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zminmax.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zminmax.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zminmax.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zminmax.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmisc.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmisc.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmisc.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmisc.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zmisc.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znat.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znat.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znat.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znat.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znat.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znumtheory.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znumtheory.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znumtheory.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znumtheory.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Znumtheory.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zorder.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zorder.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zorder.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zorder.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zorder.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_alt.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_alt.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_alt.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_alt.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_alt.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_def.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_def.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_def.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_def.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_def.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_facts.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_facts.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_facts.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_facts.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpow_facts.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpower.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpower.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpower.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpower.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zpower.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zquot.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zquot.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zquot.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zquot.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zquot.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zsqrt_compat.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zsqrt_compat.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zsqrt_compat.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zsqrt_compat.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zsqrt_compat.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zwf.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zwf.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zwf.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zwf.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_Zwf.o
> lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_auxiliary.cmi
>-lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_auxiliary.cmo
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_auxiliary.cmx
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_auxiliary.cmxs
>+lib/coq/theories/ZArith/.coq-native/NCoq_ZArith_auxiliary.o
> lib/coq/theories/ZArith/BinInt.glob
> lib/coq/theories/ZArith/BinInt.v
> lib/coq/theories/ZArith/BinInt.vo
>@@ -2947,15 +3988,21 @@
> lib/coq/toplevel/obligations.cmi
> lib/coq/toplevel/record.cmi
> lib/coq/toplevel/search.cmi
>+lib/coq/toplevel/toplevel.a
> lib/coq/toplevel/toplevel.cma
>+lib/coq/toplevel/toplevel.cmxa
> lib/coq/toplevel/usage.cmi
> lib/coq/toplevel/vernac.cmi
> lib/coq/toplevel/vernacentries.cmi
> lib/coq/toplevel/vernacinterp.cmi
> lib/coq/toploop/coqidetop.cma
>+lib/coq/toploop/coqidetop.cmxs
> lib/coq/toploop/proofworkertop.cma
>+lib/coq/toploop/proofworkertop.cmxs
> lib/coq/toploop/queryworkertop.cma
>+lib/coq/toploop/queryworkertop.cmxs
> lib/coq/toploop/tacworkertop.cma
>+lib/coq/toploop/tacworkertop.cmxs
> man/man1/coq-tex.1.gz
> man/man1/coq_makefile.1.gz
> man/man1/coqc.1.gz
>@@ -2969,11 +4016,11 @@
> man/man1/coqtop.opt.1.gz
> man/man1/coqwc.1.gz
> man/man1/gallina.1.gz
>-%%PORTDOCS%%%%DATADIR%%/coq-ssreflect.lang
>-%%PORTDOCS%%%%DATADIR%%/coq.lang
>-%%PORTDOCS%%%%DATADIR%%/coq.png
>-%%PORTDOCS%%%%DATADIR%%/coq_style.xml
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ-CoqIde
>+%%IDE%%%%DATADIR%%/coq-ssreflect.lang
>+%%IDE%%%%DATADIR%%/coq.lang
>+%%IDE%%%%DATADIR%%/coq.png
>+%%IDE%%%%DATADIR%%/coq_style.xml
>+%%IDE%%%%DOCSDIR%%/FAQ-CoqIde
> %%EMACS_SITE_LISPDIR%%/coq/coq-font-lock.el
> %%EMACS_SITE_LISPDIR%%/coq/coq-inferior.el
> %%EMACS_SITE_LISPDIR%%/coq/gallina-db.el
>@@ -2981,4 +4028,5 @@
> %%EMACS_SITE_LISPDIR%%/coq/gallina.el
> %%PORTDOCS%%%%EMACS_SITE_LISPDIR%%/coqdoc.sty
> @dir lib/coq/user-contrib
>+@dir %%OCAML_SITELIBDIR%%
> %%IDE%%@dir etc/xdg/coq
>Index: math/facile/Makefile
>===================================================================
>--- math/facile/Makefile	(revision 442522)
>+++ math/facile/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	facile
> PORTVERSION=	1.1.3
>+PORTREVISION=	1
> CATEGORIES=	math
> MASTER_SITES=	http://opti.recherche.enac.fr/facile/distrib/
> 
>@@ -12,8 +13,7 @@
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		gmake
>-USE_OCAML=	yes
>+USES=		gmake ocaml
> HAS_CONFIGURE=	yes
> ALL_TARGET=	compile
> 
>Index: math/ocaml-ocamlgraph/Makefile
>===================================================================
>--- math/ocaml-ocamlgraph/Makefile	(revision 442522)
>+++ math/ocaml-ocamlgraph/Makefile	(working copy)
>@@ -3,57 +3,61 @@
> 
> PORTNAME=	ocamlgraph
> PORTVERSION=	1.8.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	http://ocamlgraph.lri.fr/download/ \
> 		ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Graph manipulation library for OCaml
> 
>+LICENSE=	LGPL21
>+
>+USES=		gmake gettext-runtime ocaml
>+USE_OCAML=	findlib:plist ldconfig
>+#OCAML_LDLIBS=	${OCAML_LIBDIR}/${PORTNAME}
>+GNU_CONFIGURE=	yes
>+MAKE_ENV=	LIBDESTDIR=${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
>+ALL_TARGET=	all
>+INSTALL_TARGET=	install install-findlib
>+MAKE_JOBS_UNSAFE=	yes
>+PORTSCOUT=	skipv:1.81
>+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+PORTDOCS=	*
>+
>+ocaml-findlib:
>+	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/${PORTNAME}/ \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/ \
>+	    -type f -print | ${SED} -e \
>+	    's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>+
> OPTIONS_DEFINE=	GUI DOCS
> OPTIONS_DEFAULT=GUI
> OPTIONS_SUB=	yes
> GUI_DESC=		Include GUI user programs: viewer and editor
>+GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+			libfreetype.so:print/freetype2
> GUI_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
> GUI_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
> GUI_CONFIGURE_OFF=	LABLGTK2=no
>+GUI_USE=	GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,libartlgpl2,libgnomecanvas,pango
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-OCAML_LDLIBS=	${OCAML_LIBDIR}/${PORTNAME}
>-GNU_CONFIGURE=	yes
>+post-patch-GUI-off:
>+	@${REINPLACE_CMD} -Ee 's/(LABLGTK2)=yes/\1=no/' ${WRKSRC}/configure
> 
>-PLIST_SUB+=	OCAMLGRAPHDIR="${OCAML_LDLIBS}"
>+post-install-GUI-on:
>+	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} \
>+	    graph-viewer.opt graph-viewer graph-editor.opt graph-editor
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/${PORTNAME}/*.cmxs
> 
>-ALL_TARGET=	all
>-INSTALL_TARGET=	install
>+DOCS_ALL_TARGET=	doc
> 
>-MAKE_JOBS_UNSAFE=	yes
>-PORTSCOUT=	skipv:1.81
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-ALL_TARGET+=	doc
>-DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>-PORTDOCS=	*
>-
>-post-patch:
>+post-patch-DOCS-on:
> 	@${REINPLACE_CMD} -e '/VIEWER_DIR. doc/d' ${WRKSRC}/Makefile.in
>-.if empty(PORT_OPTIONS:MGUI)
>-	# Override auto-detection
>-	@${REINPLACE_CMD} -Ee 's/(LABLGTK2)=yes/\1=no/' ${WRKSRC}/configure
>-.endif
> 
>-post-install:
>+post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/META ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}
>-.endif
> 
> .include <bsd.port.mk>
>Index: math/ocaml-ocamlgraph/pkg-plist
>===================================================================
>--- math/ocaml-ocamlgraph/pkg-plist	(revision 442522)
>+++ math/ocaml-ocamlgraph/pkg-plist	(working copy)
>@@ -4,73 +4,3 @@
> %%GUI%%bin/graph-editor.byte
> %%GUI%%bin/graph-editor.opt
> %%GUI%%bin/graph-editor
>-%%OCAMLGRAPHDIR%%/META
>-%%OCAMLGRAPHDIR%%/builder.mli
>-%%OCAMLGRAPHDIR%%/classic.mli
>-%%OCAMLGRAPHDIR%%/clique.mli
>-%%OCAMLGRAPHDIR%%/cliquetree.mli
>-%%OCAMLGRAPHDIR%%/coloring.mli
>-%%OCAMLGRAPHDIR%%/components.mli
>-%%OCAMLGRAPHDIR%%/contraction.mli
>-%%OCAMLGRAPHDIR%%/delaunay.mli
>-%%OCAMLGRAPHDIR%%/dominator.mli
>-%%OCAMLGRAPHDIR%%/dot.mli
>-%%OCAMLGRAPHDIR%%/dot_ast.mli
>-%%OCAMLGRAPHDIR%%/dot_parser.mli
>-%%OCAMLGRAPHDIR%%/fixpoint.mli
>-%%OCAMLGRAPHDIR%%/flow.mli
>-%%OCAMLGRAPHDIR%%/gmap.mli
>-%%OCAMLGRAPHDIR%%/gml.mli
>-%%OCAMLGRAPHDIR%%/graph.a
>-%%OCAMLGRAPHDIR%%/graph.cma
>-%%OCAMLGRAPHDIR%%/graph.cmi
>-%%OCAMLGRAPHDIR%%/graph.cmo
>-%%OCAMLGRAPHDIR%%/graph.cmx
>-%%OCAMLGRAPHDIR%%/graph.cmxa
>-%%OCAMLGRAPHDIR%%/graph.cmxs
>-%%OCAMLGRAPHDIR%%/graph.o
>-%%OCAMLGRAPHDIR%%/graphml.mli
>-%%OCAMLGRAPHDIR%%/graphviz.mli
>-%%OCAMLGRAPHDIR%%/imperative.mli
>-%%OCAMLGRAPHDIR%%/kruskal.mli
>-%%OCAMLGRAPHDIR%%/leaderlist.mli
>-%%OCAMLGRAPHDIR%%/mcs_m.mli
>-%%OCAMLGRAPHDIR%%/md.mli
>-%%OCAMLGRAPHDIR%%/merge.mli
>-%%OCAMLGRAPHDIR%%/mincut.mli
>-%%OCAMLGRAPHDIR%%/minsep.mli
>-%%OCAMLGRAPHDIR%%/nonnegative.mli
>-%%OCAMLGRAPHDIR%%/oper.mli
>-%%OCAMLGRAPHDIR%%/pack.mli
>-%%OCAMLGRAPHDIR%%/path.mli
>-%%OCAMLGRAPHDIR%%/persistent.mli
>-%%OCAMLGRAPHDIR%%/prim.mli
>-%%OCAMLGRAPHDIR%%/rand.mli
>-%%OCAMLGRAPHDIR%%/sig.mli
>-%%OCAMLGRAPHDIR%%/sig_pack.mli
>-%%OCAMLGRAPHDIR%%/strat.mli
>-%%OCAMLGRAPHDIR%%/topological.mli
>-%%OCAMLGRAPHDIR%%/traverse.mli
>-%%OCAMLGRAPHDIR%%/util.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphContainer.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphModel.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphRandModel.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphSubTree.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphTreeLayout.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphTreeModel.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphView.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphViewItem.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmi
>-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmo
>-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmx
>-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.o
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_core.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_select.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_utils.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmi
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmo
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmx
>-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.o
>-%%GUI%%%%OCAMLGRAPHDIR%%/xDot.mli
>-%%GUI%%%%OCAMLGRAPHDIR%%/xDotDraw.mli
>-@comment @dir %%OCAML_SITELIBDIR%%
>Index: math/ocaml-zarith/Makefile
>===================================================================
>--- math/ocaml-zarith/Makefile	(revision 442522)
>+++ math/ocaml-zarith/Makefile	(working copy)
>@@ -3,11 +3,12 @@
> 
> PORTNAME=	zarith
> PORTVERSION=	1.4.1
>+PORTREVISION=	1
> CATEGORIES=	math
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1574/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml arithmetic library for arbitrary precision integers
> 
> LICENSE=	LGPL20
>@@ -15,15 +16,15 @@
> 
> LIB_DEPENDS=	libgmp.so:math/gmp
> 
>-USES=		gmake localbase:ldflags perl5 shebangfix tar:tgz
>+USES=		gmake perl5 shebangfix localbase tar:tgz ocaml
> USE_PERL5=	build
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>+USE_OCAML=	findlib ldconfig
> OCAMLFIND_LDCONF=	/dev/null
> HAS_CONFIGURE=	yes
>+CONFIGURE_ENV=	LIBS="${LIBS}" \
>+		DESTDIR="${STAGEDIR}"
> ALL_TARGET=	all
> SHEBANG_FILES=	z_pp.pl
>-CONFIGURE_ENV=	DESTDIR=${STAGEDIR}
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>Index: math/ocaml-zarith/files/patch-configure
>===================================================================
>--- math/ocaml-zarith/files/patch-configure	(revision 442522)
>+++ math/ocaml-zarith/files/patch-configure	(working copy)
>@@ -1,6 +1,14 @@
>---- configure.orig	2013-06-12 07:13:59 UTC
>+--- configure.orig	2017-06-01 02:57:51 UTC
> +++ configure
>-@@ -127,6 +127,10 @@ searchbin()
>+@@ -22,6 +22,7 @@ host='auto'
>+ gmp='auto'
>+ perf='no'
>+ 
>++libs="$LIBS"
>+ ar='ar'
>+ ocaml='ocaml'
>+ ocamlc='ocamlc'
>+@@ -119,6 +120,10 @@ searchbin()
>  {
>      if test "x$1" = "x"; then return 0; fi
>      echo_n "binary $1: "
>@@ -11,7 +19,16 @@
>      IFS=':'
>      for i in $PATH
>      do
>-@@ -258,7 +262,7 @@ searchbin ocamlfind
>+@@ -159,7 +164,7 @@ checklib()
>+     rm -f tmp.c tmp.out
>+     echo "int main() { return 1; }" >> tmp.c
>+     r=1
>+-    $cc $ccopt $cclib tmp.c -l$1 -o tmp.out >/dev/null 2>/dev/null || r=0
>++    $cc $ccopt $cclib tmp.c -l$1 $libs -o tmp.out >/dev/null 2>/dev/null || r=0
>+     if test ! -x tmp.out; then r=0; fi
>+     rm -f tmp.c tmp.o tmp.out
>+     if test $r -eq 0; then echo "not found"; else echo "found"; fi
>+@@ -261,7 +266,7 @@ searchbin ocamlfind
>  if test $? -eq 1 -a $ocamlfind != "no"; then 
>      instmeth='findlib'
>      if test "$installdir" = "auto"
>@@ -20,7 +37,7 @@
>  else
>      searchbin install
>      if test $? -eq 1; then instmeth='install'
>-@@ -304,6 +308,14 @@ case $host in
>+@@ -307,6 +312,14 @@ case $host in
>              arch='i686'
>          fi
>  	;;
>@@ -28,7 +45,7 @@
> +        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
> +        arch='i686'
> +        ;;
>-+    amd64-*freebsd* | x86_64-*dragonfly*)
>++    amd64-*freebsd* | x86_64-*freebsd* | x86_64-*dragonfly*)
> +        ccdef="-DZ_ELF -DZ_DOT_LABEL_PREFIX $ccdef"
> +        arch='x86_64'
> +        ;;
>@@ -35,7 +52,16 @@
>      i386-*darwin* | x86_64-*darwin*)
>          ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef"
>          if test "x$wordsize" = "x64"; then
>-@@ -401,7 +413,7 @@ CFLAGS=$ccinc $ccdef $ccopt
>+@@ -395,7 +408,7 @@ CC=$cc
>+ OCAMLC=$ocamlc
>+ OCAMLOPT=$ocamlopt
>+ OCAMLDEP=$ocamldep
>+-OCAMLMKLIB=$ocamlmklib
>++OCAMLMKLIB=$ocamlmklib $libs
>+ OCAMLDOC=$ocamldoc
>+ OCAMLFLAGS=$mlflags
>+ OCAMLOPTFLAGS=$mloptflags
>+@@ -404,7 +417,7 @@ CFLAGS=$ccinc $ccdef $ccopt
>  ASFLAGS=$ccdef $asopt
>  LIBS=$cclib
>  ARCH=$arch
>Index: math/why3/Makefile
>===================================================================
>--- math/why3/Makefile	(revision 442522)
>+++ math/why3/Makefile	(working copy)
>@@ -3,35 +3,28 @@
> 
> PORTNAME=	why3
> PORTVERSION=	0.83
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	math
> MASTER_SITES=	http://gforge.inria.fr/frs/download.php/33490/ \
> 		http://pkgs.fedoraproject.org/repo/pkgs/why3/${FEDORA}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Deductive program verification platform
> 
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-CONFLICTS_INSTALL= why3-gpl-*
>-
> BUILD_DEPENDS=	ocaml-zarith>1.2:math/ocaml-zarith \
> 		lablgtk2:x11-toolkits/ocaml-lablgtk2 \
> 		ocaml-sqlite3>2:databases/ocaml-sqlite3 \
>-		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph \
>-		camlp5o:devel/ocaml-camlp5
>+		ocaml-ocamlgraph>1.8:math/ocaml-ocamlgraph
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
> 
>+USES=		gmake gettext-runtime ocaml sqlite
>+USE_OCAML=	findlib campl5
>+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtksourceview2 pango
> GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-all
>-
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-
>-FEDORA=		${DISTNAME}${EXTRACT_SUFX}/35f99e5f64939e50ea57f641ba2073ec
>-ALL_TARGET=	all byte
>-
> CONFIGURE_ARGS=	--enable-relocation \
> 		--disable-doc \
> 		--disable-pvs-libs \
>@@ -39,7 +32,12 @@
> 		--disable-coq-tactic \
> 		--disable-coq-libs \
> 		--disable-isabelle-libs
>+ALL_TARGET=	all byte
>+INSTALL_TARGET=	install-all
>+CONFLICTS_INSTALL= why3-gpl-*
> 
>+FEDORA=		${DISTNAME}${EXTRACT_SUFX}/35f99e5f64939e50ea57f641ba2073ec
>+
> OPTIONS_DEFINE=	DOCS
> 
> # The pdf is pre-built, but the makefile wants to build it again in order
>Index: net/unison/Makefile
>===================================================================
>--- net/unison/Makefile	(revision 442522)
>+++ net/unison/Makefile	(working copy)
>@@ -16,10 +16,8 @@
> LICENSE=	GPLv3
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-USES=		gmake localbase
>-USE_OCAML=	yes
>+USES=		gmake localbase ocaml:build
> WRKSRC=		${WRKDIR}/src
>-NO_OCAML_RUNDEPENDS=yes
> WANT_GNOME=	yes
> CONFLICTS?=	unison-devel-[0-9]* unison-nox11-[0-9]*
> MAKE_ENV=	CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
>Index: net/unison-devel/Makefile
>===================================================================
>--- net/unison-devel/Makefile	(revision 442522)
>+++ net/unison-devel/Makefile	(working copy)
>@@ -20,9 +20,7 @@
> LICENSE=	GPLv3
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-USES=		gmake
>-USE_OCAML=	yes
>-NO_OCAML_RUNDEPENDS=yes
>+USES=		gmake ocaml:build
> WANT_GNOME=	yes
> MAKE_ARGS=	CFLAGS=""
> CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
>Index: net/unison232/Makefile
>===================================================================
>--- net/unison232/Makefile	(revision 442522)
>+++ net/unison232/Makefile	(working copy)
>@@ -18,9 +18,7 @@
> LICENSE=	GPLv3
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-USES=		gmake
>-USE_OCAML=	yes
>-NO_OCAML_RUNDEPENDS=yes
>+USES=		gmake ocaml:build
> WANT_GNOME=	yes
> MAKE_ARGS=	CFLAGS=""
> 
>Index: net/unison240/Makefile
>===================================================================
>--- net/unison240/Makefile	(revision 442522)
>+++ net/unison240/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	unison
> PORTVERSION=	2.40.128
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
> PKGNAMESUFFIX=	240
>@@ -17,9 +17,7 @@
> LICENSE=	GPLv3
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-USES=		gmake
>-USE_OCAML=	yes
>-NO_OCAML_RUNDEPENDS=yes
>+USES=		gmake ocaml:build
> WANT_GNOME=	yes
> MAKE_ARGS=	CFLAGS=""
> 
>Index: net-p2p/liberator/Makefile
>===================================================================
>--- net-p2p/liberator/Makefile	(revision 442522)
>+++ net-p2p/liberator/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	liberator
> PORTVERSION=	2.0.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF/${PORTNAME}/ofcp/ofcp-${PORTVERSION}
> DISTNAME=	ofcp-${PORTVERSION}
>@@ -14,9 +14,8 @@
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tar:bzip2
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>+USES=		ocaml tar:bzip2
>+USE_OCAML=	camlp4
> ALL_TARGET=	all opt
> MAKE_JOBS_UNSAFE=yes
> 
>Index: net-p2p/mldonkey/Makefile
>===================================================================
>--- net-p2p/mldonkey/Makefile	(revision 442522)
>+++ net-p2p/mldonkey/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mldonkey
> PORTVERSION=	3.1.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES+=	net-p2p
> MASTER_SITES=	SF
> 
>@@ -15,10 +15,9 @@
> 
> CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
> 
>-USES=		iconv tar:bzip2 gmake
>+USES=		iconv ocaml tar:bzip2 gmake
> USE_AUTOTOOLS=	autoconf:env
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>+USE_OCAML=	camlp4
> GNU_CONFIGURE=	yes
> ALL_TARGET=	opt
> MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
>@@ -32,6 +31,8 @@
> 
> SUB_FILES=	pkg-message
> 
>+IGNORE=		does not build: Multiple definition of the extension constructor name Error
>+
> ###
> ## Options activation
> ###
>@@ -71,7 +72,7 @@
> .endif # ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MCORE}
> 
> .if ${PORT_OPTIONS:MGUI}
>-BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
>+BUILD_DEPENDS+=	${LOCALBASE}/${OCAML_SITELIBDIR}/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
> LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
> 
> CONFIGURE_ARGS+=--enable-gui=newgui2
>Index: print/texvc/Makefile
>===================================================================
>--- print/texvc/Makefile	(revision 442522)
>+++ print/texvc/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	texvc
> PORTVERSION=	20050202
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	print
> MASTER_SITES=	SF/wikipedia/Support%20files/${PORTNAME}%20Linux-x86%20source%20%2B%20binary
> DISTNAME=	${PORTNAME}-linux-x86-${PORTVERSION}
>@@ -10,8 +10,7 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Convert latex equations to HTML, MathML, PNG
> 
>-USES=		gmake
>-USE_OCAML=	yes
>+USES=		gmake ocaml
> NO_OCAML_RUNDEPENDS=	yes
> BUILD_WRKSRC=	${WRKSRC}/src
> 
>Index: science/kalzium/Makefile
>===================================================================
>--- science/kalzium/Makefile	(revision 442522)
>+++ science/kalzium/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	kalzium
> PORTVERSION=	${KDE4_VERSION}
>-PORTREVISION=	2
>+PORTREVISION=	1
> CATEGORIES=	science kde kde-kde4
> 
> MAINTAINER=	kde@FreeBSD.org
>Index: science/kalzium/files/patch-src_CMakeOCamlInstructions.cmake
>===================================================================
>--- science/kalzium/files/patch-src_CMakeOCamlInstructions.cmake	(nonexistent)
>+++ science/kalzium/files/patch-src_CMakeOCamlInstructions.cmake	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/CMakeOCamlInstructions.cmake.orig	2017-04-02 01:28:31 UTC
>++++ src/CMakeOCamlInstructions.cmake
>+@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_D
>+ # object files
>+ 
>+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
>+-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
>++                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
>+                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
>+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
>+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
>
>Property changes on: science/kalzium/files/patch-src_CMakeOCamlInstructions.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/ocaml-cryptgps/Makefile
>===================================================================
>--- security/ocaml-cryptgps/Makefile	(revision 442522)
>+++ security/ocaml-cryptgps/Makefile	(working copy)
>@@ -3,12 +3,12 @@
> 
> PORTNAME=	cryptgps
> PORTVERSION=	0.2.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	security
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Symmetric cryptographic algorithms package for OCaml
> 
> LICENSE=	MIT
>@@ -15,11 +15,8 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist
> ALL_TARGET=	all opt
> 
> PORTDOCS=	*
>Index: security/ocaml-cryptokit/Makefile
>===================================================================
>--- security/ocaml-cryptokit/Makefile	(revision 442522)
>+++ security/ocaml-cryptokit/Makefile	(working copy)
>@@ -3,31 +3,31 @@
> 
> PORTNAME=	cryptokit
> PORTVERSION=	1.6
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/891/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Variety of cryptographic primitives for Objective Caml
> 
>-DESTDIRNAME=	destdir
>+LICENSE=	LGPL20
>+
>+USES=		ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--docdir ${OCAML_DOCSDIR}
> 
>-USE_OCAML=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
>-
> DOCS_ALL_TARGET=	doc
> 
>+DESTDIRNAME=	destdir
>+
> post-patch:
> 	${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \
>-		${WRKSRC}/setup.ml
>+	    ${WRKSRC}/setup.ml
> 
> .include <bsd.port.mk>
>Index: security/ocaml-cryptokit/distinfo
>===================================================================
>--- security/ocaml-cryptokit/distinfo	(revision 442522)
>+++ security/ocaml-cryptokit/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1488653480
> SHA256 (cryptokit-1.6.tar.gz) = c58cb6ee1efa996bb227d64b378e80824637f875e914ad38833d610b7f992422
> SIZE (cryptokit-1.6.tar.gz) = 133031
>Index: security/ocaml-cryptokit/files/patch-src-stubs-md5.c
>===================================================================
>--- security/ocaml-cryptokit/files/patch-src-stubs-md5.c	(nonexistent)
>+++ security/ocaml-cryptokit/files/patch-src-stubs-md5.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/stubs-md5.c.orig	2017-03-05 03:52:13.584003000 +0900
>++++ src/stubs-md5.c	2017-03-05 03:52:29.351781000 +0900
>+@@ -18,8 +18,8 @@
>+ #include <caml/alloc.h>
>+ 
>+ struct MD5Context {
>+-        uint32 buf[4];
>+-        uint32 bits[2];
>++        uint32_t buf[4];
>++        uint32_t bits[2];
>+         unsigned char in[64];
>+ };
>+ 
>
>Property changes on: security/ocaml-cryptokit/files/patch-src-stubs-md5.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/ocaml-ssl/Makefile
>===================================================================
>--- security/ocaml-ssl/Makefile	(revision 442522)
>+++ security/ocaml-ssl/Makefile	(working copy)
>@@ -3,30 +3,26 @@
> 
> PORTNAME=	ssl
> PORTVERSION=	0.5.3
>+PORTREVISION=	1
> CATEGORIES=	security devel
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OpenSSL bindings for OCaml
> 
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+USES=		autoreconf gmake ssl ocaml
> USE_GITHUB=	yes
> GH_ACCOUNT=	savonet
> GH_PROJECT=	ocaml-ssl
>-
>-USES=		autoreconf gmake ssl
>+USE_OCAML=	findlib:plist ldconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--docdir=${DOCSDIR}
> MAKE_ENV=	OCAMLFIND_INSTFLAGS="-ldconf ignore"
> MAKE_JOBS_UNSAFE=	yes
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
> ALL_TARGET=	all doc
> 
> CPPFLAGS+=	-I${OPENSSLINC}
>Index: security/sks/Makefile
>===================================================================
>--- security/sks/Makefile	(revision 442522)
>+++ security/sks/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	sks
> PORTVERSION=	1.1.6
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
> 
>@@ -10,9 +11,8 @@
> 
> LICENSE=	GPLv2+
> 
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>-USES=		bdb:5 perl5 gmake shebangfix tar:tgz
>+USES=		bdb:5 perl5 gmake ocaml shebangfix tar:tgz
>+USE_OCAML=	camlp4
> USE_PERL5=	build
> MAKE_JOBS_UNSAFE=yes
> SHEBANG_FILES=	sks_build.sh
>Index: security/sks/files/patch-cryptokit-1.7-sks.patch
>===================================================================
>--- security/sks/files/patch-cryptokit-1.7-sks.patch	(nonexistent)
>+++ security/sks/files/patch-cryptokit-1.7-sks.patch	(working copy)
>@@ -0,0 +1,19 @@
>+--- cryptokit-1.7-sks.patch.orig	2017-03-14 12:18:54.440470000 +0900
>++++ cryptokit-1.7-sks.patch	2017-03-14 12:19:04.224274000 +0900
>+@@ -143,3 +143,16 @@
>+          let num_equals =
>+            match ipos with 1 -> 2 | 2 -> 1 | _ -> 0 in
>+          self#ensure_capacity num_equals;
>++--- cryptokit-1.7/src/stubs-md5.c.orig	2017-03-14 12:18:24.064861000 +0900
>+++++ cryptokit-1.7/src/stubs-md5.c	2017-03-14 12:18:36.560212000 +0900
>++@@ -18,8 +18,8 @@
>++ #include <caml/alloc.h>
>++ 
>++ struct MD5Context {
>++-        uint32 buf[4];
>++-        uint32 bits[2];
>+++        uint32_t buf[4];
>+++        uint32_t bits[2];
>++         unsigned char in[64];
>++ };
>++ 
>
>Property changes on: security/sks/files/patch-cryptokit-1.7-sks.patch
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/ledit/Makefile
>===================================================================
>--- sysutils/ledit/Makefile	(revision 442522)
>+++ sysutils/ledit/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ledit
> PORTVERSION=	2.03
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://cristal.inria.fr/%SUBDIR%/ \
> 		http://pauillac.inria.fr/%SUBDIR%/
>@@ -14,11 +15,9 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	camlp5r:devel/ocaml-camlp5
>+USES=		gmake ocaml tar:tgz
>+USE_OCAML=	camlp5
> 
>-USES=		gmake tar:tgz
>-USE_OCAML=	yes
>-
> ALL_TARGET=	all ledit.opt
> MAKE_JOBS_UNSAFE=	yes
> 
>Index: textproc/ocaml-csv/Makefile
>===================================================================
>--- textproc/ocaml-csv/Makefile	(revision 442522)
>+++ textproc/ocaml-csv/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ocaml-csv
> PORTVERSION=	1.2.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	textproc
> MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/420/
> 
>@@ -10,13 +10,14 @@
> MAINTAINER=	tcrimi@gmail.com
> COMMENT=	OCaml library to read and write CSV files
> 
>+LICENSE=	LGPL21
>+
> BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib:devel/ocaml-extlib
> 
> WRKSRC=		${WRKDIR}/csv-${PORTVERSION}
>-USES=		gmake
>+USES=		gmake ocaml
> MAKE_ARGS=	byte native
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>+USE_OCAML=	findlib
> OCAML_PKGDIRS=	csv
> 
> MAKE_JOBS_UNSAFE=	yes
>Index: textproc/ocaml-expat/Makefile
>===================================================================
>--- textproc/ocaml-expat/Makefile	(revision 442522)
>+++ textproc/ocaml-expat/Makefile	(working copy)
>@@ -3,21 +3,21 @@
> 
> PORTNAME=	expat
> PORTVERSION=	0.9.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	textproc
> MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Stub for the expat parser in OCaml
> 
>+LICENSE=	MIT
>+
> LIB_DEPENDS=	libexpat.so:textproc/expat2
> 
>-USES=		gmake
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib ldconfig
> MAKE_ARGS=	EXPAT_LIBDIR=${LOCALBASE}/lib \
> 		EXPAT_INCDIR=${LOCALBASE}/include \
> 		CAML_INCDIR=${LOCALBASE}/lib/ocaml
>Index: textproc/ocaml-pxp/Makefile
>===================================================================
>--- textproc/ocaml-pxp/Makefile	(revision 442522)
>+++ textproc/ocaml-pxp/Makefile	(working copy)
>@@ -2,38 +2,31 @@
> # $FreeBSD$
> 
> PORTNAME=	pxp
>-PORTVERSION=	1.2.7
>+PORTVERSION=	1.2.9
> CATEGORIES=	textproc
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Validating XML parser for OCaml
> 
> BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
> RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
> 
>-BROKEN=		does not build
>+USES=		gmake ocaml
>+USE_OCAML=	findlib camlp4 ldconfig
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	-without-wlex-compat -without-wlex
>+ALL_TARGET=	all opt
>+MAKE_JOBS_UNSAFE=yes
> 
> OPTIONS_DEFINE=	ULEX
> OPTIONS_DEFAULT=ULEX
>+
> ULEX_DESC=	Include UTF-8 lexical analyzer support
>-
>-USES=		gmake
>-USE_OCAML=	true
>-USE_OCAML_FINDLIB=	true
>-USE_OCAML_LDCONFIG=	true
>-USE_OCAML_CAMLP4=	true
>-
> ULEX_BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex
> ULEX_RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex
> 
>-HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS+=-without-wlex-compat -without-wlex
>-
>-ALL_TARGET=	all opt
>-MAKE_JOBS_UNSAFE=	yes
>-
> # to avoid a conflict with PACKAGES in bsd.port.mk
> post-extract:
> 	${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e 's/PACKAGES/PXP_PACKAGES/'
>Index: textproc/ocaml-pxp/distinfo
>===================================================================
>--- textproc/ocaml-pxp/distinfo	(revision 442522)
>+++ textproc/ocaml-pxp/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (pxp-1.2.7.tar.gz) = 2b0aca564f71c87825436e31a82de2ca3b3e99ee81a83840a525b0be63d73025
>-SIZE (pxp-1.2.7.tar.gz) = 735710
>+TIMESTAMP = 1488712340
>+SHA256 (pxp-1.2.9.tar.gz) = b1ba8f305913b7e9d0bcbce0c532aeb28a79396e08f178b119c2050835ab1c7b
>+SIZE (pxp-1.2.9.tar.gz) = 626001
>Index: textproc/ocaml-text/Makefile
>===================================================================
>--- textproc/ocaml-text/Makefile	(revision 442522)
>+++ textproc/ocaml-text/Makefile	(working copy)
>@@ -3,27 +3,24 @@
> 
> PORTNAME=	text
> PORTVERSION=	0.8
>+PORTREVISION=	1
> CATEGORIES=	textproc
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml library for dealing with text
> 
>+LICENSE=	BSD3CLAUSE
>+
>+USES=		gmake ocaml
> USE_GITHUB=	yes
> GH_ACCOUNT=	vbmithr
> GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
>-
>-USES=		gmake
>+USE_OCAML=	findlib:plist ldconfig camlp4 ocamlbuild
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX} \
> 		--destdir ${STAGEDIR}
> 
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-
> SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
> DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
> 
>@@ -39,13 +36,13 @@
> 		${WRKSRC}/setup.ml
> 
> do-configure:
>-	cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -configure ${CONFIGURE_ARGS}
> 
> do-build:
>-	cd ${WRKSRC}; ocaml setup.ml -build
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -build
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}
>-	cd ${WRKSRC}; ocaml setup.ml -install
>+	cd ${WRKSRC} && ${OCAML_CMD} setup.ml -install
> 
> .include <bsd.port.mk>
>Index: textproc/ocaml-tyxml/Makefile
>===================================================================
>--- textproc/ocaml-tyxml/Makefile	(revision 442522)
>+++ textproc/ocaml-tyxml/Makefile	(working copy)
>@@ -3,11 +3,12 @@
> 
> PORTNAME=	tyxml
> PORTVERSION=	2.2.0
>+PORTREVISION=	1
> CATEGORIES=	textproc
> MASTER_SITES=	http://ocsigen.org/download/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml XML typing library
> 
> LICENSE=	LGPL21_SSLEX
>@@ -18,14 +19,9 @@
> BUILD_DEPENDS=	${SA_DIR}/netstring/netstring.a:www/ocaml-net
> RUN_DEPENDS=	${SA_DIR}/netstring/netstring.a:www/ocaml-net
> 
>-USES=			gmake
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAMLFIND_PLIST=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig
>+MAKE_ENV=	INSTALLDIR="${STAGEDIR}${SA_DIR}"
>+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
> 
>-SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
>-MAKE_ENV+=		INSTALLDIR="${STAGEDIR}${SA_DIR}"
>-
> .include <bsd.port.mk>
>Index: www/ocaml-net/Makefile
>===================================================================
>--- www/ocaml-net/Makefile	(revision 442522)
>+++ www/ocaml-net/Makefile	(working copy)
>@@ -2,36 +2,35 @@
> # $FreeBSD$
> 
> PORTNAME=	net
>-PORTVERSION=	4.0.4
>-PORTREVISION=	1
>+PORTVERSION=	4.1.2
> CATEGORIES=	www
> MASTER_SITES=	http://download.camlcity.org/download/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	ocaml${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml modules for Internet applications
> 
> LICENSE=	GPLv2
> 
> BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
>+LIB_DEPENDS=	libnettle.so:security/nettle
> RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
> 
> CONFLICTS=	ocaml-equeue-2* ocaml-netclient-0*
> 
>-USES=			gmake
>-USE_OCAML=		yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-HAS_CONFIGURE=		yes
>-CONFIGURE_ARGS=		-disable-gtk \
>-			-enable-pcre
>-
>-ALL_TARGET=		all opt
>-MAKE_JOBS_UNSAFE=	yes
>-
>+USES=		gmake ocaml
>+USE_OCAML=	findlib:plist camlp4 ldconfig
>+OCAML_PKGDIRS=	equeue netcamlbox netcgi2 netcgi2-plex \
>+		netclient netmulticore netplex netshm \
>+		netstring netstring-pcre netsys \
>+		netunidata rpc rpc-auth-local rpc-generator shell
>+OCAML_LDLIBS=	${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//}
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	-disable-gtk \
>+		-enable-pcre
>+ALL_TARGET=	all opt
>+MAKE_JOBS_UNSAFE=yes
> PLIST_FILES=	bin/netplex-admin \
> 		bin/ocamlrpcgen
> 
>@@ -41,12 +40,6 @@
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>-OCAML_PKGDIRS=	netsys netshm equeue shell netstring rpc-generator \
>-		rpc pop smtp netclient netcgi2 netgssapi netplex \
>-		netcgi2-plex netcamlbox netmulticore rpc-auth-local \
>-		netstring-pcre netunidata
>-OCAML_LDLIBS=	${OCAML_PKGDIRS:S/^/${OCAML_SITELIBDIR}\//}
>-
> OPTIONS_DEFINE=	NETHTTPD GTK2 GNUTLS APACHE ZIP EXAMPLES DOCS
> OPTIONS_DEFAULT=GNUTLS
> NETHTTPD_DESC=	Integrated HTTP daemon
>@@ -78,11 +71,11 @@
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
>-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
>+	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> 
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
>-	@(cd ${WRKSRC}/examples/ && \
>-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
>+	cd ${WRKSRC}/examples/ && \
>+	    ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: www/ocaml-net/distinfo
>===================================================================
>--- www/ocaml-net/distinfo	(revision 442522)
>+++ www/ocaml-net/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (ocamlnet-4.0.4.tar.gz) = becaa6c2b0c1ae6a3fb05139928442e5d4a685ea5033017060a86d70114e5f72
>-SIZE (ocamlnet-4.0.4.tar.gz) = 4336176
>+TIMESTAMP = 1488711346
>+SHA256 (ocamlnet-4.1.2.tar.gz) = 918c3921529cfe545e206b3535a58f43f665165044dd3548f685b583e94f14d8
>+SIZE (ocamlnet-4.1.2.tar.gz) = 4623183
>Index: www/ocaml-net/pkg-descr
>===================================================================
>--- www/ocaml-net/pkg-descr	(revision 442522)
>+++ www/ocaml-net/pkg-descr	(working copy)
>@@ -15,4 +15,4 @@
>     * netsys contains bindings for system functions
>     * smtp and pop are two further client implementations
> 
>-WWW: https://sourceforge.net/projects/ocamlnet/
>+WWW: http://projects.camlcity.org/projects/ocamlnet.html
>Index: x11-toolkits/ocaml-lablgtk2/Makefile
>===================================================================
>--- x11-toolkits/ocaml-lablgtk2/Makefile	(revision 442522)
>+++ x11-toolkits/ocaml-lablgtk2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	lablgtk2
> PORTVERSION=	2.18.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1479/ \
> 		LOCAL/bf
>@@ -10,20 +10,34 @@
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	lablgtk-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Objective Caml interface to GTK+ 2.x
> 
> LICENSE=	LGPL21
> 
>-USES=		gmake pkgconfig
>-USE_GNOME=	gtk20
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=	yes
>-USE_OCAMLFIND_PLIST=	yes
>-USE_OCAML_CAMLP4=	yes
>-USE_OCAML_LDCONFIG=	yes
>-USE_OCAML_WASH= 	yes
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2 \
>+		libpopt.so:devel/popt
> 
>+USES=		gmake gettext-runtime pkgconfig ocaml
>+USE_GNOME=	gtk20 cairo
>+USE_XORG=	sm ice
>+USE_GL=		gl glu
>+USE_OCAML=	findlib:plist camlp4 ldconfig wash
>+HAS_CONFIGURE=	yes
>+ALL_TARGET=	all opt
>+CONFIGURE_ARGS=	--prefix=${PREFIX} \
>+		--with-libdir=${PREFIX}/${OCAML_LIBDIR} \
>+		--without-gtksourceview
>+CONFIGURE_ENV=	CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo"
>+MAKE_JOBS_UNSAFE=	yes
>+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>+PORTDOCS=	COPYING README
>+EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>+PORTEXAMPLES=	*
>+
>+PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
>+
> OPTIONS_DEFINE=		GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
> 			GTKSPELL LIBRSVG2 DOCS EXAMPLES
> OPTIONS_DEFAULT=	GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
>@@ -36,28 +50,8 @@
> GTKSPELL_DESC=		GtkSpell support
> #GNOMEPANEL_DESC=	GNOME Panel support
> 
>-HAS_CONFIGURE=	yes
>-ALL_TARGET=	all opt
>-MAKE_JOBS_UNSAFE=	yes
>-
>-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \
>-		--without-gtksourceview
>-CONFIGURE_ENV=	CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo"
>-
>-PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
>-
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
>-PORTDOCS=	COPYING README
>-.endif
>-
>-.if ${PORT_OPTIONS:MEXAMPLES}
>-EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-PORTEXAMPLES=	*
>-.endif
>-
> .if ${PORT_OPTIONS:MGTKGLAREA}
> CONFIGURE_ARGS+=	--with-gl
> BUILD_DEPENDS+=	lablgl:graphics/ocaml-lablgl
>Index: x11-toolkits/ocaml-lablgtk2/files/patch-src-ml_glib.c
>===================================================================
>--- x11-toolkits/ocaml-lablgtk2/files/patch-src-ml_glib.c	(nonexistent)
>+++ x11-toolkits/ocaml-lablgtk2/files/patch-src-ml_glib.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/ml_glib.c.orig	2017-03-06 00:22:40.017047000 +0900
>++++ src/ml_glib.c	2017-03-06 00:23:07.882081000 +0900
>+@@ -163,7 +163,7 @@
>+ static void ml_raise_gerror_exn(GError *, value *) Noreturn;
>+ static void ml_raise_gerror_exn(GError *err, value *exn)
>+ {
>+-  CAMLlocal2(b, msg);
>++  value b, msg;
>+   g_assert (err && exn);
>+   msg = copy_string(err->message);
>+   b = alloc_small (3, 0);
>
>Property changes on: x11-toolkits/ocaml-lablgtk2/files/patch-src-ml_glib.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11-toolkits/ocaml-labltk/Makefile
>===================================================================
>--- x11-toolkits/ocaml-labltk/Makefile	(revision 442522)
>+++ x11-toolkits/ocaml-labltk/Makefile	(working copy)
>@@ -2,22 +2,21 @@
> # $FreeBSD$
> 
> PORTNAME=	labltk
>-PORTVERSION=	8.06.0
>+PORTVERSION=	8.06.2
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1455/
>+MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/1628/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	michipili@gmail.com
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Objective Caml interface to Tk
> 
> LICENSE=	LGPL20
> 
>-USES=		gmake tk:84,85
>+USES=		gmake tk tcl ocaml
>+USE_XORG=	x11
> HAS_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=yes
>-MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
>-USE_OCAML=	yes
>-
>+MAKE_ENV=	STAGEDIR="${STAGEDIR}"
> ALL_TARGET=	all opt
> 
> post-patch:
>@@ -33,7 +32,8 @@
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
> 
> post-install:
>-	${INSTALL_DATA} ${WRKSRC}/support/META ${STAGEDIR}${PREFIX}/lib/ocaml/${PORTNAME}
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/dlllabltk.so
>+	${INSTALL_DATA} ${WRKSRC}/support/META \
>+	    ${STAGEDIR}${PREFIX}/lib/ocaml/${PORTNAME}
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/dlllabltk.so
> 
> .include <bsd.port.mk>
>Index: x11-toolkits/ocaml-labltk/distinfo
>===================================================================
>--- x11-toolkits/ocaml-labltk/distinfo	(revision 442522)
>+++ x11-toolkits/ocaml-labltk/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (labltk-8.06.0.tar.gz) = 71997dbd6c36e4eb064484dc73037d4bd10e465e180fead07a4b193d21af9764
>-SIZE (labltk-8.06.0.tar.gz) = 368790
>+TIMESTAMP = 1488719794
>+SHA256 (labltk-8.06.2.tar.gz) = b32ea0465ec2fff89ebf5219845656f8334f61857e01ea3d59b3ab31749227dd
>+SIZE (labltk-8.06.2.tar.gz) = 369508
>Index: devel/ocaml-lacaml/Makefile
>===================================================================
>--- devel/ocaml-lacaml/Makefile	(revision 442522)
>+++ devel/ocaml-lacaml/Makefile	(working copy)
>@@ -3,37 +3,30 @@
> 
> PORTNAME=	lacaml
> PORTVERSION=	8.0.7
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
> PKGNAMEPREFIX=	ocaml-
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	OCaml interface to BLAS and LAPACK libraries
> 
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING.txt
> 
>-USE_OCAML=	yes
>-USE_OCAML_FINDLIB=yes
>-USE_OCAMLFIND_PLIST=yes
>-USE_OCAML_LDCONFIG=yes
>-USE_OCAML_WASH=	yes
>+USES=		blaslapack fortran ocaml
>+USE_OCAML=	findlib:plist ldconfig ocamlbuild wash
> OCAMLFIND_LDCONF=ignore
>-
>-USES=		blaslapack fortran
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--prefix ${PREFIX} --disable-docs --disable-examples \
> 		--override conf_ccopt "${CFLAGS}" \
> 		--override conf_cclib "${LDFLAGS}"
> MAKE_JOBS_UNSAFE=yes
>-
> CFLAGS+=	-fPIC -DEXTERNAL_EXP10
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
> EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
>-
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>@@ -41,23 +34,22 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|%%BLASLIB%%|${BLASLIB}| ; \
>-		 s|%%LAPACKLIB%%|${LAPACKLIB}| ; \
>-		 s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/myocamlbuild.ml
>+	    's|%%BLASLIB%%|${BLASLIB}| ; \
>+	     s|%%LAPACKLIB%%|${LAPACKLIB}| ; \
>+	     s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/myocamlbuild.ml
> 
> post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.cmxs
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.cmxs \
>+	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lacaml/*.so
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for i in AUTHORS.txt CHANGES.txt README.md TODO.md
>-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
>-		${STAGEDIR}${DOCSDIR})
>-.endfor
>+	cd ${WRKSRC} && ${INSTALL_DATA} \
>+	    AUTHORS.txt CHANGES.txt README.md TODO.md \
>+	    ${STAGEDIR}${DOCSDIR}
> 
> post-install-EXAMPLES-on:
>-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
>-		${STAGEDIR}${EXAMPLESDIR})
>+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
>+	    ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: devel/ocaml-lacaml/distinfo
>===================================================================
>--- devel/ocaml-lacaml/distinfo	(revision 442522)
>+++ devel/ocaml-lacaml/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1496236400
> SHA256 (lacaml-8.0.7.tar.gz) = 33c939ec663e6fb7ef483e785b59f8e21027590452a7a6e9ca20fe0cf23888e9
> SIZE (lacaml-8.0.7.tar.gz) = 180651
>Index: devel/ocaml-opam/Makefile
>===================================================================
>--- devel/ocaml-opam/Makefile	(revision 442522)
>+++ devel/ocaml-opam/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	opam
> PORTVERSION=	1.2.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>@@ -15,13 +15,20 @@
> 
> LICENSE=	GPLv3
> 
>-RUN_DEPENDS=		camlp4:devel/ocaml-camlp4
>+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib/META:devel/ocaml-extlib \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/ocamlgraph/META:math/ocaml-ocamlgraph \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/cudf/META:devel/ocaml-cudf \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/dose3/META:devel/ocaml-dose3 \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/jsonm/META:converters/ocaml-jsonm \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/re/META:devel/ocaml-re \
>+		${LOCALBASE}/${OCAML_SITELIBDIR}/cmdliner/META:devel/ocaml-cmdliner
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		gmake
>-USE_OCAML=	yes
>+USES=		gmake ocaml
>+USE_OCAML=	camlp4
> GNU_CONFIGURE=	yes
> MAKE_ENV+=	TERM=xterm
>-ALL_TARGET=	lib-ext all man
>+ALL_TARGET=	all man
> 
> OPTIONS_DEFINE=		RSYNC GIT WGET HG DARCS ASPCUD
> OPTIONS_DEFAULT=	RSYNC GIT WGET ASPCUD
>Index: math/ocamlgsl/Makefile
>===================================================================
>--- math/ocamlgsl/Makefile	(revision 442522)
>+++ math/ocamlgsl/Makefile	(working copy)
>@@ -21,11 +21,8 @@
> GH_ACCOUNT=	mmottl
> GH_PROJECT=	gsl-ocaml
> 
>-USES=			gmake
>-USE_OCAML=		YES
>-USE_OCAML_FINDLIB=	YES
>-USE_OCAML_CAMLP4=	YES
>-USE_OCAML_LDCONFIG=	YES
>+USES=			gmake ocaml
>+USE_OCAML=		findlib:plist ldconfig camlp4 ocamlbuild
> OCAML_PKGDIRS=		gsl
> HAS_CONFIGURE=		YES
> MAKE_JOBS_UNSAFE=	yes
>Index: math/ocamlgsl/pkg-plist
>===================================================================
>--- math/ocamlgsl/pkg-plist	(revision 442522)
>+++ math/ocamlgsl/pkg-plist	(working copy)
>@@ -1,319 +1,3 @@
>-%%OCAML_SITELIBDIR%%/gsl/META
>-%%OCAML_SITELIBDIR%%/gsl/dllgsl_stubs.so
>-%%OCAML_SITELIBDIR%%/gsl/gsl.a
>-%%OCAML_SITELIBDIR%%/gsl/gsl.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cma
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cmxa
>-%%OCAML_SITELIBDIR%%/gsl/gsl.cmxs
>-%%OCAML_SITELIBDIR%%/gsl/gsl.ml
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_flat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_blas_gen.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_bspline.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cdf.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_cheb.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_combi.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_complex.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_const.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_deriv.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_eigen.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_error.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fft.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fit.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_fun.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_histo.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_ieee.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_integration.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_interp.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_linalg.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_math.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_complex_flat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_matrix_flat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_min.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_misc.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_misc.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_misc.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_misc.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_misc.ml
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_monte.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multifit_nlin.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multimin.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_multiroot.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_odeiv.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_permut.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_poly.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_qrng.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_randist.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_rng.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_root.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sf.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_siman.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sort.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_stats.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_sum.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vectmat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_complex_flat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_vector_flat.mli
>-%%OCAML_SITELIBDIR%%/gsl/gsl_version.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_version.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_version.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_version.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_version.ml
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.annot
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.cmi
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.cmt
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.cmti
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.cmx
>-%%OCAML_SITELIBDIR%%/gsl/gsl_wavelet.mli
>-%%OCAML_SITELIBDIR%%/gsl/libgsl_stubs.a
> %%PORTDOCS%%%%DOCSDIR%%/ocaml/gsl/api/Gsl.Blas.html
> %%PORTDOCS%%%%DOCSDIR%%/ocaml/gsl/api/Gsl.Blas_flat.html
> %%PORTDOCS%%%%DOCSDIR%%/ocaml/gsl/api/Gsl.Blas_gen.html
>Index: math/orpie/Makefile
>===================================================================
>--- math/orpie/Makefile	(revision 442522)
>+++ math/orpie/Makefile	(working copy)
>@@ -14,9 +14,8 @@
> 
> LIB_DEPENDS=	libgsl.so:math/gsl
> 
>-USES=		gmake ncurses
>-USE_OCAML=	yes
>-USE_OCAML_CAMLP4=yes
>+USES=		gmake ocaml ncurses
>+USE_OCAML=	findlib camlp4 ocamlbuild ncurses
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
> 
>Index: textproc/hevea/Makefile
>===================================================================
>--- textproc/hevea/Makefile	(revision 442522)
>+++ textproc/hevea/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	hevea
> PORTVERSION=	2.29
>+PORTREVISION=	1
> CATEGORIES=	textproc
> MASTER_SITES=	http://para.inria.fr/~maranget/hevea/distri/ \
> 		ftp://ftp.inria.fr/INRIA/moscova/hevea/
>@@ -12,7 +13,8 @@
> MAINTAINER=	danilo@FreeBSD.org
> COMMENT=	Convert LaTeX to HTML
> 
>-BUILD_DEPENDS=	ocamlc:lang/ocaml
>+USES=		ocaml
>+USE_OCAML=	ocamlbuild
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: math/scilab/Makefile
>===================================================================
>--- math/scilab/Makefile	(revision 442522)
>+++ math/scilab/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	scilab
> PORTVERSION=	5.5.2
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	math cad java
> MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
> DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
>@@ -104,8 +104,7 @@
> 
> OCAML_IMPLIES=		GUI
> OCAML_CONFIGURE_WITH=	modelica
>-OCAML_BUILD_DEPENDS=	ocaml:lang/ocaml
>-OCAML_RUN_DEPENDS=	ocaml:lang/ocaml
>+OCAML_USES=		ocaml
> 
> TK_CONFIGURE_OFF=	--without-tk
> TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
>Index: math/scilab/distinfo
>===================================================================
>--- math/scilab/distinfo	(revision 442522)
>+++ math/scilab/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1496910066
> SHA256 (scilab-5.5.2-src.tar.gz) = a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e
> SIZE (scilab-5.5.2-src.tar.gz) = 69626327
>Index: math/scilab/files/patch-modules_scicos_Makefile.in
>===================================================================
>--- math/scilab/files/patch-modules_scicos_Makefile.in	(nonexistent)
>+++ math/scilab/files/patch-modules_scicos_Makefile.in	(working copy)
>@@ -0,0 +1,478 @@
>+--- modules/scicos/Makefile.in.orig	2017-06-09 00:22:29 UTC
>++++ modules/scicos/Makefile.in
>+@@ -438,7 +438,7 @@ libscisundials_la_OBJECTS = $(am_libscisundials_la_OBJ
>+ @OCAML_TRUE@@XCOS_TRUE@	modelicat$(EXEEXT)
>+ PROGRAMS = $(bin_PROGRAMS)
>+ am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \
>+-	$(srcdir)/src/xml2modelica/linenum.mll \
>++	$(srcdir)/src/modelica_compiler/linenum.mll \
>+ 	$(srcdir)/src/xml2modelica/stringParser.ml \
>+ 	$(srcdir)/src/xml2modelica/stringLexer.ml \
>+ 	$(srcdir)/src/xml2modelica/xMLParser.ml \
>+@@ -1146,7 +1146,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
>+ ### XML2Modelica
>+ @OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = \
>+ @OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/xml2modelica/xMLTree.ml \
>+-@OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/xml2modelica/linenum.mll \
>++@OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/modelica_compiler/linenum.mll \
>+ @OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/xml2modelica/stringParser.ml \
>+ @OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/xml2modelica/stringLexer.ml \
>+ @OCAML_TRUE@@XCOS_TRUE@	$(srcdir)/src/xml2modelica/xMLParser.ml \
>+@@ -3392,35 +3392,10 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@	$(OCAMLDEP) -all $(INCLUDE) $(MLS_XML2Modelica) $(MLIS_XML2Modelica) > .depend
>+ @OCAML_TRUE@@XCOS_TRUE@	$(OCAMLDEP) -all $(INCLUDE_modelicat) $(MLS_modelicat) $(MLIS_modelicat) >> .depend
>+ @OCAML_TRUE@@XCOS_TRUE@	$(OCAMLDEP) -all $(INCLUDE) $(MLS_modelicac) $(MLIS_modelicac) >> .depend
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmo ./src/xml2modelica/linenum.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmx ./src/xml2modelica/linenum.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/linenum.cmi : ./src/xml2modelica/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmo \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/stringParser.cmi \
>+@@ -3433,6 +3408,15 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringParser.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi ./src/xml2modelica/stringLexer.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmo ./src/xml2modelica/xML2Modelica.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi \
>+@@ -3444,31 +3428,22 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xML2Modelica.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmo \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>+@@ -3482,29 +3457,12 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmo \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
>+@@ -3543,19 +3501,48 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmo \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
>+@@ -3575,13 +3562,19 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmo \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.cmi : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi \
>+@@ -3607,39 +3600,27 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>+@@ -3653,16 +3634,6 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.ml
>+@@ -3670,30 +3641,6 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.o : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.ml
>+@@ -3701,13 +3648,25 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.o : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
>+@@ -3736,19 +3695,6 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
>+-@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.o : \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
>+-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>+@@ -3775,6 +3721,30 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
>+ @OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmo : \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>+@@ -3804,6 +3774,36 @@ distclean-local:
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmx \
>+ @OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
>++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.o : \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
>++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
>+ 
>+ # Build modelica stuff
>+ 
>
>Property changes on: math/scilab/files/patch-modules_scicos_Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: math/scilab/files/patch-modules_scicos_Makefile.modelica.am
>===================================================================
>--- math/scilab/files/patch-modules_scicos_Makefile.modelica.am	(nonexistent)
>+++ math/scilab/files/patch-modules_scicos_Makefile.modelica.am	(working copy)
>@@ -0,0 +1,11 @@
>+--- modules/scicos/Makefile.modelica.am.orig	2017-06-09 00:23:30 UTC
>++++ modules/scicos/Makefile.modelica.am
>+@@ -26,7 +26,7 @@ OCAMLLIBS=nums.cma
>+ 
>+ XML2Modelica_SOURCES = \
>+ 	$(srcdir)/src/xml2modelica/xMLTree.ml \
>+-	$(srcdir)/src/xml2modelica/linenum.mll \
>++	$(srcdir)/src/modelica_compiler/linenum.mll \
>+ 	$(srcdir)/src/xml2modelica/stringParser.ml \
>+ 	$(srcdir)/src/xml2modelica/stringLexer.ml \
>+ 	$(srcdir)/src/xml2modelica/xMLParser.ml \
>
>Property changes on: math/scilab/files/patch-modules_scicos_Makefile.modelica.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 218333: 181432 | 181439 | 181441 | 181444 | 181446 | 182846 | 182918 | 183097 | 183188 | 183347 | 183423 | 205200 | 205267 | 205297