Updated package to version 0.9.2. Changes include:

OCamlbuild 0.9.2 is a release to support OCaml 4.03. Martin Neuhäußer
contributed new flags for flambda-specific optimization options. We
also extend the scope of the flags -opaque and -for-pack, to align
with 4.03 best practices. Note that OCamlbuild should still work
correctly under older OCaml releases.

- 67: Add support for flambda's optimization parameters
  The flags are named according to the flambda options with two exceptions:
    optimization_rounds(int) for -rounds <int>
    optimize({2,3,classic}) for -O{2,3,classic}
  (Martin Neuhäußer)
- 70 (pratial): fix hygiene complains about the build directory under
  Windows
  (Andreas Hauptmann, Gabriel Scherer)
- 73: also pass predicates(foo) to ocamldep
  (Jérémie Dimino)
- extend the scope of the -opaque flag under 4.03
  (Gabriel Scherer)
- extend the scope of the -for-pack flag to ocamlc,
  as recommend by OCaml compiler maintainers in
  [5996](http://caml.inria.fr/mantis/view.php?id=5995#c13339)
  (Gabriel Scherer)

5 files changed, 34 insertions, 43 deletions

diff --git a/devel/ocamlbuild/Makefile b/devel/ocamlbuild/Makefile
index 72b49a491cc..8274d6eda93 100644
--- a/devel/ocamlbuild/Makefile
+++ b/devel/ocamlbuild/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2016/05/05 10:28:21 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2016/05/05 15:58:58 jaapb Exp $
 
-DISTNAME=	ocamlbuild-0.9.1
+DISTNAME=	ocamlbuild-0.9.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -14,5 +14,10 @@ CONFLICTS+=	ocaml<=4.02.3
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gmake
 
+OCAML_USE_FINDLIB=	yes
+INSTALL_TARGET=	findlib-install
+
+MAKE_ENV=	CHECK_IF_PREINSTALLED=false
+
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocamlbuild/PLIST b/devel/ocamlbuild/PLIST
index 0e6941e8e07..3b48e0fe9d1 100644
--- a/devel/ocamlbuild/PLIST
+++ b/devel/ocamlbuild/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/05 10:28:21 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/05/05 15:58:58 jaapb Exp $
 bin/ocamlbuild
 bin/ocamlbuild.byte
 ${PLIST.ocaml-opt}bin/ocamlbuild.native
-lib/ocaml/ocamlbuild/META
-lib/ocaml/ocamlbuild/ocamlbuild.cmo
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild.o
-lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_executor.o
-lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx
-lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_plugin.o
-lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuildlib.a
-lib/ocaml/ocamlbuild/ocamlbuildlib.cma
-${PLIST.ocaml-opt}lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
-lib/ocaml/ocamlbuild/signatures.mli
+${OCAML_SITELIB}/ocamlbuild/META
+${OCAML_SITELIB}/ocamlbuild/ocamlbuild.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild.o
+${OCAML_SITELIB}/ocamlbuild/ocamlbuild_executor.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_executor.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_executor.o
+${OCAML_SITELIB}/ocamlbuild/ocamlbuild_pack.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_pack.cmx
+${OCAML_SITELIB}/ocamlbuild/ocamlbuild_plugin.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_plugin.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_plugin.o
+${OCAML_SITELIB}/ocamlbuild/ocamlbuild_unix_plugin.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_unix_plugin.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuild_unix_plugin.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuildlib.a
+${OCAML_SITELIB}/ocamlbuild/ocamlbuildlib.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlbuild/ocamlbuildlib.cmxa
+${OCAML_SITELIB}/ocamlbuild/signatures.mli
diff --git a/devel/ocamlbuild/buildlink3.mk b/devel/ocamlbuild/buildlink3.mk
index 4138cc0453d..8ac2dbb456c 100644
--- a/devel/ocamlbuild/buildlink3.mk
+++ b/devel/ocamlbuild/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/05/05 10:28:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/05/05 15:58:58 jaapb Exp $
 
 BUILDLINK_TREE+=	ocamlbuild
 
 .if !defined(OCAMLBUILD_BUILDLINK3_MK)
 OCAMLBUILD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocamlbuild+=	ocamlbuild>=0.9.1
+BUILDLINK_API_DEPENDS.ocamlbuild+=	ocamlbuild>=0.9.2
 BUILDLINK_PKGSRCDIR.ocamlbuild?=	../../devel/ocamlbuild
 BUILDLINK_DEPMETHOD.ocamlbuild?=	build
 .endif	# OCAMLBUILD_BUILDLINK3_MK
diff --git a/devel/ocamlbuild/distinfo b/devel/ocamlbuild/distinfo
index 58f8c17acf2..67a18d0602b 100644
--- a/devel/ocamlbuild/distinfo
+++ b/devel/ocamlbuild/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/05/05 10:54:56 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2016/05/05 15:58:58 jaapb Exp $
 
-SHA1 (ocamlbuild-0.9.1.tar.gz) = eeffb0b04d66875030de73d76e7aabfc19396fec
-RMD160 (ocamlbuild-0.9.1.tar.gz) = 0467b396324a288b7e6a388e1262b9cd82430c5f
-SHA512 (ocamlbuild-0.9.1.tar.gz) = 07da313f896fd31fab42881515f33544a587f831aa0928540af2351bf8d59b14115a144b17d156cb2599ce5d568684192a922f9f85f86ddd7299b8e194fd85c6
-Size (ocamlbuild-0.9.1.tar.gz) = 160896 bytes
-SHA1 (patch-Makefile) = 726844080519bb04c38fc88d05aecd21f00c600a
+SHA1 (ocamlbuild-0.9.2.tar.gz) = 1d56cb0d5f4da2456306cde4f909e9dc0e02ba8f
+RMD160 (ocamlbuild-0.9.2.tar.gz) = c8f2ea58004d23fe1e31a0f210b179f135f9ef15
+SHA512 (ocamlbuild-0.9.2.tar.gz) = 6f6fa2ca0030256b61a9f93275f26327a032594a1ddd288e1eb9f4c41dfc139e4cdb6cd66ae8e383dd2f8aabb435181abfbf6b4aa0892ef6fa420c29e33b391a
+Size (ocamlbuild-0.9.2.tar.gz) = 163014 bytes
diff --git a/devel/ocamlbuild/patches/patch-Makefile b/devel/ocamlbuild/patches/patch-Makefile
deleted file mode 100644
index e47cdc612e1..00000000000
--- a/devel/ocamlbuild/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2016/05/05 10:54:56 jaapb Exp $
-
---- Makefile.orig	2016-02-29 18:05:35.000000000 +0000
-+++ Makefile
-@@ -176,7 +176,7 @@ beforedepend:: src/glob_lexer.ml
- configure: Makefile.config src/ocamlbuild_config.ml
- 
- Makefile.config src/ocamlbuild_config.ml:
--	$(MAKE) -f configure.make $@
-+	OCAMLBUILD_LIBDIR=${PREFIX}/lib/ocaml $(MAKE) -f configure.make $@
- 
- clean::
- 	rm -f Makefile.config src/ocamlbuild_config.ml