diff options
| -rw-r--r-- | devel/menhir/Makefile | 5 | ||||
| -rw-r--r-- | devel/menhir/PLIST | 19 | ||||
| -rw-r--r-- | devel/menhir/distinfo | 12 | ||||
| -rw-r--r-- | devel/menhir/patches/patch-Makefile | 36 |
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 |