Updated ocaml-react to latest version, 1.2.0. Changes include:

- Fix bug in dynamic creation of S.{diff,changes} (#8).
- Fix bug in dynamic creation of S.switch (#7).
- Add support for toplevel: automatically `open React` on `#require "react"`.
- Add `S.Bool.{flip,edge,fall,rise}`.
- Fix `S.switch` rank's initialisation.
- Add `E.l{1,2,3,4,5,6}`, lifting combinators on events.
- Add `E.Option.{some,value}`.
- Add `S.{Float,Int}.{zero,one,minus_one}`.
- Add `S.Bool.{zero,one}`.
- Add `S.Option.{none,some,value}`.
- Add `{S,E}.on` equivalent to `{S,E}.when_`.
- Deprecate `{S,E}.when_` (syntax error prone).
- Fix `S.bind`.
- Use package builder topkg for distribution.
- Add support for update steps, see the `React.Step` module. Allows to
  specify simultaneous primitive signal updates and event occurences.
  The functions returned by `{S,E}.create` now have an optional
  `?step` argument; if unused the previous semantics is preserved.
- Add support for strong stops, can be used on platforms where weak
  arrays are not to prevent leaks. The function `{E,S}.stop` now have
  an optional `?strong` argument; if unused the previous semantics is
  preserved.
- Change signature of `S.switch`. Any existing call `S.switch ~eq s es` can
  be replaced by `S.(switch ~eq (hold ~eq:( == ) s es))`.

4 files changed, 49 insertions, 55 deletions

diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 2681030dbb4..34b9d98b5a2 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -1,52 +1,47 @@
-# $NetBSD: Makefile,v 1.5 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2014/10/09 21:38:49 jaapb Exp $
 
-PKGNAME=	ocaml-${DISTNAME}
-DISTNAME=	react-0.9.4
-PKGREVISION=	2
+DISTNAME=	react-1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/react/releases/
 EXTRACT_SUFX=	.tbz
 
-MAINTAINER=	jaapb@kerguelen.org
+MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://erratique.ch/software/react
 COMMENT=	OCaml module for functional reactive programming
 LICENSE=	modified-bsd
 
-USE_LANGUAGES=	c
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix "${PREFIX}" --destdir "${DESTDIR}"
+CONFIGURE_ARGS+=	--prefix "${PREFIX}" --destdir "${DESTDIR}"
+INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/react
 
-SUBST_CLASSES+=   destdir
-SUBST_STAGE.destdir=  post-configure
-SUBST_MESSAGE.destdir=  Changing install location to DESTDIR
-SUBST_FILES.destdir=  setup.ml
-SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
+#SUBST_CLASSES+=   destdir
+#SUBST_STAGE.destdir=  post-configure
+#SUBST_MESSAGE.destdir=  Changing install location to DESTDIR
+#SUBST_FILES.destdir=  setup.ml
+#SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
 
-DEPENDS+=       ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
-PLIST_VARS+=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-
-post-build:
-	cd ${WRKSRC} && ocamlbuild src/react.cmxs
-
-post-install:
-	cd ${WRKSRC} && ${INSTALL_LIB} _build/src/react.cmxs ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/react
-.endif
-
-do-configure:
-	cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
+.include "../../mk/ocaml.mk"
 
 do-build:
-	cd ${WRKSRC} && ocaml setup.ml -build
-
-pre-install:
-	${MKDIR} ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib
+.if ${OCAML_USE_OPT_COMPILER} == yes
+	cd ${WRKSRC} && ocaml pkg/build.ml native=true native-dynlink=true
+.else
+	cd ${WRKSRC} && ocaml pkg/build.ml
+.endif
 
 do-install:
-	cd ${WRKSRC} && ocaml setup.ml -install
+	for i in react.cma react.cmi react.mli react_top.cma; do \
+		${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
+			${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/react; \
+	done
+.if ${OCAML_USE_OPT_COMPILER} == yes
+	for i in react.a react.cmx react.cmxa react.cmxs react_top.a react_top.cmxa \
+	react_top.cmxs; do \
+		${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
+			${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/react; \
+	done
+.endif
+	${INSTALL_DATA} ${WRKSRC}/_build/pkg/META \
+		${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/react
 
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-react/PLIST b/devel/ocaml-react/PLIST
index 0150cfe00e7..9a50d4dfa6d 100644
--- a/devel/ocaml-react/PLIST
+++ b/devel/ocaml-react/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2012/08/16 11:49:30 wiz Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/react
-lib/ocaml/site-lib/react/META
-${PLIST.opt}lib/ocaml/site-lib/react/react.a
-lib/ocaml/site-lib/react/react.cmi
-${PLIST.opt}lib/ocaml/site-lib/react/react.cma
-${PLIST.opt}lib/ocaml/site-lib/react/react.cmx
-${PLIST.opt}lib/ocaml/site-lib/react/react.cmxa
-${PLIST.opt}lib/ocaml/site-lib/react/react.cmxs
-lib/ocaml/site-lib/react/react.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/react
+@comment $NetBSD: PLIST,v 1.3 2014/10/09 21:38:49 jaapb Exp $
+@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/react
+${OCAML_SITELIB}/react/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.a
+${OCAML_SITELIB}/react/react.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.cmxs
+${OCAML_SITELIB}/react/react.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.a
+${OCAML_SITELIB}/react/react_top.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxs
+@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/react
diff --git a/devel/ocaml-react/PLIST.opt b/devel/ocaml-react/PLIST.opt
deleted file mode 100644
index f14d2327db7..00000000000
--- a/devel/ocaml-react/PLIST.opt
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2012/05/29 14:45:14 wiz Exp $
-lib/ocaml/site-lib/react/react.a
-lib/ocaml/site-lib/react/react.cma
-lib/ocaml/site-lib/react/react.cmx
-lib/ocaml/site-lib/react/react.cmxa
diff --git a/devel/ocaml-react/distinfo b/devel/ocaml-react/distinfo
index 47d82f44d9b..77956fa5a0e 100644
--- a/devel/ocaml-react/distinfo
+++ b/devel/ocaml-react/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/08/16 11:49:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/10/09 21:38:49 jaapb Exp $
 
-SHA1 (react-0.9.4.tbz) = b055d40f43411f8367eeb11f4e87f7d3955d7b2d
-RMD160 (react-0.9.4.tbz) = 64fc6c80cb4ff1c52daa89dda0d774297f900b6c
-Size (react-0.9.4.tbz) = 82964 bytes
+SHA1 (react-1.2.0.tbz) = 00804b409432fbb5ecbfb78d3802d494f4c666d7
+RMD160 (react-1.2.0.tbz) = 07a2621d5bef6c6509b80d7385393fbcded5139c
+Size (react-1.2.0.tbz) = 64665 bytes