Received: by mail.netbsd.org (Postfix, from userid 605) id 29E8E84E4A; Mon, 12 Nov 2018 17:13:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 187A584E36 for ; Mon, 12 Nov 2018 17:13:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id n2mqXJPTTJGu for ; Mon, 12 Nov 2018 17:13:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4F25084CDC for ; Mon, 12 Nov 2018 17:13:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3ECD5FB1F; Mon, 12 Nov 2018 17:13:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1542042818156510" MIME-Version: 1.0 Date: Mon, 12 Nov 2018 17:13:38 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/devel/menhir To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20181112171338.3ECD5FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1542042818156510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Mon Nov 12 17:13:38 UTC 2018 Modified Files: pkgsrc/devel/menhir: Makefile PLIST distinfo pkgsrc/devel/menhir/patches: patch-Makefile Log Message: Updated devel/menhir to version 20181026 This version contains a lot of small additions and bugfixes, see CHANGES.md in the distribution. Also, the mode of distribution has changed; the package is now distributed through INRIA's gitlab. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/menhir/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/menhir/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/menhir/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/menhir/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1542042818156510 Content-Disposition: inline Content-Length: 12097 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/menhir/Makefile diff -u pkgsrc/devel/menhir/Makefile:1.25 pkgsrc/devel/menhir/Makefile:1.26 --- pkgsrc/devel/menhir/Makefile:1.25 Thu Jul 19 15:15:21 2018 +++ pkgsrc/devel/menhir/Makefile Mon Nov 12 17:13:37 2018 @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.25 2018/07/19 15:15:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.26 2018/11/12 17:13:37 jaapb Exp $ # -DISTNAME= menhir-20170607 -PKGREVISION= 4 +DISTNAME= menhir-20181026 CATEGORIES= devel -MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/ +MASTER_SITES= https://gitlab.inria.fr/fpottier/${PKGBASE}/-/archive/${PKGVERSION_NOREV}/ MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= http://cristal.inria.fr/~fpottier/menhir/ +HOMEPAGE= http://gallium.inria.fr/~fpottier/menhir/ COMMENT= LR(1) parser generator in OCaml LICENSE= qpl-v1.0 Index: pkgsrc/devel/menhir/PLIST diff -u pkgsrc/devel/menhir/PLIST:1.7 pkgsrc/devel/menhir/PLIST:1.8 --- pkgsrc/devel/menhir/PLIST:1.7 Tue Jul 11 10:10:40 2017 +++ pkgsrc/devel/menhir/PLIST Mon Nov 12 17:13:37 2018 @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.7 2017/07/11 10:10:40 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.8 2018/11/12 17:13:37 jaapb Exp $ bin/menhir ${OCAML_SITELIB}/menhirLib/META ${OCAML_SITELIB}/menhirLib/menhirLib.cmi ${OCAML_SITELIB}/menhirLib/menhirLib.cmo ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirLib/menhirLib.cmx +${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 @@ -11,15 +12,55 @@ ${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 ${PLIST.ocaml-opt}${OCAML_SITELIB}/menhirSdk/menhirSdk.o -man/man1/menhir.1 +man/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-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 @@ -32,6 +73,16 @@ share/doc/menhir/demos/calc-inspection/R 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-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 @@ -43,6 +94,21 @@ share/doc/menhir/demos/calc-param/parser 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 @@ -57,13 +123,20 @@ share/doc/menhir/demos/calc-two/reverse. 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/find-menhir.sh +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 @@ -73,5 +146,9 @@ share/doc/menhir/demos/obsolete/Makefile 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/manual.html share/doc/menhir/manual.pdf +share/doc/menhir/manual001.png +share/doc/menhir/manual002.png +share/doc/menhir/manual003.png share/menhir/standard.mly Index: pkgsrc/devel/menhir/distinfo diff -u pkgsrc/devel/menhir/distinfo:1.8 pkgsrc/devel/menhir/distinfo:1.9 --- pkgsrc/devel/menhir/distinfo:1.8 Tue Jul 11 10:10:40 2017 +++ pkgsrc/devel/menhir/distinfo Mon Nov 12 17:13:37 2018 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2017/07/11 10:10:40 jaapb Exp $ +$NetBSD: distinfo,v 1.9 2018/11/12 17:13:37 jaapb Exp $ -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 +SHA1 (menhir-20181026.tar.gz) = 60bec523c42532b55eef3bc72e1dadf32a961b7e +RMD160 (menhir-20181026.tar.gz) = c403e93f2ab394a92c7bd16caa0901f9b8fc238b +SHA512 (menhir-20181026.tar.gz) = e2030f6bb8c042b44bd620970f754098f0fcdc4087faf50efa8041c49026079b71d94070ad1e85fe9e551110debbe93de339dacae2b25a6d89621c1adcb4b13d +Size (menhir-20181026.tar.gz) = 990380 bytes +SHA1 (patch-Makefile) = 6cfc9c1c7d1289c41288852d8707a0d0a4232993 Index: pkgsrc/devel/menhir/patches/patch-Makefile diff -u pkgsrc/devel/menhir/patches/patch-Makefile:1.5 pkgsrc/devel/menhir/patches/patch-Makefile:1.6 --- pkgsrc/devel/menhir/patches/patch-Makefile:1.5 Tue Jul 11 10:10:40 2017 +++ pkgsrc/devel/menhir/patches/patch-Makefile Mon Nov 12 17:13:38 2018 @@ -1,9 +1,9 @@ -$NetBSD: patch-Makefile,v 1.5 2017/07/11 10:10:40 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.6 2018/11/12 17:13:38 jaapb Exp $ Use correct install locations and BSD_INSTALL_* ---- Makefile.orig 2017-06-07 09:59:06.000000000 +0100 -+++ Makefile 2017-06-30 15:02:07.000000000 +0100 -@@ -45,10 +45,10 @@ +--- Makefile.orig 2018-10-26 13:17:23.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. @@ -14,18 +14,18 @@ Use correct install locations and BSD_IN +bindir := $(DESTDIR)$(PREFIX)/bin +docdir := $(DESTDIR)$(PREFIX)/share/doc/menhir +libdir := $(DESTDIR)$(PREFIX)/share/menhir -+mandir := $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 - MANS := menhir.1 - DOCS := manual.pdf demos ++mandir := $(DESTDIR)$(PREFIX)/${PKGMANDIR} + MANS := doc/menhir.1 + DOCS := doc/manual.pdf doc/manual.html doc/manual*.png demos MLYLIB := src/standard.mly -@@ -178,11 +178,11 @@ +@@ -177,11 +177,11 @@ endif install: # Install the executable. - mkdir -p $(bindir) -- install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE) +- install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) + $(BSD_INSTALL_PROGRAM_DIR) -p $(bindir) -+ $(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE) ++ $(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) # Install Menhir's standard library. - mkdir -p $(libdir) - install -m 644 $(MLYLIB) $(libdir) @@ -34,7 +34,7 @@ Use correct install locations and BSD_IN # 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 @@ +@@ -192,13 +192,13 @@ install: rm -f META ; \ else \ echo 'Installing MenhirLib and MenhirSdk manually.' ; \ @@ -43,10 +43,11 @@ Use correct install locations and BSD_IN + $(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) $(mandir) && \ -+ $(BSD_INSTALL_DATA_DIR) -p $(docdir) $(mandir) && \ - cp -r $(DOCS) $(docdir) && \ + # Install the documentation. (If building from the repository, the documentation + # may be absent.) + if [ -f doc/manual.pdf ] ; then \ +- mkdir -p $(docdir) $(mandir) ; \ ++ $(BSD_INSTALL_DATA_DIR) -p $(docdir) $(mandir) ; \ + cp -r $(DOCS) $(docdir) ; \ cp -r $(MANS) $(mandir) ; \ fi --_----------=_1542042818156510--