pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/frama-c



Module Name:    pkgsrc
Committed By:   tonio
Date:           Sun Oct  9 07:02:47 UTC 2022

Modified Files:
        pkgsrc/devel/frama-c: Makefile PLIST distinfo options.mk
        pkgsrc/devel/frama-c/patches: patch-Makefile
            patch-src_libraries_utils_c__bindings.c
Removed Files:
        pkgsrc/devel/frama-c/patches: patch-configure
            patch-src_plugins_e-acsl_Makefile.in
            patch-src_plugins_gui_gtk__helper.ml patch-src_plugins_wp_configure
            patch-src_plugins_wp_configure.ac
            patch-src_plugins_wp_share_coqwp_Zbits.v

Log Message:
Update devel/frama-c to 25.0

-   Kernel    [2022-10-05] Support for ghost VLA and calls to builtins with
              ghost arguments.
-   Eva       [2022-09-16] Numerors now needs MLMPFR 4.1.0+bugfix2
-   Kernel    [2022-09-07] Improve error message for invalid options -D/-I/-U.
o!  Configure [2022-07-28] Removed autoconf and configure
o!  Makefile  [2022-07-11] Removed Makefile, Frama-C is now built using Dune 3.x
o!  Pdg       [2022-07-01] Removed from Db. Use proper Pdg API instead.
-!  Kernel    [2022-06-06] Remove journalisation.

####################################
Open Source Release 25.0 (Manganese)
####################################

o   Kernel    [2022-05-03] Prototype of AST comparison between two versions
              of the same program, via the new option -ast-diff.
-   Eva       [2022-05-02] Fixes stack overflow errors on very large C functions.
-   Eva       [2022-04-25] Improve the multidim abstract domain: it is now
              more precise and more robust, it is able to infer simple array
              invariants on some loops without unrolling, and has a new option
              -eva-multidim-disjunctive-invariants to infer structures
              disjunctive invariants.
o   Kernel    [2022-03-07] Known compiler builtins are no longer hardcoded in
              OCaml, but defined via JSON files (in share/compliance).
o   Kernel    [2022-02-23] New visitor functions visitFramacFileFunctions
              and visitCilFileFunctions to visit only function definitions,
              for better performance.
o!  Kernel    [2022-02-23] Remove State_selection.Static (deprecated since
              10 years, use directly State_selection instead)
-*  Kernel    [2022-02-22] Fix list of potential types for decimal
              integer literal constants
