Updated package to latest version, 20170607. Changes include:

## 2017/06/07

* Removed an undeclared dependency of MenhirSdk on Unix. (Reported and fixed
  by Frédéric Bour.)

## 2017/05/09

* Menhir now always places OCaml line number directives in the generated `.ml`
  file. (Until now, this was done only when `--infer` was off.) Thus, if a
  semantic action contains an `assert` statement, the file name and line
  number information carried by the `Assert_failure` exception should now be
  correct. (Reported by Helmut Brandl.)

## 2017/04/18

* Changed Menhir's license from QPL to GPLv2.
  MenhirLib remains under LGPLv2, with a linking exception.

* Moved the repository to
  [gitlab.inria.fr](https://gitlab.inria.fr/fpottier/menhir/).

* Introduced a new command line switch, `--cmly`, which causes Menhir to
  create a `.cmly` file, containing a description of the grammar and
  automaton. (Suggested by Frédéric Bour.)

* Introduced a new library, MenhirSdk, which allows reading a `.cmly` file.
  The purpose of this library is to allow external tools to take advantage
  of the work performed by Menhir's front-end. (Suggested by Frédéric Bour.)

* Introduced new syntax for attributes in a `.mly` file. Attributes are
  ignored by Menhir's back-ends, but are written to `.cmly` files, thus
  can be exploited by external tools via MenhirSdk. (Suggested by Frédéric Bour.)

* The definition of a `%public` nonterminal symbol can now be split into several
  parts within a single `.mly` file. (This used to be permitted only over
  multiple `.mly` files.) (Suggested by Frédéric Bour.)

* New functions in the incremental API:
  `shifts`, `acceptable`, `current_state_number`.

* New functions in the incremental API and inspection API:
  `top`, `pop`, `pop_many`, `get`, `equal`,
  `force_reduction`, `feed`, `input_needed`,
  `state_has_default_reduction`,
  `production_index`, `find_production`.
  (Suggested by Frédéric Bour.)

* New module `MenhirLib.ErrorReports`. This module is supposed to offer
  auxiliary functions that help produce good syntax error messages.
  This module does not yet contain much functionality and is expected
  to evolve in the future.

* Incompatible change in the incremental API: the type `env` becomes `'a env`.

* Incompatible change in the incremental API: the function
  `has_default_reduction` is renamed `env_has_default_reduction`.

* The type `stack` and the function `stack` in the incremental API are
  deprecated. The new functions `top` and `pop` can be used instead to
  inspect the parser's stack. The module `MenhirLib.General` is deprecated
  as well. Deprecated functionality will be removed in the future.

* Incompatible change in the incremental API: the type of the function
  `print_stack` in the result signature of the functor
  `MenhirLib.Printers.Make` changes to `'a env -> unit`.
   (Anyway, as of now, `MenhirLib.Printers` remains undocumented.)

* Improved the syntax error message that is displayed when a `.mly` file
  is incorrect: the previous and next token are shown.

* Fixed a bug where the module name `Basics` was shadowed (that is, if the user's
  project happened to contain a toplevel module by this name, then it could not
  be referred to from a `.mly` file). (Reported by François Thiré.)

## 2017/01/01

* Add `$MENHIR_STDLIB` as a way of controlling where Menhir looks for the file
  `standard.mly`. This environment variable overrides the installation-time
  default setting, and is itself overridden by the `--stdlib` command line
  switch. (Requested by Jonathan Protzenko.)

* `Makefile` fix: filter out `'\r'` in the output of `menhir --suggest-ocamlfind`,
  so that the `Makefile` works when Menhir is compiled as a Windows executable.
  (Suggested by Jonathan Protzenko.)

## 2016/12/01

* Updated the Coq back-end for compatibility with Coq 8.6.
  (Jacques-Henri Jourdan.)

## 2016/11/15

* Fix in `--only-preprocess-for-ocamlyacc` mode: avoid printing newline characters
  inside a `%type` declaration, as this is forbidden by `ocamlyacc`. (Reported by
  Kenji Maillard.)
* Fix in `--only-preprocess-for-ocamlyacc` mode: avoid variable capture caused by
  `ocamlyacc` internally translating `$i` to `_i`. (Reported by Kenji Maillard.)

## 2016/09/01

* New command line switch `--only-preprocess-for-ocamlyacc`, supposed to print the
  grammar in a form that `ocamlyacc` can accept. As of now, this feature is
  incomplete (in particular, support for Menhir's position keywords is missing),
  untested, and undocumented. It could be removed in the future.

## 2016/08/26

* Fixes in the output of `--only-preprocess`:
  * The order of productions is now preserved.
      (It was not. This matters if there are reduce/reduce conflicts.)
  * `%parameter` directives are now printed. (They were not).
  * `%on_error_reduce` directives are now printed. (They were not.)

## 2016/08/25

* `Makefile` fix, undoing a change made on 2016/03/03, which caused installation
  to fail under (some versions of?) Windows where dynamic linking is not
  supported. (Reported by Andrew Appel.)

## 2016/08/05

* `%on_error_reduce` declarations now have implicit priority levels, so as to
  tell Menhir what to do when two such declarations are applicable.
  Also, the well-formedness checks on `%type` and `%on_error_reduce` declarations
  have been reinforced.

## 2016/06/23

* A small change in the generated code (both in the code and table back-ends) so
  as to avoid OCaml's warning 41. The warning would arise (when compiling a
  generated parser with OCaml 4.03) because Menhir's exception `Error` has the
  same name as the data constructor `Error` in OCaml's pervasive library.
  (Reported by Bernhard Schommer.)

## 2016/05/18

* Anonymous rules now work also when used inside a parameterized rule.
  (This did not work until now.) When an anonymous rule is hoisted out
  of a parameterized rule, it may itself become parameterized. Menhir
  parameterizes it only over the parameters that it actually needs.

## 2016/05/04

* In the Coq backend, split the largest definitions into smaller
  ones. This circumvents a limitation of vm_compute on 32 bit
  machines. This also enables us to perform sharing between
  definitions, so that the generated files are much smaller.

## 2016/04/10

* When printing a grammar (which is done by the `--only-preprocess` options),
  remove the leading bar `|`, for compatibility with `yacc` and `bison`.

## 2016/03/11

* In the code back-end, generate type annotations when extracting a semantic
  value out of the stack. When working with a semantic value of some function
  type, OCaml would incorrectly warn that this function does not use its
  argument. This warning should now be gone.

4 files changed, 44 insertions, 28 deletions

diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index 565330967ad..489d33afb30 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2016/12/30 11:16:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2017/07/11 10:10:40 jaapb Exp $
 #
 
-DISTNAME=	menhir-20160303
-PKGREVISION=	2
+DISTNAME=	menhir-20170607
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
 
diff --git a/devel/menhir/PLIST b/devel/menhir/PLIST
index b08babb921b..c04ab57c585 100644
--- a/devel/menhir/PLIST
+++ b/devel/menhir/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/05/06 11:51:47 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/07/11 10:10:40 jaapb Exp $
 bin/menhir
 ${OCAML_SITELIB}/menhirLib/META
 ${OCAML_SITELIB}/menhirLib/menhirLib.cmi
@@ -6,14 +6,21 @@ ${OCAML_SITELIB}/menhirLib/menhirLib.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.cmx
 ${OCAML_SITELIB}/menhirLib/menhirLib.ml
 ${OCAML_SITELIB}/menhirLib/menhirLib.mli
-${OCAML_SITELIB}/menhirLib/menhirLib.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.o
+${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.o
 man/man1/menhir.1
 share/doc/menhir/demos/Makefile
+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/.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
@@ -25,6 +32,7 @@ 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-param/.merlin
 share/doc/menhir/demos/calc-param/Makefile
 share/doc/menhir/demos/calc-param/README
 share/doc/menhir/demos/calc-param/_tags
@@ -35,6 +43,7 @@ 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/.merlin
 share/doc/menhir/demos/calc-two/Makefile
 share/doc/menhir/demos/calc-two/README
 share/doc/menhir/demos/calc-two/_tags
@@ -48,12 +57,18 @@ 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/.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/find-menhir.sh
+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
diff --git a/devel/menhir/distinfo b/devel/menhir/distinfo
index 1678003e317..fba8b34b1ed 100644
--- a/devel/menhir/distinfo
+++ b/devel/menhir/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/07/05 20:12:42 wiedi Exp $
+$NetBSD: distinfo,v 1.8 2017/07/11 10:10:40 jaapb Exp $
 
-SHA1 (menhir-20160303.tar.gz) = 46d58d98e2073d056b026d0508bd52e772f19df0
-RMD160 (menhir-20160303.tar.gz) = 9dd78e488c79067f493cbc233b26019e68071b51
-SHA512 (menhir-20160303.tar.gz) = 9d5dbdf863f8e3157933a79690835d98f806e8110d3fcfe2b6e4137522fe8a5d063d058e4956ba30ed71a3ac5b2a82020f598799c67c4b692e4712e15b7f290c
-Size (menhir-20160303.tar.gz) = 750200 bytes
-SHA1 (patch-Makefile) = 24495a2b7f0d405ab305de92dca21248249d96fb
+SHA1 (menhir-20170607.tar.gz) = d4be0e971a5e08384527cb59703778c4b2987cac
+RMD160 (menhir-20170607.tar.gz) = 1fe251cc80221b2cb2d23bcd4faad1260bcb4898
+SHA512 (menhir-20170607.tar.gz) = 468e0b042b8deabe2db4c33d59ff0a5d9177845bfc31eeffb4ba90de6a5e52cf2cd98965c8ec0cf6f849f459738f59802564d76310fb06f0aa4746c1441eade1
+Size (menhir-20170607.tar.gz) = 796429 bytes
+SHA1 (patch-Makefile) = 573a05ae79c7088e9cc67b257610658dd9eba844
diff --git a/devel/menhir/patches/patch-Makefile b/devel/menhir/patches/patch-Makefile
index 305fe624851..c7add91c993 100644
--- a/devel/menhir/patches/patch-Makefile
+++ b/devel/menhir/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.4 2017/07/05 20:12:42 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.5 2017/07/11 10:10:40 jaapb Exp $
 
 Use correct install locations and BSD_INSTALL_*
---- Makefile.orig	2016-03-03 10:30:08.000000000 +0000
-+++ Makefile
-@@ -45,10 +45,10 @@ endif
+--- Makefile.orig	2017-06-07 09:59:06.000000000 +0100
++++ Makefile	2017-06-30 15:02:07.000000000 +0100
+@@ -45,10 +45,10 @@
  # These may be overridden from outside; e.g., our opam package description
  # provides its own values of docdir, libdir, and mandir.
  
@@ -18,33 +18,35 @@ Use correct install locations and BSD_INSTALL_*
  MANS            := menhir.1
  DOCS            := manual.pdf demos
  MLYLIB          := src/standard.mly
-@@ -164,22 +164,22 @@ endif
+@@ -178,11 +178,11 @@
  
  install:
  # Install the executable.
 -	mkdir -p $(bindir)
 -	install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
++	$(BSD_INSTALL_PROGRAM_DIR) -p $(bindir)
 +	$(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE)
- # Install the library.
+ # Install Menhir's standard library.
 -	mkdir -p $(libdir)
 -	install -m 644 $(MLYLIB) $(libdir)
-+	$(BSD_INSTALL_LIB_DIR) $(libdir)
++	$(BSD_INSTALL_LIB_DIR) -p $(libdir)
 +	$(BSD_INSTALL_DATA) -m 644 $(MLYLIB) $(libdir)
- 	@if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind` ; then \
- 	  echo Installing MenhirLib via ocamlfind. ; \
- 	  ocamlfind install menhirLib src/META $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) ; \
+ # Install MenhirLib and MenhirSdk.
+ 	@if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind | tr -d '\r'` ; then \
+ 	  echo 'Installing MenhirLib and MenhirSdk via ocamlfind.' ; \
+@@ -193,12 +193,12 @@
+ 	  rm -f META ; \
  	else \
- 	  echo Installing MenhirLib manually. ; \
+ 	  echo 'Installing MenhirLib and MenhirSdk manually.' ; \
 -	  install -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \
+-	  install -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK)) $(libdir) ; \
 +	  $(BSD_INSTALL_DATA) -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \
++	  $(BSD_INSTALL_DATA) -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK)) $(libdir) ; \
  	fi
  # Install the documentation, if it has been built.
  	if [ -f manual.pdf ] ; then \
--	  mkdir -p $(docdir) ; \
--	  mkdir -p $(mandir) ; \
-+	  $(BSD_INSTALL_DATA_DIR) $(docdir) ; \
-+	  $(BSD_INSTALL_MAN_DIR) $(mandir) ; \
- 	  cp -r $(DOCS) $(docdir) ; \
+-	  mkdir -p $(docdir) $(mandir) && \
++	  $(BSD_INSTALL_DATA_DIR) -p $(docdir) $(mandir) && \
+ 	  cp -r $(DOCS) $(docdir) && \
  	  cp -r $(MANS) $(mandir) ; \
  	fi