Yes, indeed. It seems we need to handle that because it is obsolete and would
conflict with dune-configurator. Probably an entry to quirks is needed.
On January 24, 2023 2:44:13 PM GMT+01:00, Daniel Dickman <didick...@gmail.com>
wrote:
>Thanks a lot Volker and Christopher!
>
>Do we need to handle the upgrade path for the -private sub package since it is
>going away?
>
>> On Jan 22, 2023, at 11:12 AM, Christopher Zimmermann <chr...@openbsd.org>
>> wrote:
>>
>> On Sun, Jan 22, 2023 at 04:45:38PM +0100, Volker Schlecht wrote:
>>>> If you don't have access to a bytecode-only arch (like me), you can
>>>> simulate it:
>>>
>>> Thanks - I did, and with the attached patch that worked out nicely!
>>
>> Then ok chrisz@
>>
>> Thanks a lot for your effort :)
>>
>> Christopher
>>
>>> Index: Makefile
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/Makefile,v
>>> retrieving revision 1.16
>>> diff -u -p -r1.16 Makefile
>>> --- Makefile 11 Mar 2022 18:49:59 -0000 1.16
>>> +++ Makefile 22 Jan 2023 15:00:45 -0000
>>> @@ -1,13 +1,9 @@
>>> -MULTI_PACKAGES = -main -private -configurator
>>> +MULTI_PACKAGES = -main -configurator
>>> COMMENT-main = OCaml build system
>>> -COMMENT-private = private libraries of the dune build system
>>> COMMENT-configurator = OCaml library for gathering system configuration
>>> -REVISION-configurator = 2
>>> -REVISION-main = 1
>>> -REVISION-private = 2
>>> -VERSION = 2.7.0
>>> +VERSION = 3.6.2
>>> CATEGORIES = devel
>>> @@ -26,31 +22,38 @@ WANTLIB-main = c m pthread
>>> MODULES = lang/ocaml
>>> -RUN_DEPENDS-configurator = devel/dune,-private
>>> +RUN_DEPENDS-configurator = devel/dune
>>> CONFIGURE_STYLE = simple
>>> -CONFIGURE_ARGS = --libdir ${PREFIX}/lib/ocaml/
>>> +
>>> +# Set default installation directories
>>> +# These affect runtime behavior later!
>>> +CONFIGURE_ARGS = --bindir ${TRUEPREFIX}/bin \
>>> + --sbindir ${TRUEPREFIX}/sbin \
>>> + --datadir ${TRUEPREFIX}/share \
>>> + --etcdir ${SYSCONFDIR} \
>>> + --libdir ${TRUEPREFIX}/lib/ocaml \
>>> + --libexecdir ${TRUEPREFIX}/lib/ocaml \
>>> + --mandir ${TRUEPREFIX}/man \
>>> + --docdir ${TRUEPREFIX}/share/doc
>>> +
>>> +MAKE_ENV += JOBS=${MAKE_JOBS}
>>> USE_GMAKE = Yes
>>> ALL_TARGET = release
>>> -#FAKE_FLAGS = PREFIX=${PREFIX} LIBDIR=lib/ocaml
>>> -INSTALL_TARGET = install
>>> +FAKE_FLAGS = PREFIX=${TRUEPREFIX} LIBDIR=${PREFIX}/lib/ocaml
>>> +INSTALL_TARGET = doc install
>>> -#./dune.exe build --display=short
>>> post-build:
>>> cd ${WRKSRC} && env -i ${MAKE_ENV} \
>>> - ./dune.exe build --display=short \
>>> - dune-private-libs.install dune-configurator.install
>>> + ./dune.exe build -j${MAKE_JOBS} --display=short \
>>> + stdune.install dune-configurator.install
>>> do-install:
>>> cd ${WRKSRC} && env -i ${MAKE_ENV} ${FAKE_SETUP} \
>>> - ./dune.exe install --display=short \
>>> - dune dune-private-libs dune-configurator
>>> -
>>> -post-install:
>>> - mv ${PREFIX}/doc/* ${PREFIX}/share/doc/
>>> - rmdir ${PREFIX}/doc
>>> + ./dune.exe install -j${MAKE_JOBS} --display=short \
>>> + dune stdune dune-configurator
>>> .include <bsd.port.mk>
>>> Index: distinfo
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/distinfo,v
>>> retrieving revision 1.5
>>> diff -u -p -r1.5 distinfo
>>> --- distinfo 4 Dec 2021 03:05:30 -0000 1.5
>>> +++ distinfo 22 Jan 2023 15:00:45 -0000
>>> @@ -1,2 +1,2 @@
>>> -SHA256 (dune-2.7.0.tar.gz) = 2R9VSUrWHvpYQ97cCE2qZKaXUfCM7xPd6IPvp49+eL4=
>>> -SIZE (dune-2.7.0.tar.gz) = 1284969
>>> +SHA256 (dune-3.6.2.tar.gz) = hMKdXR1BdRipwz6HQJ3YZf7UzVugabQ/+OAwYDR06Bs=
>>> +SIZE (dune-3.6.2.tar.gz) = 1906553
>>> Index: patches/patch-Makefile
>>> ===================================================================
>>> RCS file: patches/patch-Makefile
>>> diff -N patches/patch-Makefile
>>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>>> +++ patches/patch-Makefile 22 Jan 2023 15:00:45 -0000
>>> @@ -0,0 +1,13 @@
>>> +Respect MAKE_JOBS during bootstrap phase
>>> +Index: Makefile
>>> +--- Makefile.orig
>>> ++++ Makefile
>>> +@@ -47,7 +47,7 @@ release: $(BIN)
>>> + @$(BIN) build @install -p dune --profile dune-bootstrap
>>> + + $(BIN):
>>> +- @ocaml boot/bootstrap.ml
>>> ++ @ocaml boot/bootstrap.ml -j $(JOBS)
>>> + + dev: $(BIN)
>>> + $(BIN) build @install
>>> Index: patches/patch-src_dune_cram_exec_ml
>>> ===================================================================
>>> RCS file: patches/patch-src_dune_cram_exec_ml
>>> diff -N patches/patch-src_dune_cram_exec_ml
>>> --- patches/patch-src_dune_cram_exec_ml 11 Mar 2022 18:49:59 -0000 1.2
>>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>>> @@ -1,15 +0,0 @@
>>> -Backport commit for ocaml 4.13 support. see:
>>> -https://github.com/ocaml/dune/commit/c1e82f94aa2883feda752df450130ee204855c09
>>> -
>>> -Index: src/dune/cram_exec.ml
>>> ---- src/dune/cram_exec.ml.orig
>>> -+++ src/dune/cram_exec.ml
>>> -@@ -283,7 +283,7 @@ let rewrite_paths build_path_prefix_map ~parent_script
>>> - - let sanitize ~parent_script cram_to_output :
>>> - (block_result * metadata_entry * string) Cram_lexer.block list =
>>> -- List.map cram_to_output ~f:(fun t ->
>>> -+ List.map cram_to_output ~f:(fun (t : (block_result * _)
>>> Cram_lexer.block) ->
>>> - match t with
>>> - | Cram_lexer.Comment t -> Cram_lexer.Comment t
>>> - | Command
>>> Index: pkg/DESCR-private
>>> ===================================================================
>>> RCS file: pkg/DESCR-private
>>> diff -N pkg/DESCR-private
>>> --- pkg/DESCR-private 4 Dec 2021 03:05:30 -0000 1.1
>>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>>> @@ -1,3 +0,0 @@
>>> -This package contains code that is shared between various
>>> -dune-xxx packages. However, it is not meant for public
>>> -consumption and provides no stability guarantee.
>>> Index: pkg/PFRAG.dynlink-native
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/pkg/PFRAG.dynlink-native,v
>>> retrieving revision 1.2
>>> diff -u -p -r1.2 PFRAG.dynlink-native
>>> --- pkg/PFRAG.dynlink-native 11 Mar 2022 18:50:00 -0000 1.2
>>> +++ pkg/PFRAG.dynlink-native 22 Jan 2023 15:00:45 -0000
>>> @@ -1,8 +0,0 @@
>>> -lib/ocaml/dune/_caml/dune_caml.cmxs
>>> -lib/ocaml/dune/_dune_lang/dune_lang.cmxs
>>> -lib/ocaml/dune/_ocaml_config/ocaml_config.cmxs
>>> -lib/ocaml/dune/_result/dune_result.cmxs
>>> -lib/ocaml/dune/_stdune/stdune.cmxs
>>> -lib/ocaml/dune/_wp/dune/wp_dune.cmxs
>>> -lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.cmxs
>>> -lib/ocaml/dune/configurator/configurator.cmxs
>>> Index: pkg/PFRAG.dynlink-native-private
>>> ===================================================================
>>> RCS file: pkg/PFRAG.dynlink-native-private
>>> diff -N pkg/PFRAG.dynlink-native-private
>>> --- pkg/PFRAG.dynlink-native-private 11 Mar 2022 18:50:00 -0000 1.2
>>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>>> @@ -1,8 +0,0 @@
>>> -lib/ocaml/dune-private-libs/cache/cache.cmxs
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang.cmxs
>>> -lib/ocaml/dune-private-libs/dune_csexp/dune_csexp.cmxs
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re.cmxs
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util.cmxs
>>> -lib/ocaml/dune-private-libs/ocaml-config/ocaml_config.cmxs
>>> -lib/ocaml/dune-private-libs/stdune/stdune.cmxs
>>> -lib/ocaml/dune-private-libs/xdg/xdg.cmxs
>>> Index: pkg/PFRAG.native
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/pkg/PFRAG.native,v
>>> retrieving revision 1.3
>>> diff -u -p -r1.3 PFRAG.native
>>> --- pkg/PFRAG.native 11 Mar 2022 18:50:00 -0000 1.3
>>> +++ pkg/PFRAG.native 22 Jan 2023 15:00:45 -0000
>>> @@ -1,112 +1 @@
>>> %%dynlink%%
>>> -lib/ocaml/dune/_caml/dune_caml.a
>>> -lib/ocaml/dune/_caml/dune_caml.cmx
>>> -lib/ocaml/dune/_caml/dune_caml.cmxa
>>> -lib/ocaml/dune/_dune_lang/dune_lang.a
>>> -lib/ocaml/dune/_dune_lang/dune_lang.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang.cmxa
>>> -lib/ocaml/dune/_dune_lang/dune_lang__.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Combinators.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Escape.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__File_syntax.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Jbuild_lexer.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Lexer.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Lexer_shared.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Template.cmx
>>> -lib/ocaml/dune/_dune_lang/dune_lang__Types.cmx
>>> -lib/ocaml/dune/_ocaml_config/ocaml_config.a
>>> -lib/ocaml/dune/_ocaml_config/ocaml_config.cmx
>>> -lib/ocaml/dune/_ocaml_config/ocaml_config.cmxa
>>> -lib/ocaml/dune/_result/dune_result.a
>>> -lib/ocaml/dune/_result/dune_result.cmx
>>> -lib/ocaml/dune/_result/dune_result.cmxa
>>> -lib/ocaml/dune/_result/dune_result__.cmx
>>> -lib/ocaml/dune/_result/dune_result__Result.cmx
>>> -lib/ocaml/dune/_result/dune_result__Result_compat.cmx
>>> -lib/ocaml/dune/_stdune/stdune.a
>>> -lib/ocaml/dune/_stdune/stdune.cmx
>>> -lib/ocaml/dune/_stdune/stdune.cmxa
>>> -lib/ocaml/dune/_stdune/stdune__.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Ansi_color.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Appendable_list.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Array.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Bin.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Bool.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Bytes.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Char.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Code_error.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Common.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Comparable.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Comparable_intf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Comparator.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Console.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Csexp.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Digest.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Dyn.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Either.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Env.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Escape.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Exn.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Exn_with_backtrace.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Fdecl.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Filename.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Float.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Fmt.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Fn.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Hashable.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Hashtbl.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Hashtbl_intf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Id.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Int.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Interned.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Io.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Lexbuf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__List.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Loc.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Loc0.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Log.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Map.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Map_intf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Monad.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Nothing.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Option.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Or_exn.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Ordered.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Ordering.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Path.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Path_intf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Poly.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Pp.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Proc.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Result.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Set.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Set_intf.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Sexp.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Signal.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Staged.cmx
>>> -lib/ocaml/dune/_stdune/stdune__String.cmx
>>> -lib/ocaml/dune/_stdune/stdune__String_split.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Table.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Tuple.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Type_eq.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Unit.cmx
>>> -lib/ocaml/dune/_stdune/stdune__Univ_map.cmx
>>> -lib/ocaml/dune/_stdune/stdune__User_error.cmx
>>> -lib/ocaml/dune/_stdune/stdune__User_message.cmx
>>> -lib/ocaml/dune/_stdune/stdune__User_warning.cmx
>>> -lib/ocaml/dune/_wp/dune/wp.cmx
>>> -lib/ocaml/dune/_wp/dune/wp__wp_dune__.cmx
>>> -lib/ocaml/dune/_wp/dune/wp_dune.a
>>> -lib/ocaml/dune/_wp/dune/wp_dune.cmxa
>>> -lib/ocaml/dune/_wp/jbuilder/wp.cmx
>>> -lib/ocaml/dune/_wp/jbuilder/wp__wp_jbuilder__.cmx
>>> -lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.a
>>> -lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.cmxa
>>> -lib/ocaml/dune/configurator/configurator.a
>>> -lib/ocaml/dune/configurator/configurator.cmx
>>> -lib/ocaml/dune/configurator/configurator.cmxa
>>> -lib/ocaml/dune/configurator/configurator__.cmx
>>> -lib/ocaml/dune/configurator/configurator__Extract_obj.cmx
>>> -lib/ocaml/dune/configurator/configurator__V1.cmx
>>> Index: pkg/PFRAG.native-configurator
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/pkg/PFRAG.native-configurator,v
>>> retrieving revision 1.3
>>> diff -u -p -r1.3 PFRAG.native-configurator
>>> --- pkg/PFRAG.native-configurator 11 Mar 2022 18:50:00 -0000 1.3
>>> +++ pkg/PFRAG.native-configurator 22 Jan 2023 15:00:45 -0000
>>> @@ -3,9 +3,96 @@ lib/ocaml/dune-configurator/configurator
>>> lib/ocaml/dune-configurator/configurator.cmx
>>> lib/ocaml/dune-configurator/configurator.cmxa
>>> lib/ocaml/dune-configurator/configurator__.cmx
>>> -lib/ocaml/dune-configurator/configurator__Csexp.cmx
>>> lib/ocaml/dune-configurator/configurator__Dune_lang.cmx
>>> lib/ocaml/dune-configurator/configurator__Extract_obj.cmx
>>> lib/ocaml/dune-configurator/configurator__Import.cmx
>>> lib/ocaml/dune-configurator/configurator__Ocaml_config.cmx
>>> lib/ocaml/dune-configurator/configurator__V1.cmx
>>> +lib/ocaml/stdune/csexp/csexp.a
>>> +lib/ocaml/stdune/csexp/csexp.cmx
>>> +lib/ocaml/stdune/csexp/csexp.cmxa
>>> +lib/ocaml/stdune/csexp/csexp.cmxs
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmx
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxa
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxs
>>> +lib/ocaml/stdune/stdune.a
>>> +lib/ocaml/stdune/stdune.cmx
>>> +lib/ocaml/stdune/stdune.cmxa
>>> +lib/ocaml/stdune/stdune.cmxs
>>> +lib/ocaml/stdune/stdune__.cmx
>>> +lib/ocaml/stdune/stdune__Ansi_color.cmx
>>> +lib/ocaml/stdune/stdune__Appendable_list.cmx
>>> +lib/ocaml/stdune/stdune__Applicative.cmx
>>> +lib/ocaml/stdune/stdune__Applicative_intf.cmx
>>> +lib/ocaml/stdune/stdune__Array.cmx
>>> +lib/ocaml/stdune/stdune__Bin.cmx
>>> +lib/ocaml/stdune/stdune__Bool.cmx
>>> +lib/ocaml/stdune/stdune__Bytes.cmx
>>> +lib/ocaml/stdune/stdune__Bytes_unit.cmx
>>> +lib/ocaml/stdune/stdune__Caller_id.cmx
>>> +lib/ocaml/stdune/stdune__Char.cmx
>>> +lib/ocaml/stdune/stdune__Code_error.cmx
>>> +lib/ocaml/stdune/stdune__Comparable.cmx
>>> +lib/ocaml/stdune/stdune__Comparable_intf.cmx
>>> +lib/ocaml/stdune/stdune__Comparator.cmx
>>> +lib/ocaml/stdune/stdune__Either.cmx
>>> +lib/ocaml/stdune/stdune__Env.cmx
>>> +lib/ocaml/stdune/stdune__Escape.cmx
>>> +lib/ocaml/stdune/stdune__Exn.cmx
>>> +lib/ocaml/stdune/stdune__Exn_with_backtrace.cmx
>>> +lib/ocaml/stdune/stdune__Fdecl.cmx
>>> +lib/ocaml/stdune/stdune__Filename.cmx
>>> +lib/ocaml/stdune/stdune__Float.cmx
>>> +lib/ocaml/stdune/stdune__Fpath.cmx
>>> +lib/ocaml/stdune/stdune__Hashable.cmx
>>> +lib/ocaml/stdune/stdune__Hashtbl.cmx
>>> +lib/ocaml/stdune/stdune__Hashtbl_intf.cmx
>>> +lib/ocaml/stdune/stdune__Id.cmx
>>> +lib/ocaml/stdune/stdune__Int.cmx
>>> +lib/ocaml/stdune/stdune__Io.cmx
>>> +lib/ocaml/stdune/stdune__Io_intf.cmx
>>> +lib/ocaml/stdune/stdune__Lexbuf.cmx
>>> +lib/ocaml/stdune/stdune__List.cmx
>>> +lib/ocaml/stdune/stdune__Loc.cmx
>>> +lib/ocaml/stdune/stdune__Loc0.cmx
>>> +lib/ocaml/stdune/stdune__Map.cmx
>>> +lib/ocaml/stdune/stdune__Map_intf.cmx
>>> +lib/ocaml/stdune/stdune__Monad.cmx
>>> +lib/ocaml/stdune/stdune__Monad_intf.cmx
>>> +lib/ocaml/stdune/stdune__Monoid.cmx
>>> +lib/ocaml/stdune/stdune__Monoid_intf.cmx
>>> +lib/ocaml/stdune/stdune__Nonempty_list.cmx
>>> +lib/ocaml/stdune/stdune__Nothing.cmx
>>> +lib/ocaml/stdune/stdune__Option.cmx
>>> +lib/ocaml/stdune/stdune__Or_exn.cmx
>>> +lib/ocaml/stdune/stdune__Path.cmx
>>> +lib/ocaml/stdune/stdune__Path_intf.cmx
>>> +lib/ocaml/stdune/stdune__Pid.cmx
>>> +lib/ocaml/stdune/stdune__Poly.cmx
>>> +lib/ocaml/stdune/stdune__Predicate.cmx
>>> +lib/ocaml/stdune/stdune__Proc.cmx
>>> +lib/ocaml/stdune/stdune__Queue.cmx
>>> +lib/ocaml/stdune/stdune__Result.cmx
>>> +lib/ocaml/stdune/stdune__Scanf.cmx
>>> +lib/ocaml/stdune/stdune__Seq.cmx
>>> +lib/ocaml/stdune/stdune__Set.cmx
>>> +lib/ocaml/stdune/stdune__Set_intf.cmx
>>> +lib/ocaml/stdune/stdune__Sexp.cmx
>>> +lib/ocaml/stdune/stdune__Signal.cmx
>>> +lib/ocaml/stdune/stdune__Staged.cmx
>>> +lib/ocaml/stdune/stdune__State.cmx
>>> +lib/ocaml/stdune/stdune__String.cmx
>>> +lib/ocaml/stdune/stdune__String_split.cmx
>>> +lib/ocaml/stdune/stdune__Sys.cmx
>>> +lib/ocaml/stdune/stdune__Table.cmx
>>> +lib/ocaml/stdune/stdune__Temp.cmx
>>> +lib/ocaml/stdune/stdune__Top_closure.cmx
>>> +lib/ocaml/stdune/stdune__Top_closure_intf.cmx
>>> +lib/ocaml/stdune/stdune__Tuple.cmx
>>> +lib/ocaml/stdune/stdune__Type_eq.cmx
>>> +lib/ocaml/stdune/stdune__Unit.cmx
>>> +lib/ocaml/stdune/stdune__Univ_map.cmx
>>> +lib/ocaml/stdune/stdune__Univ_map_intf.cmx
>>> +lib/ocaml/stdune/stdune__User_error.cmx
>>> +lib/ocaml/stdune/stdune__User_message.cmx
>>> +lib/ocaml/stdune/stdune__User_warning.cmx
>>> Index: pkg/PFRAG.native-private
>>> ===================================================================
>>> RCS file: pkg/PFRAG.native-private
>>> diff -N pkg/PFRAG.native-private
>>> --- pkg/PFRAG.native-private 11 Mar 2022 18:50:00 -0000 1.3
>>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>>> @@ -1,138 +0,0 @@
>>> -%%dynlink%%
>>> -lib/ocaml/dune-private-libs/cache/cache.a
>>> -lib/ocaml/dune-private-libs/cache/cache.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache.cmxa
>>> -lib/ocaml/dune-private-libs/cache/cache__.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Cache_intf.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Client.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Key.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Local.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Messages.cmx
>>> -lib/ocaml/dune-private-libs/cache/cache__Messages_intf.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang.a
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang.cmxa
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Ast.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Atom.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Combinators.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Conv.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Cst.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Decoder.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Encoder.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Escape.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Lexer.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Parser.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Syntax.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__T.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Template.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Versioned_file.cmx
>>> -lib/ocaml/dune-private-libs/dune-lang/dune_lang__Versioned_file_first_line.cmx
>>> -lib/ocaml/dune-private-libs/dune_csexp/dune_csexp.a
>>> -lib/ocaml/dune-private-libs/dune_csexp/dune_csexp.cmx
>>> -lib/ocaml/dune-private-libs/dune_csexp/dune_csexp.cmxa
>>> -lib/ocaml/dune-private-libs/dune_csexp/dune_csexp__Csexp.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re.a
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re.cmxa
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re__.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re__Re.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re__Re_automata.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re__Re_cset.cmx
>>> -lib/ocaml/dune-private-libs/dune_re/dune_re__Re_fmt.cmx
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util.a
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util.cmx
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util.cmxa
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util__Log.cmx
>>> -lib/ocaml/dune-private-libs/dune_util/dune_util__Report_error.cmx
>>> -lib/ocaml/dune-private-libs/ocaml-config/ocaml_config.a
>>> -lib/ocaml/dune-private-libs/ocaml-config/ocaml_config.cmx
>>> -lib/ocaml/dune-private-libs/ocaml-config/ocaml_config.cmxa
>>> -lib/ocaml/dune-private-libs/stdune/stdune.a
>>> -lib/ocaml/dune-private-libs/stdune/stdune.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune.cmxa
>>> -lib/ocaml/dune-private-libs/stdune/stdune__.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Ansi_color.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Appendable_list.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Applicative.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Applicative_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Array.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Bin.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Bool.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Bytes.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Char.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Code_error.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Comparable.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Comparable_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Comparator.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Console.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Csexp.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Daemonize.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Digest.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Dyn.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Either.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Env.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Escape.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Exn.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Exn_with_backtrace.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Fcntl.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Fdecl.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Filename.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Float.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Hashable.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Hashtbl.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Hashtbl_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Id.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Int.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Interned.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Interned_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Io.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Io_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Lexbuf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__List.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Loc.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Loc0.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Lock_file.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Map.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Map_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Monad.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Monad_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Nothing.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Option.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Or_exn.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Ordered.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Ordering.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Path.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Path_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Pid.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Poly.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Pp.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Proc.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Result.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Scanf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Seq.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Set.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Set_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Sexp.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Signal.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Spawn.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Staged.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__String.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__String_split.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Sys.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Table.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Top_closure.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Top_closure_intf.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Tuple.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Type_eq.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Unit.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__Univ_map.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__User_error.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__User_message.cmx
>>> -lib/ocaml/dune-private-libs/stdune/stdune__User_warning.cmx
>>> -lib/ocaml/dune-private-libs/xdg/xdg.a
>>> -lib/ocaml/dune-private-libs/xdg/xdg.cmx
>>> -lib/ocaml/dune-private-libs/xdg/xdg.cmxa
>>> Index: pkg/PLIST-configurator
>>> ===================================================================
>>> RCS file: /cvs/ports/devel/dune/pkg/PLIST-configurator,v
>>> retrieving revision 1.3
>>> diff -u -p -r1.3 PLIST-configurator
>>> --- pkg/PLIST-configurator 11 Mar 2022 18:50:00 -0000 1.3
>>> +++ pkg/PLIST-configurator 22 Jan 2023 15:00:45 -0000
>>> @@ -1,10 +1,14 @@
>>> %%native%%
>>> lib/ocaml/dune-configurator/
>>> lib/ocaml/dune-configurator/.private/
>>> -lib/ocaml/dune-configurator/.private/configurator__Csexp.cmi
>>> lib/ocaml/dune-configurator/.private/configurator__Dune_lang.cmi
>>> +lib/ocaml/dune-configurator/.private/configurator__Dune_lang.cmt
>>> +lib/ocaml/dune-configurator/.private/configurator__Dune_lang.cmti
>>> lib/ocaml/dune-configurator/.private/configurator__Import.cmi
>>> +lib/ocaml/dune-configurator/.private/configurator__Import.cmt
>>> lib/ocaml/dune-configurator/.private/configurator__Ocaml_config.cmi
>>> +lib/ocaml/dune-configurator/.private/configurator__Ocaml_config.cmt
>>> +lib/ocaml/dune-configurator/.private/configurator__Ocaml_config.cmti
>>> lib/ocaml/dune-configurator/META
>>> lib/ocaml/dune-configurator/configurator.cma
>>> lib/ocaml/dune-configurator/configurator.cmi
>>> @@ -13,21 +17,12 @@ lib/ocaml/dune-configurator/configurator
>>> lib/ocaml/dune-configurator/configurator__.cmi
>>> lib/ocaml/dune-configurator/configurator__.cmt
>>> lib/ocaml/dune-configurator/configurator__.ml
>>> -lib/ocaml/dune-configurator/configurator__Csexp.cmt
>>> -lib/ocaml/dune-configurator/configurator__Csexp.cmti
>>> -lib/ocaml/dune-configurator/configurator__Dune_lang.cmt
>>> -lib/ocaml/dune-configurator/configurator__Dune_lang.cmti
>>> lib/ocaml/dune-configurator/configurator__Extract_obj.cmi
>>> lib/ocaml/dune-configurator/configurator__Extract_obj.cmt
>>> lib/ocaml/dune-configurator/configurator__Extract_obj.cmti
>>> -lib/ocaml/dune-configurator/configurator__Import.cmt
>>> -lib/ocaml/dune-configurator/configurator__Ocaml_config.cmt
>>> -lib/ocaml/dune-configurator/configurator__Ocaml_config.cmti
>>> lib/ocaml/dune-configurator/configurator__V1.cmi
>>> lib/ocaml/dune-configurator/configurator__V1.cmt
>>> lib/ocaml/dune-configurator/configurator__V1.cmti
>>> -lib/ocaml/dune-configurator/csexp.ml
>>> -lib/ocaml/dune-configurator/csexp.mli
>>> lib/ocaml/dune-configurator/dune-package
>>> lib/ocaml/dune-configurator/dune_lang.ml
>>> lib/ocaml/dune-configurator/dune_lang.mli
>>> @@ -39,7 +34,390 @@ lib/ocaml/dune-configurator/ocaml_config
>>> lib/ocaml/dune-configurator/opam
>>> lib/ocaml/dune-configurator/v1.ml
>>> lib/ocaml/dune-configurator/v1.mli
>>> +lib/ocaml/stdune/
>>> +lib/ocaml/stdune/META
>>> +lib/ocaml/stdune/ansi_color.ml
>>> +lib/ocaml/stdune/ansi_color.mli
>>> +lib/ocaml/stdune/appendable_list.ml
>>> +lib/ocaml/stdune/appendable_list.mli
>>> +lib/ocaml/stdune/applicative.ml
>>> +lib/ocaml/stdune/applicative.mli
>>> +lib/ocaml/stdune/applicative_intf.ml
>>> +lib/ocaml/stdune/array.ml
>>> +lib/ocaml/stdune/bin.ml
>>> +lib/ocaml/stdune/bin.mli
>>> +lib/ocaml/stdune/bool.ml
>>> +lib/ocaml/stdune/bool.mli
>>> +lib/ocaml/stdune/bytes.ml
>>> +lib/ocaml/stdune/bytes.mli
>>> +lib/ocaml/stdune/bytes_unit.ml
>>> +lib/ocaml/stdune/bytes_unit.mli
>>> +lib/ocaml/stdune/caller_id.ml
>>> +lib/ocaml/stdune/caller_id.mli
>>> +lib/ocaml/stdune/char.ml
>>> +lib/ocaml/stdune/char.mli
>>> +lib/ocaml/stdune/code_error.ml
>>> +lib/ocaml/stdune/code_error.mli
>>> +lib/ocaml/stdune/comparable.ml
>>> +lib/ocaml/stdune/comparable.mli
>>> +lib/ocaml/stdune/comparable_intf.ml
>>> +lib/ocaml/stdune/comparator.ml
>>> +lib/ocaml/stdune/comparator.mli
>>> +lib/ocaml/stdune/csexp/
>>> +lib/ocaml/stdune/csexp/csexp.cma
>>> +lib/ocaml/stdune/csexp/csexp.cmi
>>> +lib/ocaml/stdune/csexp/csexp.cmt
>>> +lib/ocaml/stdune/csexp/csexp.cmti
>>> +lib/ocaml/stdune/csexp/csexp.ml
>>> +lib/ocaml/stdune/csexp/csexp.mli
>>> +lib/ocaml/stdune/dune-package
>>> +lib/ocaml/stdune/either.ml
>>> +lib/ocaml/stdune/either.mli
>>> +lib/ocaml/stdune/env.ml
>>> +lib/ocaml/stdune/env.mli
>>> +lib/ocaml/stdune/escape.ml
>>> +lib/ocaml/stdune/escape.mli
>>> +lib/ocaml/stdune/exn.ml
>>> +lib/ocaml/stdune/exn.mli
>>> +lib/ocaml/stdune/exn_with_backtrace.ml
>>> +lib/ocaml/stdune/exn_with_backtrace.mli
>>> +lib/ocaml/stdune/fdecl.ml
>>> +lib/ocaml/stdune/fdecl.mli
>>> +lib/ocaml/stdune/filename.ml
>>> +lib/ocaml/stdune/filename.mli
>>> +lib/ocaml/stdune/filesystem_stubs/
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cma
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmi
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmt
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmti
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.ml
>>> +lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.mli
>>> +@static-l
