diff options
Diffstat (limited to 'devel')
35 files changed, 122 insertions, 50 deletions
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile index 5ac9f9aca82e..d6a441db0e22 100644 --- a/devel/aifad/Makefile +++ b/devel/aifad/Makefile @@ -13,6 +13,7 @@ LICENSE= LGPL21+ BUILD_DEPENDS= menhir:devel/menhir \ ocaml-cfg>0:devel/ocaml-cfg \ + ocamlbuild:devel/ocaml-ocamlbuild \ ocaml-pcre>0:devel/ocaml-pcre \ ocaml-res>0:devel/ocaml-res LIB_DEPENDS= libpcre.so:devel/pcre diff --git a/devel/cil/Makefile b/devel/cil/Makefile index e20f321b05ee..6b1debbccdd7 100644 --- a/devel/cil/Makefile +++ b/devel/cil/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= ccured-[0-9]* +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + ONLY_FOR_ARCHS= i386 amd64 USES= gmake perl5 USE_OCAML= yes diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile index 6a18864494fc..b1d88c8055be 100644 --- a/devel/menhir/Makefile +++ b/devel/menhir/Makefile @@ -12,6 +12,8 @@ COMMENT= LR(1) parser generator for OCaml LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= gmake shebangfix USE_OCAML= yes USE_OCAML_FINDLIB= yes diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index fa73b17c913d..15e6c6b53f27 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -23,6 +23,7 @@ post-patch: -e "s,^\(CC=\).*,#\&,g" \ -e "s,i386,${ARCH},g" \ ${WRKSRC}/Makefile.config + @${REINPLACE_CMD} -e 's,(int64,&_t,' ${WRKSRC}/lib/jnistubs.c test: @${ECHO_CMD} "Testing IDL library" diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile index 56692428b933..07d08c901f6a 100644 --- a/devel/ocaml-camlp4/Makefile +++ b/devel/ocaml-camlp4/Makefile @@ -2,16 +2,17 @@ # $FreeBSD$ PORTNAME= camlp4 -PORTVERSION= 4.02.1+1 -PORTREVISION= 1 +PORTVERSION= 4.05+2 CATEGORIES= devel PKGNAMEPREFIX= ocaml- MAINTAINER= michipili@gmail.com -COMMENT= Camlp4 is a system for writing extensible parsers for OCaml +COMMENT= System for writing extensible parsers for OCaml LICENSE= LGPL20 +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_GITHUB= yes GH_ACCOUNT= ocaml diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo index dafc83be6c4b..058ba6be8a87 100644 --- a/devel/ocaml-camlp4/distinfo +++ b/devel/ocaml-camlp4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464772487 -SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2 -SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754 +TIMESTAMP = 1533176554 +SHA256 (ocaml-camlp4-4.05+2_GH0.tar.gz) = db242c0f4896ddd9dc7d6e8064cba8bf099fb9a4d4f5ed35120978501cd3a935 +SIZE (ocaml-camlp4-4.05+2_GH0.tar.gz) = 647609 diff --git a/devel/ocaml-camlp4/files/patch-Makefile b/devel/ocaml-camlp4/files/patch-Makefile index bf1e1fab001b..7e45c5769b8a 100644 --- a/devel/ocaml-camlp4/files/patch-Makefile +++ b/devel/ocaml-camlp4/files/patch-Makefile @@ -1,18 +1,11 @@ ---- Makefile.orig 2014-10-21 11:41:15 UTC +--- Makefile.orig 2017-10-11 20:17:38 UTC +++ Makefile -@@ -19,12 +19,12 @@ all: byte native +@@ -21,7 +21,7 @@ all: byte native .PHONY: install install: -- ./build/install.sh -+ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh +- env DESTDIR=$(DESTDIR) sh ./build/install.sh ++ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) sh ./build/install.sh .PHONY: install-META install-META: camlp4/META -- mkdir -p ${PKGDIR}/camlp4/ -- cp -f camlp4/META ${PKGDIR}/camlp4/ -+ mkdir -p ${DESTDIR}${PKGDIR}/camlp4/ -+ cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/ - - camlp4/META: camlp4/META.in - sed -e s/@@VERSION@@/${version}/g $? > $@ diff --git a/devel/ocaml-camlp4/files/patch-build_install.sh b/devel/ocaml-camlp4/files/patch-build_install.sh deleted file mode 100644 index b99f59baa514..000000000000 --- a/devel/ocaml-camlp4/files/patch-build_install.sh +++ /dev/null @@ -1,13 +0,0 @@ ---- build/install.sh.orig 2014-10-21 11:41:15 UTC -+++ build/install.sh -@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}" - - . ./config.sh - --BINDIR="${SAVED_BINDIR:-${BINDIR}}" --LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}" -+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}" -+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}" - - not_installed=$PWD/_build/not_installed - diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile index 9e89e1ccf7a0..44968a05da5f 100644 --- a/devel/ocaml-camlp5/Makefile +++ b/devel/ocaml-camlp5/Makefile @@ -2,11 +2,8 @@ # $FreeBSD$ PORTNAME= camlp5 -PORTVERSION= 6.16 +PORTVERSION= 7.07 CATEGORIES= devel -MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \ - http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \ - http://pauillac.inria.fr/~ddr/camlp5/distrib/src/ PKGNAMEPREFIX= ocaml- DIST_SUBDIR= ${PKGBASE} @@ -19,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= tar:tgz +USE_GITHUB= yes +GH_TAGNAME= rel${PORTVERSION:S/.//} USE_OCAML= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} diff --git a/devel/ocaml-camlp5/distinfo b/devel/ocaml-camlp5/distinfo index 2f717af62e5e..2ff8c4ba9974 100644 --- a/devel/ocaml-camlp5/distinfo +++ b/devel/ocaml-camlp5/distinfo @@ -1,2 +1,3 @@ -SHA256 (ocaml-camlp5/camlp5-6.16.tgz) = fd446cff6421f5144a521c7cecfdc7217b1424908186cddd3d5be543b35058b1 -SIZE (ocaml-camlp5/camlp5-6.16.tgz) = 759877 +TIMESTAMP = 1539160056 +SHA256 (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = a2c493b833b217adf94d2000eb19015b990c4e441beb35cf36b1d33ed2351991 +SIZE (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = 813500 diff --git a/devel/ocaml-camlp5/pkg-plist b/devel/ocaml-camlp5/pkg-plist index 5c24601eb7d4..60b8267cd96f 100644 --- a/devel/ocaml-camlp5/pkg-plist +++ b/devel/ocaml-camlp5/pkg-plist @@ -8,6 +8,8 @@ bin/mkcamlp5 bin/mkcamlp5.opt bin/ocpp5 lib/ocaml/camlp5/META +lib/ocaml/camlp5/ast2pt.cmi +lib/ocaml/camlp5/ast2pt.mli lib/ocaml/camlp5/camlp5.a lib/ocaml/camlp5/camlp5.cma lib/ocaml/camlp5/camlp5.cmxa diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile index 10403728c39e..1611427e132a 100644 --- a/devel/ocaml-cfg/Makefile +++ b/devel/ocaml-cfg/Makefile @@ -14,6 +14,7 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= menhir:devel/menhir +BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild USE_GITHUB= yes GH_ACCOUNT= mmottl diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile index 9ed9bb4edf60..e2b33c7d6fa8 100644 --- a/devel/ocaml-cmdliner/Makefile +++ b/devel/ocaml-cmdliner/Makefile @@ -11,6 +11,8 @@ COMMENT= OCaml module for handling of command line interfaces LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes USE_OCAML_FINDLIB= yes diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile index dc00badf524f..5e5a9d371bdf 100644 --- a/devel/ocaml-deriving-ocsigen/Makefile +++ b/devel/ocaml-deriving-ocsigen/Makefile @@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Function derivation library +BROKEN= old version, incompatible with modern OCaml + LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 2b1e3e361493..f85b742948a0 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -36,12 +36,18 @@ TOOLBOX_CONFIGURE_ON= -with-toolbox TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} +.include <bsd.port.pre.mk> + post-install: cd ${STAGEDIR}${PREFIX} && \ ${STRIP_CMD} bin/ocamlfind \ ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs +# Spacetime profiling is only available for native code on 64-bit targets +.if ${ARCH} == i386 || ${ARCH} == powerpc + @${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST} +.endif post-install-TOOLBOX-on: ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ @@ -52,4 +58,4 @@ post-install-DOCS-on: cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ "! -regex .*ref-man.*" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist index 7ccae20246da..8d0cad0e5353 100644 --- a/devel/ocaml-findlib/pkg-plist +++ b/devel/ocaml-findlib/pkg-plist @@ -40,8 +40,8 @@ bin/safe_camlp4 %%OCAML_SITELIBDIR%%/num-top/num_top.cmi %%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi %%OCAML_SITELIBDIR%%/num/META -%%OCAML_SITELIBDIR%%/ocamlbuild/META %%OCAML_SITELIBDIR%%/ocamldoc/META +%%OCAML_SITELIBDIR%%/raw_spacetime/META %%OCAML_SITELIBDIR%%/stdlib/META %%OCAML_SITELIBDIR%%/str/META %%OCAML_SITELIBDIR%%/threads/META diff --git a/devel/ocaml-ipaddr/Makefile b/devel/ocaml-ipaddr/Makefile index 1be028492abe..fbbddf62f1bd 100644 --- a/devel/ocaml-ipaddr/Makefile +++ b/devel/ocaml-ipaddr/Makefile @@ -9,6 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= OCaml library for manipulation of IP address representations BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib +BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib USE_GITHUB= yes diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index c4a56f0cce60..e7d7995aed44 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -14,6 +14,8 @@ COMMENT= OCaml interface to BLAS and LAPACK libraries LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.txt +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_OCAML= yes USE_OCAML_FINDLIB=yes USE_OCAMLFIND_PLIST=yes diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 4e10ef16d410..acaea76f556e 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -13,6 +13,7 @@ LICENSE= LGPL21 BUILD_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl +BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl @@ -51,6 +52,10 @@ DOCS_RUN_DEPENDS= ${SA_DIR}/text/text.a:textproc/ocaml-text post-patch: @${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \ ${WRKSRC}/setup.ml + @${REINPLACE_CMD} -e 's,| O_CLOEXEC,& | O_KEEPEXEC, \ + ; s,else Unix\.socketpair ,&?cloexec:None,' \ + ${WRKSRC}/src/unix/lwt_unix.ml \ + ${WRKSRC}/src/unix/lwt_unix.mli do-configure: cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS} diff --git a/devel/ocaml-ocamlbuild/Makefile b/devel/ocaml-ocamlbuild/Makefile index 9a8f097658e4..33572f7f6406 100644 --- a/devel/ocaml-ocamlbuild/Makefile +++ b/devel/ocaml-ocamlbuild/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ocamlbuild -PORTVERSION= 0.9.3 +PORTVERSION= 0.14.0 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -11,8 +11,6 @@ COMMENT= Build tool for OCaml libraries and programs LICENSE= GPLv2 -BROKEN= conflicts with ocaml - USES= gmake USE_GITHUB= yes GH_ACCOUNT= ocaml @@ -20,6 +18,4 @@ USE_OCAML= yes ALL_TARGET= configure all -MAKE_ARGS= CHECK_IF_PREINSTALLED=false # XXX: remove after 4.03.0+ - .include <bsd.port.mk> diff --git a/devel/ocaml-ocamlbuild/distinfo b/devel/ocaml-ocamlbuild/distinfo index bb51ddd13112..9a3197bb922e 100644 --- a/devel/ocaml-ocamlbuild/distinfo +++ b/devel/ocaml-ocamlbuild/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475804532 -SHA256 (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 32e4824906888c61244909eab0d2c22d31f18fc9579873a070a4cf7947c2c0a9 -SIZE (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 191583 +TIMESTAMP = 1550933160 +SHA256 (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78 +SIZE (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 198267 diff --git a/devel/ocaml-ocamlbuild/pkg-plist b/devel/ocaml-ocamlbuild/pkg-plist index 6f5e6bbab2eb..0ff52e89fc06 100644 --- a/devel/ocaml-ocamlbuild/pkg-plist +++ b/devel/ocaml-ocamlbuild/pkg-plist @@ -19,4 +19,7 @@ lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o lib/ocaml/ocamlbuild/ocamlbuildlib.a lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa +lib/ocaml/ocamlbuild/signatures.cmi +lib/ocaml/ocamlbuild/signatures.cmti lib/ocaml/ocamlbuild/signatures.mli +man/man1/ocamlbuild.1.gz diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index 21a30400e79d..8ec1bce70669 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -12,6 +12,8 @@ COMMENT= Minimalistic library allowing to exploit multicore architecture LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_GITHUB= yes GH_ACCOUNT= rdicosmo diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index 91c5232f5727..31b462f363ec 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -13,6 +13,7 @@ COMMENT= Perl compatible regular expressions for Objective Caml LICENSE= LGPL21 +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile index 573fd46ef438..2f97aa3eb7c8 100644 --- a/devel/ocaml-pomap/Makefile +++ b/devel/ocaml-pomap/Makefile @@ -13,6 +13,8 @@ COMMENT= OCaml library to maintain a list of partially ordered elements LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.txt +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_GITHUB= yes GH_ACCOUNT= mmottl diff --git a/devel/ocaml-ppx-tools/Makefile b/devel/ocaml-ppx-tools/Makefile index 829f9b32fc8e..2167037710bd 100644 --- a/devel/ocaml-ppx-tools/Makefile +++ b/devel/ocaml-ppx-tools/Makefile @@ -3,7 +3,8 @@ PORTNAME= ppx-tools PORTVERSION= 5.0 -DISTVERSIONSUFFIX= +4.02.0 +PORTREVISION= 1 +DISTVERSIONSUFFIX= +4.05.0 CATEGORIES= devel PKGNAMEPREFIX= ocaml- diff --git a/devel/ocaml-ppx-tools/distinfo b/devel/ocaml-ppx-tools/distinfo index 71ac38e209e7..e05e5a0424e8 100644 --- a/devel/ocaml-ppx-tools/distinfo +++ b/devel/ocaml-ppx-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1462286829 -SHA256 (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 2c9b80f1755a6155820fc165b603f7184998ec2f097ff2c74169a2f86c264f66 -SIZE (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 17443 +TIMESTAMP = 1488115400 +SHA256 (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 031e05e2f98fd77a412cff00f19262e186b0c8a1804fece06d2af05e37a563b7 +SIZE (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 17893 diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile index 4ebd04ada0de..b7311d3af7f5 100644 --- a/devel/ocaml-re/Makefile +++ b/devel/ocaml-re/Makefile @@ -12,6 +12,8 @@ COMMENT= Pure OCaml regular expressions LICENSE= LGPL21 +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= gmake HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile index 06c01db9eb5b..f33cdd266c23 100644 --- a/devel/ocaml-react/Makefile +++ b/devel/ocaml-react/Makefile @@ -12,6 +12,8 @@ COMMENT= OCaml module for functional reactive programming LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes OPTIONS_DEFINE= X11 diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile index c8de3cdb1f32..4bd4495e3340 100644 --- a/devel/ocaml-res/Makefile +++ b/devel/ocaml-res/Makefile @@ -13,6 +13,8 @@ COMMENT= Automatically Resizing Contiguous Memory for OCaml LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.txt +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_OCAML= yes USE_OCAML_FINDLIB=yes USE_OCAMLFIND_PLIST=yes diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index f8a5f9150b66..62b25e3f3b6a 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -16,6 +16,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt BUILD_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv +BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv OPTIONS_DEFINE= DOCS diff --git a/devel/ocaml-sexplib/files/patch-lib_conv.ml b/devel/ocaml-sexplib/files/patch-lib_conv.ml new file mode 100644 index 000000000000..4e1382e8aa58 --- /dev/null +++ b/devel/ocaml-sexplib/files/patch-lib_conv.ml @@ -0,0 +1,46 @@ +From cba80ebe02962504fbe404b1baf484a5000f44b4 +From: Jeremie Dimino <jdimino@janestreet.com> +Date: Tue, 12 Jul 2016 17:08:10 +0100 +Subject: [PATCH] 114.01+04 + +--- lib/conv.ml.orig 2016-03-09 15:44:55 UTC ++++ lib/conv.ml +@@ -185,7 +185,7 @@ module Exn_converter = struct + + (* [Obj.extension_id] works on both the exception itself, and the extension slot of the + exception. *) +- let rec clean_up_handler (slot : Obj.t) = ++ let rec clean_up_handler (slot : extension_constructor) = + let id = Obj.extension_id slot in + let old_exn_id_map = !exn_id_map in + let new_exn_id_map = Exn_ids.remove id old_exn_id_map in +@@ -196,7 +196,7 @@ module Exn_converter = struct + exn_id_map := new_exn_id_map + + let add_auto ?(finalise = true) exn sexp_of_exn = +- let id = Obj.extension_id exn in ++ let id = Obj.extension_id (Obj.extension_constructor exn) in + let rec loop () = + let old_exn_id_map = !exn_id_map in + let new_exn_id_map = Exn_ids.add id sexp_of_exn old_exn_id_map in +@@ -205,13 +205,18 @@ module Exn_converter = struct + loop () + else begin + exn_id_map := new_exn_id_map; +- if finalise then Gc.finalise clean_up_handler (Obj.extension_slot exn) ++ if finalise then ++ try ++ Gc.finalise clean_up_handler (Obj.extension_constructor exn) ++ with Invalid_argument _ -> ++ (* Pre-allocated extension constructors cannot be finalised *) ++ () + end + in + loop () + + let find_auto exn = +- let id = Obj.extension_id exn in ++ let id = Obj.extension_id (Obj.extension_constructor exn) in + match Exn_ids.find id !exn_id_map with + | exception Not_found -> None + | sexp_of_exn -> Some (sexp_of_exn exn) diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile index 274a6af1ba1d..d77ca0aba611 100644 --- a/devel/ocaml-type_conv/Makefile +++ b/devel/ocaml-type_conv/Makefile @@ -13,6 +13,8 @@ COMMENT= Type conversion routines for OCaml LICENSE= APACHE20 BSD3CLAUSE LICENSE_COMB= multi +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + OPTIONS_DEFINE= DOCS CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} diff --git a/devel/ocaml-ulex/Makefile b/devel/ocaml-ulex/Makefile index 196b0538b147..7ca760b0554e 100644 --- a/devel/ocaml-ulex/Makefile +++ b/devel/ocaml-ulex/Makefile @@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Lexer generator for Unicode and OCaml +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= gmake USE_OCAML= true USE_OCAML_FINDLIB= true diff --git a/devel/ocaml-uutf/Makefile b/devel/ocaml-uutf/Makefile index ea05a254fb2b..2431c0b25dce 100644 --- a/devel/ocaml-uutf/Makefile +++ b/devel/ocaml-uutf/Makefile @@ -12,6 +12,8 @@ COMMENT= Non-blocking streaming Unicode codec for OCaml LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes |