My opam setup has dune 1.11.3 and it seems to work fine so ok krw@. .... Ken
> On Sep 18, 2019, at 2:31 PM, Christopher Zimmermann <chr...@openbsd.org> > wrote: > > Hi, > > this is a straightforward upgrade to dune 1.11.3. It is needed for the > graphics module, which will be removed from the compiler distribution > from OCaml 4.09 onward. OK? > > Christopher > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/dune/Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 Makefile > --- Makefile 18 Sep 2019 17:49:35 -0000 1.7 > +++ Makefile 18 Sep 2019 18:28:15 -0000 > @@ -6,8 +6,7 @@ CATEGORIES = devel > > GH_ACCOUNT = ocaml > GH_PROJECT = dune > -GH_TAGNAME = 1.10.0 > -REVISION = 2 > +GH_TAGNAME = 1.11.3 > > HOMEPAGE = https://github.com/ocaml/dune > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/dune/distinfo,v > retrieving revision 1.3 > diff -u -p -r1.3 distinfo > --- distinfo 19 Jun 2019 09:18:18 -0000 1.3 > +++ distinfo 18 Sep 2019 18:28:15 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (dune-1.10.0.tar.gz) = fHeaZWgH1lnPi1wYr5Nitn/YJzo2GPIXQqyXtKU7cyg= > -SIZE (dune-1.10.0.tar.gz) = 786819 > +SHA256 (dune-1.11.3.tar.gz) = pU1P+mztBBVUk155MNMWcEkTlf94uGAMTk2Mu9AoQbw= > +SIZE (dune-1.11.3.tar.gz) = 848134 > Index: pkg/PFRAG.native > =================================================================== > RCS file: /cvs/ports/devel/dune/pkg/PFRAG.native,v > retrieving revision 1.1 > diff -u -p -r1.1 PFRAG.native > --- pkg/PFRAG.native 17 Aug 2019 13:29:42 -0000 1.1 > +++ pkg/PFRAG.native 18 Sep 2019 18:28:15 -0000 > @@ -8,6 +8,7 @@ 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 > @@ -36,11 +37,15 @@ 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__Dyn0.cmx > lib/ocaml/dune/_stdune/stdune__Either.cmx > lib/ocaml/dune/_stdune/stdune__Env.cmx > lib/ocaml/dune/_stdune/stdune__Escape.cmx > @@ -55,19 +60,21 @@ lib/ocaml/dune/_stdune/stdune__Hashable. > 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__Import.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 > @@ -78,8 +85,7 @@ lib/ocaml/dune/_stdune/stdune__Result.cm > 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__Sexp0.cmx > -lib/ocaml/dune/_stdune/stdune__Sexp_intf.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 > @@ -88,6 +94,9 @@ 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 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/dune/pkg/PLIST,v > retrieving revision 1.5 > diff -u -p -r1.5 PLIST > --- pkg/PLIST 17 Aug 2019 13:29:42 -0000 1.5 > +++ pkg/PLIST 18 Sep 2019 18:28:15 -0000 > @@ -14,6 +14,7 @@ lib/ocaml/dune/_caml/dune_caml.ml > lib/ocaml/dune/_dune_lang/ > lib/ocaml/dune/_dune_lang/atom.ml > lib/ocaml/dune/_dune_lang/atom.mli > +lib/ocaml/dune/_dune_lang/combinators.ml > lib/ocaml/dune/_dune_lang/dune_lang.cma > lib/ocaml/dune/_dune_lang/dune_lang.cmi > lib/ocaml/dune/_dune_lang/dune_lang.cmt > @@ -26,6 +27,8 @@ lib/ocaml/dune/_dune_lang/dune_lang__.ml > lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmi > lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmt > lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmti > +lib/ocaml/dune/_dune_lang/dune_lang__Combinators.cmi > +lib/ocaml/dune/_dune_lang/dune_lang__Combinators.cmt > lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmi > lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmt > lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmti > @@ -100,14 +103,22 @@ lib/ocaml/dune/_stdune/bool.mli > lib/ocaml/dune/_stdune/bytes.ml > lib/ocaml/dune/_stdune/bytes.mli > lib/ocaml/dune/_stdune/char.ml > +lib/ocaml/dune/_stdune/code_error.ml > +lib/ocaml/dune/_stdune/code_error.mli > lib/ocaml/dune/_stdune/common.ml > lib/ocaml/dune/_stdune/comparable.ml > lib/ocaml/dune/_stdune/comparable.mli > +lib/ocaml/dune/_stdune/comparable_intf.ml > +lib/ocaml/dune/_stdune/comparator.ml > +lib/ocaml/dune/_stdune/comparator.mli > +lib/ocaml/dune/_stdune/console.ml > +lib/ocaml/dune/_stdune/console.mli > +lib/ocaml/dune/_stdune/csexp.ml > +lib/ocaml/dune/_stdune/csexp.mli > lib/ocaml/dune/_stdune/digest.ml > lib/ocaml/dune/_stdune/digest.mli > lib/ocaml/dune/_stdune/dyn.ml > lib/ocaml/dune/_stdune/dyn.mli > -lib/ocaml/dune/_stdune/dyn0.ml > lib/ocaml/dune/_stdune/either.ml > lib/ocaml/dune/_stdune/either.mli > lib/ocaml/dune/_stdune/env.ml > @@ -134,18 +145,21 @@ lib/ocaml/dune/_stdune/hashtbl.mli > lib/ocaml/dune/_stdune/hashtbl_intf.ml > lib/ocaml/dune/_stdune/id.ml > lib/ocaml/dune/_stdune/id.mli > -lib/ocaml/dune/_stdune/import.ml > lib/ocaml/dune/_stdune/int.ml > lib/ocaml/dune/_stdune/int.mli > lib/ocaml/dune/_stdune/interned.ml > lib/ocaml/dune/_stdune/interned.mli > lib/ocaml/dune/_stdune/io.ml > lib/ocaml/dune/_stdune/io.mli > +lib/ocaml/dune/_stdune/lexbuf.ml > +lib/ocaml/dune/_stdune/lexbuf.mli > lib/ocaml/dune/_stdune/list.ml > lib/ocaml/dune/_stdune/list.mli > lib/ocaml/dune/_stdune/loc.ml > lib/ocaml/dune/_stdune/loc.mli > lib/ocaml/dune/_stdune/loc0.ml > +lib/ocaml/dune/_stdune/log.ml > +lib/ocaml/dune/_stdune/log.mli > lib/ocaml/dune/_stdune/map.ml > lib/ocaml/dune/_stdune/map.mli > lib/ocaml/dune/_stdune/map_intf.ml > @@ -157,6 +171,8 @@ lib/ocaml/dune/_stdune/option.ml > lib/ocaml/dune/_stdune/option.mli > lib/ocaml/dune/_stdune/or_exn.ml > lib/ocaml/dune/_stdune/or_exn.mli > +lib/ocaml/dune/_stdune/ordered.ml > +lib/ocaml/dune/_stdune/ordered.mli > lib/ocaml/dune/_stdune/ordering.ml > lib/ocaml/dune/_stdune/ordering.mli > lib/ocaml/dune/_stdune/path.ml > @@ -175,8 +191,8 @@ lib/ocaml/dune/_stdune/set.mli > lib/ocaml/dune/_stdune/set_intf.ml > lib/ocaml/dune/_stdune/sexp.ml > lib/ocaml/dune/_stdune/sexp.mli > -lib/ocaml/dune/_stdune/sexp0.ml > -lib/ocaml/dune/_stdune/sexp_intf.ml > +lib/ocaml/dune/_stdune/signal.ml > +lib/ocaml/dune/_stdune/signal.mli > lib/ocaml/dune/_stdune/staged.ml > lib/ocaml/dune/_stdune/staged.mli > lib/ocaml/dune/_stdune/stdune.cma > @@ -205,19 +221,31 @@ lib/ocaml/dune/_stdune/stdune__Bytes.cmt > lib/ocaml/dune/_stdune/stdune__Bytes.cmti > lib/ocaml/dune/_stdune/stdune__Char.cmi > lib/ocaml/dune/_stdune/stdune__Char.cmt > +lib/ocaml/dune/_stdune/stdune__Code_error.cmi > +lib/ocaml/dune/_stdune/stdune__Code_error.cmt > +lib/ocaml/dune/_stdune/stdune__Code_error.cmti > lib/ocaml/dune/_stdune/stdune__Common.cmi > lib/ocaml/dune/_stdune/stdune__Common.cmt > lib/ocaml/dune/_stdune/stdune__Comparable.cmi > lib/ocaml/dune/_stdune/stdune__Comparable.cmt > lib/ocaml/dune/_stdune/stdune__Comparable.cmti > +lib/ocaml/dune/_stdune/stdune__Comparable_intf.cmi > +lib/ocaml/dune/_stdune/stdune__Comparable_intf.cmt > +lib/ocaml/dune/_stdune/stdune__Comparator.cmi > +lib/ocaml/dune/_stdune/stdune__Comparator.cmt > +lib/ocaml/dune/_stdune/stdune__Comparator.cmti > +lib/ocaml/dune/_stdune/stdune__Console.cmi > +lib/ocaml/dune/_stdune/stdune__Console.cmt > +lib/ocaml/dune/_stdune/stdune__Console.cmti > +lib/ocaml/dune/_stdune/stdune__Csexp.cmi > +lib/ocaml/dune/_stdune/stdune__Csexp.cmt > +lib/ocaml/dune/_stdune/stdune__Csexp.cmti > lib/ocaml/dune/_stdune/stdune__Digest.cmi > lib/ocaml/dune/_stdune/stdune__Digest.cmt > lib/ocaml/dune/_stdune/stdune__Digest.cmti > lib/ocaml/dune/_stdune/stdune__Dyn.cmi > lib/ocaml/dune/_stdune/stdune__Dyn.cmt > lib/ocaml/dune/_stdune/stdune__Dyn.cmti > -lib/ocaml/dune/_stdune/stdune__Dyn0.cmi > -lib/ocaml/dune/_stdune/stdune__Dyn0.cmt > lib/ocaml/dune/_stdune/stdune__Either.cmi > lib/ocaml/dune/_stdune/stdune__Either.cmt > lib/ocaml/dune/_stdune/stdune__Either.cmti > @@ -258,8 +286,6 @@ lib/ocaml/dune/_stdune/stdune__Hashtbl_i > lib/ocaml/dune/_stdune/stdune__Id.cmi > lib/ocaml/dune/_stdune/stdune__Id.cmt > lib/ocaml/dune/_stdune/stdune__Id.cmti > -lib/ocaml/dune/_stdune/stdune__Import.cmi > -lib/ocaml/dune/_stdune/stdune__Import.cmt > lib/ocaml/dune/_stdune/stdune__Int.cmi > lib/ocaml/dune/_stdune/stdune__Int.cmt > lib/ocaml/dune/_stdune/stdune__Int.cmti > @@ -269,6 +295,9 @@ lib/ocaml/dune/_stdune/stdune__Interned. > lib/ocaml/dune/_stdune/stdune__Io.cmi > lib/ocaml/dune/_stdune/stdune__Io.cmt > lib/ocaml/dune/_stdune/stdune__Io.cmti > +lib/ocaml/dune/_stdune/stdune__Lexbuf.cmi > +lib/ocaml/dune/_stdune/stdune__Lexbuf.cmt > +lib/ocaml/dune/_stdune/stdune__Lexbuf.cmti > lib/ocaml/dune/_stdune/stdune__List.cmi > lib/ocaml/dune/_stdune/stdune__List.cmt > lib/ocaml/dune/_stdune/stdune__List.cmti > @@ -277,6 +306,9 @@ lib/ocaml/dune/_stdune/stdune__Loc.cmt > lib/ocaml/dune/_stdune/stdune__Loc.cmti > lib/ocaml/dune/_stdune/stdune__Loc0.cmi > lib/ocaml/dune/_stdune/stdune__Loc0.cmt > +lib/ocaml/dune/_stdune/stdune__Log.cmi > +lib/ocaml/dune/_stdune/stdune__Log.cmt > +lib/ocaml/dune/_stdune/stdune__Log.cmti > lib/ocaml/dune/_stdune/stdune__Map.cmi > lib/ocaml/dune/_stdune/stdune__Map.cmt > lib/ocaml/dune/_stdune/stdune__Map.cmti > @@ -294,6 +326,9 @@ lib/ocaml/dune/_stdune/stdune__Option.cm > lib/ocaml/dune/_stdune/stdune__Or_exn.cmi > lib/ocaml/dune/_stdune/stdune__Or_exn.cmt > lib/ocaml/dune/_stdune/stdune__Or_exn.cmti > +lib/ocaml/dune/_stdune/stdune__Ordered.cmi > +lib/ocaml/dune/_stdune/stdune__Ordered.cmt > +lib/ocaml/dune/_stdune/stdune__Ordered.cmti > lib/ocaml/dune/_stdune/stdune__Ordering.cmi > lib/ocaml/dune/_stdune/stdune__Ordering.cmt > lib/ocaml/dune/_stdune/stdune__Ordering.cmti > @@ -322,10 +357,9 @@ lib/ocaml/dune/_stdune/stdune__Set_intf. > lib/ocaml/dune/_stdune/stdune__Sexp.cmi > lib/ocaml/dune/_stdune/stdune__Sexp.cmt > lib/ocaml/dune/_stdune/stdune__Sexp.cmti > -lib/ocaml/dune/_stdune/stdune__Sexp0.cmi > -lib/ocaml/dune/_stdune/stdune__Sexp0.cmt > -lib/ocaml/dune/_stdune/stdune__Sexp_intf.cmi > -lib/ocaml/dune/_stdune/stdune__Sexp_intf.cmt > +lib/ocaml/dune/_stdune/stdune__Signal.cmi > +lib/ocaml/dune/_stdune/stdune__Signal.cmt > +lib/ocaml/dune/_stdune/stdune__Signal.cmti > lib/ocaml/dune/_stdune/stdune__Staged.cmi > lib/ocaml/dune/_stdune/stdune__Staged.cmt > lib/ocaml/dune/_stdune/stdune__Staged.cmti > @@ -350,6 +384,15 @@ lib/ocaml/dune/_stdune/stdune__Unit.cmti > lib/ocaml/dune/_stdune/stdune__Univ_map.cmi > lib/ocaml/dune/_stdune/stdune__Univ_map.cmt > lib/ocaml/dune/_stdune/stdune__Univ_map.cmti > +lib/ocaml/dune/_stdune/stdune__User_error.cmi > +lib/ocaml/dune/_stdune/stdune__User_error.cmt > +lib/ocaml/dune/_stdune/stdune__User_error.cmti > +lib/ocaml/dune/_stdune/stdune__User_message.cmi > +lib/ocaml/dune/_stdune/stdune__User_message.cmt > +lib/ocaml/dune/_stdune/stdune__User_message.cmti > +lib/ocaml/dune/_stdune/stdune__User_warning.cmi > +lib/ocaml/dune/_stdune/stdune__User_warning.cmt > +lib/ocaml/dune/_stdune/stdune__User_warning.cmti > lib/ocaml/dune/_stdune/string.ml > lib/ocaml/dune/_stdune/string.mli > lib/ocaml/dune/_stdune/string_split.ml > @@ -364,6 +407,12 @@ lib/ocaml/dune/_stdune/unit.ml > lib/ocaml/dune/_stdune/unit.mli > lib/ocaml/dune/_stdune/univ_map.ml > lib/ocaml/dune/_stdune/univ_map.mli > +lib/ocaml/dune/_stdune/user_error.ml > +lib/ocaml/dune/_stdune/user_error.mli > +lib/ocaml/dune/_stdune/user_message.ml > +lib/ocaml/dune/_stdune/user_message.mli > +lib/ocaml/dune/_stdune/user_warning.ml > +lib/ocaml/dune/_stdune/user_warning.mli > lib/ocaml/dune/_wp/ > lib/ocaml/dune/_wp/dune/ > lib/ocaml/dune/_wp/dune/wp.cmi > > > -- > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
