[pkgsrc/trunk]: pkgsrc/devel/menhir Updated devel/menhir to version 20220210.

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2ace154c9ec
branches:  trunk
changeset: 378990:c2ace154c9ec
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue May 10 08:20:33 2022 +0000

description:
Updated devel/menhir to version 20220210.

There are many changes since the last version, including a
from-the-ground-up rewrite of the parser generator code and a switch of
the build system to dune. More details in the CHANGES.md file included
in the distribution.

diffstat:

 devel/menhir/Makefile               |   27 +---
 devel/menhir/PLIST                  |  204 +++++++----------------------------
 devel/menhir/distinfo               |    9 +-
 devel/menhir/patches/patch-Makefile |   52 ---------
 4 files changed, 52 insertions(+), 240 deletions(-)

diffs (truncated from 338 to 300 lines):

diff -r d8f63e79c94e -r c2ace154c9ec devel/menhir/Makefile
--- a/devel/menhir/Makefile     Tue May 10 08:14:10 2022 +0000
+++ b/devel/menhir/Makefile     Tue May 10 08:20:33 2022 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2022/04/25 10:51:50 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/10 08:20:33 jaapb Exp $
 #
 
-DISTNAME=      menhir-20190924
-PKGREVISION=   1
+DISTNAME=      menhir-20220210
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.inria.fr/fpottier/${PKGBASE}/-/archive/${PKGVERSION_NOREV}/
 
@@ -11,26 +10,10 @@
 COMMENT=       LR(1) parser generator in OCaml
 LICENSE=       qpl-v1.0
 
-USE_TOOLS+=    gmake
-MAKE_JOBS_SAFE=        no
-
 SUPERSEDES=            ocaml-menhir-[0-9]*
-OCAML_USE_FINDLIB=     yes
-OCAML_FINDLIB_REGISTER=        no
-CHECK_RELRO_SKIP+=     bin/menhir
+OCAML_USE_DUNE=                yes
+DUNE_BUILD_PACKAGES=   menhir menhirLib menhirSdk
+OPAM_INSTALL_FILES=    ${DUNE_BUILD_PACKAGES}
 
 .include "../../mk/ocaml.mk"
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-MAKE_ENV+=     TARGET=native
-.else
-MAKE_ENV+=     TARGET=byte
-.endif
-
-EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
-MAKE_ENV+=     EGDIR=${EGDIR:Q} USE_OCAMLFIND=true \
-               OCAML_SITELIBDIR=${OCAML_SITELIBDIR}
-MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d8f63e79c94e -r c2ace154c9ec devel/menhir/PLIST
--- a/devel/menhir/PLIST        Tue May 10 08:14:10 2022 +0000
+++ b/devel/menhir/PLIST        Tue May 10 08:20:33 2022 +0000
@@ -1,177 +1,59 @@
-@comment $NetBSD: PLIST,v 1.10 2020/01/14 22:04:26 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/05/10 08:20:33 jaapb Exp $
 bin/menhir
+${OCAML_SITELIB}/menhir/META
+${OCAML_SITELIB}/menhir/dune-package
 ${OCAML_SITELIB}/menhirLib/META
+${OCAML_SITELIB}/menhirLib/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.a
+${OCAML_SITELIB}/menhirLib/menhirLib.cma
 ${OCAML_SITELIB}/menhirLib/menhirLib.cmi
-${OCAML_SITELIB}/menhirLib/menhirLib.cmo
+${OCAML_SITELIB}/menhirLib/menhirLib.cmt
+${OCAML_SITELIB}/menhirLib/menhirLib.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.cmxs
 ${OCAML_SITELIB}/menhirLib/menhirLib.ml
 ${OCAML_SITELIB}/menhirLib/menhirLib.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.o
 ${OCAML_SITELIB}/menhirSdk/META
+${OCAML_SITELIB}/menhirSdk/cmly_api.ml
+${OCAML_SITELIB}/menhirSdk/cmly_format.ml
+${OCAML_SITELIB}/menhirSdk/cmly_read.ml
+${OCAML_SITELIB}/menhirSdk/cmly_read.mli
+${OCAML_SITELIB}/menhirSdk/dune-package
+${OCAML_SITELIB}/menhirSdk/keyword.ml
+${OCAML_SITELIB}/menhirSdk/keyword.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.a
+${OCAML_SITELIB}/menhirSdk/menhirSdk.cma
 ${OCAML_SITELIB}/menhirSdk/menhirSdk.cmi
