Revision bump associated with the update of lang/ocaml to version 4.

14 files changed, 80 insertions, 65 deletions

diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 8d1d93e086d..8c1661e3d67 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 21:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/10/08 15:18:21 jaapb Exp $
 
 DISTNAME=	coccinelle-0.2.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
 EXTRACT_SUFX=	.tgz
diff --git a/devel/equeue/Makefile b/devel/equeue/Makefile
index bae51eb700b..54b8e892f20 100644
--- a/devel/equeue/Makefile
+++ b/devel/equeue/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2012/06/21 04:51:57 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/08 15:18:21 jaapb Exp $
 
 DISTNAME=		equeue-2.1.4
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile
index ac309e642b3..e8c85c02da8 100644
--- a/devel/js_of_ocaml/Makefile
+++ b/devel/js_of_ocaml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/07/20 20:08:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/08 15:18:21 jaapb Exp $
 #
 
 DISTNAME=	js_of_ocaml-1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://ocsigen.org/download/
 
diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index c19904372d1..2610ef223cb 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -1,30 +1,41 @@
-# $NetBSD: Makefile,v 1.5 2011/12/06 00:19:23 sbd Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/08 15:18:21 jaapb Exp $
 #
 
-DISTNAME=	menhir-20080912
-PKGREVISION=	2
+DISTNAME=	menhir-20120123
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://cristal.inria.fr/~fpottier/menhir/
 COMMENT=	LR(1) parser generator in OCaml
+LICENSE=	qpl-v1.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-BUILD_DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
 USE_TOOLS+=		gmake
 
+BUILD_DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
+
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MAKE_ENV=		EGDIR=${EGDIR:Q}
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.09
+PLIST_VARS=	opt
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
+    (${MACHINE_ARCH} == "arm")
+PLIST.opt=	yes
+.else
+MAKE_ENV+=	TARGET=byte
+.endif
 
 post-extract:
 	${RM} ${WRKSRC}/demos/calc/.omakedb*
 
+pre-install:
+	${MKDIR} ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/menhirLib
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/menhir/PLIST b/devel/menhir/PLIST
index 73b0d9e0def..083cea7eb28 100644
--- a/devel/menhir/PLIST
+++ b/devel/menhir/PLIST
@@ -1,44 +1,41 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:43:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/08 15:18:21 jaapb Exp $
 bin/menhir
 lib/ocaml/site-lib/menhirLib/META
 lib/ocaml/site-lib/menhirLib/menhirLib.cmi
 lib/ocaml/site-lib/menhirLib/menhirLib.cmo
-lib/ocaml/site-lib/menhirLib/menhirLib.cmx
+${PLIST.opt}lib/ocaml/site-lib/menhirLib/menhirLib.cmx
 lib/ocaml/site-lib/menhirLib/menhirLib.o
-lib/ocaml/site-lib/standard.mly
-man/man1/menhir.1
+share/doc/menhir/demos/Makefile
+share/doc/menhir/demos/Makefile.auto
+share/doc/menhir/demos/Makefile.shared
+share/doc/menhir/demos/OMakefile.shared
+share/doc/menhir/demos/calc-param/Makefile
+share/doc/menhir/demos/calc-param/OMakefile
+share/doc/menhir/demos/calc-param/OMakeroot
+share/doc/menhir/demos/calc-param/README
+share/doc/menhir/demos/calc-param/calc.ml
+share/doc/menhir/demos/calc-param/lexer.mll
+share/doc/menhir/demos/calc-param/parser.mly
+share/doc/menhir/demos/calc-param/tokens.mly
+share/doc/menhir/demos/calc-two/Makefile
+share/doc/menhir/demos/calc-two/OMakefile
+share/doc/menhir/demos/calc-two/OMakeroot
+share/doc/menhir/demos/calc-two/README
+share/doc/menhir/demos/calc-two/algebraic.mly
+share/doc/menhir/demos/calc-two/calc.ml
+share/doc/menhir/demos/calc-two/common.mly
+share/doc/menhir/demos/calc-two/lexer.mll
+share/doc/menhir/demos/calc-two/reverse.mly
+share/doc/menhir/demos/calc-two/tokens.mly
+share/doc/menhir/demos/calc/Makefile
+share/doc/menhir/demos/calc/OMakefile
+share/doc/menhir/demos/calc/OMakefile.omc
+share/doc/menhir/demos/calc/OMakeroot
+share/doc/menhir/demos/calc/OMakeroot.omc
+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/ocamldep.wrapper
 share/doc/menhir/manual.pdf
