[pkgsrc/trunk]: pkgsrc/devel/js_of_ocaml Revbump associated with ocaml 4.02.1...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba4361f6fe7c
branches:  trunk
changeset: 645004:ba4361f6fe7c
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Jan 20 16:09:15 2015 +0000

description:
Revbump associated with ocaml 4.02.1. Also added the ocaml-tyxml option
which compiles in tyxml (and react) support.

diffstat:

 devel/js_of_ocaml/Makefile                    |   4 +++-
 devel/js_of_ocaml/PLIST                       |   9 ++++++++-
 devel/js_of_ocaml/distinfo                    |   4 ++--
 devel/js_of_ocaml/options.mk                  |  22 ++++++++++++++++++++++
 devel/js_of_ocaml/patches/patch-Makefile.conf |  15 +++++++++++++--
 5 files changed, 48 insertions(+), 6 deletions(-)

diffs (115 lines):

diff -r 0494399fc4f4 -r ba4361f6fe7c devel/js_of_ocaml/Makefile
--- a/devel/js_of_ocaml/Makefile        Tue Jan 20 16:04:57 2015 +0000
+++ b/devel/js_of_ocaml/Makefile        Tue Jan 20 16:09:15 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/10/09 21:18:05 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2015/01/20 16:09:15 jaapb Exp $
 #
 
 DISTNAME=      2.5
 PKGNAME=       js_of_ocaml-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://github.com/ocsigen/js_of_ocaml/archive/
 DIST_SUBDIR=   js_of_ocaml
@@ -21,6 +22,7 @@
 MAKE_ENV=      BINDIR=${DESTDIR}/${PREFIX}/bin DESTDIR=${DESTDIR} OCAML_SITELIBDIR=${OCAML_SITELIBDIR}
 MAKE_JOBS_SAFE=        no
 
+.include "options.mk"
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/ocaml-optcomp/buildlink3.mk"
diff -r 0494399fc4f4 -r ba4361f6fe7c devel/js_of_ocaml/PLIST
--- a/devel/js_of_ocaml/PLIST   Tue Jan 20 16:04:57 2015 +0000
+++ b/devel/js_of_ocaml/PLIST   Tue Jan 20 16:09:15 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/09 21:18:05 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/01/20 16:09:15 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/js_of_ocaml
 bin/js_of_ocaml
 bin/jsoo_minify
@@ -86,6 +86,13 @@
 ${OCAML_SITELIB}/js_of_ocaml/toplevel.js
 ${OCAML_SITELIB}/js_of_ocaml/typed_array.cmi
 ${OCAML_SITELIB}/js_of_ocaml/typed_array.mli
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml.cma
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_cast.cmi
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_cast.mli
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_cast_sigs.cmi
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_cast_sigs.mli
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_js.cmi
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml/tyxml_js.mli
 ${OCAML_SITELIB}/js_of_ocaml/url.cmi
 ${OCAML_SITELIB}/js_of_ocaml/url.mli
 ${OCAML_SITELIB}/js_of_ocaml/weak.js
diff -r 0494399fc4f4 -r ba4361f6fe7c devel/js_of_ocaml/distinfo
--- a/devel/js_of_ocaml/distinfo        Tue Jan 20 16:04:57 2015 +0000
+++ b/devel/js_of_ocaml/distinfo        Tue Jan 20 16:09:15 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2014/10/09 21:18:05 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2015/01/20 16:09:15 jaapb Exp $
 
 SHA1 (js_of_ocaml/2.5.tar.gz) = d3871a5a054f775134662ffb1886a22adc6dcf56
 RMD160 (js_of_ocaml/2.5.tar.gz) = c586e6d33f182dac10c3d6270f8b095a500c3894
 Size (js_of_ocaml/2.5.tar.gz) = 1249680 bytes
 SHA1 (patch-Makefile) = a1ef24c53bce499e56fefb4e141d79bb8701528d
-SHA1 (patch-Makefile.conf) = 632544abd696d53fad35755bcc616922561605bf
+SHA1 (patch-Makefile.conf) = 30e429cd5193326514420a955878f5d91718e7c6
diff -r 0494399fc4f4 -r ba4361f6fe7c devel/js_of_ocaml/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/js_of_ocaml/options.mk      Tue Jan 20 16:09:15 2015 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2015/01/20 16:09:15 jaapb Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.js_of_ocaml
+PKG_SUPPORTED_OPTIONS= ocaml-tyxml
+PKG_SUGGESTED_OPTIONS= ocaml-tyxml
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   tyxml
+###
+### TyXML support
+###
+.if !empty(PKG_OPTIONS:Mocaml-tyxml)
+.include "../../textproc/ocaml-tyxml/buildlink3.mk"
+.include "../../devel/ocaml-reactiveData/buildlink3.mk"
+MAKE_ENV+=     USE_TYXML="YES" USE_REACT="YES"
+PLIST.tyxml=   yes
+.else
+MAKE_ENV+=     USE_TYXML="NO" USE_REACT="NO"
+.endif
diff -r 0494399fc4f4 -r ba4361f6fe7c devel/js_of_ocaml/patches/patch-Makefile.conf
--- a/devel/js_of_ocaml/patches/patch-Makefile.conf     Tue Jan 20 16:04:57 2015 +0000
+++ b/devel/js_of_ocaml/patches/patch-Makefile.conf     Tue Jan 20 16:09:15 2015 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-Makefile.conf,v 1.2 2014/10/09 21:18:05 jaapb Exp $
+$NetBSD: patch-Makefile.conf,v 1.3 2015/01/20 16:09:16 jaapb Exp $
 
 Have BINDIR be determined from package Makefile, do not call git
+Also determine tyxml and react usage based on options rather than detection
 --- Makefile.conf.orig 2014-09-30 14:40:37.000000000 +0000
 +++ Makefile.conf
 @@ -1,6 +1,6 @@
@@ -11,7 +12,17 @@
  
  ####
  
-@@ -47,4 +47,4 @@ NATDYNLINK ?= $(shell if [ -f `ocamlc -w
+@@ -39,12 +39,12 @@ WITH_DERIVING ?= $(shell if [ -f `ocamlf
+ 
+ WITH_GRAPHICS ?= $(shell if [ -f `ocamlfind query graphics 2> /dev/null`/graphics.cmi ]; then echo YES; else echo NO; fi)
+ 
+-WITH_REACT ?= $(shell if [ -f `ocamlfind query reactiveData 2> /dev/null`/reactiveData.cma ]; then echo YES; else echo NO; fi)
+-WITH_TYXML ?= $(shell if [ -f `ocamlfind query tyxml 2> /dev/null`/tyxml_f.cma ]; then echo YES; else echo NO; fi)
++WITH_REACT ?= $(USE_REACT)
++WITH_TYXML ?= $(USE_TYXML)
+ 
+ 
+ NATDYNLINK ?= $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi)
  
  METAOCAML ?= 0