-${OCAML_SITELIB}/menhirSdk/menhirSdk.cmo
+${OCAML_SITELIB}/menhirSdk/menhirSdk.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.cmx
-${OCAML_SITELIB}/menhirSdk/menhirSdk.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.cmxs
+${OCAML_SITELIB}/menhirSdk/menhirSdk.ml
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_api.cmi
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_api.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_api.cmx
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_format.cmi
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_format.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_format.cmx
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_read.cmi
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_read.cmt
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_read.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk__Cmly_read.cmx
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Keyword.cmi
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Keyword.cmt
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Keyword.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk__Keyword.cmx
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Version.cmi
+${OCAML_SITELIB}/menhirSdk/menhirSdk__Version.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk__Version.cmx
+${OCAML_SITELIB}/menhirSdk/version.ml
 man/man1/menhir.1
-share/doc/menhir/demos/Makefile
-share/doc/menhir/demos/calc-alias/.gitignore
-share/doc/menhir/demos/calc-alias/.merlin
-share/doc/menhir/demos/calc-alias/Makefile
-share/doc/menhir/demos/calc-alias/README
-share/doc/menhir/demos/calc-alias/calc.ml
-share/doc/menhir/demos/calc-alias/lexer.mll
-share/doc/menhir/demos/calc-alias/parser.mly
-share/doc/menhir/demos/calc-ast-dune/.gitignore
-share/doc/menhir/demos/calc-ast-dune/Makefile
-share/doc/menhir/demos/calc-ast-dune/README.md
-share/doc/menhir/demos/calc-ast-dune/calc.ml
-share/doc/menhir/demos/calc-ast-dune/dune
-share/doc/menhir/demos/calc-ast-dune/dune-project
-share/doc/menhir/demos/calc-ast-dune/lexer.mll
-share/doc/menhir/demos/calc-ast-dune/parser.mly
-share/doc/menhir/demos/calc-ast-dune/syntax.ml
-share/doc/menhir/demos/calc-dune/.gitignore
-share/doc/menhir/demos/calc-dune/Makefile
-share/doc/menhir/demos/calc-dune/README.md
-share/doc/menhir/demos/calc-dune/calc.ml
-share/doc/menhir/demos/calc-dune/dune
-share/doc/menhir/demos/calc-dune/dune-project
-share/doc/menhir/demos/calc-dune/lexer.mll
-share/doc/menhir/demos/calc-dune/parser.mly
-share/doc/menhir/demos/calc-incremental-dune/.gitignore
-share/doc/menhir/demos/calc-incremental-dune/Makefile
-share/doc/menhir/demos/calc-incremental-dune/README.md
-share/doc/menhir/demos/calc-incremental-dune/calc.ml
-share/doc/menhir/demos/calc-incremental-dune/dune
-share/doc/menhir/demos/calc-incremental-dune/dune-project
-share/doc/menhir/demos/calc-incremental-dune/lexer.mll
-share/doc/menhir/demos/calc-incremental-dune/parser.mly
-share/doc/menhir/demos/calc-incremental/.gitignore
-share/doc/menhir/demos/calc-incremental/.merlin
-share/doc/menhir/demos/calc-incremental/Makefile
-share/doc/menhir/demos/calc-incremental/README
-share/doc/menhir/demos/calc-incremental/calc.ml
-share/doc/menhir/demos/calc-incremental/lexer.mll
-share/doc/menhir/demos/calc-incremental/parser.mly
-share/doc/menhir/demos/calc-inspection-dune/.gitignore
-share/doc/menhir/demos/calc-inspection-dune/CalcErrorReporting.ml
-share/doc/menhir/demos/calc-inspection-dune/CalcErrorReporting.mli
-share/doc/menhir/demos/calc-inspection-dune/CalcPrinters.ml
-share/doc/menhir/demos/calc-inspection-dune/CalcPrinters.mli
-share/doc/menhir/demos/calc-inspection-dune/ErrorReporting.ml
-share/doc/menhir/demos/calc-inspection-dune/ErrorReporting.mli
-share/doc/menhir/demos/calc-inspection-dune/Makefile
-share/doc/menhir/demos/calc-inspection-dune/README
-share/doc/menhir/demos/calc-inspection-dune/calc.ml
-share/doc/menhir/demos/calc-inspection-dune/dune
-share/doc/menhir/demos/calc-inspection-dune/dune-project
-share/doc/menhir/demos/calc-inspection-dune/lexer.mll
-share/doc/menhir/demos/calc-inspection-dune/parser.mly
-share/doc/menhir/demos/calc-inspection/.gitignore
-share/doc/menhir/demos/calc-inspection/.merlin
-share/doc/menhir/demos/calc-inspection/CalcErrorReporting.ml
-share/doc/menhir/demos/calc-inspection/CalcErrorReporting.mli
-share/doc/menhir/demos/calc-inspection/CalcPrinters.ml
-share/doc/menhir/demos/calc-inspection/CalcPrinters.mli
-share/doc/menhir/demos/calc-inspection/ErrorReporting.ml
-share/doc/menhir/demos/calc-inspection/ErrorReporting.mli
-share/doc/menhir/demos/calc-inspection/Makefile
-share/doc/menhir/demos/calc-inspection/README
-share/doc/menhir/demos/calc-inspection/calc.ml
-share/doc/menhir/demos/calc-inspection/lexer.mll
-share/doc/menhir/demos/calc-inspection/parser.mly
-share/doc/menhir/demos/calc-new-syntax-dune/.gitignore
-share/doc/menhir/demos/calc-new-syntax-dune/Makefile
-share/doc/menhir/demos/calc-new-syntax-dune/README.md
-share/doc/menhir/demos/calc-new-syntax-dune/calc.ml
-share/doc/menhir/demos/calc-new-syntax-dune/dune
-share/doc/menhir/demos/calc-new-syntax-dune/dune-project
-share/doc/menhir/demos/calc-new-syntax-dune/lexer.mll
-share/doc/menhir/demos/calc-new-syntax-dune/parser.mly
-share/doc/menhir/demos/calc-param-dune/.gitignore
-share/doc/menhir/demos/calc-param-dune/Makefile
-share/doc/menhir/demos/calc-param-dune/README
-share/doc/menhir/demos/calc-param-dune/calc.ml
-share/doc/menhir/demos/calc-param-dune/dune
-share/doc/menhir/demos/calc-param-dune/dune-project
-share/doc/menhir/demos/calc-param-dune/lexer.mll
-share/doc/menhir/demos/calc-param-dune/parser.mly
-share/doc/menhir/demos/calc-param-dune/tokens.mly
-share/doc/menhir/demos/calc-param/.gitignore
-share/doc/menhir/demos/calc-param/.merlin
-share/doc/menhir/demos/calc-param/Makefile
-share/doc/menhir/demos/calc-param/README
-share/doc/menhir/demos/calc-param/_tags
-share/doc/menhir/demos/calc-param/calc.ml
-share/doc/menhir/demos/calc-param/lexer.mll
-share/doc/menhir/demos/calc-param/myocamlbuild.ml
-share/doc/menhir/demos/calc-param/parser.mly
-share/doc/menhir/demos/calc-param/parser.mlypack
-share/doc/menhir/demos/calc-param/tokens.mly
-share/doc/menhir/demos/calc-param/tokens.mlypack
-share/doc/menhir/demos/calc-two-dune/.gitignore
-share/doc/menhir/demos/calc-two-dune/Makefile
-share/doc/menhir/demos/calc-two-dune/README
-share/doc/menhir/demos/calc-two-dune/algebraic.mly
-share/doc/menhir/demos/calc-two-dune/algebraic.mlypack
-share/doc/menhir/demos/calc-two-dune/calc.ml
-share/doc/menhir/demos/calc-two-dune/common.mly
-share/doc/menhir/demos/calc-two-dune/dune
-share/doc/menhir/demos/calc-two-dune/dune-project
-share/doc/menhir/demos/calc-two-dune/lexer.mll
-share/doc/menhir/demos/calc-two-dune/reverse.mly
-share/doc/menhir/demos/calc-two-dune/reverse.mlypack
-share/doc/menhir/demos/calc-two-dune/tokens.mly
-share/doc/menhir/demos/calc-two-dune/tokens.mlypack
-share/doc/menhir/demos/calc-two/.gitignore
-share/doc/menhir/demos/calc-two/.merlin
-share/doc/menhir/demos/calc-two/Makefile
-share/doc/menhir/demos/calc-two/README
-share/doc/menhir/demos/calc-two/_tags
-share/doc/menhir/demos/calc-two/algebraic.mly
-share/doc/menhir/demos/calc-two/algebraic.mlypack
-share/doc/menhir/demos/calc-two/calc.ml
-share/doc/menhir/demos/calc-two/common.mly
-share/doc/menhir/demos/calc-two/lexer.mll
-share/doc/menhir/demos/calc-two/myocamlbuild.ml
-share/doc/menhir/demos/calc-two/reverse.mly
-share/doc/menhir/demos/calc-two/reverse.mlypack
-share/doc/menhir/demos/calc-two/tokens.mly
-share/doc/menhir/demos/calc-two/tokens.mlypack
-share/doc/menhir/demos/calc/.gitignore
-share/doc/menhir/demos/calc/.merlin
-share/doc/menhir/demos/calc/Makefile
-share/doc/menhir/demos/calc/README
-share/doc/menhir/demos/calc/calc.ml
-share/doc/menhir/demos/calc/lexer.mll
-share/doc/menhir/demos/calc/parser.mly
-share/doc/menhir/demos/coq-minicalc/Lexer.v
-share/doc/menhir/demos/coq-minicalc/Makefile
-share/doc/menhir/demos/coq-minicalc/MiniCalc.v
-share/doc/menhir/demos/coq-minicalc/Parser.vy
-share/doc/menhir/demos/coq-minicalc/README.md
-share/doc/menhir/demos/coq-minicalc/_CoqProject
-share/doc/menhir/demos/generate-printers-dune/.gitignore
-share/doc/menhir/demos/generate-printers-dune/Makefile
-share/doc/menhir/demos/generate-printers-dune/README.md
-share/doc/menhir/demos/generate-printers-dune/dune
-share/doc/menhir/demos/generate-printers-dune/dune-project
-share/doc/menhir/demos/generate-printers-dune/generate.ml
-share/doc/menhir/demos/generate-printers/.gitignore
-share/doc/menhir/demos/generate-printers/.merlin
-share/doc/menhir/demos/generate-printers/Makefile
-share/doc/menhir/demos/generate-printers/README.md
-share/doc/menhir/demos/generate-printers/_tags
-share/doc/menhir/demos/generate-printers/generate.ml
-share/doc/menhir/demos/obsolete/Makefile.auto
-share/doc/menhir/demos/obsolete/Makefile.calc-two
-share/doc/menhir/demos/obsolete/Makefile.shared
-share/doc/menhir/demos/obsolete/ocamldep.wrapper
+share/doc/menhir/LICENSE
 share/doc/menhir/manual.html
 share/doc/menhir/manual.pdf
 share/doc/menhir/manual001.png
 share/doc/menhir/manual002.png
 share/doc/menhir/manual003.png
