Updated package to latest version, 1.2.1. Incorporated license change

(BSD3 to ISC) that was not mentioned in changelog. Changes include:

- Allow signals to be created and `S.stop`ped instantaneously (#18)
  Previously this could lead to failed assertions in updates (e.g.
  `S.bind` trying to switch to an uninitialized signal). Thanks
  to Arthur Wendling for the report.
- Fix implementation of `S.Bool.flip`, its initial value on creation
  could be wrong in dynamic creation (#17). Thanks to Arthur Wendling
  for the report.
- Fix bug in `S.Option.value` with `` `Always`` on `S.const None` (#19).
  Thanks to Arthur Wendling for the report.

4 files changed, 20 insertions, 35 deletions

diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 352b39f23b1..33fa86c8404 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/12/30 11:16:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2017/07/11 11:02:44 jaapb Exp $
 
-DISTNAME=	react-1.2.0
+DISTNAME=	react-1.2.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/react/releases/
 EXTRACT_SUFX=	.tbz
@@ -10,36 +9,14 @@ EXTRACT_SUFX=	.tbz
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://erratique.ch/software/react
 COMMENT=	OCaml module for functional reactive programming
-LICENSE=	modified-bsd
+LICENSE=	isc
 
 CONFIGURE_ARGS+=	--prefix "${PREFIX}" --destdir "${DESTDIR}"
 INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/react
 
-OCAML_USE_FINDLIB=	yes
+OCAML_USE_TOPKG=	yes
+OCAML_USE_OPAM=		yes
 
 .include "../../mk/ocaml.mk"
-
-do-build:
-.if ${OCAML_USE_OPT_COMPILER} == yes
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml pkg/build.ml native=true native-dynlink=true
-.else
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml pkg/build.ml
-.endif
-
-do-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 "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-react/PLIST b/devel/ocaml-react/PLIST
index 82c771381b7..c178d5b0a14 100644
--- a/devel/ocaml-react/PLIST
+++ b/devel/ocaml-react/PLIST
@@ -1,13 +1,20 @@
-@comment $NetBSD: PLIST,v 1.4 2016/06/25 14:29:01 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/07/11 11:02:44 jaapb Exp $
 ${OCAML_SITELIB}/react/META
+${OCAML_SITELIB}/react/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.a
 ${OCAML_SITELIB}/react/react.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.cma
+${OCAML_SITELIB}/react/react.cmti
 ${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.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxs
+${OCAML_SITELIB}/react/react_top_init.ml
+share/doc/react/CHANGES.md
+share/doc/react/LICENSE.md
+share/doc/react/README.md
diff --git a/devel/ocaml-react/buildlink3.mk b/devel/ocaml-react/buildlink3.mk
index 165c2b7e4dd..06747ad20fa 100644
--- a/devel/ocaml-react/buildlink3.mk
+++ b/devel/ocaml-react/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/01/20 15:22:53 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 11:02:44 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-react
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-react
 OCAML_REACT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-react+=	ocaml-react>=1.2.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-react+=	ocaml-react>=1.2.1
 BUILDLINK_PKGSRCDIR.ocaml-react?=	../../devel/ocaml-react
 .endif	# OCAML_REACT_BUILDLINK3_MK
 
diff --git a/devel/ocaml-react/distinfo b/devel/ocaml-react/distinfo
index 783691e6c0b..e128cd83aab 100644
--- a/devel/ocaml-react/distinfo
+++ b/devel/ocaml-react/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/07/11 11:02:44 jaapb Exp $
 
-SHA1 (react-1.2.0.tbz) = 00804b409432fbb5ecbfb78d3802d494f4c666d7
-RMD160 (react-1.2.0.tbz) = 07a2621d5bef6c6509b80d7385393fbcded5139c
-SHA512 (react-1.2.0.tbz) = 3f2037ca68ea9d61eebaf7dcd7a768c59d3ce5bdd33c3adec9eee9df875a1b958cb450398eb7d72ac1a4144dc7b6dab344156ba920aaea2e3d39cc0f515839be
-Size (react-1.2.0.tbz) = 64665 bytes
+SHA1 (react-1.2.1.tbz) = 7502bcf6f98bc2eed2c2f43641a8b0d4ce9e481e
+RMD160 (react-1.2.1.tbz) = 5fcfab9a8bf2cae19422ccd9ccf40882fcc5efa8
+SHA512 (react-1.2.1.tbz) = 60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1
+Size (react-1.2.1.tbz) = 39184 bytes