diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/js_of_ocaml/Makefile | 13 | ||||
-rw-r--r-- | devel/js_of_ocaml/PLIST | 51 | ||||
-rw-r--r-- | devel/js_of_ocaml/distinfo | 14 | ||||
-rw-r--r-- | devel/js_of_ocaml/patches/patch-Makefile | 8 | ||||
-rw-r--r-- | devel/js_of_ocaml/patches/patch-Makefile.conf | 18 |
5 files changed, 79 insertions, 25 deletions
diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile index 6ccff095c06..df70a932c10 100644 --- a/devel/js_of_ocaml/Makefile +++ b/devel/js_of_ocaml/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2015/08/07 11:20:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.11 2016/02/06 14:00:13 jaapb Exp $ # -DISTNAME= 2.5 -PKGNAME= js_of_ocaml-${DISTNAME} -PKGREVISION= 3 +GITHUB_PROJECT= js_of_ocaml +DISTNAME= ${GITHUB_PROJECT}-2.7 CATEGORIES= devel -MASTER_SITES= https://github.com/ocsigen/js_of_ocaml/archive/ -DIST_SUBDIR= js_of_ocaml +MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://ocsigen.org/js_of_ocaml/ @@ -23,10 +21,13 @@ MAKE_ENV= BINDIR=${DESTDIR}/${PREFIX}/bin DESTDIR=${DESTDIR} OCAML_SITELIBDIR=${ MAKE_JOBS_SAFE= no .include "options.mk" +.include "../../devel/ocaml-base64/buildlink3.mk" .include "../../devel/ocaml-cmdliner/buildlink3.mk" +.include "../../devel/ocaml-cppo/buildlink3.mk" .include "../../devel/ocaml-lwt/buildlink3.mk" .include "../../devel/ocaml-optcomp/buildlink3.mk" BUILDLINK_API_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6 +.include "../../devel/ocaml-ppx_tools/buildlink3.mk" .include "../../lang/camlp4/buildlink3.mk" .include "../../mk/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/js_of_ocaml/PLIST b/devel/js_of_ocaml/PLIST index 09a3e518859..276d351861a 100644 --- a/devel/js_of_ocaml/PLIST +++ b/devel/js_of_ocaml/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/01/20 16:09:15 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/02/06 14:00:13 jaapb Exp $ @unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/js_of_ocaml bin/js_of_ocaml bin/jsoo_minify @@ -6,6 +6,7 @@ bin/jsoo_mkcmis bin/jsoo_mktop ${OCAML_SITELIB}/js_of_ocaml/META ${OCAML_SITELIB}/js_of_ocaml/array.js +${OCAML_SITELIB}/js_of_ocaml/bigarray.js ${OCAML_SITELIB}/js_of_ocaml/cSS.cmi ${OCAML_SITELIB}/js_of_ocaml/cSS.mli ${OCAML_SITELIB}/js_of_ocaml/classlist.js @@ -34,6 +35,7 @@ ${OCAML_SITELIB}/js_of_ocaml/dom_html.cmi ${OCAML_SITELIB}/js_of_ocaml/dom_html.mli ${OCAML_SITELIB}/js_of_ocaml/dom_svg.cmi ${OCAML_SITELIB}/js_of_ocaml/dom_svg.mli +${OCAML_SITELIB}/js_of_ocaml/dynlink.js ${OCAML_SITELIB}/js_of_ocaml/eventSource.cmi ${OCAML_SITELIB}/js_of_ocaml/eventSource.mli ${OCAML_SITELIB}/js_of_ocaml/file.cmi @@ -42,19 +44,44 @@ ${OCAML_SITELIB}/js_of_ocaml/firebug.cmi ${OCAML_SITELIB}/js_of_ocaml/firebug.mli ${OCAML_SITELIB}/js_of_ocaml/form.cmi ${OCAML_SITELIB}/js_of_ocaml/form.mli +${OCAML_SITELIB}/js_of_ocaml/fs.js +${OCAML_SITELIB}/js_of_ocaml/gc.js +${OCAML_SITELIB}/js_of_ocaml/geolocation.cmi +${OCAML_SITELIB}/js_of_ocaml/geolocation.mli ${OCAML_SITELIB}/js_of_ocaml/graphics.js +${OCAML_SITELIB}/js_of_ocaml/ieee_754.js +${OCAML_SITELIB}/js_of_ocaml/int64.js +${OCAML_SITELIB}/js_of_ocaml/internalMod.js +${OCAML_SITELIB}/js_of_ocaml/io.js ${OCAML_SITELIB}/js_of_ocaml/js.cmi ${OCAML_SITELIB}/js_of_ocaml/js.mli ${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.cma +${OCAML_SITELIB}/js_of_ocaml/jslib.js +${OCAML_SITELIB}/js_of_ocaml/jslib_js_of_ocaml.js ${OCAML_SITELIB}/js_of_ocaml/json.cmi ${OCAML_SITELIB}/js_of_ocaml/json.mli +${OCAML_SITELIB}/js_of_ocaml/json2.js ${OCAML_SITELIB}/js_of_ocaml/jsonp.cmi ${OCAML_SITELIB}/js_of_ocaml/jsonp.mli ${OCAML_SITELIB}/js_of_ocaml/jsooTop.cmi ${OCAML_SITELIB}/js_of_ocaml/jsooTop.cmo ${OCAML_SITELIB}/js_of_ocaml/jsooTop.mli +${OCAML_SITELIB}/js_of_ocaml/jsooTopCamlp4.cmo +${OCAML_SITELIB}/js_of_ocaml/jsooTopError.cmi +${OCAML_SITELIB}/js_of_ocaml/jsooTopError.cmo +${OCAML_SITELIB}/js_of_ocaml/jsooTopError.mli +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.a +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.cma +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.cmi +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.cmx +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.cmxa +${OCAML_SITELIB}/js_of_ocaml/jsoo_findlib_support.cmxs +${OCAML_SITELIB}/js_of_ocaml/jstable.cmi +${OCAML_SITELIB}/js_of_ocaml/jstable.mli ${OCAML_SITELIB}/js_of_ocaml/keycode.cmi ${OCAML_SITELIB}/js_of_ocaml/keycode.mli +${OCAML_SITELIB}/js_of_ocaml/lexing.js +${OCAML_SITELIB}/js_of_ocaml/lib_version.cmi ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/libjs_of_ocaml.a ${OCAML_SITELIB}/js_of_ocaml/logger.cma ${OCAML_SITELIB}/js_of_ocaml/lwt_js.cmi @@ -63,6 +90,11 @@ ${OCAML_SITELIB}/js_of_ocaml/lwt_js_events.cmi ${OCAML_SITELIB}/js_of_ocaml/lwt_js_events.mli ${OCAML_SITELIB}/js_of_ocaml/lwt_log_js.cmi ${OCAML_SITELIB}/js_of_ocaml/lwt_log_js.mli +${OCAML_SITELIB}/js_of_ocaml/marshal.js +${OCAML_SITELIB}/js_of_ocaml/md5.js +${OCAML_SITELIB}/js_of_ocaml/mlString.js +${OCAML_SITELIB}/js_of_ocaml/mutationObserver.cmi +${OCAML_SITELIB}/js_of_ocaml/mutationObserver.mli ${OCAML_SITELIB}/js_of_ocaml/nat.js ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/ocamlbuild_js_of_ocaml.a ${OCAML_SITELIB}/js_of_ocaml/ocamlbuild_js_of_ocaml.cma @@ -78,21 +110,34 @@ ${OCAML_SITELIB}/js_of_ocaml/pa_deriving_Json.mli ${OCAML_SITELIB}/js_of_ocaml/pa_js.cmo ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/pa_js.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/pa_js.cmxs +${OCAML_SITELIB}/js_of_ocaml/parsing.js +${OCAML_SITELIB}/js_of_ocaml/ppx_js +${OCAML_SITELIB}/js_of_ocaml/ppx_js.cma +${OCAML_SITELIB}/js_of_ocaml/ppx_js.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/ppx_js.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/ppx_js.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/ppx_js.cmxs +${OCAML_SITELIB}/js_of_ocaml/ppx_js.mli +${OCAML_SITELIB}/js_of_ocaml/ppx_js_bin.cmi +${OCAML_SITELIB}/js_of_ocaml/predefined_exceptions.js ${OCAML_SITELIB}/js_of_ocaml/regexp.cmi ${OCAML_SITELIB}/js_of_ocaml/regexp.mli ${OCAML_SITELIB}/js_of_ocaml/runtime.js +${OCAML_SITELIB}/js_of_ocaml/stdlib.js +${OCAML_SITELIB}/js_of_ocaml/string.js ${OCAML_SITELIB}/js_of_ocaml/sys_js.cmi ${OCAML_SITELIB}/js_of_ocaml/sys_js.mli ${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.cma ${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/unix.js ${OCAML_SITELIB}/js_of_ocaml/url.cmi ${OCAML_SITELIB}/js_of_ocaml/url.mli ${OCAML_SITELIB}/js_of_ocaml/weak.js @@ -100,6 +145,8 @@ ${OCAML_SITELIB}/js_of_ocaml/webGL.cmi ${OCAML_SITELIB}/js_of_ocaml/webGL.mli ${OCAML_SITELIB}/js_of_ocaml/webSockets.cmi ${OCAML_SITELIB}/js_of_ocaml/webSockets.mli +${OCAML_SITELIB}/js_of_ocaml/worker.cmi +${OCAML_SITELIB}/js_of_ocaml/worker.mli ${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmi ${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.mli @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/js_of_ocaml diff --git a/devel/js_of_ocaml/distinfo b/devel/js_of_ocaml/distinfo index 611abae5d79..8427e208090 100644 --- a/devel/js_of_ocaml/distinfo +++ b/devel/js_of_ocaml/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 03:27:36 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/02/06 14:00:13 jaapb Exp $ -SHA1 (js_of_ocaml/2.5.tar.gz) = d3871a5a054f775134662ffb1886a22adc6dcf56 -RMD160 (js_of_ocaml/2.5.tar.gz) = c586e6d33f182dac10c3d6270f8b095a500c3894 -SHA512 (js_of_ocaml/2.5.tar.gz) = 5a69993dbb5e6dd763a1b43cf2fee7de7000c91e8cb473379445603a0592941dc9c67c7591f322dca1c7fedd8d3df2cd79e2a9716204b5642a9d2999de1db82d -Size (js_of_ocaml/2.5.tar.gz) = 1249680 bytes -SHA1 (patch-Makefile) = a1ef24c53bce499e56fefb4e141d79bb8701528d -SHA1 (patch-Makefile.conf) = 30e429cd5193326514420a955878f5d91718e7c6 +SHA1 (js_of_ocaml-2.7.tar.gz) = 38cf61fd0963d3cd9414c5c2f619dfed75118687 +RMD160 (js_of_ocaml-2.7.tar.gz) = d1a6f659a46a73b8a31560e1b7a41ee3e7f4938c +SHA512 (js_of_ocaml-2.7.tar.gz) = ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b +Size (js_of_ocaml-2.7.tar.gz) = 1304487 bytes +SHA1 (patch-Makefile) = 9268aaa9bfb7aedda30a9a0356d6caa531c88f34 +SHA1 (patch-Makefile.conf) = 528bb6922649f0a07e760e45a8f70d13287277d2 diff --git a/devel/js_of_ocaml/patches/patch-Makefile b/devel/js_of_ocaml/patches/patch-Makefile index 78f853fe0c4..ea3985cad5c 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.3 2014/10/09 21:18:05 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.4 2016/02/06 14:01:13 jaapb Exp $ Install to DESTDIR ---- Makefile.orig 2014-09-30 14:40:37.000000000 +0000 +--- Makefile.orig 2016-01-25 19:35:03.000000000 +0000 +++ Makefile @@ -47,7 +47,7 @@ VERSION := $(shell head -n 1 VERSION) install: install-lib install-bin install-lib: -- ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) -+ ocamlfind install -ldconf ignore -destdir ${DESTDIR}/${PREFIX}/${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) +- ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) ${OCAMLFIND_BIN} ++ ocamlfind install -ldconf ignore -destdir ${DESTDIR}/${PREFIX}/${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) ${OCAMLFIND_BIN} install-bin: install -d -m 755 $(BINDIR) diff --git a/devel/js_of_ocaml/patches/patch-Makefile.conf b/devel/js_of_ocaml/patches/patch-Makefile.conf index 9d3e12157ba..553e956279d 100644 --- a/devel/js_of_ocaml/patches/patch-Makefile.conf +++ b/devel/js_of_ocaml/patches/patch-Makefile.conf @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile.conf,v 1.3 2015/01/20 16:09:16 jaapb Exp $ +$NetBSD: patch-Makefile.conf,v 1.4 2016/02/06 14:01:13 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.orig 2016-01-25 19:35:03.000000000 +0000 +++ Makefile.conf @@ -1,6 +1,6 @@ @@ -12,19 +12,25 @@ Also determine tyxml and react usage based on options rather than detection #### -@@ -39,12 +39,12 @@ WITH_DERIVING ?= $(shell if [ -f `ocamlf +@@ -40,8 +40,8 @@ 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) ++WITH_REACT ?= ${USE_REACT} ++WITH_TYXML ?= ${USE_TYXML} + WITH_FINDLIB?=YES - NATDYNLINK ?= $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi) +@@ -60,7 +60,7 @@ endif METAOCAML ?= 0 -VERSION_GIT := $(shell git log -n1 --pretty=format:%h 2> /dev/null) +#VERSION_GIT := $(shell git log -n1 --pretty=format:%h 2> /dev/null) + + %.ml: %.cppo.ml +- cppo $< -o $@ -V OCAML:`ocamlc -version` +\ No newline at end of file ++ cppo $< -o $@ -V OCAML:`ocamlc -version` |