diff -urN /usr/ports/devel/menhir/Makefile devel/menhir/Makefile --- /usr/ports/devel/menhir/Makefile 2014-07-04 21:32:10.000000000 +0900 +++ devel/menhir/Makefile 2014-07-12 00:00:00.000000000 +0900 @@ -2,11 +2,11 @@ # $FreeBSD: head/devel/menhir/Makefile 360604 2014-07-04 12:06:07Z bapt $ PORTNAME= menhir -PORTVERSION= 20080912 +PORTVERSION= 20140422 CATEGORIES= devel MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= LR(1) parser generator for OCaml USES= gmake @@ -14,17 +14,26 @@ USE_OCAML_FINDLIB= yes USE_OCAMLFIND_PLIST= yes OCAML_PKGDIRS= menhirLib - -INSTALL_TARGET= install -MAKE_ENV+= mandir="${MANPREFIX}/man/man1" MAKE_JOBS_UNSAFE= yes -MAN1= menhir.1 -.if !defined(NOPORTDOCS) -INSTALL_TARGET+= docinstall DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} -MAKE_ENV+= docdir="${DOCSDIR}" -.endif -NO_STAGE= yes +PORTDOCS= * +PLIST_FILES= bin/menhir man/man1/menhir.1.gz %%DATADIR%%/standard.mly +PLIST_DIRS= %%DATADIR%% + +OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} -e \ + 's|share/man|man| ; \ + s|doc/menhir|doc/ocaml/menhir| ; \ + s| \($$(bindir)\)| $${DESTDIR}\1| ; \ + s| \($$(libdir)\)| $${DESTDIR}\1| ; \ + s| \($$(docdir)\)| $${DESTDIR}\1| ; \ + s| \($$(mandir)\)| $${DESTDIR}\1|' ${WRKSRC}/Makefile + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/menhir + .include diff -urN /usr/ports/devel/menhir/distinfo devel/menhir/distinfo --- /usr/ports/devel/menhir/distinfo 2014-06-21 17:50:27.000000000 +0900 +++ devel/menhir/distinfo 2014-07-12 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (menhir-20080912.tar.gz) = 079665a90e3f6fee66e93f17562d92a5aa2189c749a4fd24e46a0830ba430bee -SIZE (menhir-20080912.tar.gz) = 377709 +SHA256 (menhir-20140422.tar.gz) = 0da8c84fff1713f9bd666940be19e2be9d7ecdf2688a7d7b822428d3a27021ce +SIZE (menhir-20140422.tar.gz) = 549129 diff -urN /usr/ports/devel/menhir/files/patch-Makefile devel/menhir/files/patch-Makefile --- /usr/ports/devel/menhir/files/patch-Makefile 2014-06-21 17:50:27.000000000 +0900 +++ devel/menhir/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,40 +0,0 @@ ---- Makefile.orig 2008-09-12 13:58:19.000000000 +0200 -+++ Makefile 2009-02-24 14:36:26.000000000 +0100 -@@ -28,10 +28,10 @@ - $(error Please define PREFIX) - endif - --bindir := ${PREFIX}/bin --docdir := ${PREFIX}/share/doc/menhir --libdir := ${PREFIX}/share/menhir --mandir := ${PREFIX}/share/man/man1 -+bindir ?= ${PREFIX}/bin -+docdir ?= ${PREFIX}/share/doc/menhir -+libdir ?= ${PREFIX}/share/menhir -+mandir ?= ${PREFIX}/share/man/man1 - MANS := menhir.1 - DOCS := manual.pdf demos - MLYLIB := src/standard.mly -@@ -64,11 +64,9 @@ - install: src/menhir - mkdir -p $(bindir) - mkdir -p $(libdir) -- mkdir -p $(docdir) - mkdir -p $(mandir) - install src/menhir $(bindir) - install -m 644 $(MLYLIB) $(libdir) -- cp -r $(DOCS) $(docdir) - cp -r $(MANS) $(mandir) - @cd src && if $(USE_OCAMLFIND) ; then \ - echo Installing MenhirLib via ocamlfind. ; \ -@@ -78,6 +76,10 @@ - install -m 644 $(MENHIRLIB) $(libdir) ; \ - fi - -+docinstall: -+ mkdir -p $(docdir) -+ cp -r $(DOCS) $(docdir) -+ - uninstall: - rm -rf $(bindir)/menhir - rm -rf $(libdir) diff -urN /usr/ports/devel/menhir/pkg-descr devel/menhir/pkg-descr --- /usr/ports/devel/menhir/pkg-descr 2014-06-21 17:50:27.000000000 +0900 +++ devel/menhir/pkg-descr 2014-07-12 00:00:00.000000000 +0900 @@ -1,7 +1,7 @@ Menhir is a LR(1) parser generator for the OCaml programming language. -It is 90% compatible to ocamlyacc (included with the OCaml distribution), and -it has some advantages over ocamlyacc, such as limited EBNF support, LR(1) -generation instead of LALR(1), better conflict explanation and production of -reentrant parsers (amongst others). +It is 90% compatible to ocamlyacc (included with the OCaml distribution), +and it has some advantages over ocamlyacc, such as limited EBNF support, +LR(1) generation instead of LALR(1), better conflict explanation and +production of reentrant parsers (amongst others). WWW: http://cristal.inria.fr/~fpottier/menhir diff -urN /usr/ports/devel/menhir/pkg-plist devel/menhir/pkg-plist --- /usr/ports/devel/menhir/pkg-plist 2014-06-21 17:50:27.000000000 +0900 +++ devel/menhir/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,44 +0,0 @@ -bin/menhir -share/menhir/standard.mly -%%PORTDOCS%%%%DOCSDIR%%/manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/demos/Makefile -%%PORTDOCS%%%%DOCSDIR%%/demos/Makefile.auto -%%PORTDOCS%%%%DOCSDIR%%/demos/Makefile.shared -%%PORTDOCS%%%%DOCSDIR%%/demos/OMakefile.shared -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/Makefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/OMakefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/OMakefile.omc -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/OMakeroot -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/OMakeroot.omc -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/.omakedb.lock -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/.omakedb -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/README -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/calc.ml -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/lexer.mll -%%PORTDOCS%%%%DOCSDIR%%/demos/calc/parser.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/Makefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/OMakefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/OMakeroot -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/README -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/algebraic.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/calc.ml -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/common.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/lexer.mll -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/reverse.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-two/tokens.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/calc.ml -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/OMakeroot -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/OMakefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/lexer.mll -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/tokens.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/Makefile -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/README -%%PORTDOCS%%%%DOCSDIR%%/demos/calc-param/parser.mly -%%PORTDOCS%%%%DOCSDIR%%/demos/ocamldep.wrapper -@dirrm share/menhir -@dirrm %%DOCSDIR%%/demos/calc -@dirrm %%DOCSDIR%%/demos/calc-param -@dirrm %%DOCSDIR%%/demos/calc-two -@dirrm %%DOCSDIR%%/demos -@dirrm %%DOCSDIR%% -@dirrmtry share/doc/ocaml