4 files changed, 76 insertions, 52 deletions

diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index 19c3ae6712f3..884b10abe69a 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	menhir
-PORTVERSION=	20070215
-PORTREVISION=	1
+PORTVERSION=	20071212
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
 
@@ -16,10 +15,16 @@ COMMENT=	LR(1) parser generator for OCaml
 
 USE_GMAKE=	yes
 USE_OCAML=	yes
+USE_OCAML_FINDLIB=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-MAKE_ENV+=	DOCSDIR="${DOCSDIR}" OCAML_SITELIBDIR="${PREFIX}/${OCAML_SITELIBDIR}"
-
+INSTALL_TARGET=	install
+MAKE_ENV+=	mandir="${MANPREFIX}/man/man1"
 MAN1=		menhir.1
 
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET+=	docinstall
+DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
+MAKE_ENV+=	docdir="${DOCSDIR}"
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/menhir/distinfo b/devel/menhir/distinfo
index 27b9a5b745d5..a9506a732e0b 100644
--- a/devel/menhir/distinfo
+++ b/devel/menhir/distinfo
@@ -1,3 +1,3 @@
-MD5 (menhir-20070215.tar.gz) = e7a1682ae072293ef0718a97d8f57939
-SHA256 (menhir-20070215.tar.gz) = 53eda84e6af031e22ea5d0de1f6701ec144ad664fb480ec27c2ccef3be22f920
-SIZE (menhir-20070215.tar.gz) = 295465
+MD5 (menhir-20071212.tar.gz) = 0bb0bdacbd0ca22fbb25ec07cb257bba
+SHA256 (menhir-20071212.tar.gz) = a74583040dea75c540710b9e64ece9f27487ac74a8a7becd212d154f0c7a1626
+SIZE (menhir-20071212.tar.gz) = 389945
diff --git a/devel/menhir/files/patch-Makefile b/devel/menhir/files/patch-Makefile
index 8956d5a71929..dc650926f3a9 100644
--- a/devel/menhir/files/patch-Makefile
+++ b/devel/menhir/files/patch-Makefile
@@ -1,24 +1,35 @@
---- Makefile.orig	Thu Feb 15 11:03:08 2007
-+++ Makefile	Mon Mar  5 12:25:21 2007
-@@ -50,9 +50,9 @@
+--- Makefile.orig	2007-12-12 17:44:32.000000000 +0100
++++ Makefile	2008-04-25 12:12:02.000000000 +0200
+@@ -20,10 +20,10 @@
+   $(error Please define PREFIX)
+ endif
  
- EXECUTABLE      := menhir
- bindir          := ${PREFIX}/bin
--docdir		:= ${PREFIX}/share/doc/$(EXECUTABLE)
--libdir	        := ${PREFIX}/share/$(EXECUTABLE)
+-bindir          := ${PREFIX}/bin
+-docdir		:= ${PREFIX}/share/doc/menhir
+-libdir	        := ${PREFIX}/share/menhir
 -mandir          := ${PREFIX}/share/man/man1
-+docdir		:= ${DOCSDIR}
-+libdir	        := ${OCAML_SITELIBDIR}/${EXECUTABLE}
-+mandir          := ${PREFIX}/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
  LIBS            := standard.mly
-@@ -75,7 +75,7 @@
- # during bootstrap stage one.
+@@ -52,13 +52,15 @@
+ install:
+ 	mkdir -p $(bindir)
+ 	mkdir -p $(libdir)
+-	mkdir -p $(docdir)
+ 	mkdir -p $(mandir)
+ 	install menhir $(bindir)
+ 	install -m 644 $(LIBS) $(libdir)
+-	cp -r $(DOCS) $(docdir)
+ 	cp -r $(MANS) $(mandir)
  
- stdlib.ml:
--	echo "let path = \"${PREFIX}/share/menhir\"" > stdlib.ml
-+	echo "let path = \"${OCAML_SITELIBDIR}/menhir\"" > stdlib.ml
- 
- # ----------------------------------------------------------------------------
- # Installation.
++docinstall:
++	mkdir -p $(docdir)
++	cp -r $(DOCS) $(docdir)
++
+ uninstall:
+ 	rm -rf $(bindir)/menhir
+ 	rm -rf $(libdir)
diff --git a/devel/menhir/pkg-plist b/devel/menhir/pkg-plist
index 94846194cc09..596e13614d58 100644
--- a/devel/menhir/pkg-plist
+++ b/devel/menhir/pkg-plist
@@ -1,32 +1,40 @@
 bin/menhir
-%%OCAML_SITELIBDIR%%/menhir/standard.mly
-%%DOCSDIR%%/manual.pdf
-%%DOCSDIR%%/demos/Makefile
-%%DOCSDIR%%/demos/Makefile.auto
-%%DOCSDIR%%/demos/Makefile.shared
-%%DOCSDIR%%/demos/OMakefile.shared
-%%DOCSDIR%%/demos/calc/Makefile
-%%DOCSDIR%%/demos/calc/OMakefile
-%%DOCSDIR%%/demos/calc/OMakeroot
-%%DOCSDIR%%/demos/calc/README
-%%DOCSDIR%%/demos/calc/calc.ml
-%%DOCSDIR%%/demos/calc/lexer.mll
-%%DOCSDIR%%/demos/calc/parser.mly
-%%DOCSDIR%%/demos/calc-two/Makefile
-%%DOCSDIR%%/demos/calc-two/OMakefile
-%%DOCSDIR%%/demos/calc-two/OMakeroot
-%%DOCSDIR%%/demos/calc-two/README
-%%DOCSDIR%%/demos/calc-two/algebraic.mly
-%%DOCSDIR%%/demos/calc-two/calc.ml
-%%DOCSDIR%%/demos/calc-two/lexer.mll
-%%DOCSDIR%%/demos/calc-two/reverse.mly
-%%DOCSDIR%%/demos/calc-two/tokens.mly
-%%DOCSDIR%%/demos/ocamldep.wrapper
-@dirrm %%OCAML_SITELIBDIR%%/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/OMakeroot
+%%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
-@dirrmtry lib/ocaml/site-lib
-@dirrmtry lib/ocaml