-share/examples/menhir/demos/Makefile
-share/examples/menhir/demos/Makefile.auto
-share/examples/menhir/demos/Makefile.shared
-share/examples/menhir/demos/OMakefile.shared
-share/examples/menhir/demos/calc-param/Makefile
-share/examples/menhir/demos/calc-param/OMakefile
-share/examples/menhir/demos/calc-param/OMakeroot
-share/examples/menhir/demos/calc-param/README
-share/examples/menhir/demos/calc-param/calc.ml
-share/examples/menhir/demos/calc-param/lexer.mll
-share/examples/menhir/demos/calc-param/parser.mly
-share/examples/menhir/demos/calc-param/tokens.mly
-share/examples/menhir/demos/calc-two/Makefile
-share/examples/menhir/demos/calc-two/OMakefile
-share/examples/menhir/demos/calc-two/OMakeroot
-share/examples/menhir/demos/calc-two/README
-share/examples/menhir/demos/calc-two/algebraic.mly
-share/examples/menhir/demos/calc-two/calc.ml
-share/examples/menhir/demos/calc-two/common.mly
-share/examples/menhir/demos/calc-two/lexer.mll
-share/examples/menhir/demos/calc-two/reverse.mly
-share/examples/menhir/demos/calc-two/tokens.mly
-share/examples/menhir/demos/calc/Makefile
-share/examples/menhir/demos/calc/OMakefile
-share/examples/menhir/demos/calc/OMakefile.omc
-share/examples/menhir/demos/calc/OMakeroot
-share/examples/menhir/demos/calc/OMakeroot.omc
-share/examples/menhir/demos/calc/README
-share/examples/menhir/demos/calc/calc.ml
-share/examples/menhir/demos/calc/lexer.mll
-share/examples/menhir/demos/calc/parser.mly
-share/examples/menhir/demos/ocamldep.wrapper
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/lwt
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/lwt
+share/menhir/standard.mly
diff --git a/devel/menhir/distinfo b/devel/menhir/distinfo
index 848cc2a0f45..478b1d72e30 100644
--- a/devel/menhir/distinfo
+++ b/devel/menhir/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/13 22:45:03 bjs Exp $
+$NetBSD: distinfo,v 1.2 2012/10/08 15:18:21 jaapb Exp $
 
-SHA1 (menhir-20080912.tar.gz) = 8a18733023a4a0775cb19837a7497b40628ca197
-RMD160 (menhir-20080912.tar.gz) = f02e43047ee96d8f69505f43810a807404c322eb
-Size (menhir-20080912.tar.gz) = 377709 bytes
-SHA1 (patch-aa) = a10c492c55352aa49673345b47c8f420fc9fbe15
+SHA1 (menhir-20120123.tar.gz) = 6d521cfb1203ae640ecf0672b7a6c4ead9e76786
+RMD160 (menhir-20120123.tar.gz) = 7991cae05cc8246ff81f8f193ca6a8ba6d4d3d7b
+Size (menhir-20120123.tar.gz) = 398871 bytes
+SHA1 (patch-Makefile) = bc736eb58bc87e0bb11b0b2b483f2ebbd82573b2
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 81cb32e31ea..32495466828 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2012/10/02 17:10:50 tron Exp $
+# $NetBSD: Makefile,v 1.44 2012/10/08 15:18:21 jaapb Exp $
 #
 
 DISTNAME=		monotone-viz-1.0.1-nolablgtk
 PKGNAME=		${DISTNAME:S/-nolablgtk//}
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		devel scm
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile
index 0f1e1c11b32..178cef91b49 100644
--- a/devel/ocaml-deriving-ocsigen/Makefile
+++ b/devel/ocaml-deriving-ocsigen/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2012/07/11 15:33:51 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/10/08 15:18:21 jaapb Exp $
 #
 
 DISTNAME=	deriving-ocsigen-0.3c
 PKGNAME=	ocaml-${DISTNAME}
 COMMENT=	Extension to OCaml for deriving functions from type declarations
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ocsigen.org/download/
 
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 707ca96aa54..e18a1d83f6f 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2012/09/25 09:02:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/08 15:18:21 jaapb Exp $
 #
 
 DISTNAME=		findlib-1.3.3
 PKGNAME=		ocaml-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST
index bd1105fa20d..53bb96bc77f 100644
--- a/devel/ocaml-findlib/PLIST
+++ b/devel/ocaml-findlib/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2012/07/06 09:22:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/10/08 15:18:21 jaapb Exp $
 bin/ocamlfind
 bin/safe_camlp4
 lib/ocaml/site-lib/bigarray/META
 lib/ocaml/site-lib/camlp4/META
+lib/ocaml/site-lib/compiler-libs/META
 lib/ocaml/site-lib/dbm/META
 lib/ocaml/site-lib/dynlink/META
 lib/ocaml/site-lib/findlib/META
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index 332a0503fa9..f71868fa0c1 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2012/08/15 08:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/08 15:18:22 jaapb Exp $
 #
 
 DISTNAME=	lwt-2.4.0
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocsigen.org/download/
 
diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 1014e96beb0..cb332a3552e 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/08/16 11:49:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/08 15:18:22 jaapb Exp $
 
 PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	react-0.9.4
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/react/releases/
 EXTRACT_SUFX=	.tbz
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 4e03b5948a4..659eb500620 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/12/06 00:19:23 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/08 15:18:22 jaapb Exp $
 #
 
 DISTNAME=	omake-${VERSION}-0.rc1
 PKGNAME=	omake-${VERSION}.0rc1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://omake.metaprl.org/downloads/
 
diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile
index 47ce95e4143..5a25d0ac828 100644
--- a/devel/pcre-ocaml/Makefile
+++ b/devel/pcre-ocaml/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2012/03/04 09:42:31 asau Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/08 15:18:22 jaapb Exp $
 
 DISTNAME=		pcre-ocaml-6.2.5
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.ocaml.info/ocaml_sources/