Updated devel/js_of_ocaml to its newest version, 1.3.2. Changes include:

Features/Changes
* Runtime and toplevel updates to support OCaml 4.0
* Add WebSocket bindings
* Added -debuginfo option to output source code location information
  (patch by Kensuke Matsuzaki)
* Dom_html: added change, input and hashChange event bindings
* Adding Lwt_js_events.async_loop and buffered_loop
Bugfixes
* Fix array and string blitting with overlapping regions
* Url module: fix encoding of '+'
* Library: use 'this' instead of 'window' for better portability
* Dom_html: fix creation of elements with type or name attribute under IE 9
* Compiler: small fix to bytecode parsing that could result in incorrect
  generated code
* Dom_html: fix mouse wheel event bindings
* Dom: fix the type of item methods
* Deriving_json: tail-recursive serialisation of lists (by Hugo Heuzard)
* Deriving_json: fix parsing of float arrays and polymorphic variants
  (by Hugo Heuzard)

4 files changed, 18 insertions, 21 deletions

diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile
index daa0e6a1113..5b6f63ca5a1 100644
--- a/devel/js_of_ocaml/Makefile
+++ b/devel/js_of_ocaml/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:08 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/12/14 14:40:24 jaapb Exp $
 #
 
-DISTNAME=	js_of_ocaml-1.2
-PKGREVISION=	2
+DISTNAME=	js_of_ocaml-1.3.2
 CATEGORIES=	devel
 MASTER_SITES=	http://ocsigen.org/download/
 
-MAINTAINER=	jaapb@kerguelen.org
+MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocsigen.org/js_of_ocaml/
 COMMENT=	Compiler of OCaml bytecode to Javascript
 LICENSE=	gnu-lgpl-v2
 
-# remove on next update
-DIST_SUBDIR=	js_of_ocaml-1.2
-
 DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=	ocaml-lwt>=2.3.0:../../devel/ocaml-lwt
 DEPENDS+=	ocaml-deriving-ocsigen>=0.3:../../devel/ocaml-deriving-ocsigen
 
 USE_LANGUAGES=	c
@@ -23,14 +18,14 @@ USE_TOOLS=	gmake
 
 MAKE_ENV=	BINDIR=${DESTDIR}${PREFIX}/bin DESTDIR=${DESTDIR} OCAML_SITELIBDIR=${PREFIX}/lib/ocaml/site-lib
 
+INSTALLATION_DIRS=	lib/ocaml/site-lib
+
 PLIST_VARS=	opt
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 PLIST.opt=	yes
 .endif
 
-pre-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/lib/ocaml/site-lib
-
+.include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/js_of_ocaml/PLIST b/devel/js_of_ocaml/PLIST
index 03fc98dae8e..69562141326 100644
--- a/devel/js_of_ocaml/PLIST
+++ b/devel/js_of_ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/20 20:08:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/12/14 14:40:24 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/js_of_ocaml
 bin/js_of_ocaml
 lib/ocaml/site-lib/js_of_ocaml/META
@@ -50,6 +50,8 @@ lib/ocaml/site-lib/js_of_ocaml/url.cmi
 lib/ocaml/site-lib/js_of_ocaml/url.mli
 lib/ocaml/site-lib/js_of_ocaml/webGL.cmi
 lib/ocaml/site-lib/js_of_ocaml/webGL.mli
+lib/ocaml/site-lib/js_of_ocaml/webSockets.cmi
+lib/ocaml/site-lib/js_of_ocaml/webSockets.mli
 lib/ocaml/site-lib/js_of_ocaml/xmlHttpRequest.cmi
 lib/ocaml/site-lib/js_of_ocaml/xmlHttpRequest.mli
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/js_of_ocaml
diff --git a/devel/js_of_ocaml/distinfo b/devel/js_of_ocaml/distinfo
index bc38cd32194..9e5728123e3 100644
--- a/devel/js_of_ocaml/distinfo
+++ b/devel/js_of_ocaml/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/07/20 20:08:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/12/14 14:40:24 jaapb Exp $
 
-SHA1 (js_of_ocaml-1.2/js_of_ocaml-1.2.tar.gz) = 6c2e24acd08d61c9c558b3700242b1717f1e9fbb
-RMD160 (js_of_ocaml-1.2/js_of_ocaml-1.2.tar.gz) = 9a10c83330ce3fa7030f3941f1f44067f3df60f5
-Size (js_of_ocaml-1.2/js_of_ocaml-1.2.tar.gz) = 1887043 bytes
-SHA1 (patch-Makefile) = 82f76c28cdb034105b1a4a0d16058a41c976a501
+SHA1 (js_of_ocaml-1.3.2.tar.gz) = a906303391fb136659f9a9971a1bc16d9f71acc5
+RMD160 (js_of_ocaml-1.3.2.tar.gz) = e79ec4bab7976d76e9573c2edb7f61f0bdcd9818
+Size (js_of_ocaml-1.3.2.tar.gz) = 1901593 bytes
+SHA1 (patch-Makefile) = 58a58804bfb2ab3ad3cc39096b658757a232ba3a
 SHA1 (patch-Makefile.conf) = e21058295b9c94760d5a0ff4225baade98911c7c
diff --git a/devel/js_of_ocaml/patches/patch-Makefile b/devel/js_of_ocaml/patches/patch-Makefile
index 41fee2e32f0..8b7fec7186e 100644
--- a/devel/js_of_ocaml/patches/patch-Makefile
+++ b/devel/js_of_ocaml/patches/patch-Makefile
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2012/07/11 15:35:06 wiz Exp $
+$NetBSD: patch-Makefile,v 1.2 2012/12/14 14:40:24 jaapb Exp $
 
-Make package support DESTDIR
---- Makefile.orig	2012-03-16 13:02:12.000000000 +0000
+Install to DESTDIR
+--- Makefile.orig	2012-12-07 19:39:02.000000000 +0000
 +++ Makefile
 @@ -31,7 +31,7 @@ include Makefile.filelist
  
  VERSION := $(shell head -n 1 VERSION)
  install:
 -	ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC)
-+	ocamlfind install -ldconf /dev/null -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC)
++	ocamlfind install -ldconf ignore -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC)
  	install -d -m 755 $(BINDIR)
  	install $(BIN) $(BINDIR)