*   Kernel    [2022-02-17] Reject programs using unsupported
              vector_size attribute (fixes ##2573)
o   Eva       [2022-02-15] New API to run the analysis and access its results,
              intended to replace the old API in Db.Value. It is more precise
              as it uses all available domains to evaluate values and locations.
              See file Eva.mli for more details.
*   Kernel    [2022-02-08] Reject array whose size is too big with a proper
              error message instead of a crash (fixes ##2590)
o!  Kernel    [2022-02-19] Removed obsolete AST nodes IndexPI and Info
*   Kernel    [2022-02-08] Reject array whose size is too big with a proper
              error message instead of a crash (fixes ##2590)
o!  Kernel    [2021-12-03] Remove unused AST node Dcustom_annot and field
              fpadding_in_bits. Do not cache size of types in the AST but in
              a dedicated table.
-*  Logic     [2021-11-30] Fix type of expressions whose value are functions
o!  Kernel    [2021-11-29] Integer.pretty does not have the optional argument
              hexa anymore. Use Integer.pretty_hex or Integer.pp_hex if you
              want to print integers in hexadecimal format.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/devel/frama-c/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/frama-c/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/frama-c/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/frama-c/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/frama-c/patches/patch-Makefile \
    pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/frama-c/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in \
    pkgsrc/devel/frama-c/patches/patch-src_plugins_gui_gtk__helper.ml \
    pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_share_coqwp_Zbits.v
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure \
    pkgsrc/devel/frama-c/patches/patch-src_plugins_wp_configure.ac

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

Modified files:

Index: pkgsrc/devel/frama-c/Makefile
diff -u pkgsrc/devel/frama-c/Makefile:1.104 pkgsrc/devel/frama-c/Makefile:1.105
--- pkgsrc/devel/frama-c/Makefile:1.104 Mon Aug 29 16:14:41 2022
+++ pkgsrc/devel/frama-c/Makefile       Sun Oct  9 07:02:47 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2022/08/29 16:14:41 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2022/10/09 07:02:47 tonio Exp $
 #
 
-DISTNAME=      frama-c-Phosphorus-20170501
-PKGNAME=       ${DISTNAME:S/-Phosphorus//}
-PKGREVISION=   35
+DISTNAME=      frama-c-25.0-Manganese
+PKGNAME=       ${DISTNAME:S/-Manganese//}
 CATEGORIES=    devel
 MASTER_SITES=  https://frama-c.com/download/
 
@@ -14,6 +13,8 @@ LICENSE=      gnu-lgpl-v2
 
 USE_TOOLS+=    gmake autoconf
 GNU_CONFIGURE= yes
+REPLACE_SH=    src/plugins/e-acsl/scripts/e-acsl-gcc.sh
+REPLACE_PYTHON=        share/analysis-scripts/*.py
 
 OCAML_USE_FINDLIB=     yes
 
@@ -23,8 +24,12 @@ OCAML_USE_FINDLIB=   yes
 # (not the default) or the build fails with missing module "Dgraph".
 
 .include "../../devel/ocamlgraph/buildlink3.mk"
+.include "../../devel/ocaml-yojson/buildlink3.mk"
+.include "../../devel/ocaml-ppx_import/buildlink3.mk"
+.include "../../devel/ocaml-ppx_deriving/buildlink3.mk"
 .include "../../math/ocaml-num/buildlink3.mk"
 .include "../../math/ocaml-zarith/buildlink3.mk"
 
 .include "../../lang/ocaml/ocaml.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/frama-c/PLIST
diff -u pkgsrc/devel/frama-c/PLIST:1.6 pkgsrc/devel/frama-c/PLIST:1.7
--- pkgsrc/devel/frama-c/PLIST:1.6      Tue Sep  5 07:41:35 2017
+++ pkgsrc/devel/frama-c/PLIST  Sun Oct  9 07:02:47 2022
@@ -1,574 +1,631 @@
-@comment $NetBSD: PLIST,v 1.6 2017/09/05 07:41:35 dholland Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/10/09 07:02:47 tonio Exp $
 bin/e-acsl-gcc.sh
 bin/frama-c
 bin/frama-c-config
 ${PLIST.gui}bin/frama-c-gui
 ${PLIST.gui}bin/frama-c-gui.byte
+bin/frama-c-script
 bin/frama-c.byte
-@comment bin/ptests.byte
 bin/ptests.opt
-lib/frama-c/FCBuffer.cmi
-lib/frama-c/FCBuffer.cmo
-lib/frama-c/FCBuffer.cmx
-lib/frama-c/FCBuffer.o
 lib/frama-c/FCHashtbl.cmi
 lib/frama-c/FCHashtbl.cmo
-lib/frama-c/FCHashtbl.cmx
+${PLIST.ocaml-opt}lib/frama-c/FCHashtbl.cmx
 lib/frama-c/FCHashtbl.o
-lib/frama-c/FCMap.cmi
-lib/frama-c/FCMap.cmo
-lib/frama-c/FCMap.cmx
-lib/frama-c/FCMap.o
-lib/frama-c/FCSet.cmi
-lib/frama-c/FCSet.cmo
-lib/frama-c/FCSet.cmx
-lib/frama-c/FCSet.o
-lib/frama-c/Qed.cmi
-lib/frama-c/Qed.cmo
-lib/frama-c/Qed.cmx
-lib/frama-c/Qed.o
+${PLIST.gui}lib/frama-c/GSourceView.cmi
+${PLIST.gui}lib/frama-c/GSourceView.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/GSourceView.cmx
+${PLIST.gui}lib/frama-c/GSourceView.o
+lib/frama-c/META.frama-c
 lib/frama-c/abstract_interp.cmi
 lib/frama-c/abstract_interp.cmo
-lib/frama-c/abstract_interp.cmx
+${PLIST.ocaml-opt}lib/frama-c/abstract_interp.cmx
 lib/frama-c/abstract_interp.o
-@comment lib/frama-c/abstract_value.cmi
-@comment lib/frama-c/abstract_value.cmo
-@comment lib/frama-c/abstract_value.cmx
-@comment lib/frama-c/abstract_value.o
+lib/frama-c/acsl_extension.cmi
+lib/frama-c/acsl_extension.cmo
+${PLIST.ocaml-opt}lib/frama-c/acsl_extension.cmx
+lib/frama-c/acsl_extension.o
 lib/frama-c/alarms.cmi
 lib/frama-c/alarms.cmo
-lib/frama-c/alarms.cmx
+${PLIST.ocaml-opt}lib/frama-c/alarms.cmx
 lib/frama-c/alarms.o
 lib/frama-c/allocates.cmi
 lib/frama-c/allocates.cmo
-lib/frama-c/allocates.cmx
+${PLIST.ocaml-opt}lib/frama-c/allocates.cmx
 lib/frama-c/allocates.o
 lib/frama-c/alpha.cmi
 lib/frama-c/alpha.cmo
-lib/frama-c/alpha.cmx
+${PLIST.ocaml-opt}lib/frama-c/alpha.cmx
 lib/frama-c/alpha.o
 ${PLIST.gui}lib/frama-c/analyses_manager.cmi
 ${PLIST.gui}lib/frama-c/analyses_manager.cmo
-${PLIST.gui}lib/frama-c/analyses_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/analyses_manager.cmx
 ${PLIST.gui}lib/frama-c/analyses_manager.o
 lib/frama-c/annotations.cmi
 lib/frama-c/annotations.cmo
-lib/frama-c/annotations.cmx
+${PLIST.ocaml-opt}lib/frama-c/annotations.cmx
 lib/frama-c/annotations.o
 lib/frama-c/asm_contracts.cmi
 lib/frama-c/asm_contracts.cmo
-lib/frama-c/asm_contracts.cmx
+${PLIST.ocaml-opt}lib/frama-c/asm_contracts.cmx
 lib/frama-c/asm_contracts.o
 lib/frama-c/ast.cmi
 lib/frama-c/ast.cmo
-lib/frama-c/ast.cmx
+${PLIST.ocaml-opt}lib/frama-c/ast.cmx
 lib/frama-c/ast.o
+lib/frama-c/ast_diff.cmi
+lib/frama-c/ast_diff.cmo
+${PLIST.ocaml-opt}lib/frama-c/ast_diff.cmx
+lib/frama-c/ast_diff.o
 lib/frama-c/ast_info.cmi
 lib/frama-c/ast_info.cmo
-lib/frama-c/ast_info.cmx
+${PLIST.ocaml-opt}lib/frama-c/ast_info.cmx
 lib/frama-c/ast_info.o
 lib/frama-c/bag.cmi
 lib/frama-c/bag.cmo
-lib/frama-c/bag.cmx
+${PLIST.ocaml-opt}lib/frama-c/bag.cmx
 lib/frama-c/bag.o
 lib/frama-c/base.cmi
 lib/frama-c/base.cmo
-lib/frama-c/base.cmx
+${PLIST.ocaml-opt}lib/frama-c/base.cmx
 lib/frama-c/base.o
 lib/frama-c/binary_cache.cmi
 lib/frama-c/binary_cache.cmo
-lib/frama-c/binary_cache.cmx
+${PLIST.ocaml-opt}lib/frama-c/binary_cache.cmx
 lib/frama-c/binary_cache.o
 lib/frama-c/bit_utils.cmi
 lib/frama-c/bit_utils.cmo
-lib/frama-c/bit_utils.cmx
+${PLIST.ocaml-opt}lib/frama-c/bit_utils.cmx
 lib/frama-c/bit_utils.o
 lib/frama-c/bitvector.cmi
 lib/frama-c/bitvector.cmo
-lib/frama-c/bitvector.cmx
+${PLIST.ocaml-opt}lib/frama-c/bitvector.cmx
 lib/frama-c/bitvector.o
 ${PLIST.gui}lib/frama-c/book_manager.cmi
 ${PLIST.gui}lib/frama-c/book_manager.cmo
-${PLIST.gui}lib/frama-c/book_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/book_manager.cmx
 ${PLIST.gui}lib/frama-c/book_manager.o
 lib/frama-c/boot.cmi
 lib/frama-c/boot.cmo
-lib/frama-c/boot.cmx
+${PLIST.ocaml-opt}lib/frama-c/boot.cmx
 lib/frama-c/boot.o
-lib/frama-c/bottom.cmi
-lib/frama-c/bottom.cmo
-lib/frama-c/bottom.cmx
-lib/frama-c/bottom.o
 lib/frama-c/c_bindings.o
 lib/frama-c/cabs.cmi
-lib/frama-c/cabs.cmo
-lib/frama-c/cabs.cmx
-lib/frama-c/cabs.o
 lib/frama-c/cabs2cil.cmi
 lib/frama-c/cabs2cil.cmo
-lib/frama-c/cabs2cil.cmx
+${PLIST.ocaml-opt}lib/frama-c/cabs2cil.cmx
 lib/frama-c/cabs2cil.o
 lib/frama-c/cabs_debug.cmi
 lib/frama-c/cabs_debug.cmo
-lib/frama-c/cabs_debug.cmx
+${PLIST.ocaml-opt}lib/frama-c/cabs_debug.cmx
 lib/frama-c/cabs_debug.o
 lib/frama-c/cabshelper.cmi
 lib/frama-c/cabshelper.cmo
-lib/frama-c/cabshelper.cmx
+${PLIST.ocaml-opt}lib/frama-c/cabshelper.cmx
 lib/frama-c/cabshelper.o
 lib/frama-c/cabsvisit.cmi
 lib/frama-c/cabsvisit.cmo
-lib/frama-c/cabsvisit.cmx
+${PLIST.ocaml-opt}lib/frama-c/cabsvisit.cmx
 lib/frama-c/cabsvisit.o
 lib/frama-c/cfg.cmi
 lib/frama-c/cfg.cmo
-lib/frama-c/cfg.cmx
+${PLIST.ocaml-opt}lib/frama-c/cfg.cmx
 lib/frama-c/cfg.o
 lib/frama-c/cil.cmi
 lib/frama-c/cil.cmo
-lib/frama-c/cil.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil.cmx
 lib/frama-c/cil.o
 lib/frama-c/cilE.cmi
 lib/frama-c/cilE.cmo
-lib/frama-c/cilE.cmx
+${PLIST.ocaml-opt}lib/frama-c/cilE.cmx
 lib/frama-c/cilE.o
+lib/frama-c/cil_builder.cmi
+lib/frama-c/cil_builder.cmo
+${PLIST.ocaml-opt}lib/frama-c/cil_builder.cmx
+lib/frama-c/cil_builder.o
+lib/frama-c/cil_builtins.cmi
+lib/frama-c/cil_builtins.cmo
+${PLIST.ocaml-opt}lib/frama-c/cil_builtins.cmx
+lib/frama-c/cil_builtins.o
 lib/frama-c/cil_const.cmi
 lib/frama-c/cil_const.cmo
-lib/frama-c/cil_const.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_const.cmx
 lib/frama-c/cil_const.o
 lib/frama-c/cil_datatype.cmi
 lib/frama-c/cil_datatype.cmo
-lib/frama-c/cil_datatype.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_datatype.cmx
 lib/frama-c/cil_datatype.o
 lib/frama-c/cil_descriptive_printer.cmi
 lib/frama-c/cil_descriptive_printer.cmo
-lib/frama-c/cil_descriptive_printer.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_descriptive_printer.cmx
 lib/frama-c/cil_descriptive_printer.o
 lib/frama-c/cil_printer.cmi
 lib/frama-c/cil_printer.cmo
-lib/frama-c/cil_printer.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_printer.cmx
 lib/frama-c/cil_printer.o
 lib/frama-c/cil_state_builder.cmi
 lib/frama-c/cil_state_builder.cmo
-lib/frama-c/cil_state_builder.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_state_builder.cmx
 lib/frama-c/cil_state_builder.o
 lib/frama-c/cil_types.cmi
 lib/frama-c/cil_types_debug.cmi
 lib/frama-c/cil_types_debug.cmo
-lib/frama-c/cil_types_debug.cmx
+${PLIST.ocaml-opt}lib/frama-c/cil_types_debug.cmx
 lib/frama-c/cil_types_debug.o
 lib/frama-c/cilconfig.cmi
 lib/frama-c/cilconfig.cmo
-lib/frama-c/cilconfig.cmx
+${PLIST.ocaml-opt}lib/frama-c/cilconfig.cmx
 lib/frama-c/cilconfig.o
 lib/frama-c/clexer.cmi
 lib/frama-c/clexer.cmo
-lib/frama-c/clexer.cmx
+${PLIST.ocaml-opt}lib/frama-c/clexer.cmx
 lib/frama-c/clexer.o
 lib/frama-c/clone.cmi
 lib/frama-c/clone.cmo
-lib/frama-c/clone.cmx
+${PLIST.ocaml-opt}lib/frama-c/clone.cmx
 lib/frama-c/clone.o
 lib/frama-c/cmdline.cmi
 lib/frama-c/cmdline.cmo
-lib/frama-c/cmdline.cmx
+${PLIST.ocaml-opt}lib/frama-c/cmdline.cmx
 lib/frama-c/cmdline.o
 lib/frama-c/command.cmi
 lib/frama-c/command.cmo
-lib/frama-c/command.cmx
+${PLIST.ocaml-opt}lib/frama-c/command.cmx
 lib/frama-c/command.o
-lib/frama-c/config.cmi
-lib/frama-c/config.cmo
-lib/frama-c/config.cmx
-lib/frama-c/config.o
+lib/frama-c/contract_special_float.cmi
+lib/frama-c/contract_special_float.cmo
+${PLIST.ocaml-opt}lib/frama-c/contract_special_float.cmx
+lib/frama-c/contract_special_float.o
 lib/frama-c/cparser.cmi
 lib/frama-c/cparser.cmo
-lib/frama-c/cparser.cmx
+${PLIST.ocaml-opt}lib/frama-c/cparser.cmx
 lib/frama-c/cparser.o
 lib/frama-c/cprint.cmi
 lib/frama-c/cprint.cmo
-lib/frama-c/cprint.cmx
+${PLIST.ocaml-opt}lib/frama-c/cprint.cmx
 lib/frama-c/cprint.o
 lib/frama-c/cvalue.cmi
 lib/frama-c/cvalue.cmo
-lib/frama-c/cvalue.cmx
+${PLIST.ocaml-opt}lib/frama-c/cvalue.cmx
 lib/frama-c/cvalue.o
-@comment lib/frama-c/dashtbl.cmi
-@comment lib/frama-c/dashtbl.cmo
-@comment lib/frama-c/dashtbl.cmx
-@comment lib/frama-c/dashtbl.o
-lib/frama-c/dataflow.cmi
-lib/frama-c/dataflow.cmo
-lib/frama-c/dataflow.cmx
-lib/frama-c/dataflow.o
 lib/frama-c/dataflow2.cmi
 lib/frama-c/dataflow2.cmo
-lib/frama-c/dataflow2.cmx
+${PLIST.ocaml-opt}lib/frama-c/dataflow2.cmx
 lib/frama-c/dataflow2.o
 lib/frama-c/dataflows.cmi
 lib/frama-c/dataflows.cmo
-lib/frama-c/dataflows.cmx
+${PLIST.ocaml-opt}lib/frama-c/dataflows.cmx
 lib/frama-c/dataflows.o
 lib/frama-c/datatype.cmi
 lib/frama-c/datatype.cmo
-lib/frama-c/datatype.cmx
+${PLIST.ocaml-opt}lib/frama-c/datatype.cmx
 lib/frama-c/datatype.o
 lib/frama-c/db.cmi
 lib/frama-c/db.cmo
-lib/frama-c/db.cmx
+${PLIST.ocaml-opt}lib/frama-c/db.cmx
 lib/frama-c/db.o
-${PLIST.gui}lib/frama-c/debug_manager.cmi
-${PLIST.gui}lib/frama-c/debug_manager.cmo
-${PLIST.gui}lib/frama-c/debug_manager.cmx
-${PLIST.gui}lib/frama-c/debug_manager.o
 lib/frama-c/descr.cmi
 lib/frama-c/descr.cmo
-lib/frama-c/descr.cmx
+${PLIST.ocaml-opt}lib/frama-c/descr.cmx
 lib/frama-c/descr.o
 lib/frama-c/description.cmi
 lib/frama-c/description.cmo
-lib/frama-c/description.cmx
+${PLIST.ocaml-opt}lib/frama-c/description.cmx
 lib/frama-c/description.o
 ${PLIST.gui}lib/frama-c/design.cmi
 ${PLIST.gui}lib/frama-c/design.cmo
-${PLIST.gui}lib/frama-c/design.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/design.cmx
 ${PLIST.gui}lib/frama-c/design.o
 lib/frama-c/destructors.cmi
 lib/frama-c/destructors.cmo
-lib/frama-c/destructors.cmx
+${PLIST.ocaml-opt}lib/frama-c/destructors.cmx
 lib/frama-c/destructors.o
+${PLIST.gui}lib/frama-c/dgraph_helper.cmi
+${PLIST.gui}lib/frama-c/dgraph_helper.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/dgraph_helper.cmx
+${PLIST.gui}lib/frama-c/dgraph_helper.o
+lib/frama-c/dllframa-c.so
 lib/frama-c/dominators.cmi
 lib/frama-c/dominators.cmo
-lib/frama-c/dominators.cmx
+${PLIST.ocaml-opt}lib/frama-c/dominators.cmx
 lib/frama-c/dominators.o
+lib/frama-c/dotgraph.cmi
+lib/frama-c/dotgraph.cmo
+${PLIST.ocaml-opt}lib/frama-c/dotgraph.cmx
+lib/frama-c/dotgraph.o
+lib/frama-c/dump_config.cmi
+lib/frama-c/dump_config.cmo
+${PLIST.ocaml-opt}lib/frama-c/dump_config.cmx
+lib/frama-c/dump_config.o
 lib/frama-c/dynamic.cmi
 lib/frama-c/dynamic.cmo
-lib/frama-c/dynamic.cmx
+${PLIST.ocaml-opt}lib/frama-c/dynamic.cmx
 lib/frama-c/dynamic.o
+${PLIST.ocaml-opt}lib/frama-c/e-acsl/libeacsl-dlmalloc.a
 lib/frama-c/emitter.cmi
 lib/frama-c/emitter.cmo
-lib/frama-c/emitter.cmx
+${PLIST.ocaml-opt}lib/frama-c/emitter.cmx
 lib/frama-c/emitter.o
 lib/frama-c/errorloc.cmi
 lib/frama-c/errorloc.cmo
-lib/frama-c/errorloc.cmx
+${PLIST.ocaml-opt}lib/frama-c/errorloc.cmx
 lib/frama-c/errorloc.o
 lib/frama-c/escape.cmi
 lib/frama-c/escape.cmo
-lib/frama-c/escape.cmx
+${PLIST.ocaml-opt}lib/frama-c/escape.cmx
 lib/frama-c/escape.o
+lib/frama-c/eva_lattice_type.cmi
 lib/frama-c/exn_flow.cmi
 lib/frama-c/exn_flow.cmo
-lib/frama-c/exn_flow.cmx
+${PLIST.ocaml-opt}lib/frama-c/exn_flow.cmx
 lib/frama-c/exn_flow.o
 lib/frama-c/extlib.cmi
 lib/frama-c/extlib.cmo
-lib/frama-c/extlib.cmx
+${PLIST.ocaml-opt}lib/frama-c/extlib.cmx
 lib/frama-c/extlib.o
+lib/frama-c/fc_config.cmi
+lib/frama-c/fc_config.cmo
+${PLIST.ocaml-opt}lib/frama-c/fc_config.cmx
+lib/frama-c/fc_config.o
+lib/frama-c/fc_float.cmi
+lib/frama-c/fc_float.cmo
+${PLIST.ocaml-opt}lib/frama-c/fc_float.cmx
+lib/frama-c/fc_float.o
 lib/frama-c/file.cmi
 lib/frama-c/file.cmo
-lib/frama-c/file.cmx
+${PLIST.ocaml-opt}lib/frama-c/file.cmx
 lib/frama-c/file.o
 ${PLIST.gui}lib/frama-c/file_manager.cmi
 ${PLIST.gui}lib/frama-c/file_manager.cmo
-${PLIST.gui}lib/frama-c/file_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/file_manager.cmx
 ${PLIST.gui}lib/frama-c/file_manager.o
 lib/frama-c/filecheck.cmi
 lib/frama-c/filecheck.cmo
-lib/frama-c/filecheck.cmx
+${PLIST.ocaml-opt}lib/frama-c/filecheck.cmx
 lib/frama-c/filecheck.o
 lib/frama-c/filepath.cmi
 lib/frama-c/filepath.cmo
-lib/frama-c/filepath.cmx
+${PLIST.ocaml-opt}lib/frama-c/filepath.cmx
 lib/frama-c/filepath.o
 ${PLIST.gui}lib/frama-c/filetree.cmi
 ${PLIST.gui}lib/frama-c/filetree.cmo
-${PLIST.gui}lib/frama-c/filetree.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/filetree.cmx
 ${PLIST.gui}lib/frama-c/filetree.o
 lib/frama-c/filter.cmi
 lib/frama-c/filter.cmo
-lib/frama-c/filter.cmx
+${PLIST.ocaml-opt}lib/frama-c/filter.cmx
 lib/frama-c/filter.o
+lib/frama-c/float_interval.cmi
+lib/frama-c/float_interval.cmo
+${PLIST.ocaml-opt}lib/frama-c/float_interval.cmx
+lib/frama-c/float_interval.o
+lib/frama-c/float_interval_sig.cmi
+lib/frama-c/float_sig.cmi
 lib/frama-c/floating_point.cmi
 lib/frama-c/floating_point.cmo
-lib/frama-c/floating_point.cmx
+${PLIST.ocaml-opt}lib/frama-c/floating_point.cmx
 lib/frama-c/floating_point.o
+${PLIST.ocaml-opt}lib/frama-c/frama-c.a
+lib/frama-c/frama-c.cma
+${PLIST.ocaml-opt}lib/frama-c/frama-c.cmxa
 lib/frama-c/frama_c_init.cmi
 lib/frama-c/frama_c_init.cmo
-lib/frama-c/frama_c_init.cmx
+${PLIST.ocaml-opt}lib/frama-c/frama_c_init.cmx
 lib/frama-c/frama_c_init.o
 lib/frama-c/frontc.cmi
 lib/frama-c/frontc.cmo
-lib/frama-c/frontc.cmx
+${PLIST.ocaml-opt}lib/frama-c/frontc.cmx
 lib/frama-c/frontc.o
 lib/frama-c/function_Froms.cmi
 lib/frama-c/function_Froms.cmo
-lib/frama-c/function_Froms.cmx
+${PLIST.ocaml-opt}lib/frama-c/function_Froms.cmx
 lib/frama-c/function_Froms.o
 lib/frama-c/fval.cmi
 lib/frama-c/fval.cmo
-lib/frama-c/fval.cmx
+${PLIST.ocaml-opt}lib/frama-c/fval.cmx
 lib/frama-c/fval.o
+lib/frama-c/ghost_accesses.cmi
+lib/frama-c/ghost_accesses.cmo
+${PLIST.ocaml-opt}lib/frama-c/ghost_accesses.cmx
+lib/frama-c/ghost_accesses.o
+lib/frama-c/ghost_cfg.cmi
+lib/frama-c/ghost_cfg.cmo
+${PLIST.ocaml-opt}lib/frama-c/ghost_cfg.cmx
+lib/frama-c/ghost_cfg.o
 lib/frama-c/globals.cmi
 lib/frama-c/globals.cmo
-lib/frama-c/globals.cmx
+${PLIST.ocaml-opt}lib/frama-c/globals.cmx
 lib/frama-c/globals.o
+${PLIST.gui}lib/frama-c/gtk_compat.cmi
+${PLIST.gui}lib/frama-c/gtk_compat.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/gtk_compat.cmx
+${PLIST.gui}lib/frama-c/gtk_compat.o
 ${PLIST.gui}lib/frama-c/gtk_form.cmi
 ${PLIST.gui}lib/frama-c/gtk_form.cmo
-${PLIST.gui}lib/frama-c/gtk_form.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/gtk_form.cmx
 ${PLIST.gui}lib/frama-c/gtk_form.o
 ${PLIST.gui}lib/frama-c/gtk_helper.cmi
 ${PLIST.gui}lib/frama-c/gtk_helper.cmo
-${PLIST.gui}lib/frama-c/gtk_helper.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/gtk_helper.cmx
 ${PLIST.gui}lib/frama-c/gtk_helper.o
 ${PLIST.gui}lib/frama-c/gui_parameters.cmi
 ${PLIST.gui}lib/frama-c/gui_parameters.cmo
-${PLIST.gui}lib/frama-c/gui_parameters.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/gui_parameters.cmx
 ${PLIST.gui}lib/frama-c/gui_parameters.o
 ${PLIST.gui}lib/frama-c/gui_printers.cmi
 ${PLIST.gui}lib/frama-c/gui_printers.cmo
-${PLIST.gui}lib/frama-c/gui_printers.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/gui_printers.cmx
 ${PLIST.gui}lib/frama-c/gui_printers.o
 ${PLIST.gui}lib/frama-c/help_manager.cmi
 ${PLIST.gui}lib/frama-c/help_manager.cmo
-${PLIST.gui}lib/frama-c/help_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/help_manager.cmx
 ${PLIST.gui}lib/frama-c/help_manager.o
 ${PLIST.gui}lib/frama-c/history.cmi
 ${PLIST.gui}lib/frama-c/history.cmo
-${PLIST.gui}lib/frama-c/history.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/history.cmx
 ${PLIST.gui}lib/frama-c/history.o
 lib/frama-c/hook.cmi
 lib/frama-c/hook.cmo
-lib/frama-c/hook.cmx
+${PLIST.ocaml-opt}lib/frama-c/hook.cmx
 lib/frama-c/hook.o
 lib/frama-c/hptmap.cmi
 lib/frama-c/hptmap.cmo
-lib/frama-c/hptmap.cmx
+${PLIST.ocaml-opt}lib/frama-c/hptmap.cmx
 lib/frama-c/hptmap.o
 lib/frama-c/hptmap_sig.cmi
 lib/frama-c/hptset.cmi
 lib/frama-c/hptset.cmo
-lib/frama-c/hptset.cmx
+${PLIST.ocaml-opt}lib/frama-c/hptset.cmx
 lib/frama-c/hptset.o
 lib/frama-c/indexer.cmi
 lib/frama-c/indexer.cmo
-lib/frama-c/indexer.cmx
+${PLIST.ocaml-opt}lib/frama-c/indexer.cmx
 lib/frama-c/indexer.o
 lib/frama-c/infer_annotations.cmi
 lib/frama-c/infer_annotations.cmo
-lib/frama-c/infer_annotations.cmx
+${PLIST.ocaml-opt}lib/frama-c/infer_annotations.cmx
 lib/frama-c/infer_annotations.o
+lib/frama-c/inline.cmi
+lib/frama-c/inline.cmo
+${PLIST.ocaml-opt}lib/frama-c/inline.cmx
+lib/frama-c/inline.o
 lib/frama-c/inout_type.cmi
 lib/frama-c/inout_type.cmo
-lib/frama-c/inout_type.cmx
+${PLIST.ocaml-opt}lib/frama-c/inout_type.cmx
 lib/frama-c/inout_type.o
 lib/frama-c/int_Base.cmi
 lib/frama-c/int_Base.cmo
-lib/frama-c/int_Base.cmx
+${PLIST.ocaml-opt}lib/frama-c/int_Base.cmx
 lib/frama-c/int_Base.o
 lib/frama-c/int_Intervals.cmi
 lib/frama-c/int_Intervals.cmo
-lib/frama-c/int_Intervals.cmx
+${PLIST.ocaml-opt}lib/frama-c/int_Intervals.cmx
 lib/frama-c/int_Intervals.o
 lib/frama-c/int_Intervals_sig.cmi
+lib/frama-c/int_interval.cmi
+lib/frama-c/int_interval.cmo
+${PLIST.ocaml-opt}lib/frama-c/int_interval.cmx
+lib/frama-c/int_interval.o
+lib/frama-c/int_set.cmi
+lib/frama-c/int_set.cmo
+${PLIST.ocaml-opt}lib/frama-c/int_set.cmx
+lib/frama-c/int_set.o
+lib/frama-c/int_val.cmi
+lib/frama-c/int_val.cmo
+${PLIST.ocaml-opt}lib/frama-c/int_val.cmx
+lib/frama-c/int_val.o
 lib/frama-c/integer.cmi
 lib/frama-c/integer.cmo
-lib/frama-c/integer.cmx
+${PLIST.ocaml-opt}lib/frama-c/integer.cmx
 lib/frama-c/integer.o
-@comment lib/frama-c/inthash.cmi
-@comment lib/frama-c/inthash.cmo
-@comment lib/frama-c/inthash.cmx
-@comment lib/frama-c/inthash.o
+lib/frama-c/interpreted_automata.cmi
+lib/frama-c/interpreted_automata.cmo
+${PLIST.ocaml-opt}lib/frama-c/interpreted_automata.cmx
+lib/frama-c/interpreted_automata.o
 lib/frama-c/ival.cmi
 lib/frama-c/ival.cmo
-lib/frama-c/ival.cmx
+${PLIST.ocaml-opt}lib/frama-c/ival.cmx
 lib/frama-c/ival.o
 lib/frama-c/journal.cmi
 lib/frama-c/journal.cmo
-lib/frama-c/journal.cmx
+${PLIST.ocaml-opt}lib/frama-c/journal.cmx
 lib/frama-c/journal.o
 lib/frama-c/json.cmi
 lib/frama-c/json.cmo
-lib/frama-c/json.cmx
+${PLIST.ocaml-opt}lib/frama-c/json.cmx
 lib/frama-c/json.o
+lib/frama-c/json_compilation_database.cmi
+lib/frama-c/json_compilation_database.cmo
+${PLIST.ocaml-opt}lib/frama-c/json_compilation_database.cmx
+lib/frama-c/json_compilation_database.o
 lib/frama-c/kernel.cmi
 lib/frama-c/kernel.cmo
-lib/frama-c/kernel.cmx
+${PLIST.ocaml-opt}lib/frama-c/kernel.cmx
 lib/frama-c/kernel.o
 lib/frama-c/kernel_function.cmi
 lib/frama-c/kernel_function.cmo
-lib/frama-c/kernel_function.cmx
+${PLIST.ocaml-opt}lib/frama-c/kernel_function.cmx
 lib/frama-c/kernel_function.o
+lib/frama-c/lattice_bounds.cmi
+lib/frama-c/lattice_bounds.cmo
+${PLIST.ocaml-opt}lib/frama-c/lattice_bounds.cmx
+lib/frama-c/lattice_bounds.o
 lib/frama-c/lattice_messages.cmi
 lib/frama-c/lattice_messages.cmo
-lib/frama-c/lattice_messages.cmx
+${PLIST.ocaml-opt}lib/frama-c/lattice_messages.cmx
 lib/frama-c/lattice_messages.o
 lib/frama-c/lattice_type.cmi
 ${PLIST.gui}lib/frama-c/launcher.cmi
 ${PLIST.gui}lib/frama-c/launcher.cmo
-${PLIST.gui}lib/frama-c/launcher.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/launcher.cmx
 ${PLIST.gui}lib/frama-c/launcher.o
-lib/frama-c/leftistheap.cmi
-lib/frama-c/leftistheap.cmo
-lib/frama-c/leftistheap.cmx
-lib/frama-c/leftistheap.o
 lib/frama-c/lexerhack.cmi
 lib/frama-c/lexerhack.cmo
-lib/frama-c/lexerhack.cmx
+${PLIST.ocaml-opt}lib/frama-c/lexerhack.cmx
 lib/frama-c/lexerhack.o
+${PLIST.ocaml-opt}lib/frama-c/libframa-c.a
 lib/frama-c/lmap.cmi
 lib/frama-c/lmap.cmo
-lib/frama-c/lmap.cmx
+${PLIST.ocaml-opt}lib/frama-c/lmap.cmx
 lib/frama-c/lmap.o
 lib/frama-c/lmap_bitwise.cmi
 lib/frama-c/lmap_bitwise.cmo
-lib/frama-c/lmap_bitwise.cmx
+${PLIST.ocaml-opt}lib/frama-c/lmap_bitwise.cmx
 lib/frama-c/lmap_bitwise.o
 lib/frama-c/lmap_sig.cmi
 lib/frama-c/locations.cmi
 lib/frama-c/locations.cmo
-lib/frama-c/locations.cmx
+${PLIST.ocaml-opt}lib/frama-c/locations.cmx
 lib/frama-c/locations.o
 lib/frama-c/log.cmi
 lib/frama-c/log.cmo
-lib/frama-c/log.cmx
+${PLIST.ocaml-opt}lib/frama-c/log.cmx
 lib/frama-c/log.o
 lib/frama-c/logic_builtin.cmi
 lib/frama-c/logic_builtin.cmo
-lib/frama-c/logic_builtin.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_builtin.cmx
 lib/frama-c/logic_builtin.o
 lib/frama-c/logic_const.cmi
 lib/frama-c/logic_const.cmo
-lib/frama-c/logic_const.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_const.cmx
 lib/frama-c/logic_const.o
 lib/frama-c/logic_env.cmi
 lib/frama-c/logic_env.cmo
-lib/frama-c/logic_env.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_env.cmx
 lib/frama-c/logic_env.o
 lib/frama-c/logic_interp.cmi
 lib/frama-c/logic_interp.cmo
-lib/frama-c/logic_interp.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_interp.cmx
 lib/frama-c/logic_interp.o
 lib/frama-c/logic_lexer.cmi
 lib/frama-c/logic_lexer.cmo
-lib/frama-c/logic_lexer.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_lexer.cmx
 lib/frama-c/logic_lexer.o
 lib/frama-c/logic_parser.cmi
 lib/frama-c/logic_parser.cmo
-lib/frama-c/logic_parser.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_parser.cmx
 lib/frama-c/logic_parser.o
 lib/frama-c/logic_preprocess.cmi
 lib/frama-c/logic_preprocess.cmo
-lib/frama-c/logic_preprocess.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_preprocess.cmx
 lib/frama-c/logic_preprocess.o
 lib/frama-c/logic_print.cmi
 lib/frama-c/logic_print.cmo
-lib/frama-c/logic_print.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_print.cmx
 lib/frama-c/logic_print.o
 lib/frama-c/logic_ptree.cmi
 lib/frama-c/logic_typing.cmi
 lib/frama-c/logic_typing.cmo
-lib/frama-c/logic_typing.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_typing.cmx
 lib/frama-c/logic_typing.o
 lib/frama-c/logic_utils.cmi
 lib/frama-c/logic_utils.cmo
-lib/frama-c/logic_utils.cmx
+${PLIST.ocaml-opt}lib/frama-c/logic_utils.cmx
 lib/frama-c/logic_utils.o
 lib/frama-c/loop.cmi
 lib/frama-c/loop.cmo
-lib/frama-c/loop.cmx
+${PLIST.ocaml-opt}lib/frama-c/loop.cmx
 lib/frama-c/loop.o
 lib/frama-c/machdeps.cmi
 lib/frama-c/machdeps.cmo
-lib/frama-c/machdeps.cmx
+${PLIST.ocaml-opt}lib/frama-c/machdeps.cmx
 lib/frama-c/machdeps.o
-lib/frama-c/map_Lattice.cmi
-lib/frama-c/map_Lattice.cmo
-lib/frama-c/map_Lattice.cmx
-lib/frama-c/map_Lattice.o
+lib/frama-c/map_lattice.cmi
+lib/frama-c/map_lattice.cmo
+${PLIST.ocaml-opt}lib/frama-c/map_lattice.cmx
+lib/frama-c/map_lattice.o
+lib/frama-c/markdown.cmi
+lib/frama-c/markdown.cmo
+${PLIST.ocaml-opt}lib/frama-c/markdown.cmx
+lib/frama-c/markdown.o
 ${PLIST.gui}lib/frama-c/menu_manager.cmi
 ${PLIST.gui}lib/frama-c/menu_manager.cmo
-${PLIST.gui}lib/frama-c/menu_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/menu_manager.cmx
 ${PLIST.gui}lib/frama-c/menu_manager.o
 lib/frama-c/mergecil.cmi
 lib/frama-c/mergecil.cmo
-lib/frama-c/mergecil.cmx
+${PLIST.ocaml-opt}lib/frama-c/mergecil.cmx
 lib/frama-c/mergecil.o
 lib/frama-c/messages.cmi
 lib/frama-c/messages.cmo
-lib/frama-c/messages.cmx
+${PLIST.ocaml-opt}lib/frama-c/messages.cmx
 lib/frama-c/messages.o
 lib/frama-c/offsetmap.cmi
 lib/frama-c/offsetmap.cmo
-lib/frama-c/offsetmap.cmx
+${PLIST.ocaml-opt}lib/frama-c/offsetmap.cmx
 lib/frama-c/offsetmap.o
 lib/frama-c/offsetmap_bitwise_sig.cmi
 lib/frama-c/offsetmap_lattice_with_isotropy.cmi
 lib/frama-c/offsetmap_sig.cmi
 lib/frama-c/oneret.cmi
 lib/frama-c/oneret.cmo
-lib/frama-c/oneret.cmx
+${PLIST.ocaml-opt}lib/frama-c/oneret.cmx
 lib/frama-c/oneret.o
 lib/frama-c/ordered_stmt.cmi
 lib/frama-c/ordered_stmt.cmo
-lib/frama-c/ordered_stmt.cmx
+${PLIST.ocaml-opt}lib/frama-c/ordered_stmt.cmx
 lib/frama-c/ordered_stmt.o
 lib/frama-c/origin.cmi
 lib/frama-c/origin.cmo
-lib/frama-c/origin.cmx
+${PLIST.ocaml-opt}lib/frama-c/origin.cmx
 lib/frama-c/origin.o
 lib/frama-c/parameter_builder.cmi
 lib/frama-c/parameter_builder.cmo
-lib/frama-c/parameter_builder.cmx
+${PLIST.ocaml-opt}lib/frama-c/parameter_builder.cmx
 lib/frama-c/parameter_builder.o
 lib/frama-c/parameter_category.cmi
 lib/frama-c/parameter_category.cmo
-lib/frama-c/parameter_category.cmx
+${PLIST.ocaml-opt}lib/frama-c/parameter_category.cmx
 lib/frama-c/parameter_category.o
 lib/frama-c/parameter_customize.cmi
 lib/frama-c/parameter_customize.cmo
-lib/frama-c/parameter_customize.cmx
+${PLIST.ocaml-opt}lib/frama-c/parameter_customize.cmx
 lib/frama-c/parameter_customize.o
 lib/frama-c/parameter_sig.cmi
 lib/frama-c/parameter_state.cmi
 lib/frama-c/parameter_state.cmo
-lib/frama-c/parameter_state.cmx
+${PLIST.ocaml-opt}lib/frama-c/parameter_state.cmx
 lib/frama-c/parameter_state.o
-@comment lib/frama-c/path_lattice.cmi
-@comment lib/frama-c/path_lattice.cmo
-@comment lib/frama-c/path_lattice.cmx
-@comment lib/frama-c/path_lattice.o
+lib/frama-c/parse_env.cmi
+lib/frama-c/parse_env.cmo
+${PLIST.ocaml-opt}lib/frama-c/parse_env.cmx
+lib/frama-c/parse_env.o
 lib/frama-c/pdgIndex.cmi
 lib/frama-c/pdgIndex.cmo
-lib/frama-c/pdgIndex.cmx
+${PLIST.ocaml-opt}lib/frama-c/pdgIndex.cmx
 lib/frama-c/pdgIndex.o
 lib/frama-c/pdgMarks.cmi
 lib/frama-c/pdgMarks.cmo
-lib/frama-c/pdgMarks.cmx
+${PLIST.ocaml-opt}lib/frama-c/pdgMarks.cmx
 lib/frama-c/pdgMarks.o
 lib/frama-c/pdgTypes.cmi
 lib/frama-c/pdgTypes.cmo
-lib/frama-c/pdgTypes.cmx
+${PLIST.ocaml-opt}lib/frama-c/pdgTypes.cmx
 lib/frama-c/pdgTypes.o
 lib/frama-c/plugin.cmi
 lib/frama-c/plugin.cmo
-lib/frama-c/plugin.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugin.cmx
 lib/frama-c/plugin.o
 lib/frama-c/plugins/Aorai.cmi
 lib/frama-c/plugins/Callgraph.cmi
 lib/frama-c/plugins/Constant_Propagation.cmi
+lib/frama-c/plugins/Dive.cmi
 lib/frama-c/plugins/E_ACSL.cmi
+lib/frama-c/plugins/Eva.cmi
 lib/frama-c/plugins/From.cmi
 lib/frama-c/plugins/Impact.cmi
 lib/frama-c/plugins/Inout.cmi
+lib/frama-c/plugins/Instantiate.cmi
 lib/frama-c/plugins/LoopAnalysis.cmi
 lib/frama-c/plugins/META.frama-c-aorai
 lib/frama-c/plugins/META.frama-c-callgraph
 lib/frama-c/plugins/META.frama-c-constant_propagation
+lib/frama-c/plugins/META.frama-c-dive
 lib/frama-c/plugins/META.frama-c-e_acsl
+lib/frama-c/plugins/META.frama-c-eva
 lib/frama-c/plugins/META.frama-c-from
 lib/frama-c/plugins/META.frama-c-impact
 lib/frama-c/plugins/META.frama-c-inout
+lib/frama-c/plugins/META.frama-c-instantiate
 lib/frama-c/plugins/META.frama-c-loopanalysis
 lib/frama-c/plugins/META.frama-c-metrics
 lib/frama-c/plugins/META.frama-c-nonterm
@@ -577,16 +634,19 @@ lib/frama-c/plugins/META.frama-c-occurre
 lib/frama-c/plugins/META.frama-c-pdg
 lib/frama-c/plugins/META.frama-c-postdominators
 lib/frama-c/plugins/META.frama-c-print_api
+lib/frama-c/plugins/META.frama-c-qed
+lib/frama-c/plugins/META.frama-c-reduc
 lib/frama-c/plugins/META.frama-c-report
 lib/frama-c/plugins/META.frama-c-rtegen
 lib/frama-c/plugins/META.frama-c-scope
 ${PLIST.gui}lib/frama-c/plugins/META.frama-c-security_slicing
+lib/frama-c/plugins/META.frama-c-server
 lib/frama-c/plugins/META.frama-c-slicing
 lib/frama-c/plugins/META.frama-c-sparecode
+lib/frama-c/plugins/META.frama-c-studia
 lib/frama-c/plugins/META.frama-c-users
-lib/frama-c/plugins/META.frama-c-value
 lib/frama-c/plugins/META.frama-c-variadic
-lib/frama-c/plugins/META.frama-c-wp
+${PLIST.coq}lib/frama-c/plugins/META.frama-c-wp
 lib/frama-c/plugins/Metrics.cmi
 lib/frama-c/plugins/Nonterm.cmi
 lib/frama-c/plugins/Obfuscator.cmi
@@ -594,382 +654,434 @@ lib/frama-c/plugins/Occurrence.cmi
 lib/frama-c/plugins/Pdg.cmi
 lib/frama-c/plugins/Postdominators.cmi
 lib/frama-c/plugins/Print_api.cmi
+lib/frama-c/plugins/Qed.cmi
+lib/frama-c/plugins/Reduc.cmi
 lib/frama-c/plugins/Report.cmi
 lib/frama-c/plugins/RteGen.cmi
 lib/frama-c/plugins/Scope.cmi
 ${PLIST.gui}lib/frama-c/plugins/Security_slicing.cmi
+lib/frama-c/plugins/Server.cmi
 lib/frama-c/plugins/Slicing.cmi
 lib/frama-c/plugins/Sparecode.cmi
+lib/frama-c/plugins/Studia.cmi
 lib/frama-c/plugins/Users.cmi
-lib/frama-c/plugins/Value.cmi
 lib/frama-c/plugins/Variadic.cmi
-lib/frama-c/plugins/Wp.cmi
-${PLIST.gui}lib/frama-c/plugins/gui/Callgraph.cmi
-${PLIST.gui}lib/frama-c/plugins/gui/Callgraph.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Callgraph.cmxs
+${PLIST.coq}lib/frama-c/plugins/Wp.cmi
+${PLIST.gui}lib/frama-c/plugins/gui/Eva.cmi
+${PLIST.gui}lib/frama-c/plugins/gui/Eva.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Eva.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/From.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/From.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/From.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/From.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Impact.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Impact.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Impact.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Impact.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Metrics.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Metrics.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Metrics.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Metrics.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Occurrence.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Occurrence.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Occurrence.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Occurrence.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Scope.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Scope.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Scope.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Scope.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Security_slicing.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Security_slicing.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Security_slicing.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Security_slicing.cmxs
 ${PLIST.gui}lib/frama-c/plugins/gui/Slicing.cmi
 ${PLIST.gui}lib/frama-c/plugins/gui/Slicing.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Slicing.cmxs
-${PLIST.gui}lib/frama-c/plugins/gui/Value.cmi
-${PLIST.gui}lib/frama-c/plugins/gui/Value.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Value.cmxs
-${PLIST.gui}lib/frama-c/plugins/gui/Wp.cma
-${PLIST.gui}lib/frama-c/plugins/gui/Wp.cmi
-@comment ${PLIST.gui}lib/frama-c/plugins/gui/Wp.cmo
-${PLIST.gui}lib/frama-c/plugins/gui/Wp.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Slicing.cmxs
+${PLIST.gui}lib/frama-c/plugins/gui/Studia.cmi
+${PLIST.gui}lib/frama-c/plugins/gui/Studia.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Studia.cmxs
+${PLIST.coq}lib/frama-c/plugins/gui/Wp.cmi
+${PLIST.coq}lib/frama-c/plugins/gui/Wp.cmo
+${PLIST.coq}${PLIST.ocaml-opt}lib/frama-c/plugins/gui/Wp.cmxs
 lib/frama-c/plugins/top/Aorai.cmo
-lib/frama-c/plugins/top/Aorai.cmx
-lib/frama-c/plugins/top/Aorai.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Aorai.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Aorai.cmxs
 lib/frama-c/plugins/top/Callgraph.cmo
-lib/frama-c/plugins/top/Callgraph.cmx
-lib/frama-c/plugins/top/Callgraph.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Callgraph.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Callgraph.cmxs
 lib/frama-c/plugins/top/Constant_Propagation.cmo
-lib/frama-c/plugins/top/Constant_Propagation.cmx
-lib/frama-c/plugins/top/Constant_Propagation.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Constant_Propagation.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Constant_Propagation.cmxs
+lib/frama-c/plugins/top/Dive.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Dive.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Dive.cmxs
 lib/frama-c/plugins/top/E_ACSL.cmo
-lib/frama-c/plugins/top/E_ACSL.cmx
-lib/frama-c/plugins/top/E_ACSL.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/E_ACSL.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/E_ACSL.cmxs
+lib/frama-c/plugins/top/Eva.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Eva.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Eva.cmxs
 lib/frama-c/plugins/top/From.cmo
-lib/frama-c/plugins/top/From.cmx
-lib/frama-c/plugins/top/From.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/From.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/From.cmxs
 lib/frama-c/plugins/top/Impact.cmo
-lib/frama-c/plugins/top/Impact.cmx
-lib/frama-c/plugins/top/Impact.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Impact.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Impact.cmxs
 lib/frama-c/plugins/top/Inout.cmo
-lib/frama-c/plugins/top/Inout.cmx
-lib/frama-c/plugins/top/Inout.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Inout.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Inout.cmxs
+lib/frama-c/plugins/top/Instantiate.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Instantiate.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Instantiate.cmxs
 lib/frama-c/plugins/top/LoopAnalysis.cmo
-lib/frama-c/plugins/top/LoopAnalysis.cmx
-lib/frama-c/plugins/top/LoopAnalysis.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/LoopAnalysis.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/LoopAnalysis.cmxs
 lib/frama-c/plugins/top/Metrics.cmo
-lib/frama-c/plugins/top/Metrics.cmx
-lib/frama-c/plugins/top/Metrics.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Metrics.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Metrics.cmxs
 lib/frama-c/plugins/top/Nonterm.cmo
-lib/frama-c/plugins/top/Nonterm.cmx
-lib/frama-c/plugins/top/Nonterm.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Nonterm.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Nonterm.cmxs
 lib/frama-c/plugins/top/Obfuscator.cmo
-lib/frama-c/plugins/top/Obfuscator.cmx
-lib/frama-c/plugins/top/Obfuscator.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Obfuscator.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Obfuscator.cmxs
 lib/frama-c/plugins/top/Occurrence.cmo
-lib/frama-c/plugins/top/Occurrence.cmx
-lib/frama-c/plugins/top/Occurrence.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Occurrence.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Occurrence.cmxs
 lib/frama-c/plugins/top/Pdg.cmo
-lib/frama-c/plugins/top/Pdg.cmx
-lib/frama-c/plugins/top/Pdg.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Pdg.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Pdg.cmxs
 lib/frama-c/plugins/top/Postdominators.cmo
-lib/frama-c/plugins/top/Postdominators.cmx
-lib/frama-c/plugins/top/Postdominators.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Postdominators.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Postdominators.cmxs
 lib/frama-c/plugins/top/Print_api.cmo
-lib/frama-c/plugins/top/Print_api.cmx
-lib/frama-c/plugins/top/Print_api.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Print_api.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Print_api.cmxs
+lib/frama-c/plugins/top/Qed.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Qed.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Qed.cmxs
+lib/frama-c/plugins/top/Reduc.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Reduc.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Reduc.cmxs
 lib/frama-c/plugins/top/Report.cmo
-lib/frama-c/plugins/top/Report.cmx
-lib/frama-c/plugins/top/Report.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Report.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Report.cmxs
 lib/frama-c/plugins/top/RteGen.cmo
-lib/frama-c/plugins/top/RteGen.cmx
-lib/frama-c/plugins/top/RteGen.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/RteGen.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/RteGen.cmxs
 lib/frama-c/plugins/top/Scope.cmo
-lib/frama-c/plugins/top/Scope.cmx
-lib/frama-c/plugins/top/Scope.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Scope.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Scope.cmxs
 ${PLIST.gui}lib/frama-c/plugins/top/Security_slicing.cmo
-${PLIST.gui}lib/frama-c/plugins/top/Security_slicing.cmx
-${PLIST.gui}lib/frama-c/plugins/top/Security_slicing.cmxs
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/top/Security_slicing.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/plugins/top/Security_slicing.cmxs
+lib/frama-c/plugins/top/Server.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Server.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Server.cmxs
 lib/frama-c/plugins/top/Slicing.cmo
-lib/frama-c/plugins/top/Slicing.cmx
-lib/frama-c/plugins/top/Slicing.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Slicing.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Slicing.cmxs
 lib/frama-c/plugins/top/Sparecode.cmo
-lib/frama-c/plugins/top/Sparecode.cmx
-lib/frama-c/plugins/top/Sparecode.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Sparecode.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Sparecode.cmxs
+lib/frama-c/plugins/top/Studia.cmo
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Studia.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Studia.cmxs
 lib/frama-c/plugins/top/Users.cmo
-lib/frama-c/plugins/top/Users.cmx
-lib/frama-c/plugins/top/Users.cmxs
-lib/frama-c/plugins/top/Value.cmo
-lib/frama-c/plugins/top/Value.cmx
-lib/frama-c/plugins/top/Value.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Users.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Users.cmxs
 lib/frama-c/plugins/top/Variadic.cmo
-lib/frama-c/plugins/top/Variadic.cmx
-lib/frama-c/plugins/top/Variadic.cmxs
-lib/frama-c/plugins/top/Wp.cma
-lib/frama-c/plugins/top/Wp.cmx
-lib/frama-c/plugins/top/Wp.cmxa
-lib/frama-c/plugins/top/Wp.cmxs
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Variadic.cmx
+${PLIST.ocaml-opt}lib/frama-c/plugins/top/Variadic.cmxs
+${PLIST.coq}lib/frama-c/plugins/top/Wp.cmo
+${PLIST.coq}lib/frama-c/plugins/top/Wp.cmx
+${PLIST.coq}${PLIST.ocaml-opt}lib/frama-c/plugins/top/Wp.cmxs
 lib/frama-c/precise_locs.cmi
 lib/frama-c/precise_locs.cmo
-lib/frama-c/precise_locs.cmx
+${PLIST.ocaml-opt}lib/frama-c/precise_locs.cmx
 lib/frama-c/precise_locs.o
 ${PLIST.gui}lib/frama-c/pretty_source.cmi
 ${PLIST.gui}lib/frama-c/pretty_source.cmo
-${PLIST.gui}lib/frama-c/pretty_source.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/pretty_source.cmx
 ${PLIST.gui}lib/frama-c/pretty_source.o
 lib/frama-c/pretty_utils.cmi
 lib/frama-c/pretty_utils.cmo
-lib/frama-c/pretty_utils.cmx
+${PLIST.ocaml-opt}lib/frama-c/pretty_utils.cmx
 lib/frama-c/pretty_utils.o
 lib/frama-c/printer.cmi
 lib/frama-c/printer.cmo
-lib/frama-c/printer.cmx
+${PLIST.ocaml-opt}lib/frama-c/printer.cmx
 lib/frama-c/printer.o
 lib/frama-c/printer_api.cmi
 lib/frama-c/printer_builder.cmi
 lib/frama-c/printer_builder.cmo
-lib/frama-c/printer_builder.cmx
+${PLIST.ocaml-opt}lib/frama-c/printer_builder.cmx
 lib/frama-c/printer_builder.o
+lib/frama-c/printer_tag.cmi
+lib/frama-c/printer_tag.cmo
+${PLIST.ocaml-opt}lib/frama-c/printer_tag.cmx
+lib/frama-c/printer_tag.o
 lib/frama-c/project.cmi
 lib/frama-c/project.cmo
-lib/frama-c/project.cmx
+${PLIST.ocaml-opt}lib/frama-c/project.cmx
 lib/frama-c/project.o
 ${PLIST.gui}lib/frama-c/project_manager.cmi
 ${PLIST.gui}lib/frama-c/project_manager.cmo
-${PLIST.gui}lib/frama-c/project_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/project_manager.cmx
 ${PLIST.gui}lib/frama-c/project_manager.o
 lib/frama-c/project_skeleton.cmi
 lib/frama-c/project_skeleton.cmo
-lib/frama-c/project_skeleton.cmx
+${PLIST.ocaml-opt}lib/frama-c/project_skeleton.cmx
 lib/frama-c/project_skeleton.o
 lib/frama-c/property.cmi
 lib/frama-c/property.cmo
-lib/frama-c/property.cmx
+${PLIST.ocaml-opt}lib/frama-c/property.cmx
 lib/frama-c/property.o
 ${PLIST.gui}lib/frama-c/property_navigator.cmi
 ${PLIST.gui}lib/frama-c/property_navigator.cmo
-${PLIST.gui}lib/frama-c/property_navigator.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/property_navigator.cmx
 ${PLIST.gui}lib/frama-c/property_navigator.o
 lib/frama-c/property_status.cmi
 lib/frama-c/property_status.cmo
-lib/frama-c/property_status.cmx
+${PLIST.ocaml-opt}lib/frama-c/property_status.cmx
 lib/frama-c/property_status.o
 lib/frama-c/ptests_config.cmi
-lib/frama-c/ptests_config.cmx
+${PLIST.ocaml-opt}lib/frama-c/ptests_config.cmx
 lib/frama-c/ptests_config.o
 lib/frama-c/qstack.cmi
 lib/frama-c/qstack.cmo
-lib/frama-c/qstack.cmx
+${PLIST.ocaml-opt}lib/frama-c/qstack.cmx
 lib/frama-c/qstack.o
 lib/frama-c/rangemap.cmi
 lib/frama-c/rangemap.cmo
-lib/frama-c/rangemap.cmx
+${PLIST.ocaml-opt}lib/frama-c/rangemap.cmx
 lib/frama-c/rangemap.o
 lib/frama-c/rgmap.cmi
 lib/frama-c/rgmap.cmo
-lib/frama-c/rgmap.cmx
+${PLIST.ocaml-opt}lib/frama-c/rgmap.cmx
 lib/frama-c/rgmap.o
+lib/frama-c/rich_text.cmi
+lib/frama-c/rich_text.cmo
+${PLIST.ocaml-opt}lib/frama-c/rich_text.cmx
+lib/frama-c/rich_text.o
 lib/frama-c/rmtmps.cmi
 lib/frama-c/rmtmps.cmo
-lib/frama-c/rmtmps.cmx
+${PLIST.ocaml-opt}lib/frama-c/rmtmps.cmx
 lib/frama-c/rmtmps.o
+lib/frama-c/sanitizer.cmi
+lib/frama-c/sanitizer.cmo
+${PLIST.ocaml-opt}lib/frama-c/sanitizer.cmx
+lib/frama-c/sanitizer.o
 lib/frama-c/service_graph.cmi
 lib/frama-c/service_graph.cmo
-lib/frama-c/service_graph.cmx
+${PLIST.ocaml-opt}lib/frama-c/service_graph.cmx
 lib/frama-c/service_graph.o
-@comment lib/frama-c/shifted_Location.cmi
-@comment lib/frama-c/shifted_Location.cmo
-@comment lib/frama-c/shifted_Location.cmx
-@comment lib/frama-c/shifted_Location.o
-lib/frama-c/slicingInternals.cmi
-lib/frama-c/slicingInternals.cmo
-lib/frama-c/slicingInternals.cmx
-lib/frama-c/slicingInternals.o
-lib/frama-c/slicingTypes.cmi
-lib/frama-c/slicingTypes.cmo
-lib/frama-c/slicingTypes.cmx
-lib/frama-c/slicingTypes.o
 ${PLIST.gui}lib/frama-c/source_manager.cmi
 ${PLIST.gui}lib/frama-c/source_manager.cmo
-${PLIST.gui}lib/frama-c/source_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/source_manager.cmx
 ${PLIST.gui}lib/frama-c/source_manager.o
 ${PLIST.gui}lib/frama-c/source_viewer.cmi
 ${PLIST.gui}lib/frama-c/source_viewer.cmo
-${PLIST.gui}lib/frama-c/source_viewer.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/source_viewer.cmx
 ${PLIST.gui}lib/frama-c/source_viewer.o
 lib/frama-c/special_hooks.cmi
 lib/frama-c/special_hooks.cmo
-lib/frama-c/special_hooks.cmx
+${PLIST.ocaml-opt}lib/frama-c/special_hooks.cmx
 lib/frama-c/special_hooks.o
 lib/frama-c/state.cmi
 lib/frama-c/state.cmo
-lib/frama-c/state.cmx
+${PLIST.ocaml-opt}lib/frama-c/state.cmx
 lib/frama-c/state.o
 lib/frama-c/state_builder.cmi
 lib/frama-c/state_builder.cmo
-lib/frama-c/state_builder.cmx
+${PLIST.ocaml-opt}lib/frama-c/state_builder.cmx
 lib/frama-c/state_builder.o
 lib/frama-c/state_dependency_graph.cmi
 lib/frama-c/state_dependency_graph.cmo
-lib/frama-c/state_dependency_graph.cmx
+${PLIST.ocaml-opt}lib/frama-c/state_dependency_graph.cmx
 lib/frama-c/state_dependency_graph.o
-@comment lib/frama-c/state_imp.cmi
-@comment lib/frama-c/state_imp.cmo
-@comment lib/frama-c/state_imp.cmx
-@comment lib/frama-c/state_imp.o
 lib/frama-c/state_selection.cmi
 lib/frama-c/state_selection.cmo
-lib/frama-c/state_selection.cmx
+${PLIST.ocaml-opt}lib/frama-c/state_selection.cmx
 lib/frama-c/state_selection.o
-@comment lib/frama-c/state_set.cmi
-@comment lib/frama-c/state_set.cmo
-@comment lib/frama-c/state_set.cmx
-@comment lib/frama-c/state_set.o
 lib/frama-c/state_topological.cmi
 lib/frama-c/state_topological.cmo
-lib/frama-c/state_topological.cmx
+${PLIST.ocaml-opt}lib/frama-c/state_topological.cmx
 lib/frama-c/state_topological.o
 lib/frama-c/statuses_by_call.cmi
 lib/frama-c/statuses_by_call.cmo
-lib/frama-c/statuses_by_call.cmx
+${PLIST.ocaml-opt}lib/frama-c/statuses_by_call.cmx
 lib/frama-c/statuses_by_call.o
 lib/frama-c/stmts_graph.cmi
 lib/frama-c/stmts_graph.cmo
-lib/frama-c/stmts_graph.cmx
+${PLIST.ocaml-opt}lib/frama-c/stmts_graph.cmx
 lib/frama-c/stmts_graph.o
 lib/frama-c/structural_descr.cmi
 lib/frama-c/structural_descr.cmo
-lib/frama-c/structural_descr.cmx
+${PLIST.ocaml-opt}lib/frama-c/structural_descr.cmx
 lib/frama-c/structural_descr.o
+lib/frama-c/substitute_const_globals.cmi
+lib/frama-c/substitute_const_globals.cmo
+${PLIST.ocaml-opt}lib/frama-c/substitute_const_globals.cmx
+lib/frama-c/substitute_const_globals.o
 lib/frama-c/task.cmi
 lib/frama-c/task.cmo
-lib/frama-c/task.cmx
+${PLIST.ocaml-opt}lib/frama-c/task.cmx
 lib/frama-c/task.o
 lib/frama-c/tr_offset.cmi
 lib/frama-c/tr_offset.cmo
-lib/frama-c/tr_offset.cmx
+${PLIST.ocaml-opt}lib/frama-c/tr_offset.cmx
 lib/frama-c/tr_offset.o
 lib/frama-c/transitioning.cmi
 lib/frama-c/transitioning.cmo
-lib/frama-c/transitioning.cmx
+${PLIST.ocaml-opt}lib/frama-c/transitioning.cmx
 lib/frama-c/transitioning.o
 lib/frama-c/translate_lightweight.cmi
 lib/frama-c/translate_lightweight.cmo
-lib/frama-c/translate_lightweight.cmx
+${PLIST.ocaml-opt}lib/frama-c/translate_lightweight.cmx
 lib/frama-c/translate_lightweight.o
 lib/frama-c/type.cmi
 lib/frama-c/type.cmo
-lib/frama-c/type.cmx
+${PLIST.ocaml-opt}lib/frama-c/type.cmx
 lib/frama-c/type.o
 lib/frama-c/typed_parameter.cmi
 lib/frama-c/typed_parameter.cmo
-lib/frama-c/typed_parameter.cmx
+${PLIST.ocaml-opt}lib/frama-c/typed_parameter.cmx
 lib/frama-c/typed_parameter.o
 lib/frama-c/undefined_sequence.cmi
 lib/frama-c/undefined_sequence.cmo
-lib/frama-c/undefined_sequence.cmx
+${PLIST.ocaml-opt}lib/frama-c/undefined_sequence.cmx
 lib/frama-c/undefined_sequence.o
 lib/frama-c/unicode.cmi
 lib/frama-c/unicode.cmo
-lib/frama-c/unicode.cmx
+${PLIST.ocaml-opt}lib/frama-c/unicode.cmx
 lib/frama-c/unicode.o
 lib/frama-c/unmarshal.cmi
 lib/frama-c/unmarshal.cmo
-lib/frama-c/unmarshal.cmx
+${PLIST.ocaml-opt}lib/frama-c/unmarshal.cmx
 lib/frama-c/unmarshal.o
 lib/frama-c/unmarshal_z.cmi
 lib/frama-c/unmarshal_z.cmo
-lib/frama-c/unmarshal_z.cmx
+${PLIST.ocaml-opt}lib/frama-c/unmarshal_z.cmx
 lib/frama-c/unmarshal_z.o
 lib/frama-c/unroll_loops.cmi
 lib/frama-c/unroll_loops.cmo
-lib/frama-c/unroll_loops.cmx
+${PLIST.ocaml-opt}lib/frama-c/unroll_loops.cmx
 lib/frama-c/unroll_loops.o
 lib/frama-c/utf8_logic.cmi
 lib/frama-c/utf8_logic.cmo
-lib/frama-c/utf8_logic.cmx
+${PLIST.ocaml-opt}lib/frama-c/utf8_logic.cmx
 lib/frama-c/utf8_logic.o
 lib/frama-c/value_types.cmi
 lib/frama-c/value_types.cmo
-lib/frama-c/value_types.cmx
+${PLIST.ocaml-opt}lib/frama-c/value_types.cmx
 lib/frama-c/value_types.o
 lib/frama-c/vector.cmi
 lib/frama-c/vector.cmo
-lib/frama-c/vector.cmx
+${PLIST.ocaml-opt}lib/frama-c/vector.cmx
 lib/frama-c/vector.o
 lib/frama-c/visitor.cmi
 lib/frama-c/visitor.cmo
-lib/frama-c/visitor.cmx
+${PLIST.ocaml-opt}lib/frama-c/visitor.cmx
 lib/frama-c/visitor.o
+lib/frama-c/visitor_behavior.cmi
+lib/frama-c/visitor_behavior.cmo
+${PLIST.ocaml-opt}lib/frama-c/visitor_behavior.cmx
+lib/frama-c/visitor_behavior.o
 ${PLIST.gui}lib/frama-c/warning_manager.cmi
 ${PLIST.gui}lib/frama-c/warning_manager.cmo
-${PLIST.gui}lib/frama-c/warning_manager.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/warning_manager.cmx
 ${PLIST.gui}lib/frama-c/warning_manager.o
 ${PLIST.gui}lib/frama-c/wbox.cmi
 ${PLIST.gui}lib/frama-c/wbox.cmo
-${PLIST.gui}lib/frama-c/wbox.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wbox.cmx
 ${PLIST.gui}lib/frama-c/wbox.o
 ${PLIST.gui}lib/frama-c/wfile.cmi
 ${PLIST.gui}lib/frama-c/wfile.cmo
-${PLIST.gui}lib/frama-c/wfile.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wfile.cmx
 ${PLIST.gui}lib/frama-c/wfile.o
-@comment lib/frama-c/widen.cmi
-@comment lib/frama-c/widen.cmo
-@comment lib/frama-c/widen.cmx
-@comment lib/frama-c/widen.o
 lib/frama-c/widen_type.cmi
 lib/frama-c/widen_type.cmo
-lib/frama-c/widen_type.cmx
+${PLIST.ocaml-opt}lib/frama-c/widen_type.cmx
 lib/frama-c/widen_type.o
 ${PLIST.gui}lib/frama-c/widget.cmi
 ${PLIST.gui}lib/frama-c/widget.cmo
-${PLIST.gui}lib/frama-c/widget.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/widget.cmx
 ${PLIST.gui}lib/frama-c/widget.o
 ${PLIST.gui}lib/frama-c/wpalette.cmi
 ${PLIST.gui}lib/frama-c/wpalette.cmo
-${PLIST.gui}lib/frama-c/wpalette.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wpalette.cmx
 ${PLIST.gui}lib/frama-c/wpalette.o
 ${PLIST.gui}lib/frama-c/wpane.cmi
 ${PLIST.gui}lib/frama-c/wpane.cmo
-${PLIST.gui}lib/frama-c/wpane.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wpane.cmx
 ${PLIST.gui}lib/frama-c/wpane.o
 ${PLIST.gui}lib/frama-c/wtable.cmi
 ${PLIST.gui}lib/frama-c/wtable.cmo
-${PLIST.gui}lib/frama-c/wtable.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wtable.cmx
 ${PLIST.gui}lib/frama-c/wtable.o
 ${PLIST.gui}lib/frama-c/wtext.cmi
 ${PLIST.gui}lib/frama-c/wtext.cmo
-${PLIST.gui}lib/frama-c/wtext.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wtext.cmx
 ${PLIST.gui}lib/frama-c/wtext.o
 lib/frama-c/wto.cmi
 lib/frama-c/wto.cmo
-lib/frama-c/wto.cmx
+${PLIST.ocaml-opt}lib/frama-c/wto.cmx
 lib/frama-c/wto.o
 lib/frama-c/wto_statement.cmi
 lib/frama-c/wto_statement.cmo
-lib/frama-c/wto_statement.cmx
+${PLIST.ocaml-opt}lib/frama-c/wto_statement.cmx
 lib/frama-c/wto_statement.o
 ${PLIST.gui}lib/frama-c/wutil.cmi
 ${PLIST.gui}lib/frama-c/wutil.cmo
-${PLIST.gui}lib/frama-c/wutil.cmx
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wutil.cmx
 ${PLIST.gui}lib/frama-c/wutil.o
-lib/libeacsl-gmp.a
-lib/libeacsl-jemalloc.a
+${PLIST.gui}lib/frama-c/wutil_once.cmi
+${PLIST.gui}lib/frama-c/wutil_once.cmo
+${PLIST.gui}${PLIST.ocaml-opt}lib/frama-c/wutil_once.cmx
+${PLIST.gui}lib/frama-c/wutil_once.o
 man/man1/e-acsl-gcc.sh.1
 man/man1/frama-c-gui.1
 man/man1/frama-c.1
+share/bash-completion/completions/e-acsl-gcc.sh
 share/frama-c/Makefile.common
 share/frama-c/Makefile.config
 share/frama-c/Makefile.dynamic
 share/frama-c/Makefile.dynamic_config
 share/frama-c/Makefile.generic
-share/frama-c/Makefile.kernel
 share/frama-c/Makefile.plugin.template
+share/frama-c/_frama-c
+share/frama-c/analysis-scripts/README.md
+share/frama-c/analysis-scripts/analysis.mk
+share/frama-c/analysis-scripts/benchmark_database.py
+share/frama-c/analysis-scripts/build.py
+share/frama-c/analysis-scripts/build_callgraph.py
+share/frama-c/analysis-scripts/clone.sh
+share/frama-c/analysis-scripts/cmd-dep.sh
+share/frama-c/analysis-scripts/concat-csv.sh
+share/frama-c/analysis-scripts/creduce.sh
+share/frama-c/analysis-scripts/epilogue.mk
+share/frama-c/analysis-scripts/fc_stubs.c
+share/frama-c/analysis-scripts/find_fun.py
+share/frama-c/analysis-scripts/flamegraph.pl
+share/frama-c/analysis-scripts/frama_c_results.py
+share/frama-c/analysis-scripts/function_finder.py
+share/frama-c/analysis-scripts/git_utils.py
+share/frama-c/analysis-scripts/list_files.py
+share/frama-c/analysis-scripts/list_functions.ml
+share/frama-c/analysis-scripts/make_wrapper.py
+share/frama-c/analysis-scripts/normalize_jcdb.py
+share/frama-c/analysis-scripts/parse-coverage.sh
+share/frama-c/analysis-scripts/prologue.mk
+share/frama-c/analysis-scripts/pyproject.toml
+share/frama-c/analysis-scripts/results_display.py
+share/frama-c/analysis-scripts/script_for_creduce_fatal.sh
+share/frama-c/analysis-scripts/script_for_creduce_non_fatal.sh
+share/frama-c/analysis-scripts/source_filter.py
+share/frama-c/analysis-scripts/summary.py
+share/frama-c/analysis-scripts/template.mk
 share/frama-c/autocomplete_frama-c
-share/frama-c/builtin.h
-@comment share/frama-c/check.png
+share/frama-c/compliance/c11_functions.json
+share/frama-c/compliance/c11_headers.json
+share/frama-c/compliance/compiler_builtins.json
+share/frama-c/compliance/gcc_builtins.json
+share/frama-c/compliance/glibc_functions.json
+share/frama-c/compliance/nonstandard_identifiers.json
+share/frama-c/compliance/posix_identifiers.json
 share/frama-c/configure.ac
 share/frama-c/doc/code/docgen.ml
 share/frama-c/doc/code/intro_kernel_plugin.txt
@@ -978,65 +1090,107 @@ share/frama-c/doc/code/intro_plugin_defa
 share/frama-c/doc/code/style.css
 share/frama-c/doc/code/toc_head.htm
 share/frama-c/doc/code/toc_tail.htm
-share/frama-c/e-acsl/bittree_model/e_acsl_bittree.h
-share/frama-c/e-acsl/bittree_model/e_acsl_bittree_api.h
-share/frama-c/e-acsl/bittree_model/e_acsl_bittree_mmodel.c
+share/frama-c/e-acsl/contrib/libdlmalloc/dlmalloc.c
 share/frama-c/e-acsl/e_acsl.h
-share/frama-c/e-acsl/e_acsl_assert.h
-share/frama-c/e-acsl/e_acsl_bits.h
-share/frama-c/e-acsl/e_acsl_debug.h
-share/frama-c/e-acsl/e_acsl_gmp.h
-share/frama-c/e-acsl/e_acsl_malloc.h
-share/frama-c/e-acsl/e_acsl_mmodel.c
-share/frama-c/e-acsl/e_acsl_mmodel_api.h
-share/frama-c/e-acsl/e_acsl_printf.h
-share/frama-c/e-acsl/e_acsl_safe_locations.h
-share/frama-c/e-acsl/e_acsl_shexec.h
-share/frama-c/e-acsl/e_acsl_string.h
-share/frama-c/e-acsl/e_acsl_syscall.h
-share/frama-c/e-acsl/e_acsl_trace.h
-share/frama-c/e-acsl/glibc/memcmp.c
-share/frama-c/e-acsl/glibc/memcopy.h
-share/frama-c/e-acsl/glibc/memcpy.c
-share/frama-c/e-acsl/glibc/memmove.c
-share/frama-c/e-acsl/glibc/memset.c
-share/frama-c/e-acsl/glibc/pagecopy.h
-share/frama-c/e-acsl/glibc/strcmp.c
-share/frama-c/e-acsl/glibc/strlen.c
-share/frama-c/e-acsl/glibc/strncmp.c
-share/frama-c/e-acsl/glibc/wordcopy.c
-share/frama-c/e-acsl/segment_model/e_acsl_segment_mmodel.c
-share/frama-c/e-acsl/segment_model/e_acsl_segment_tracking.h
-share/frama-c/e-acsl/segment_model/e_acsl_shadow_layout.h
+share/frama-c/e-acsl/e_acsl_rtl.c
+share/frama-c/e-acsl/instrumentation_model/e_acsl_assert.c
+share/frama-c/e-acsl/instrumentation_model/e_acsl_assert.h
+share/frama-c/e-acsl/instrumentation_model/e_acsl_assert_data.h
+share/frama-c/e-acsl/instrumentation_model/e_acsl_assert_data_api.c
+share/frama-c/e-acsl/instrumentation_model/e_acsl_assert_data_api.h
+share/frama-c/e-acsl/instrumentation_model/e_acsl_contract.c
+share/frama-c/e-acsl/instrumentation_model/e_acsl_contract.h
+share/frama-c/e-acsl/instrumentation_model/e_acsl_temporal.c
+share/frama-c/e-acsl/instrumentation_model/e_acsl_temporal.h
+share/frama-c/e-acsl/instrumentation_model/e_acsl_temporal_timestamp.h
+share/frama-c/e-acsl/internals/e_acsl_alias.h
+share/frama-c/e-acsl/internals/e_acsl_bits.c
+share/frama-c/e-acsl/internals/e_acsl_bits.h
+share/frama-c/e-acsl/internals/e_acsl_concurrency.h
+share/frama-c/e-acsl/internals/e_acsl_config.h
+share/frama-c/e-acsl/internals/e_acsl_debug.c
+share/frama-c/e-acsl/internals/e_acsl_debug.h
+share/frama-c/e-acsl/internals/e_acsl_malloc.c
+share/frama-c/e-acsl/internals/e_acsl_malloc.h
+share/frama-c/e-acsl/internals/e_acsl_private_assert.c
+share/frama-c/e-acsl/internals/e_acsl_private_assert.h
+share/frama-c/e-acsl/internals/e_acsl_rtl_error.c
+share/frama-c/e-acsl/internals/e_acsl_rtl_error.h
+share/frama-c/e-acsl/internals/e_acsl_rtl_io.c
+share/frama-c/e-acsl/internals/e_acsl_rtl_io.h
+share/frama-c/e-acsl/internals/e_acsl_rtl_string.c
+share/frama-c/e-acsl/internals/e_acsl_rtl_string.h
+share/frama-c/e-acsl/internals/e_acsl_shexec.c
+share/frama-c/e-acsl/internals/e_acsl_shexec.h
+share/frama-c/e-acsl/internals/e_acsl_trace.c
+share/frama-c/e-acsl/internals/e_acsl_trace.h
+share/frama-c/e-acsl/libc_replacements/e_acsl_stdio.c
+share/frama-c/e-acsl/libc_replacements/e_acsl_stdio.h
+share/frama-c/e-acsl/libc_replacements/e_acsl_string.c
+share/frama-c/e-acsl/libc_replacements/e_acsl_string.h
+share/frama-c/e-acsl/numerical_model/e_acsl_floating_point.c
+share/frama-c/e-acsl/numerical_model/e_acsl_floating_point.h
+share/frama-c/e-acsl/numerical_model/e_acsl_gmp_api.h
+share/frama-c/e-acsl/observation_model/bittree_model/e_acsl_bittree.c
+share/frama-c/e-acsl/observation_model/bittree_model/e_acsl_bittree.h
+share/frama-c/e-acsl/observation_model/bittree_model/e_acsl_bittree_observation_model.c
+share/frama-c/e-acsl/observation_model/bittree_model/e_acsl_bittree_omodel_debug.c
+share/frama-c/e-acsl/observation_model/bittree_model/e_acsl_bittree_timestamp_retrieval.c
+share/frama-c/e-acsl/observation_model/e_acsl_heap.c
+share/frama-c/e-acsl/observation_model/e_acsl_heap.h
+share/frama-c/e-acsl/observation_model/e_acsl_observation_model.c
+share/frama-c/e-acsl/observation_model/e_acsl_observation_model.h
+share/frama-c/e-acsl/observation_model/internals/e_acsl_heap_tracking.c
+share/frama-c/e-acsl/observation_model/internals/e_acsl_heap_tracking.h
+share/frama-c/e-acsl/observation_model/internals/e_acsl_omodel_debug.h
+share/frama-c/e-acsl/observation_model/internals/e_acsl_patricia_trie.c
+share/frama-c/e-acsl/observation_model/internals/e_acsl_patricia_trie.h
+share/frama-c/e-acsl/observation_model/internals/e_acsl_safe_locations.c
+share/frama-c/e-acsl/observation_model/internals/e_acsl_safe_locations.h
+share/frama-c/e-acsl/observation_model/internals/e_acsl_timestamp_retrieval.h
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_segment_observation_model.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_segment_omodel_debug.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_segment_timestamp_retrieval.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_segment_tracking.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_segment_tracking.h
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.h
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.c
+share/frama-c/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.h
 share/frama-c/emacs/acsl.el
 share/frama-c/emacs/frama-c-dev.el
 share/frama-c/emacs/frama-c-init.el
 share/frama-c/emacs/frama-c-recommended.el
-@comment share/frama-c/failed.png
 share/frama-c/frama-c.ico
 share/frama-c/frama-c.png
 share/frama-c/frama-c.rc
-@comment share/frama-c/left.png
 share/frama-c/libc.c
+share/frama-c/libc/__fc_alloc_axiomatic.h
 share/frama-c/libc/__fc_builtin.c
 share/frama-c/libc/__fc_builtin.h
-share/frama-c/libc/__fc_builtin_for_normalization.i
 share/frama-c/libc/__fc_define_blkcnt_t.h
 share/frama-c/libc/__fc_define_blksize_t.h
+share/frama-c/libc/__fc_define_clockid_t.h
 share/frama-c/libc/__fc_define_dev_t.h
 share/frama-c/libc/__fc_define_eof.h
 share/frama-c/libc/__fc_define_fd_set_t.h
+share/frama-c/libc/__fc_define_fds.h
 share/frama-c/libc/__fc_define_file.h
 share/frama-c/libc/__fc_define_fpos_t.h
+share/frama-c/libc/__fc_define_fs_cnt.h
 share/frama-c/libc/__fc_define_id_t.h
 share/frama-c/libc/__fc_define_ino_t.h
 share/frama-c/libc/__fc_define_intptr_t.h
 share/frama-c/libc/__fc_define_iovec.h
+share/frama-c/libc/__fc_define_key_t.h
+share/frama-c/libc/__fc_define_locale_t.h
+share/frama-c/libc/__fc_define_max_open_files.h
 share/frama-c/libc/__fc_define_mode_t.h
 share/frama-c/libc/__fc_define_nlink_t.h
 share/frama-c/libc/__fc_define_null.h
 share/frama-c/libc/__fc_define_off_t.h
 share/frama-c/libc/__fc_define_pid_t.h
+share/frama-c/libc/__fc_define_pthread_types.h
 share/frama-c/libc/__fc_define_sa_family_t.h
 share/frama-c/libc/__fc_define_seek_macros.h
 share/frama-c/libc/__fc_define_sigset_t.h
@@ -1046,34 +1200,51 @@ share/frama-c/libc/__fc_define_ssize_t.h
 share/frama-c/libc/__fc_define_stat.h
 share/frama-c/libc/__fc_define_suseconds_t.h
 share/frama-c/libc/__fc_define_time_t.h
+share/frama-c/libc/__fc_define_timer_t.h
 share/frama-c/libc/__fc_define_timespec.h
+share/frama-c/libc/__fc_define_timeval.h
 share/frama-c/libc/__fc_define_uid_and_gid.h
 share/frama-c/libc/__fc_define_useconds_t.h
 share/frama-c/libc/__fc_define_wchar_t.h
 share/frama-c/libc/__fc_define_wint_t.h
+share/frama-c/libc/__fc_gcc_builtins.h
+share/frama-c/libc/__fc_inet.h
+share/frama-c/libc/__fc_integer.h
+share/frama-c/libc/__fc_libc.h
 share/frama-c/libc/__fc_machdep.h
-share/frama-c/libc/__fc_machdep_linux_gcc_shared.h
+share/frama-c/libc/__fc_machdep_linux_shared.h
+share/frama-c/libc/__fc_runtime.c
 share/frama-c/libc/__fc_select.h
 share/frama-c/libc/__fc_string_axiomatic.h
+share/frama-c/libc/aio.h
+share/frama-c/libc/alloca.h
+share/frama-c/libc/argz.c
+share/frama-c/libc/argz.h
 share/frama-c/libc/arpa/inet.h
 share/frama-c/libc/assert.c
 share/frama-c/libc/assert.h
 share/frama-c/libc/byteswap.h
 share/frama-c/libc/complex.h
+share/frama-c/libc/cpio.h
 share/frama-c/libc/ctype.c
 share/frama-c/libc/ctype.h
 share/frama-c/libc/dirent.h
 share/frama-c/libc/dlfcn.h
 share/frama-c/libc/endian.h
+share/frama-c/libc/err.h
 share/frama-c/libc/errno.c
 share/frama-c/libc/errno.h
-share/frama-c/libc/fc_runtime.c
 share/frama-c/libc/fcntl.h
 share/frama-c/libc/features.h
+share/frama-c/libc/fenv.c
 share/frama-c/libc/fenv.h
 share/frama-c/libc/float.h
+share/frama-c/libc/fmtmsg.h
+share/frama-c/libc/fnmatch.h
+share/frama-c/libc/ftw.h
 share/frama-c/libc/getopt.c
 share/frama-c/libc/getopt.h
+share/frama-c/libc/glob.c
 share/frama-c/libc/glob.h
 share/frama-c/libc/grp.h
 share/frama-c/libc/iconv.h
@@ -1081,31 +1252,43 @@ share/frama-c/libc/ifaddrs.h
 share/frama-c/libc/inttypes.c
 share/frama-c/libc/inttypes.h
 share/frama-c/libc/iso646.h
+share/frama-c/libc/langinfo.h
 share/frama-c/libc/libgen.h
-share/frama-c/libc/libintl.h
 share/frama-c/libc/limits.h
-share/frama-c/libc/linux/fs.h
-share/frama-c/libc/linux/if_addr.h
-share/frama-c/libc/linux/if_netlink.h
-share/frama-c/libc/linux/netlink.h
-share/frama-c/libc/linux/rtnetlink.h
 share/frama-c/libc/locale.c
 share/frama-c/libc/locale.h
+share/frama-c/libc/malloc.h
 share/frama-c/libc/math.c
 share/frama-c/libc/math.h
+share/frama-c/libc/memory.h
+share/frama-c/libc/monetary.h
+share/frama-c/libc/mqueue.h
+share/frama-c/libc/ndbm.h
 share/frama-c/libc/net/if.h
+share/frama-c/libc/netdb.c
 share/frama-c/libc/netdb.h
+share/frama-c/libc/netinet/in.c
 share/frama-c/libc/netinet/in.h
-share/frama-c/libc/netinet/in_systm.h
 share/frama-c/libc/netinet/ip.h
-share/frama-c/libc/netinet/ip_icmp.h
 share/frama-c/libc/netinet/tcp.h
 share/frama-c/libc/nl_types.h
+share/frama-c/libc/poll.h
+share/frama-c/libc/pthread.h
+share/frama-c/libc/pwd.c
 share/frama-c/libc/pwd.h
 share/frama-c/libc/regex.h
+share/frama-c/libc/resolv.h
+share/frama-c/libc/sched.h
+share/frama-c/libc/search.h
+share/frama-c/libc/semaphore.h
 share/frama-c/libc/setjmp.h
+share/frama-c/libc/signal.c
 share/frama-c/libc/signal.h
+share/frama-c/libc/spawn.h
+share/frama-c/libc/stdalign.h
 share/frama-c/libc/stdarg.h
+share/frama-c/libc/stdatomic.c
+share/frama-c/libc/stdatomic.h
 share/frama-c/libc/stdbool.h
 share/frama-c/libc/stddef.h
 share/frama-c/libc/stdint.h
@@ -1113,147 +1296,105 @@ share/frama-c/libc/stdio.c
 share/frama-c/libc/stdio.h
 share/frama-c/libc/stdlib.c
 share/frama-c/libc/stdlib.h
+share/frama-c/libc/stdnoreturn.h
 share/frama-c/libc/string.c
 share/frama-c/libc/string.h
 share/frama-c/libc/strings.h
+share/frama-c/libc/stropts.h
+share/frama-c/libc/sys/file.h
 share/frama-c/libc/sys/ioctl.h
+share/frama-c/libc/sys/ipc.h
+share/frama-c/libc/sys/mman.h
+share/frama-c/libc/sys/msg.h
 share/frama-c/libc/sys/param.h
+share/frama-c/libc/sys/random.h
 share/frama-c/libc/sys/resource.h
 share/frama-c/libc/sys/select.h
+share/frama-c/libc/sys/sem.h
+share/frama-c/libc/sys/sendfile.h
+share/frama-c/libc/sys/shm.h
+share/frama-c/libc/sys/signal.h
 share/frama-c/libc/sys/socket.h
 share/frama-c/libc/sys/stat.h
-share/frama-c/libc/sys/sysctl.h
+share/frama-c/libc/sys/statvfs.h
 share/frama-c/libc/sys/time.h
 share/frama-c/libc/sys/times.h
+share/frama-c/libc/sys/timex.h
 share/frama-c/libc/sys/types.h
 share/frama-c/libc/sys/uio.h
 share/frama-c/libc/sys/un.h
+share/frama-c/libc/sys/utsname.h
+share/frama-c/libc/sys/vfs.h
 share/frama-c/libc/sys/wait.h
 share/frama-c/libc/syslog.h
+share/frama-c/libc/tar.h
 share/frama-c/libc/termios.h
 share/frama-c/libc/tgmath.h
+share/frama-c/libc/time.c
 share/frama-c/libc/time.h
-share/frama-c/libc/uchar.h
+share/frama-c/libc/trace.h
+share/frama-c/libc/ulimit.h
+share/frama-c/libc/unistd.c
 share/frama-c/libc/unistd.h
+share/frama-c/libc/utime.h
+share/frama-c/libc/utmp.h
+share/frama-c/libc/utmpx.h
+share/frama-c/libc/wait.h
 share/frama-c/libc/wchar.c
 share/frama-c/libc/wchar.h
 share/frama-c/libc/wctype.h
+share/frama-c/libc/wordexp.h
 share/frama-c/machdep.c
-@comment share/frama-c/maybe.png
-@comment share/frama-c/right.png
 share/frama-c/switch-off.png
 share/frama-c/switch-on.png
 share/frama-c/theme/colorblind/considered_valid.png
+share/frama-c/theme/colorblind/fold.png
 share/frama-c/theme/colorblind/inconsistent.png
 share/frama-c/theme/colorblind/invalid_but_dead.png
 share/frama-c/theme/colorblind/invalid_under_hyp.png
 share/frama-c/theme/colorblind/never_tried.png
 share/frama-c/theme/colorblind/surely_invalid.png
 share/frama-c/theme/colorblind/surely_valid.png
+share/frama-c/theme/colorblind/unfold.png
 share/frama-c/theme/colorblind/unknown.png
 share/frama-c/theme/colorblind/unknown_but_dead.png
 share/frama-c/theme/colorblind/valid_but_dead.png
 share/frama-c/theme/colorblind/valid_under_hyp.png
 share/frama-c/theme/default/considered_valid.png
+share/frama-c/theme/default/fold.png
 share/frama-c/theme/default/inconsistent.png
 share/frama-c/theme/default/invalid_but_dead.png
 share/frama-c/theme/default/invalid_under_hyp.png
 share/frama-c/theme/default/never_tried.png
 share/frama-c/theme/default/surely_invalid.png
 share/frama-c/theme/default/surely_valid.png
+share/frama-c/theme/default/unfold.png
 share/frama-c/theme/default/unknown.png
 share/frama-c/theme/default/unknown_but_dead.png
 share/frama-c/theme/default/valid_but_dead.png
 share/frama-c/theme/default/valid_under_hyp.png
+share/frama-c/theme/flat/considered_valid.png
+share/frama-c/theme/flat/fold.png
+share/frama-c/theme/flat/inconsistent.png
+share/frama-c/theme/flat/invalid_but_dead.png
+share/frama-c/theme/flat/invalid_under_hyp.png
+share/frama-c/theme/flat/never_tried.png
+share/frama-c/theme/flat/surely_invalid.png
+share/frama-c/theme/flat/surely_valid.png
+share/frama-c/theme/flat/unfold.png
+share/frama-c/theme/flat/unknown.png
+share/frama-c/theme/flat/unknown_but_dead.png
+share/frama-c/theme/flat/valid_but_dead.png
+share/frama-c/theme/flat/valid_under_hyp.png
 share/frama-c/unmark.png
-share/frama-c/wp/coqwp/Bits.v
-${PLIST.coq}share/frama-c/wp/coqwp/Bits.vo
-share/frama-c/wp/coqwp/BuiltIn.v
-${PLIST.coq}share/frama-c/wp/coqwp/BuiltIn.vo
-share/frama-c/wp/coqwp/Cbits.v
-${PLIST.coq}share/frama-c/wp/coqwp/Cbits.vo
-share/frama-c/wp/coqwp/Cfloat.v
-${PLIST.coq}share/frama-c/wp/coqwp/Cfloat.vo
-share/frama-c/wp/coqwp/Cint.v
-${PLIST.coq}share/frama-c/wp/coqwp/Cint.vo
-share/frama-c/wp/coqwp/Cmath.v
-${PLIST.coq}share/frama-c/wp/coqwp/Cmath.vo
-share/frama-c/wp/coqwp/Memory.v
-${PLIST.coq}share/frama-c/wp/coqwp/Memory.vo
-share/frama-c/wp/coqwp/Qed.v
-${PLIST.coq}share/frama-c/wp/coqwp/Qed.vo
-share/frama-c/wp/coqwp/Qedlib.v
-${PLIST.coq}share/frama-c/wp/coqwp/Qedlib.vo
-share/frama-c/wp/coqwp/Vlist.v
-${PLIST.coq}share/frama-c/wp/coqwp/Vlist.vo
-share/frama-c/wp/coqwp/Vset.v
-${PLIST.coq}share/frama-c/wp/coqwp/Vset.vo
-share/frama-c/wp/coqwp/Zbits.v
-${PLIST.coq}share/frama-c/wp/coqwp/Zbits.vo
-share/frama-c/wp/coqwp/bool/Bool.v
-${PLIST.coq}share/frama-c/wp/coqwp/bool/Bool.vo
-share/frama-c/wp/coqwp/int/Abs.v
-${PLIST.coq}share/frama-c/wp/coqwp/int/Abs.vo
-share/frama-c/wp/coqwp/int/ComputerDivision.v
-${PLIST.coq}share/frama-c/wp/coqwp/int/ComputerDivision.vo
-share/frama-c/wp/coqwp/int/Int.v
-${PLIST.coq}share/frama-c/wp/coqwp/int/Int.vo
-share/frama-c/wp/coqwp/int/MinMax.v
-${PLIST.coq}share/frama-c/wp/coqwp/int/MinMax.vo
-share/frama-c/wp/coqwp/map/Map.v
-${PLIST.coq}share/frama-c/wp/coqwp/map/Map.vo
-share/frama-c/wp/coqwp/real/Abs.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/Abs.vo
-share/frama-c/wp/coqwp/real/FromInt.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/FromInt.vo
-share/frama-c/wp/coqwp/real/MinMax.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/MinMax.vo
-share/frama-c/wp/coqwp/real/Real.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/Real.vo
-share/frama-c/wp/coqwp/real/RealInfix.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/RealInfix.vo
-share/frama-c/wp/coqwp/real/Square.v
-${PLIST.coq}share/frama-c/wp/coqwp/real/Square.vo
-share/frama-c/wp/ergo/Cbits.mlw
-share/frama-c/wp/ergo/Cfloat.mlw
-share/frama-c/wp/ergo/Cint.mlw
-share/frama-c/wp/ergo/Cmath.mlw
-share/frama-c/wp/ergo/Memory.mlw
-share/frama-c/wp/ergo/Qed.mlw
-share/frama-c/wp/ergo/Vlist.mlw
-share/frama-c/wp/ergo/Vset.mlw
-share/frama-c/wp/ergo/bool.Bool.mlw
-share/frama-c/wp/ergo/int.Abs.mlw
-share/frama-c/wp/ergo/int.ComputerDivision.mlw
-share/frama-c/wp/ergo/int.Int.mlw
-share/frama-c/wp/ergo/int.MinMax.mlw
-share/frama-c/wp/ergo/map.Map.mlw
-share/frama-c/wp/ergo/real.Abs.mlw
-share/frama-c/wp/ergo/real.FromInt.mlw
-share/frama-c/wp/ergo/real.MinMax.mlw
-share/frama-c/wp/ergo/real.Real.mlw
-share/frama-c/wp/ergo/real.RealInfix.mlw
-share/frama-c/wp/ergo/real.Square.mlw
-share/frama-c/wp/why3/Bits.v
-share/frama-c/wp/why3/Cbits.v
-share/frama-c/wp/why3/Cbits.why
-share/frama-c/wp/why3/Cfloat.v
-share/frama-c/wp/why3/Cfloat.why
-share/frama-c/wp/why3/Cint.v
-share/frama-c/wp/why3/Cint.why
-share/frama-c/wp/why3/Cmath.v
-share/frama-c/wp/why3/Cmath.why
-share/frama-c/wp/why3/Memory.v
-share/frama-c/wp/why3/Memory.why
-share/frama-c/wp/why3/Qed.v
-share/frama-c/wp/why3/Qed.why
-share/frama-c/wp/why3/Qedlib.v
-share/frama-c/wp/why3/Vlist.v
-share/frama-c/wp/why3/Vlist.why
-share/frama-c/wp/why3/Vset.v
-share/frama-c/wp/why3/Vset.why
-share/frama-c/wp/why3/Zbits.v
-share/frama-c/wp/why3/coq.drv
-share/frama-c/wp/why3/why3.conf
-share/frama-c/wp/wp.driver
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/cbits.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/cfloat.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/cint.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/cmath.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/memory.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/qed.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/vlist.mlw
+${PLIST.coq}share/frama-c/wp/why3/frama_c_wp/vset.mlw
+${PLIST.coq}share/frama-c/wp/wp.driver
+@pkgdir ${OCAML_SITELIB}
 @pkgdir lib/frama-c/plugins/gui

Index: pkgsrc/devel/frama-c/distinfo
diff -u pkgsrc/devel/frama-c/distinfo:1.11 pkgsrc/devel/frama-c/distinfo:1.12
--- pkgsrc/devel/frama-c/distinfo:1.11  Tue Oct 26 10:14:39 2021
+++ pkgsrc/devel/frama-c/distinfo       Sun Oct  9 07:02:47 2022
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:14:39 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/10/09 07:02:47 tonio Exp $
 
-BLAKE2s (frama-c-Phosphorus-20170501.tar.gz) = b208a3503faa6b35aeeea99a630a859113ecc4609e5bd34a1aa084a5672daab8
-SHA512 (frama-c-Phosphorus-20170501.tar.gz) = b3b73932378cba7be8ac0cbb1f7311e8f60dde68cad55c10659ffa40e76ab3f106d554e245ccd90ffb5307b9a42b6ce51154a5b9c006687b8c5808c77ca4c2f3
-Size (frama-c-Phosphorus-20170501.tar.gz) = 7431131 bytes
-SHA1 (patch-Makefile) = d9a23653196d4586c3cca87091518aea6791ddcc
-SHA1 (patch-configure) = 84c96178f487a65fe875a336e0f271a7d101e5a7
+BLAKE2s (frama-c-25.0-Manganese.tar.gz) = 589c14ead33b8371a96e6e65ac2f58434e8de7066d71b821cf285ff01bb6e233
+SHA512 (frama-c-25.0-Manganese.tar.gz) = 8fdc71ee252e7dd0ca5782d16d54df8d126a3fbcc324cf250dd96bcb5b743a4a387ec65fe633583a976d6b692d147f657faf49160ccbd519e04a2664b0d68f0f
+Size (frama-c-25.0-Manganese.tar.gz) = 7670862 bytes
+SHA1 (patch-Makefile) = 87c7dc7dd9246aae396cdcae7c410f834b92ec4b
 SHA1 (patch-share_Makefile.common) = f5230aee768e6af4c7458d96f1f210172daa9bb2
-SHA1 (patch-src_libraries_utils_c__bindings.c) = b37db1c51e9082e4a328a6a7189f57db3f12d624
-SHA1 (patch-src_plugins_e-acsl_Makefile.in) = 8b1c4838ecd609504c1070917c0b61433f1e1f12
-SHA1 (patch-src_plugins_gui_gtk__helper.ml) = 9870ffaaa9b042d4052d3eff1affaec6e254597b
-SHA1 (patch-src_plugins_wp_configure) = a32631ddfe6f5c639b98cac2778aa9f5279e1033
-SHA1 (patch-src_plugins_wp_configure.ac) = a68d7ecebae07106d0d76ddbed4bf01ba0026e1a
-SHA1 (patch-src_plugins_wp_share_coqwp_Zbits.v) = 26fac23dc015087b7126e40a47d566eb49a24293
+SHA1 (patch-src_libraries_utils_c__bindings.c) = b634836b18c3be97c9b026a65c454cab6552b6f4

Index: pkgsrc/devel/frama-c/options.mk
diff -u pkgsrc/devel/frama-c/options.mk:1.4 pkgsrc/devel/frama-c/options.mk:1.5
--- pkgsrc/devel/frama-c/options.mk:1.4 Tue Sep  5 07:30:00 2017
+++ pkgsrc/devel/frama-c/options.mk     Sun Oct  9 07:02:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2017/09/05 07:30:00 dholland Exp $
+# $NetBSD: options.mk,v 1.5 2022/10/09 07:02:47 tonio Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.frama-c
 PKG_SUPPORTED_OPTIONS= gui coq
@@ -11,7 +11,7 @@ PLIST_VARS=   gui coq
 .if !empty(PKG_OPTIONS:Mgui)
 PLIST.gui=     yes
 
-.include "../../x11/ocaml-lablgtk/buildlink3.mk"
+.include "../../x11/ocaml-lablgtk3/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --enable-gui=no
 .endif
@@ -20,6 +20,7 @@ CONFIGURE_ARGS+=      --enable-gui=no
 PLIST.coq=     yes
 
 DEPENDS+=              coq>=8.6:../../lang/coq
+DEPENDS+=              why3>=1.5:../../devel/why3
 .else
 CONFIGURE_ARGS+=       --enable-wp-coq=no
 .endif

Index: pkgsrc/devel/frama-c/patches/patch-Makefile
diff -u pkgsrc/devel/frama-c/patches/patch-Makefile:1.1 pkgsrc/devel/frama-c/patches/patch-Makefile:1.2
--- pkgsrc/devel/frama-c/patches/patch-Makefile:1.1     Tue Sep  5 07:30:00 2017
+++ pkgsrc/devel/frama-c/patches/patch-Makefile Sun Oct  9 07:02:47 2022
@@ -1,29 +1,41 @@
-$NetBSD: patch-Makefile,v 1.1 2017/09/05 07:30:00 dholland Exp $
+$NetBSD: patch-Makefile,v 1.2 2022/10/09 07:02:47 tonio Exp $
 
 Don't install nonexecutables with execute permission.
 
---- Makefile.orig      2017-06-01 08:02:11.000000000 +0000
+--- Makefile.orig      2022-06-21 00:00:00.000000000 +0000
 +++ Makefile
-@@ -1527,30 +1527,30 @@ install:: install-lib
+@@ -1974,7 +1974,7 @@ install:: install-lib-$(OCAMLBEST)
        $(MKDIR) $(FRAMAC_DATADIR)/libc/net
        $(MKDIR) $(FRAMAC_DATADIR)/libc/arpa
        $(PRINT_INSTALL) shared files
 -      $(CP) \
 +      $(CPNX) \
          $(wildcard share/*.c share/*.h) \
-         share/Makefile.dynamic share/Makefile.plugin.template share/Makefile.kernel \
+         share/Makefile.dynamic share/Makefile.plugin.template \
          share/Makefile.config share/Makefile.common share/Makefile.generic \
-         share/configure.ac share/autocomplete_frama-c \
-         $(FRAMAC_DATADIR)
+@@ -2013,7 +2013,7 @@ install:: install-lib-$(OCAMLBEST)
+         share/analysis-scripts/template.mk \
+         $(FRAMAC_DATADIR)/analysis-scripts
+       $(MKDIR) $(FRAMAC_DATADIR)/compliance
+-      $(CP) share/compliance/c11_functions.json \
++      $(CPNX) share/compliance/c11_functions.json \
+         share/compliance/c11_headers.json \
+         share/compliance/compiler_builtins.json \
+         share/compliance/gcc_builtins.json \
+@@ -2022,23 +2022,23 @@ install:: install-lib-$(OCAMLBEST)
+         share/compliance/posix_identifiers.json \
+         $(FRAMAC_DATADIR)/compliance
        $(MKDIR) $(FRAMAC_DATADIR)/emacs
 -      $(CP) $(wildcard share/emacs/*.el) $(FRAMAC_DATADIR)/emacs
 -      $(CP) share/frama-c.rc $(ICONS) $(FRAMAC_DATADIR)
--      $(CP) $(FEEDBACK_ICONS_DEFAULT) $(FRAMAC_DATADIR)/theme/default
--      $(CP) $(FEEDBACK_ICONS_COLORBLIND) $(FRAMAC_DATADIR)/theme/colorblind
+-      $(CP) $(THEME_ICONS_DEFAULT) $(FRAMAC_DATADIR)/theme/default
+-      $(CP) $(THEME_ICONS_COLORBLIND) $(FRAMAC_DATADIR)/theme/colorblind
+-      $(CP) $(THEME_ICONS_FLAT) $(FRAMAC_DATADIR)/theme/flat
 +      $(CPNX) $(wildcard share/emacs/*.el) $(FRAMAC_DATADIR)/emacs
 +      $(CPNX) share/frama-c.rc $(ICONS) $(FRAMAC_DATADIR)
-+      $(CPNX) $(FEEDBACK_ICONS_DEFAULT) $(FRAMAC_DATADIR)/theme/default
-+      $(CPNX) $(FEEDBACK_ICONS_COLORBLIND) $(FRAMAC_DATADIR)/theme/colorblind
++      $(CPNX) $(THEME_ICONS_DEFAULT) $(FRAMAC_DATADIR)/theme/default
++      $(CPNX) $(THEME_ICONS_COLORBLIND) $(FRAMAC_DATADIR)/theme/colorblind
++      $(CPNX) $(THEME_ICONS_FLAT) $(FRAMAC_DATADIR)/theme/flat
        if [ -d $(EMACS_DATADIR) ]; then \
 -        $(CP) $(wildcard share/emacs/*.el) $(EMACS_DATADIR); \
 +        $(CPNX) $(wildcard share/emacs/*.el) $(EMACS_DATADIR); \
@@ -39,17 +51,15 @@ Don't install nonexecutables with execut
 -      $(CP) share/libc/arpa/*.[ch] $(FRAMAC_DATADIR)/libc/arpa
 -      $(CP) share/libc/net/*.[ch] $(FRAMAC_DATADIR)/libc/net
 -      $(CP) share/libc/netinet/*.[ch] $(FRAMAC_DATADIR)/libc/netinet
--      $(CP) share/libc/linux/*.[ch] $(FRAMAC_DATADIR)/libc/linux
 +      $(CPNX) share/libc/sys/*.[ch] $(FRAMAC_DATADIR)/libc/sys
 +      $(CPNX) share/libc/arpa/*.[ch] $(FRAMAC_DATADIR)/libc/arpa
 +      $(CPNX) share/libc/net/*.[ch] $(FRAMAC_DATADIR)/libc/net
 +      $(CPNX) share/libc/netinet/*.[ch] $(FRAMAC_DATADIR)/libc/netinet
-+      $(CPNX) share/libc/linux/*.[ch] $(FRAMAC_DATADIR)/libc/linux
        $(PRINT_INSTALL) binaries
        $(CP) bin/toplevel.$(OCAMLBEST) $(BINDIR)/frama-c$(EXE)
        $(CP) bin/toplevel.byte$(EXE) $(BINDIR)/frama-c.byte$(EXE)
-@@ -1569,27 +1569,27 @@ install:: install-lib
-               $(CP) bin/frama-c-config$(EXE) $(BINDIR); \
+@@ -2058,15 +2058,15 @@ install:: install-lib-$(OCAMLBEST)
+               $(CP) bin/frama-c-script $(BINDIR)/frama-c-script; \
        fi
        $(PRINT_INSTALL) config files
 -      $(CP) $(addprefix ptests/,$(PTESTS_FILES)) $(FRAMAC_LIBDIR)
@@ -58,22 +68,26 @@ Don't install nonexecutables with execut
        $(MKDIR) $(FRAMAC_DATADIR)/doc/code
 -      $(CP) $(wildcard $(DOC_GEN_FILES)) $(FRAMAC_DATADIR)/doc/code
 +      $(CPNX) $(wildcard $(DOC_GEN_FILES)) $(FRAMAC_DATADIR)/doc/code
-       $(PRINT_INSTALL) dynamic plug-ins
-       if [ -d "$(FRAMAC_PLUGIN)" -a "$(PLUGIN_DYN_EXISTS)" = "yes" ]; then \
+       $(PRINT_INSTALL) plug-ins
+       if [ -d "$(FRAMAC_PLUGIN)" ]; then \
 -        $(CP)  $(PLUGIN_DYN_CMI_LIST) $(PLUGIN_META_LIST) \
 +        $(CPNX)  $(PLUGIN_DYN_CMI_LIST) $(PLUGIN_META_LIST) \
                 $(FRAMAC_PLUGINDIR); \
--        $(CP)  $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
-+        $(CPNX)  $(PLUGIN_DYN_CMO_LIST) $(PLUGIN_DYN_CMX_LIST) \
-                $(FRAMAC_PLUGINDIR)/top; \
-       fi
-       $(PRINT_INSTALL) dynamic gui plug-ins
+-        $(CP)  $(PLUGIN_DYN_CMO_LIST) $(FRAMAC_PLUGINDIR)/top; \
++        $(CPNX)  $(PLUGIN_DYN_CMO_LIST) $(FRAMAC_PLUGINDIR)/top; \
+         if [ "$(OCAMLBEST)" = "opt" ]; then \
+           $(CP) $(PLUGIN_DYN_CMX_LIST) $(FRAMAC_PLUGINDIR)/top; \
+         fi; \
+@@ -2074,15 +2074,15 @@ install:: install-lib-$(OCAMLBEST)
+       $(PRINT_INSTALL) gui plug-ins
        if [ -d "$(FRAMAC_PLUGIN_GUI)" -a "$(PLUGIN_DYN_GUI_EXISTS)" = "yes" ]; \
        then \
 -        $(CP) $(patsubst %.cma,%.cmi,$(PLUGIN_DYN_GUI_CMO_LIST:.cmo=.cmi)) \
 +        $(CPNX) $(patsubst %.cma,%.cmi,$(PLUGIN_DYN_GUI_CMO_LIST:.cmo=.cmi)) \
-               $(PLUGIN_DYN_GUI_CMO_LIST) $(PLUGIN_DYN_GUI_CMX_LIST) \
-               $(FRAMAC_PLUGINDIR)/gui; \
+               $(PLUGIN_DYN_GUI_CMO_LIST) $(FRAMAC_PLUGINDIR)/gui; \
+         if [ "$(OCAMLBEST)" = "opt" ]; then \
+           $(CP) $(PLUGIN_DYN_GUI_CMX_LIST) $(FRAMAC_PLUGINDIR)/gui; \
+         fi; \
        fi
        $(PRINT_INSTALL) man pages
 -      $(CP) man/frama-c.1 $(MANDIR)/man1/frama-c.1
Index: pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c
diff -u pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c:1.1 pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c:1.2
--- pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c:1.1    Tue Sep  5 07:30:00 2017
+++ pkgsrc/devel/frama-c/patches/patch-src_libraries_utils_c__bindings.c        Sun Oct  9 07:02:47 2022
@@ -1,24 +1,26 @@
-$NetBSD: patch-src_libraries_utils_c__bindings.c,v 1.1 2017/09/05 07:30:00 dholland Exp $
+$NetBSD: patch-src_libraries_utils_c__bindings.c,v 1.2 2022/10/09 07:02:47 tonio Exp $
 
 sync ifdefs with reality
 
---- src/libraries/utils/c_bindings.c~  2017-06-01 08:02:15.000000000 +0000
+--- src/libraries/utils/c_bindings.c.orig      2022-06-21 00:00:00.000000000 +0000
 +++ src/libraries/utils/c_bindings.c
-@@ -35,7 +35,7 @@
+@@ -34,18 +34,7 @@
+ #include <stdint.h>
  #include <unistd.h>
  
- // Some BSD flavors do not implement all of C99
--#if defined(__OpenBSD__) || defined(__NetBSD__) 
-+#if defined(__OpenBSD__)
- # include <ieeefp.h>
- # define FE_DOWNWARD FP_RM
- # define FE_UPWARD FP_RP
-@@ -218,7 +218,7 @@ value single_precision_of_string(value s
- value terminate_process(value v) 
- {
-   long pid = Long_val(v);
--#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE || __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 
-+#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE || __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || 
defined(__DragonFly__) || defined (__Bitrig__)
-   kill(pid,9);
- #else
-  #ifdef _WIN32
+-// Some BSD flavors do not implement all of C99
+-#if defined(__NetBSD__)
+-# include <ieeefp.h>
+-# define FE_DOWNWARD FP_RM
+-# define FE_UPWARD FP_RP
+-# define FE_TONEAREST FP_RN
+-# define FE_TOWARDZERO FP_RZ
+-# define fegetround() fpgetround()
+-# define fesetround(RM)       fpsetround(RM)
+-#else 
+-# include <fenv.h>
+-#endif
++#include <fenv.h>
+ 
+ #include <float.h>
+ #include <math.h>



Home | Main Index | Thread Index | Old Index