Updated devel/menhir to version 20190924.

It mostly contains minor changes and bugfixes.

5 files changed, 44 insertions, 37 deletions

diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index 4aae08cf3ea..73129316eac 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2019/11/03 10:39:20 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2020/01/14 22:04:26 jaapb Exp $
 #
 
-DISTNAME=	menhir-20181113
+DISTNAME=	menhir-20190924
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab.inria.fr/fpottier/${PKGBASE}/-/archive/${PKGVERSION_NOREV}/
 
@@ -16,6 +16,7 @@ MAKE_JOBS_SAFE=	no
 SUPERSEDES=		ocaml-menhir-[0-9]*
 OCAML_USE_FINDLIB=	yes
 OCAML_FINDLIB_REGISTER=	no
+CHECK_RELRO_SKIP+=	bin/menhir
 
 .include "../../mk/ocaml.mk"
 
diff --git a/devel/menhir/PLIST b/devel/menhir/PLIST
index a13d3015539..ca2da055f2b 100644
--- a/devel/menhir/PLIST
+++ b/devel/menhir/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/03/21 12:18:56 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/01/14 22:04:26 jaapb Exp $
 bin/menhir
 ${OCAML_SITELIB}/menhirLib/META
 ${OCAML_SITELIB}/menhirLib/menhirLib.cmi
@@ -12,9 +12,9 @@ ${OCAML_SITELIB}/menhirSdk/META
 ${OCAML_SITELIB}/menhirSdk/menhirSdk.cmi
 ${OCAML_SITELIB}/menhirSdk/menhirSdk.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.cmxs
+${OCAML_SITELIB}/menhirSdk/menhirSdk.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.o
-man/menhir.1
+man/man1/menhir.1
 share/doc/menhir/demos/Makefile
 share/doc/menhir/demos/calc-alias/.gitignore
 share/doc/menhir/demos/calc-alias/.merlin
@@ -40,14 +40,6 @@ 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-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-incremental-dune/.gitignore
 share/doc/menhir/demos/calc-incremental-dune/Makefile
 share/doc/menhir/demos/calc-incremental-dune/README.md
@@ -90,6 +82,14 @@ 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
@@ -147,6 +147,12 @@ 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
@@ -168,4 +174,4 @@ share/doc/menhir/manual.pdf
 share/doc/menhir/manual001.png
 share/doc/menhir/manual002.png
 share/doc/menhir/manual003.png
-share/menhir/standard.mly
+@pkgdir share/menhir
diff --git a/devel/menhir/buildlink3.mk b/devel/menhir/buildlink3.mk
index b8e62e2acf1..9722f48f4f7 100644
--- a/devel/menhir/buildlink3.mk
+++ b/devel/menhir/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/03/21 12:18:56 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/01/14 22:04:26 jaapb Exp $
 
 BUILDLINK_TREE+=	menhir
 
 .if !defined(MENHIR_BUILDLINK3_MK)
 MENHIR_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.menhir+=	menhir>=20180530
+BUILDLINK_API_DEPENDS.menhir+=	menhir>=20190626
+BUILDLINK_ABI_DEPENDS.menhir+=	menhir>=20190924
 BUILDLINK_PKGSRCDIR.menhir?=	../../devel/menhir
 
 .endif	# MENHIR_BUILDLINK3_MK
diff --git a/devel/menhir/distinfo b/devel/menhir/distinfo
index a3434abe79f..01234102343 100644
--- a/devel/menhir/distinfo
+++ b/devel/menhir/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/03/21 12:18:56 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2020/01/14 22:04:26 jaapb Exp $
 
-SHA1 (menhir-20181113.tar.gz) = b912ca1d1184d4f0bcb7e75ffdc8b0fafa0db5ec
-RMD160 (menhir-20181113.tar.gz) = bc711bd542f19044c53a19864875aecf1df3a5d1
-SHA512 (menhir-20181113.tar.gz) = 998ff8e5b5f8dbaf9c6500ffe798de14dd4d7437e674ee75a1d41f428480dc0f4095389da0eae692f72a9e8c42d7a9a156dd90d2221cdd67a54e9a10cdbe239b
-Size (menhir-20181113.tar.gz) = 1028432 bytes
-SHA1 (patch-Makefile) = 6cfc9c1c7d1289c41288852d8707a0d0a4232993
+SHA1 (menhir-20190924.tar.gz) = 289aa1a5b8dff3b6e8ab8134e8931dbf662f8933
+RMD160 (menhir-20190924.tar.gz) = 4f11eb980d6ce043c1453a474dd521fb85caf71b
+SHA512 (menhir-20190924.tar.gz) = 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
+Size (menhir-20190924.tar.gz) = 2491000 bytes
+SHA1 (patch-Makefile) = e36784736e352adf4b595ac508e096b626790057
diff --git a/devel/menhir/patches/patch-Makefile b/devel/menhir/patches/patch-Makefile
index 57059612935..6dd132fee0a 100644
--- a/devel/menhir/patches/patch-Makefile
+++ b/devel/menhir/patches/patch-Makefile
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile,v 1.6 2018/11/12 17:13:38 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.7 2020/01/14 22:04:26 jaapb Exp $
 
-Use correct install locations and BSD_INSTALL_*
---- Makefile.orig	2018-10-26 13:17:23.000000000 +0000
+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
@@ -11,30 +12,28 @@ Use correct install locations and BSD_INSTALL_*
 -docdir		:= $(PREFIX)/share/doc/menhir
 -libdir	        := $(PREFIX)/share/menhir
 -mandir          := $(PREFIX)/share/man/man1
-+bindir          := $(DESTDIR)$(PREFIX)/bin
-+docdir		:= $(DESTDIR)$(PREFIX)/share/doc/menhir
-+libdir	        := $(DESTDIR)$(PREFIX)/share/menhir
-+mandir          := $(DESTDIR)$(PREFIX)/${PKGMANDIR}
++bindir          := ${DESTDIR}$(PREFIX)/bin
++docdir		:= ${DESTDIR}$(PREFIX)/share/doc/menhir
++libdir	        := ${DESTDIR}$(PREFIX)/share/menhir
++mandir          := ${DESTDIR}$(PREFIX)/man/man1
  MANS            := doc/menhir.1
  DOCS            := doc/manual.pdf doc/manual.html doc/manual*.png demos
- MLYLIB          := src/standard.mly
-@@ -177,11 +177,11 @@ endif
+ 
+@@ -176,10 +176,10 @@ endif
  
  install:
  # Install the executable.
 -	mkdir -p $(bindir)
 -	install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE)
-+	$(BSD_INSTALL_PROGRAM_DIR) -p $(bindir)
-+	$(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE)
++	${BSD_INSTALL_PROGRAM_DIR} $(bindir)
++	${BSD_INSTALL_PROGRAM} $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE)
  # Install Menhir's standard library.
 -	mkdir -p $(libdir)
--	install -m 644 $(MLYLIB) $(libdir)
-+	$(BSD_INSTALL_LIB_DIR) -p $(libdir)
-+	$(BSD_INSTALL_DATA) -m 644 $(MLYLIB) $(libdir)
++	${BSD_INSTALL_LIB_DIR} $(libdir)
  # Install MenhirLib and MenhirSdk.
  	@if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind | tr -d '\r'` ; then \
  	  echo 'Installing MenhirLib and MenhirSdk via ocamlfind.' ; \
-@@ -192,13 +192,13 @@ install:
+@@ -190,13 +190,13 @@ install:
  	  rm -f META ; \
  	else \
  	  echo 'Installing MenhirLib and MenhirSdk manually.' ; \