-@pkgdir share/menhir
+share/doc/menhirLib/LICENSE
+share/doc/menhirSdk/LICENSE
diff -r d8f63e79c94e -r c2ace154c9ec devel/menhir/distinfo
--- a/devel/menhir/distinfo     Tue May 10 08:14:10 2022 +0000
+++ b/devel/menhir/distinfo     Tue May 10 08:20:33 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:15:40 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/05/10 08:20:33 jaapb Exp $
 
-BLAKE2s (menhir-20190924.tar.gz) = beba70f775685710a1f00a2bdbd9d23d626d0f6ed12d47534443e0de1c722b15
-SHA512 (menhir-20190924.tar.gz) = 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
-Size (menhir-20190924.tar.gz) = 2491000 bytes
-SHA1 (patch-Makefile) = e36784736e352adf4b595ac508e096b626790057
+BLAKE2s (menhir-20220210.tar.gz) = 73903af264345bbb8cdfa9eee7ce4cfb8c760cea16792781cdf8d3f3df0b2335
+SHA512 (menhir-20220210.tar.gz) = 55af21092fd133c2b3f84589c0f98c9a4ce718cbafaacf82b459a15d0eaee711d82fa269283cab24caaebe2a5a1c75d469650248333a2991323c49d10cfe9e7f
+Size (menhir-20220210.tar.gz) = 1304512 bytes
diff -r d8f63e79c94e -r c2ace154c9ec devel/menhir/patches/patch-Makefile
--- a/devel/menhir/patches/patch-Makefile       Tue May 10 08:14:10 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-Makefile,v 1.7 2020/01/14 22:04:26 jaapb Exp $
-
-Install into correct locations and use BSD_INSTALL_*
-
---- Makefile.orig      2019-09-24 09:29:51.000000000 +0000
-+++ Makefile
-@@ -46,10 +46,10 @@ endif
- # These may be overridden from outside; e.g., our opam package description
- # provides its own values of docdir, libdir, and mandir.
- 
--bindir          := $(PREFIX)/bin
--docdir                := $(PREFIX)/share/doc/menhir
--libdir                := $(PREFIX)/share/menhir
--mandir          := $(PREFIX)/share/man/man1