Date: Mon, 27 May 2024 19:42:54 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c596e1267179 - main - math/abella: update 2.0.7 =?utf-8?Q?=E2=86=92?= 2.0.8 Message-ID: <202405271942.44RJgsFc032944@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c596e126717974126f15561c3f53d74f773377dc commit c596e126717974126f15561c3f53d74f773377dc Author: Benjamin Jacobs <freebsd@dev.thsi.be> AuthorDate: 2024-05-27 19:42:11 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-05-27 19:42:52 +0000 math/abella: update 2.0.7 → 2.0.8 PR: 278471 --- math/abella/Makefile | 12 ++++++------ math/abella/distinfo | 6 +++--- math/abella/files/patch-dune-project | 8 ++++++++ math/abella/files/patch-src_abella.ml | 25 +++++++++++++++++++++++++ math/abella/files/patch-src_abella__dep.ml | 13 +++++++++++++ math/abella/files/patch-src_abella__doc.ml | 30 ++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 9 deletions(-) diff --git a/math/abella/Makefile b/math/abella/Makefile index fb64cf6b8ed9..7be6b53ec622 100644 --- a/math/abella/Makefile +++ b/math/abella/Makefile @@ -1,5 +1,5 @@ PORTNAME= abella -DISTVERSION= 2.0.7 +DISTVERSION= 2.0.8 CATEGORIES= math MASTER_SITES= http://abella-prover.org/distributions/ @@ -10,16 +10,16 @@ WWW= https://abella-prover.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= until https://github.com/abella-prover/abella/issues/154 is resolved - -BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild \ - ocamlfind:devel/ocaml-findlib +BUILD_DEPENDS= menhir>=20231231:devel/menhir \ + ocaml-dune>=3.7.1_2:devel/ocaml-dune \ + ocaml-cmdliner>=0:devel/ocaml-cmdliner \ + ocaml-yojson>=0:textproc/ocaml-yojson USES= gmake PLIST_FILES= bin/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/_build/default/src/${PORTNAME}.exe ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/math/abella/distinfo b/math/abella/distinfo index 71c2d2017cda..a4ac5440729d 100644 --- a/math/abella/distinfo +++ b/math/abella/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611938365 -SHA256 (abella-2.0.7.tar.gz) = fde3a279b3051e0aeeaedad21cf96064edf19a6c413949b2033b305d92dddd87 -SIZE (abella-2.0.7.tar.gz) = 215056 +TIMESTAMP = 1714934587 +SHA256 (abella-2.0.8.tar.gz) = f346ff454a44dca458d10bbc79e4f101b93a9b0186ea35533ce3f4a858f28f63 +SIZE (abella-2.0.8.tar.gz) = 255157 diff --git a/math/abella/files/patch-dune-project b/math/abella/files/patch-dune-project new file mode 100644 index 000000000000..6d7a6f580c03 --- /dev/null +++ b/math/abella/files/patch-dune-project @@ -0,0 +1,8 @@ +--- dune-project.orig 2024-05-05 18:43:45 UTC ++++ dune-project +@@ -1,4 +1,4 @@ +-(lang dune 3.11) ++(lang dune 3.7) + (name abella) + (version v2.0.8) + (using menhir 2.0) diff --git a/math/abella/files/patch-src_abella.ml b/math/abella/files/patch-src_abella.ml new file mode 100644 index 000000000000..6b6107511cca --- /dev/null +++ b/math/abella/files/patch-src_abella.ml @@ -0,0 +1,25 @@ +--- src/abella.ml.orig 2024-05-21 12:02:44 UTC ++++ src/abella.ml +@@ -877,8 +877,7 @@ let () = + + let em = + let doc = "Does nothing; use abella_dep instead." in +- let deprecated = "The -M flag is deprecated and does nothing; use abella_dep instead" in +- Arg.(value @@ flag @@ info ["M"] ~doc ~deprecated) ++ Arg.(value @@ flag @@ info ["M"] ~doc) + in + + let file = +@@ -897,9 +896,8 @@ let () = + `S Manpage.s_bugs ; + `P "File bug reports on <$(b,https://github.com/abella-prover/abella/issues)>" ; + ] in +- let info = Cmd.info "abella" ~doc ~man ~exits:[] ~version:Version.version in +- Cmd.v info @@ Term.(const abella_main $ flags $ switch $ output $ compiled $ annotate $ norec $ em $ file) ++ let info = Term.info "abella" ~doc ~man ~exits:[] ~version:Version.version in ++ Term.(const abella_main $ flags $ switch $ output $ compiled $ annotate $ norec $ em $ file), info + in +- +- Stdlib.exit (Cmd.eval' cmd) ++ Term.exit @@ Term.eval cmd + ;; diff --git a/math/abella/files/patch-src_abella__dep.ml b/math/abella/files/patch-src_abella__dep.ml new file mode 100644 index 000000000000..8e186a546d5d --- /dev/null +++ b/math/abella/files/patch-src_abella__dep.ml @@ -0,0 +1,13 @@ +--- src/abella_dep.ml.orig 2024-05-21 11:46:09 UTC ++++ src/abella_dep.ml +@@ -132,7 +132,7 @@ let () = + `S Manpage.s_bugs ; + `P "File bug reports on <$(b,https://github.com/abella-prover/abella/issues)>" ; + ] in +- let info = Cmd.info "abella_dep" ~doc ~man ~exits:[] in +- Cmd.v info @@ Term.(const abella_dep $ conf $ files) ++ let info = Term.info "abella_dep" ~doc ~man ~exits:[] in ++ Term.(const abella_dep $ conf $ files), info + in +- exit (Cmd.eval cmd) ++ Term.exit @@ Term.eval cmd diff --git a/math/abella/files/patch-src_abella__doc.ml b/math/abella/files/patch-src_abella__doc.ml new file mode 100644 index 000000000000..e8843d95cdfd --- /dev/null +++ b/math/abella/files/patch-src_abella__doc.ml @@ -0,0 +1,30 @@ +--- src/abella_doc.ml.orig 2024-05-21 12:00:44 UTC ++++ src/abella_doc.ml +@@ -261,13 +261,12 @@ let () = + let ab1 = Filename.concat dir "abella" in + let ab2 = Filename.concat dir "abella.exe" in + if Sys.file_exists ab1 then ab1 else ab2 in +- let env = Cmd.Env.info "ABELLA" ++ let env = Arg.env_var "ABELLA" + ~doc:"Abella command to run (overriden by $(b,--abella))" in + let doc = "Set the Abella command to $(docv)" in + Arg.(value @@ opt string default @@ + info ["a" ; "abella"] ~doc ~env +- ~docv:"CMD" +- ~absent:"$(b,abella[.exe])") ++ ~docv:"CMD") + in + let verbose = + let doc = "Verbose output" in +@@ -298,7 +297,8 @@ let () = + `S Manpage.s_bugs ; + `P "File bug reports on <$(b,https://github.com/abella-prover/abella/issues)>" ; + ] in +- let info = Cmd.info "abella_doc" ~doc ~man ~exits:[] in +- Cmd.v info @@ Term.(const main $ conf $ files) ++ let info = Term.info "abella_doc" ~doc ~man ~exits:[] in ++ (Term.(const main $ conf $ files), info) + in +- exit (Cmd.eval cmd) ++ Term.exit @@ Term.eval cmd ++ (* exit (Cmd.eval cmd) *)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405271942.44RJgsFc032944>