You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
ocaml-cmdliner: update to 2.1.1; cascade related updates
Update ocaml-cmdliner to 2.1.1, ocaml-dune to 3.22.2, ocaml-fmt to 0.11.0,
ocaml-logs to 0.10.0, ocaml-ocp-indent to 1.9.0, and ocaml-uutf to 1.0.4.
Bump revisions of ports affected by the changed module interfaces.
Patch ocaml-bisect_ppx 2.8.3 to build against cmdliner 2.x using upstream
commit 2d8dffb ("Adapt to Cmdliner 2.0.0", post-2.8.3); same patch ships
in Debian as 0002-Adapt-to-Cmdliner-2.0.0.patch.
Patch ledit to build against camlp5 8 with a patch from Debian.
Fix geneweb post-activate script and notes.
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
This commit is contained in:
Paul Guyot
committed by
Perry E. Metzger
Perry E. Metzger
parent
aded83e7fb
commit
a039804bdc
@@ -8,7 +8,7 @@ github.setup project-everest everparse 69d6c064ea34d0f5458db94ba1204795db
|
||||
github.tarball_from archive
|
||||
version 2025.01.25
|
||||
epoch 1
|
||||
revision 0
|
||||
revision 1
|
||||
|
||||
categories devel
|
||||
maintainers {landonf @landonf} openmaintainer
|
||||
|
||||
@@ -6,7 +6,7 @@ name ledit
|
||||
version 2.04
|
||||
categories editors
|
||||
license BSD
|
||||
platforms darwin
|
||||
revision 1
|
||||
maintainers nomaintainer
|
||||
|
||||
description A line editor to be used with interactive commands.
|
||||
@@ -31,6 +31,9 @@ depends_build port:ocaml
|
||||
depends_lib bin:camlp5:camlp5 \
|
||||
port:ncurses
|
||||
|
||||
# https://salsa.debian.org/ocaml-team/ledit/-/blob/master/debian/patches/0002-Fix-compilation-with-camlp5-8.00.02.patch
|
||||
patchfiles patch-camlp5-8.diff
|
||||
|
||||
use_parallel_build no
|
||||
|
||||
configure {
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
--- ext/pa_def.ml.orig
|
||||
+++ ext/pa_def.ml
|
||||
@@ -33,7 +33,7 @@ value subst mloc env =
|
||||
loop where rec loop =
|
||||
fun
|
||||
[ <:expr< let $opt:rf$ $list:pel$ in $e$ >> ->
|
||||
- let pel = List.map (fun (p, e) -> (p, loop e)) pel in
|
||||
+ let pel = List.map (fun (p, e, a) -> (p, loop e, a)) pel in
|
||||
<:expr< let $opt:rf$ $list:pel$ in $loop e$ >>
|
||||
| <:expr< if $e1$ then $e2$ else $e3$ >> ->
|
||||
<:expr< if $loop e1$ then $loop e2$ else $loop e3$ >>
|
||||
--- ext/pa_local.ml.orig
|
||||
+++ ext/pa_local.ml
|
||||
@@ -29,7 +29,7 @@ EXTEND
|
||||
lb = LIST1 let_binding SEP "and"; "in"; "value";
|
||||
rf1 = [ "rec" -> True | -> False ];
|
||||
lb1 = LIST1 let_binding SEP "and" ->
|
||||
- let pl = List.map fst lb1 in
|
||||
+ let pl = List.map (fun (a, _, _) -> a) lb1 in
|
||||
let el = List.map expr_of_patt pl in
|
||||
<:str_item<
|
||||
value ($list:pl$) =
|
||||
@@ -4,7 +4,7 @@ PortSystem 1.0
|
||||
PortGroup github 1.0
|
||||
|
||||
github.setup geneweb geneweb 7.1.0-beta2 v
|
||||
revision 1
|
||||
revision 2
|
||||
categories genealogy
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license GPL-2
|
||||
@@ -121,7 +121,7 @@ destroot {
|
||||
|
||||
post-activate {
|
||||
system "chown -R ${gwuser}:${gwgroup} ${prefix}/var/db/${name}"
|
||||
system "chmod -R a+rw ${prefix}/var/db/${name}"
|
||||
system "chmod -R a+rwX ${prefix}/var/db/${name}"
|
||||
}
|
||||
|
||||
notes "
|
||||
@@ -133,5 +133,5 @@ simply point your browser to http://localhost:2317 to review\
|
||||
the data.
|
||||
|
||||
If you are upgrading, you may need to fix permissions:\
|
||||
sudo chmod 0755 ${destroot}/var/db/geneweb/cnt/
|
||||
sudo chmod 0755 ${prefix}/var/db/geneweb/cnt/
|
||||
"
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup github 1.0
|
||||
github.setup camlp5 camlp5 8.03.01
|
||||
# Change github.tarball_from to 'releases' or 'archive' next update
|
||||
github.tarball_from tarball
|
||||
revision 2
|
||||
revision 3
|
||||
categories lang ocaml
|
||||
license BSD
|
||||
maintainers {pmetzger @pmetzger} openmaintainer
|
||||
|
||||
@@ -61,6 +61,7 @@ if {${subport} eq "fstar" || ${subport} eq "karamel"} {
|
||||
subport fstar {
|
||||
github.setup FStarLang FStar 2025.03.25 v
|
||||
epoch 1
|
||||
revision 1
|
||||
|
||||
license Apache-2
|
||||
description Verification system for effectful programs
|
||||
@@ -139,6 +140,7 @@ subport karamel {
|
||||
github.setup FStarLang karamel 86f99f08afa04ca792f9c4f64f24db4c0fdbc46c
|
||||
version 2025.04.01
|
||||
epoch 1
|
||||
revision 1
|
||||
|
||||
license Apache-2
|
||||
description A tool for extracting low-level F* programs to readable C code
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
|
||||
github.setup abella-prover abella 2.0.8.3 v
|
||||
|
||||
revision 0
|
||||
revision 1
|
||||
categories math ocaml
|
||||
maintainers nomaintainer
|
||||
license GPL-3
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
github.setup stan-dev stanc3 2.35.0 v
|
||||
epoch 1
|
||||
revision 0
|
||||
revision 1
|
||||
categories math lang ocaml
|
||||
maintainers nomaintainer
|
||||
license BSD
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-alcotest
|
||||
github.setup mirage alcotest 1.7.0
|
||||
revision 0
|
||||
revision 1
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
license ISC
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-async
|
||||
github.setup janestreet async 0.16.0 v
|
||||
revision 1
|
||||
revision 2
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
license MIT
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-bisect_ppx
|
||||
github.setup aantron bisect_ppx 2.8.3
|
||||
revision 2
|
||||
revision 3
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
license MIT
|
||||
@@ -18,6 +18,10 @@ checksums rmd160 bd9a11dda069cd7c13f8b59035ef570fe9593130 \
|
||||
size 328819
|
||||
github.tarball_from archive
|
||||
|
||||
# https://github.com/aantron/bisect_ppx/commit/2d8dffbbfc0c431a37319d4d9a143836c9ec542e
|
||||
# Unreleased yet. Drop with next bisect_ppx release.
|
||||
patchfiles-append patch-cmdliner-2.0.diff
|
||||
|
||||
depends_lib-append port:ocaml-cmdliner \
|
||||
port:ocaml-ppxlib
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
--- src/report/main.ml.orig 2023-07-17 20:20:34
|
||||
+++ src/report/main.ml 2026-05-02 23:29:18
|
||||
@@ -21,29 +21,15 @@
|
||||
| exception Not_found -> []
|
||||
| directory -> [Filename.concat directory "default"]
|
||||
|
||||
-(* Many of the values used from Cmdliner.Term are deprecated in favor of values
|
||||
- from Cmdliner.Cmd. However, Cmdliner.Cmd was introduced in Cmdliner 1.1.0,
|
||||
- which requires OCaml 4.08.0. Bisect_ppx still supports OCaml 4.04, so Bisect
|
||||
- cannot use this recent version of Cmdliner. The 4.04 constraint itself is
|
||||
- only due to ppxlib.
|
||||
-
|
||||
- So, suppress the deprecation warnings. *)
|
||||
-module Term =
|
||||
-struct
|
||||
- include Cmdliner.Term
|
||||
-
|
||||
- let eval_choice = Cmdliner.Term.eval_choice [@ocaml.warning "-3"]
|
||||
- let exit = Cmdliner.Term.exit [@ocaml.warning "-3"]
|
||||
- let info = Cmdliner.Term.info [@ocaml.warning "-3"]
|
||||
-end
|
||||
-
|
||||
module Arg = Cmdliner.Arg
|
||||
+module Cmd = Cmdliner.Cmd
|
||||
+module Term = Cmdliner.Term
|
||||
|
||||
|
||||
|
||||
(* Common arguments. *)
|
||||
|
||||
-let term_info = Term.info ~sdocs:"COMMON OPTIONS"
|
||||
+let term_info = Cmd.info ~sdocs:"COMMON OPTIONS"
|
||||
|
||||
let coverage_files from_position =
|
||||
Arg.(value @@ pos_right (from_position - 1) string [] @@
|
||||
@@ -295,9 +281,8 @@
|
||||
(* Entry point. *)
|
||||
|
||||
let () =
|
||||
- Term.(eval_choice
|
||||
- (ret (const (`Help (`Auto, None))),
|
||||
- term_info
|
||||
+ Cmd.group
|
||||
+ (term_info
|
||||
"bisect-ppx-report"
|
||||
~doc:"Generate coverage reports for OCaml and Reason."
|
||||
~man:[
|
||||
@@ -308,6 +293,10 @@
|
||||
`P
|
||||
("See bisect-ppx-report $(i,COMMAND) --help for further " ^
|
||||
"information on each command, including options.")
|
||||
- ]))
|
||||
- [html; send_to; text; cobertura; coveralls; merge]
|
||||
- |> Term.exit
|
||||
+ ]
|
||||
+ ~exits:((Cmd.Exit.info ~doc:"on error." 1)::Cmd.Exit.defaults)
|
||||
+ )
|
||||
+ ([html; send_to; text; cobertura; coveralls; merge]
|
||||
+ |> List.map (fun (term, info) -> Cmd.v info term))
|
||||
+ |> Cmd.eval
|
||||
+ |> exit
|
||||
@@ -5,7 +5,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-bos
|
||||
version 0.3.0
|
||||
revision 0
|
||||
revision 1
|
||||
categories ocaml devel
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license ISC
|
||||
|
||||
@@ -7,7 +7,7 @@ PortGroup github 1.0
|
||||
github.setup camlp5 camlp5-buildscripts 0.06
|
||||
github.tarball_from archive
|
||||
name ocaml-camlp5-buildscripts
|
||||
revision 2
|
||||
revision 3
|
||||
categories ocaml devel
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license BSD
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-cmdliner
|
||||
github.setup dbuenzli cmdliner 1.3.0 v
|
||||
github.setup dbuenzli cmdliner 2.1.1 v
|
||||
revision 0
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
@@ -13,9 +13,18 @@ license ISC
|
||||
description ${name} allows the declarative definition of command line interfaces for OCaml
|
||||
long_description ${description}
|
||||
homepage https://erratique.ch/software/cmdliner
|
||||
checksums rmd160 d62277e3339733615dded9f4d5fd93d092bab6f4 \
|
||||
sha256 a7763e802c4e46e151916c1ba46a608d3ae6d4522ce70a1748cf47ea54d809ba \
|
||||
size 70415
|
||||
checksums rmd160 aca19565b18b274d83643821d97b2f892db0539e \
|
||||
sha256 90dee3ef327fb7db1eb5859be7143ea9b60e37534865a725e2fcb92569a38370 \
|
||||
size 120277
|
||||
github.tarball_from archive
|
||||
|
||||
ocaml.build_type dune
|
||||
use_configure no
|
||||
|
||||
post-extract {
|
||||
reinplace "s|%%VERSION_NUM%%|${github.version}|g" \
|
||||
${worksrcpath}/pkg/META
|
||||
}
|
||||
|
||||
destroot.target install install-doc
|
||||
destroot.args PREFIX=${prefix} \
|
||||
LIBDIR=${destroot}${ocaml.package_dir}/cmdliner
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
PortGroup ocaml 1.1
|
||||
|
||||
github.setup mirage ocaml-crunch 3.3.1 v
|
||||
revision 0
|
||||
revision 1
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
license ISC
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-decompress
|
||||
github.setup mirage decompress 1.5.3 v
|
||||
revision 0
|
||||
revision 1
|
||||
categories ocaml devel
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license MIT
|
||||
|
||||
@@ -5,7 +5,7 @@ PortGroup github 1.0
|
||||
PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-dune
|
||||
github.setup ocaml dune 3.16.0
|
||||
github.setup ocaml dune 3.22.2
|
||||
categories ocaml devel
|
||||
license MIT
|
||||
maintainers {landonf @landonf} openmaintainer
|
||||
@@ -13,9 +13,9 @@ maintainers {landonf @landonf} openmaintainer
|
||||
description Composable build system for OCaml
|
||||
long_description Dune is a build system for OCaml and Reason.
|
||||
|
||||
checksums rmd160 a165d6c7f1b78d9c1992552bdc3a10b1f2cd3016 \
|
||||
sha256 cf141fe2113d95faab9714bc3203f4665ba58c7e0c4450f9a719f1ba075cd214 \
|
||||
size 2999701
|
||||
checksums rmd160 553208d413f79d5adb5a08408731f547b481839d \
|
||||
sha256 fe5d5110cbde0cec51a9e88f2f96516ea9bc19f2d3588a150140b47951e2ea06 \
|
||||
size 3571784
|
||||
github.tarball_from archive
|
||||
|
||||
if { ${subport} eq ${name} } {
|
||||
|
||||
@@ -5,7 +5,8 @@ PortGroup github 1.0
|
||||
PortGroup ocaml 1.1
|
||||
|
||||
name ocaml-fmt
|
||||
github.setup dbuenzli fmt 0.9.0 v
|
||||
github.setup dbuenzli fmt 0.11.0 v
|
||||
revision 0
|
||||
categories ocaml devel
|
||||
maintainers nomaintainer
|
||||
license ISC
|
||||
@@ -13,9 +14,9 @@ description Fmt exposes combinators to devise format pretty-printing fun
|
||||
long_description {*}${description}
|
||||
homepage https://erratique.ch/software/fmt
|
||||
|
||||
checksums rmd160 9814ebc3e3d24e11654000654632bc96d422f9c2 \
|
||||
sha256 af0906f0665e76be69992c1a556c5ffc2f79d88d3ba6115d6abf21c0909c378c \
|
||||
size 24005
|
||||
checksums rmd160 63669993f69e979616766724fc3543823576d896 \
|
||||
sha256 4fccf14cc680517ea4efb08a884a0c41577ccf051b74d212dabdd8a981d81d5f \
|
||||
size 24818
|
||||
github.tarball_from archive
|
||||
|
||||
depends_lib-append port:ocaml-cmdliner
|
||||
|
||||
@@ -6,7 +6,7 @@ PortGroup github 1.0
|
||||
|
||||
name ocaml-jingoo
|
||||
version 1.5.2
|
||||
revision 0
|
||||
revision 1
|
||||
categories ocaml devel
|
||||
maintainers {pguyot @pguyot} openmaintainer
|
||||
license BSD
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user