Index: head/lang/js_of_ocaml/Makefile
===================================================================
--- head/lang/js_of_ocaml/Makefile	(revision 386608)
+++ head/lang/js_of_ocaml/Makefile	(revision 386609)
@@ -1,31 +1,42 @@
 # Created by: Jaap Boender <jaapb@kerguelen.org>
 # $FreeBSD$
 
 PORTNAME=	js_of_ocaml
-PORTVERSION=	1.3.2
+PORTVERSION=	2.5
 CATEGORIES=	lang
-MASTER_SITES=	http://ocsigen.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml to JavaScript compiler
 
 BUILD_DEPENDS=	ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \
-		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen
+		menhir:${PORTSDIR}/devel/menhir \
+		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \
+		${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/cmdliner/cmdliner
 RUN_DEPENDS=	ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \
-		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen
+		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \
+		${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/cmdliner/cmdliner
 
 SA_DIR=		${PREFIX}/${OCAML_SITELIBDIR}
 
 USES=			gmake
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
+USE_OCAML_CAMLP4=	yes
 USE_OCAMLFIND_PLIST=	yes
 
-PLIST_FILES+=		bin/js_of_ocaml
+USE_GITHUB=		yes
+GH_ACCOUNT=		ocsigen
 
+PLIST_FILES+=		bin/js_of_ocaml bin/jsoo_minify bin/jsoo_mkcmis \
+			bin/jsoo_mktop
+
+MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV+=		BINDIR=${STAGEDIR}${PREFIX}/bin \
 			DESTDIR=${STAGEDIR} \
 			OCAML_SITELIBDIR=${PREFIX}/lib/ocaml/site-lib
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^BINDIR/d' ${WRKSRC}/Makefile.conf
 
 .include <bsd.port.mk>
Index: head/lang/js_of_ocaml/distinfo
===================================================================
--- head/lang/js_of_ocaml/distinfo	(revision 386608)
+++ head/lang/js_of_ocaml/distinfo	(revision 386609)
@@ -1,2 +1,2 @@
-SHA256 (js_of_ocaml-1.3.2.tar.gz) = 5996d2a9bc32121186e1964af557bb411eb5a27aa155d2c6a8a144ee5f3d0c36
-SIZE (js_of_ocaml-1.3.2.tar.gz) = 1901593
+SHA256 (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 5bea34f47210791b8bb89adb158ec9d47816ba074bfb11ee68f56be42c0235df
+SIZE (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 1249680
Index: head/lang/js_of_ocaml/files/patch-Makefile.conf
===================================================================
--- head/lang/js_of_ocaml/files/patch-Makefile.conf	(revision 386608)
+++ head/lang/js_of_ocaml/files/patch-Makefile.conf	(nonexistent)
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.conf,v 1.1 2012/07/11 15:35:06 wiz Exp $
-
-Have BINDIR be determined from package Makefile
---- Makefile.conf.orig	2011-11-30 14:25:06.000000000 +0000
-+++ Makefile.conf
-@@ -1,6 +1,6 @@
- 
- # Where binaries are installed:
--BINDIR := /usr/local/bin
-+# BINDIR := /usr/local/bin
- 
- ####
- 

Property changes on: head/lang/js_of_ocaml/files/patch-Makefile.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/js_of_ocaml/files/patch-Makefile
===================================================================
--- head/lang/js_of_ocaml/files/patch-Makefile	(revision 386608)
+++ head/lang/js_of_ocaml/files/patch-Makefile	(revision 386609)
@@ -1,14 +1,11 @@
-$NetBSD: patch-Makefile,v 1.2 2012/12/14 14:40:24 jaapb Exp $
-
-Install to DESTDIR
---- Makefile.orig	2012-12-07 19:39:02.000000000 +0000
+--- Makefile.orig	2014-09-30 14:40:37 UTC
 +++ Makefile
-@@ -31,7 +31,7 @@ include Makefile.filelist
+@@ -47,7 +47,7 @@ VERSION := $(shell head -n 1 VERSION)
+ install: install-lib install-bin
  
- VERSION := $(shell head -n 1 VERSION)
- install:
--	ocamlfind install -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)
+ install-lib:
+-	ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL)
++	ocamlfind install -ldconf ignore -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL)
  
+ install-bin:
+ 	install -d -m 755 $(BINDIR)