Date: Mon, 24 Jun 2019 10:14:57 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505020 - in head: converters/ocaml-base64 converters/ocaml-jsonm databases/ocaml-sqlite3 devel/aifad devel/cil devel/menhir devel/ocaml-camljava devel/ocaml-camlp4 devel/ocaml-camlp4/f... Message-ID: <201906241014.x5OAEvgn033719@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jun 24 10:14:57 2019 New Revision: 505020 URL: https://svnweb.freebsd.org/changeset/ports/505020 Log: Update OCaml to version 4.05.0 (this is the last version where strings are unsafe by default, which is the main motivation why it was picked, but not the very latest one) and synchronize the rest of the stack and dependent ports with it, particularly: - Update `devel/ocaml-ocamlbuild' to version 0.14.0 and unbreak, register build dependency on all ports that require it (should be part of USE_OCAML, but we do not want to make any Mk-related changes the for time being) - Update `devel/ocaml-camlp4' to version 4.05+2 - Update `devel/ocaml-camlp5' to version 7.07 (the project had moved to GitHub) - Mark `devel/ocaml-deriving-ocsigen' as BROKEN for now, it is very outdated and requires quite a lot of work - Update `x11-toolkits/ocaml-labltk' to version 8.06.3 PR: 218333 Exp-run by: antoine Added: head/devel/ocaml-sexplib/files/ head/devel/ocaml-sexplib/files/patch-lib_conv.ml (contents, props changed) head/security/sks/files/debian-bug-870150 (contents, props changed) head/security/sks/files/patch-Makefile (contents, props changed) Deleted: head/devel/ocaml-camlp4/files/patch-build_install.sh Modified: head/converters/ocaml-base64/Makefile head/converters/ocaml-jsonm/Makefile head/databases/ocaml-sqlite3/Makefile head/devel/aifad/Makefile head/devel/cil/Makefile head/devel/menhir/Makefile head/devel/ocaml-camljava/Makefile head/devel/ocaml-camlp4/Makefile head/devel/ocaml-camlp4/distinfo head/devel/ocaml-camlp4/files/patch-Makefile head/devel/ocaml-camlp5/Makefile head/devel/ocaml-camlp5/distinfo head/devel/ocaml-camlp5/pkg-plist head/devel/ocaml-cfg/Makefile head/devel/ocaml-cmdliner/Makefile head/devel/ocaml-deriving-ocsigen/Makefile head/devel/ocaml-findlib/Makefile head/devel/ocaml-findlib/pkg-plist head/devel/ocaml-ipaddr/Makefile head/devel/ocaml-lacaml/Makefile head/devel/ocaml-lwt/Makefile head/devel/ocaml-ocamlbuild/Makefile head/devel/ocaml-ocamlbuild/distinfo head/devel/ocaml-ocamlbuild/pkg-plist head/devel/ocaml-parmap/Makefile head/devel/ocaml-pcre/Makefile head/devel/ocaml-pomap/Makefile head/devel/ocaml-ppx-tools/Makefile head/devel/ocaml-ppx-tools/distinfo head/devel/ocaml-re/Makefile head/devel/ocaml-react/Makefile head/devel/ocaml-res/Makefile head/devel/ocaml-sexplib/Makefile head/devel/ocaml-type_conv/Makefile head/devel/ocaml-ulex/Makefile head/devel/ocaml-uutf/Makefile head/lang/ocaml-camlidl/Makefile head/lang/ocaml/Makefile head/lang/ocaml/distinfo head/lang/ocaml/files/patch-configure head/lang/ocaml/pkg-descr head/lang/ocaml/pkg-plist head/math/facile/Makefile head/math/ocamlgsl/Makefile head/net-p2p/mldonkey/Makefile head/security/ocaml-cryptokit/Makefile head/security/sks/Makefile head/textproc/hevea/Makefile head/textproc/ocaml-text/Makefile head/x11-toolkits/ocaml-labltk/Makefile head/x11-toolkits/ocaml-labltk/distinfo Modified: head/converters/ocaml-base64/Makefile ============================================================================== --- head/converters/ocaml-base64/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/converters/ocaml-base64/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -10,6 +10,8 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Base64 encoding and decoding in OCaml +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_GITHUB= yes GH_ACCOUNT= mirage GH_PROJECT= ocaml-base64 Modified: head/converters/ocaml-jsonm/Makefile ============================================================================== --- head/converters/ocaml-jsonm/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/converters/ocaml-jsonm/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -13,6 +13,7 @@ COMMENT= Non-blocking streaming JSON codec for OCaml LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf +BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild RUN_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf USES= tar:tbz Modified: head/databases/ocaml-sqlite3/Makefile ============================================================================== --- head/databases/ocaml-sqlite3/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/databases/ocaml-sqlite3/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -15,6 +15,8 @@ LICENSE_NAME= OCaml-SQLite3 unique permissive license LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= compiler:features gmake pkgconfig sqlite USE_OCAML= yes USE_OCAML_FINDLIB= yes Modified: head/devel/aifad/Makefile ============================================================================== --- head/devel/aifad/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/aifad/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/cil/Makefile ============================================================================== --- head/devel/cil/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/cil/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/menhir/Makefile ============================================================================== --- head/devel/menhir/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/menhir/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-camljava/Makefile ============================================================================== --- head/devel/ocaml-camljava/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camljava/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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" Modified: head/devel/ocaml-camlp4/Makefile ============================================================================== --- head/devel/ocaml-camlp4/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp4/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -2,15 +2,16 @@ # $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 Modified: head/devel/ocaml-camlp4/distinfo ============================================================================== --- head/devel/ocaml-camlp4/distinfo Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp4/distinfo Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-camlp4/files/patch-Makefile ============================================================================== --- head/devel/ocaml-camlp4/files/patch-Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp4/files/patch-Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 $? > $@ Modified: head/devel/ocaml-camlp5/Makefile ============================================================================== --- head/devel/ocaml-camlp5/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp5/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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} Modified: head/devel/ocaml-camlp5/distinfo ============================================================================== --- head/devel/ocaml-camlp5/distinfo Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp5/distinfo Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-camlp5/pkg-plist ============================================================================== --- head/devel/ocaml-camlp5/pkg-plist Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-camlp5/pkg-plist Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-cfg/Makefile ============================================================================== --- head/devel/ocaml-cfg/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-cfg/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-cmdliner/Makefile ============================================================================== --- head/devel/ocaml-cmdliner/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-cmdliner/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -11,6 +11,8 @@ COMMENT= OCaml module for handling of command line int LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes USE_OCAML_FINDLIB= yes Modified: head/devel/ocaml-deriving-ocsigen/Makefile ============================================================================== --- head/devel/ocaml-deriving-ocsigen/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-deriving-ocsigen/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-findlib/Makefile ============================================================================== --- head/devel/ocaml-findlib/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-findlib/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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> Modified: head/devel/ocaml-findlib/pkg-plist ============================================================================== --- head/devel/ocaml-findlib/pkg-plist Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-findlib/pkg-plist Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-ipaddr/Makefile ============================================================================== --- head/devel/ocaml-ipaddr/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ipaddr/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-lacaml/Makefile ============================================================================== --- head/devel/ocaml-lacaml/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-lacaml/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-lwt/Makefile ============================================================================== --- head/devel/ocaml-lwt/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-lwt/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 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} Modified: head/devel/ocaml-ocamlbuild/Makefile ============================================================================== --- head/devel/ocaml-ocamlbuild/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ocamlbuild/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ocamlbuild -PORTVERSION= 0.9.3 +PORTVERSION= 0.14.0 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -11,15 +11,11 @@ COMMENT= Build tool for OCaml libraries and programs LICENSE= GPLv2 -BROKEN= conflicts with ocaml - USES= gmake USE_GITHUB= yes GH_ACCOUNT= ocaml USE_OCAML= yes ALL_TARGET= configure all - -MAKE_ARGS= CHECK_IF_PREINSTALLED=false # XXX: remove after 4.03.0+ .include <bsd.port.mk> Modified: head/devel/ocaml-ocamlbuild/distinfo ============================================================================== --- head/devel/ocaml-ocamlbuild/distinfo Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ocamlbuild/distinfo Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-ocamlbuild/pkg-plist ============================================================================== --- head/devel/ocaml-ocamlbuild/pkg-plist Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ocamlbuild/pkg-plist Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-parmap/Makefile ============================================================================== --- head/devel/ocaml-parmap/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-parmap/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -12,6 +12,8 @@ COMMENT= Minimalistic library allowing to exploit mult LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USE_GITHUB= yes GH_ACCOUNT= rdicosmo Modified: head/devel/ocaml-pcre/Makefile ============================================================================== --- head/devel/ocaml-pcre/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-pcre/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -13,6 +13,7 @@ COMMENT= Perl compatible regular expressions for Objec LICENSE= LGPL21 +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes Modified: head/devel/ocaml-pomap/Makefile ============================================================================== --- head/devel/ocaml-pomap/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-pomap/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -13,6 +13,8 @@ COMMENT= OCaml library to maintain a list of partially 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 Modified: head/devel/ocaml-ppx-tools/Makefile ============================================================================== --- head/devel/ocaml-ppx-tools/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ppx-tools/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -3,7 +3,8 @@ PORTNAME= ppx-tools PORTVERSION= 5.0 -DISTVERSIONSUFFIX= +4.02.0 +PORTREVISION= 1 +DISTVERSIONSUFFIX= +4.05.0 CATEGORIES= devel PKGNAMEPREFIX= ocaml- Modified: head/devel/ocaml-ppx-tools/distinfo ============================================================================== --- head/devel/ocaml-ppx-tools/distinfo Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ppx-tools/distinfo Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-re/Makefile ============================================================================== --- head/devel/ocaml-re/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-re/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-react/Makefile ============================================================================== --- head/devel/ocaml-react/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-react/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -12,6 +12,8 @@ COMMENT= OCaml module for functional reactive programm LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes OPTIONS_DEFINE= X11 Modified: head/devel/ocaml-res/Makefile ============================================================================== --- head/devel/ocaml-res/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-res/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -13,6 +13,8 @@ COMMENT= Automatically Resizing Contiguous Memory for 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 Modified: head/devel/ocaml-sexplib/Makefile ============================================================================== --- head/devel/ocaml-sexplib/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-sexplib/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Added: head/devel/ocaml-sexplib/files/patch-lib_conv.ml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ocaml-sexplib/files/patch-lib_conv.ml Mon Jun 24 10:14:57 2019 (r505020) @@ -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) Modified: head/devel/ocaml-type_conv/Makefile ============================================================================== --- head/devel/ocaml-type_conv/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-type_conv/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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} Modified: head/devel/ocaml-ulex/Makefile ============================================================================== --- head/devel/ocaml-ulex/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-ulex/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -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 Modified: head/devel/ocaml-uutf/Makefile ============================================================================== --- head/devel/ocaml-uutf/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/devel/ocaml-uutf/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -12,6 +12,8 @@ COMMENT= Non-blocking streaming Unicode codec for OCam LICENSE= BSD3CLAUSE +BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild + USES= tar:tbz USE_OCAML= yes Modified: head/lang/ocaml-camlidl/Makefile ============================================================================== --- head/lang/ocaml-camlidl/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml-camlidl/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -35,6 +35,7 @@ post-extract: @${REINPLACE_CMD} -e \ "/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \ + -e 's,$$(OCAMLC),& -warn-error -a,' \ ${WRKSRC}/compiler/Makefile @${REINPLACE_CMD} -e \ Modified: head/lang/ocaml/Makefile ============================================================================== --- head/lang/ocaml/Makefile Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml/Makefile Mon Jun 24 10:14:57 2019 (r505020) @@ -3,7 +3,7 @@ # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated PORTNAME= ocaml -PORTVERSION= 4.02.3 +PORTVERSION= 4.05.0 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs @@ -118,7 +118,8 @@ post-patch: -e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \ - ${WRKSRC}/Makefile ${WRKSRC}/asmrun/Makefile \ + ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \ + ${WRKSRC}/asmrun/Makefile \ ${WRKSRC}/otherlibs/systhreads/Makefile \ ${WRKSRC}/testsuite/makefiles/Makefile.common \ ${WRKSRC}/testsuite/tests/asmcomp/Makefile @@ -127,7 +128,6 @@ post-configure: @${REINPLACE_CMD} -E \ -e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \ ${WRKSRC}/config/Makefile - # INSTALL* safeness (which preserves the correct permissions despite # user's umask(1) @${FIND} ${WRKDIR} -type f -name Makefile -print0 | \ @@ -149,6 +149,10 @@ post-install: (cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR} +.endif +# Spacetime profiling is only available for native code on 64-bit targets +.if ${ARCH} == i386 || ${ARCH} == powerpc + @${REINPLACE_CMD} -e '/raw_spacetime_lib/d' ${TMPPLIST} .endif .include <bsd.port.post.mk> Modified: head/lang/ocaml/distinfo ============================================================================== --- head/lang/ocaml/distinfo Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml/distinfo Mon Jun 24 10:14:57 2019 (r505020) @@ -1,8 +1,9 @@ -SHA256 (ocaml-4.02.3.tar.xz) = 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 -SIZE (ocaml-4.02.3.tar.xz) = 2058552 -SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8 -SIZE (ocaml-4.02-refman-html.tar.gz) = 612839 -SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a -SIZE (ocaml-4.02-refman.ps.gz) = 1111960 -SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8 -SIZE (ocaml-4.02-refman.pdf) = 1519190 +TIMESTAMP = 1532851883 +SHA256 (ocaml-4.05.0.tar.xz) = 04a527ba14b4d7d1b2ea7b2ae21aefecfa8d304399db94f35a96df1459e02ef9 +SIZE (ocaml-4.05.0.tar.xz) = 2442036 +SHA256 (ocaml-4.05-refman-html.tar.gz) = 2524723648dbbc34b42cbe2fe06822b79837299429d26ff037169b568888cd9c +SIZE (ocaml-4.05-refman-html.tar.gz) = 882287 +SHA256 (ocaml-4.05-refman.ps.gz) = 1540f86028a9460313b5ab3e0544e280052577d5dc4966f80647e1f49c5ab8df +SIZE (ocaml-4.05-refman.ps.gz) = 1221553 +SHA256 (ocaml-4.05-refman.pdf) = 3d3a82a676668ccf66fa6d88f46a2496c89b1488ee6098585a6b7f22a9171eef +SIZE (ocaml-4.05-refman.pdf) = 1741857 Modified: head/lang/ocaml/files/patch-configure ============================================================================== --- head/lang/ocaml/files/patch-configure Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml/files/patch-configure Mon Jun 24 10:14:57 2019 (r505020) @@ -1,62 +1,30 @@ ---- configure.orig 2015-05-12 14:46:37 UTC +--- configure.orig 2017-07-13 08:56:44 UTC +++ configure -@@ -446,7 +446,7 @@ esac - - # Configure compiler to use in further tests - --cc="$bytecc -O $bytecclinkopts" -+cc="$bytecc $bytecclinkopts" - export cc cclibs verbose - - # Check C compiler -@@ -688,9 +688,9 @@ if test $with_sharedlibs = "yes"; then - mksharedlib="$flexlink" - mkmaindll="$flexlink -maindll" - shared_libraries_supported=true;; -- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*) -+ *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*) - sharedcccompopts="-fPIC" -- mksharedlib="$bytecc -shared" -+ mksharedlib="$bytecc $bytecclinkopts -shared" - bytecclinkopts="$bytecclinkopts -Wl,-E" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," -@@ -790,9 +790,11 @@ if test $with_sharedlibs = "yes"; then - fi;; +@@ -838,6 +838,7 @@ if test $with_sharedlibs = "yes"; then x86_64-*-darwin*) natdynlink=true;; + s390x*-*-linux*) natdynlink=true;; powerpc*-*-linux*) natdynlink=true;; + powerpc*-*-freebsd*) natdynlink=true;; sparc*-*-linux*) natdynlink=true;; i686-*-kfreebsd*) natdynlink=true;; x86_64-*-kfreebsd*) natdynlink=true;; -+ x86_64-*-dragonfly*) natdynlink=true;; - i[3456]86-*-freebsd*) natdynlink=true;; - x86_64-*-freebsd*) natdynlink=true;; - i[3456]86-*-openbsd*) natdynlink=true;; -@@ -804,6 +806,7 @@ if test $with_sharedlibs = "yes"; then - arm*-*-linux*) natdynlink=true;; +@@ -854,6 +855,7 @@ if test $with_sharedlibs = "yes"; then arm*-*-freebsd*) natdynlink=true;; + earm*-*-netbsd*) natdynlink=true;; aarch64-*-linux*) natdynlink=true;; + aarch64-*-freebsd*) natdynlink=true;; esac fi -@@ -844,6 +847,7 @@ case "$target" in - i[3456]86-*-gnu*) arch=i386; system=gnu;; - i[3456]86-*-mingw*) arch=i386; system=mingw;; - powerpc*-*-linux*) arch=power; model=ppc; system=elf;; +@@ -921,6 +923,7 @@ case "$target" in + powerpc*-*-linux*) arch=power; + if $arch64; then model=ppc64; else model=ppc; fi + system=elf;; + powerpc-*-freebsd*) arch=power; model=ppc; system=bsd_elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; - powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; -@@ -862,12 +866,14 @@ case "$target" in - zaurus*-*-openbsd*) arch=arm; system=bsd;; - x86_64-*-linux*) arch=amd64; system=linux;; - x86_64-*-gnu*) arch=amd64; system=gnu;; -+ x86_64-*-dragonfly*) arch=amd64; system=dragonfly;; - x86_64-*-freebsd*) arch=amd64; system=freebsd;; - x86_64-*-netbsd*) arch=amd64; system=netbsd;; - x86_64-*-openbsd*) arch=amd64; system=openbsd;; + s390x*-*-linux*) arch=s390x; model=z10; system=elf;; +@@ -946,6 +949,7 @@ case "$target" in x86_64-*-darwin*) arch=amd64; system=macosx;; x86_64-*-mingw*) arch=amd64; system=mingw;; aarch64-*-linux*) arch=arm64; system=linux;; @@ -64,106 +32,25 @@ x86_64-*-cygwin*) arch=amd64; system=cygwin;; esac -@@ -889,7 +895,7 @@ else - fi - - nativecccompopts='' --nativecclinkopts='' -+nativecclinkopts="" - # FIXME the naming of nativecclinkopts is broken: these are options for - # ld (for shared libs), not for cc - nativeccrpath="$byteccrpath" -@@ -932,6 +938,8 @@ case "$arch,$system" in - esac;; - arm,freebsd) as="${TOOLPREF}cc -c" - aspp="${TOOLPREF}cc -c";; -+ *,dragonfly) as="${TOOLPREF}as" -+ aspp="${TOOLPREF}cc -c";; - *,freebsd) as="${TOOLPREF}as" - aspp="${TOOLPREF}cc -c";; - amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*) -@@ -955,9 +963,11 @@ case "$arch,$system" in +@@ -1051,10 +1055,12 @@ case "$arch,$system" in case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; - amd64,linux) profiling='prof';; - amd64,openbsd) profiling='prof';; -+ amd64,dragonfly) profiling='prof';; - amd64,freebsd) profiling='prof';; - amd64,netbsd) profiling='prof';; - amd64,gnu) profiling='prof';; -+ arm,freebsd) profiling='prof';; - arm,linux*) profiling='prof';; - power,elf) profiling='prof';; - power,bsd*) profiling='prof';; -@@ -1415,6 +1425,8 @@ if test "$pthread_wanted" = "yes"; then - case "$target" in - *-*-solaris*) pthread_link="-lpthread -lposix4" - pthread_caml_link="-cclib -lpthread -cclib -lposix4";; -+ *-*-dragon*) pthread_link="-pthread" -+ pthread_caml_link="-cclib -pthread";; - *-*-freebsd*) pthread_link="-pthread" - pthread_caml_link="-cclib -pthread";; - *-*-openbsd*) pthread_link="-pthread" -@@ -1431,7 +1443,7 @@ if test "$pthread_wanted" = "yes"; then - bytecccompopts="$bytecccompopts -D_REENTRANT" - nativecccompopts="$nativecccompopts -D_REENTRANT" - case "$target" in -- *-*-freebsd*) -+ *-*-freebsd*|*-*-dragonfly*) - bytecccompopts="$bytecccompopts -D_THREAD_SAFE" - nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; - *-*-openbsd*) -@@ -1601,6 +1613,7 @@ if test "$x11_include" = "not found"; then - else - x11_libs="-L$dir" - case "$target" in -+ *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";; - *-kfreebsd*-gnu) x11_link="-L$dir -lX11";; - *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";; - *) x11_link="-L$dir -lX11";; -@@ -1644,10 +1657,10 @@ echo "X11_LINK=$x11_link" >> Makefile - # Look for BFD library - - if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \ -- sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then -+ sh ./hasgot -DPACKAGE=ocaml -lbfd $dllib -liberty -lz bfd_openr; then - inf "BFD library found." - echo "#define HAS_LIBBFD" >> s.h -- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile -+ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile - else - wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files." - echo "LIBBFD_LINK=" >> Makefile -@@ -1686,12 +1699,6 @@ if $no_naked_pointers; then - echo "#define NO_NAKED_POINTERS" >> m.h - fi - --# Add Unix-style optimization flag --bytecccompopts="-O $bytecccompopts" --dllcccompopts="-O $dllcccompopts" --nativecccompopts="-O $nativecccompopts" --sharedcccompopts="-O $sharedcccompopts" -- - # Final twiddling of compiler options to work around known bugs - - nativeccprofopts="$nativecccompopts" -@@ -1701,6 +1708,11 @@ case "$buggycc" in - nativecccompopts="$nativecccompopts -fomit-frame-pointer";; - esac - -+# Allow user-defined C compiler flags -+ -+bytecccompopts="$bytecccompopts $CFLAGS" -+nativecccompopts="$nativecccompopts $CFLAGS" -+ - # Finish generated files - - cclibs="$cclibs $mathlib" -@@ -1723,7 +1735,7 @@ SYSLIB=-l\$(1) - MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1) - #ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;; + amd64,linux) profiling='true';; + amd64,openbsd) profiling='true';; ++ amd64,dragonfly) profiling='true';; + amd64,freebsd) profiling='true';; + amd64,netbsd) profiling='true';; + arm,netbsd) profiling='true';; + amd64,gnu) profiling='true';; ++ arm,freebsd) profiling='true';; + arm,linux*) profiling='true';; + power,elf) profiling='true';; + power,bsd*) profiling='true';; +@@ -2029,7 +2035,7 @@ MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib + #ml Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" + #ml out opts files out;; EOF -echo "ARCH=$arch" >> Makefile +echo "SYSTEM_ARCH=$arch" >> Makefile echo "MODEL=$model" >> Makefile echo "SYSTEM=$system" >> Makefile - echo "NATIVECC=$nativecc" >> Makefile + echo "NATIVECC=$nativecc $nativecccompopts" >> Makefile Modified: head/lang/ocaml/pkg-descr ============================================================================== --- head/lang/ocaml/pkg-descr Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml/pkg-descr Mon Jun 24 10:14:57 2019 (r505020) @@ -16,4 +16,4 @@ of processors. Compilation takes longer and generates the generated programs deliver excellent performance, while retaining the moderate memory requirements of the bytecode compiler. -WWW: http://caml.inria.fr/ocaml/ +WWW: http://ocaml.org/ Modified: head/lang/ocaml/pkg-plist ============================================================================== --- head/lang/ocaml/pkg-plist Mon Jun 24 10:14:07 2019 (r505019) +++ head/lang/ocaml/pkg-plist Mon Jun 24 10:14:57 2019 (r505020) @@ -49,6 +49,7 @@ %%PROF%%lib/ocaml/string.p.cmx %%PROF%%lib/ocaml/stringLabels.p.cmx %%PROF%%lib/ocaml/sys.p.cmx +%%PROF%%lib/ocaml/uchar.p.cmx %%PROF%%lib/ocaml/weak.p.cmx %%THREADS%%@dir lib/ocaml/threads %%THREADS%%lib/ocaml/caml/threads.h @@ -76,36 +77,51 @@ %%X11%%lib/ocaml/graphics.a %%X11%%lib/ocaml/graphics.cma %%X11%%lib/ocaml/graphics.cmi +%%X11%%lib/ocaml/graphics.cmti %%X11%%lib/ocaml/graphics.cmx %%X11%%lib/ocaml/graphics.cmxa %%X11%%lib/ocaml/graphics.cmxs %%X11%%lib/ocaml/graphics.mli %%X11%%lib/ocaml/graphicsX11.cmi +%%X11%%lib/ocaml/graphicsX11.cmti %%X11%%lib/ocaml/graphicsX11.cmx %%X11%%lib/ocaml/graphicsX11.mli %%X11%%lib/ocaml/libgraphics.a %%X11%%lib/ocaml/stublibs/dllgraphics.so bin/ocaml -bin/ocamlbuild -bin/ocamlbuild.byte -bin/ocamlbuild.native bin/ocamlc +bin/ocamlc.byte bin/ocamlc.opt bin/ocamlcp +bin/ocamlcp.byte +bin/ocamlcp.opt bin/ocamldebug bin/ocamldep +bin/ocamldep.byte bin/ocamldep.opt bin/ocamldoc bin/ocamldoc.opt bin/ocamllex +bin/ocamllex.byte bin/ocamllex.opt bin/ocamlmklib +bin/ocamlmklib.byte +bin/ocamlmklib.opt bin/ocamlmktop +bin/ocamlmktop.byte +bin/ocamlmktop.opt bin/ocamlobjinfo +bin/ocamlobjinfo.byte +bin/ocamlobjinfo.opt bin/ocamlopt +bin/ocamlopt.byte bin/ocamlopt.opt bin/ocamloptp +bin/ocamloptp.byte +bin/ocamloptp.opt bin/ocamlprof +bin/ocamlprof.byte +bin/ocamlprof.opt bin/ocamlrun bin/ocamlyacc lib/ocaml/Makefile.config @@ -119,6 +135,7 @@ lib/ocaml/arg.mli lib/ocaml/arg.p.cmt lib/ocaml/arith_flags.cmx lib/ocaml/arith_status.cmi +lib/ocaml/arith_status.cmti lib/ocaml/arith_status.cmx lib/ocaml/arith_status.mli lib/ocaml/array.cmi @@ -136,11 +153,13 @@ lib/ocaml/arrayLabels.ml lib/ocaml/arrayLabels.mli lib/ocaml/arrayLabels.p.cmt lib/ocaml/big_int.cmi +lib/ocaml/big_int.cmti lib/ocaml/big_int.cmx lib/ocaml/big_int.mli lib/ocaml/bigarray.a lib/ocaml/bigarray.cma lib/ocaml/bigarray.cmi +lib/ocaml/bigarray.cmti lib/ocaml/bigarray.cmx lib/ocaml/bigarray.cmxa lib/ocaml/bigarray.cmxs @@ -175,23 +194,60 @@ lib/ocaml/callback.mli lib/ocaml/callback.p.cmt lib/ocaml/caml/address_class.h lib/ocaml/caml/alloc.h +lib/ocaml/caml/backtrace.h +lib/ocaml/caml/backtrace_prim.h lib/ocaml/caml/bigarray.h lib/ocaml/caml/callback.h +lib/ocaml/caml/compact.h +lib/ocaml/caml/compare.h lib/ocaml/caml/compatibility.h lib/ocaml/caml/config.h lib/ocaml/caml/custom.h +lib/ocaml/caml/debugger.h +lib/ocaml/caml/dynlink.h +lib/ocaml/caml/exec.h lib/ocaml/caml/fail.h +lib/ocaml/caml/finalise.h +lib/ocaml/caml/fix_code.h +lib/ocaml/caml/freelist.h lib/ocaml/caml/gc.h +lib/ocaml/caml/gc_ctrl.h +lib/ocaml/caml/globroots.h lib/ocaml/caml/hash.h +lib/ocaml/caml/hooks.h +lib/ocaml/caml/instrtrace.h +lib/ocaml/caml/instruct.h +lib/ocaml/caml/int64_emul.h +lib/ocaml/caml/int64_format.h +lib/ocaml/caml/int64_native.h +lib/ocaml/caml/interp.h lib/ocaml/caml/intext.h +lib/ocaml/caml/io.h +lib/ocaml/caml/jumptbl.h +lib/ocaml/caml/major_gc.h +lib/ocaml/caml/md5.h lib/ocaml/caml/memory.h +lib/ocaml/caml/minor_gc.h lib/ocaml/caml/misc.h lib/ocaml/caml/mlvalues.h +lib/ocaml/caml/osdeps.h +lib/ocaml/caml/prims.h lib/ocaml/caml/printexc.h +lib/ocaml/caml/reverse.h +lib/ocaml/caml/roots.h lib/ocaml/caml/signals.h +lib/ocaml/caml/signals_machdep.h lib/ocaml/caml/socketaddr.h +lib/ocaml/caml/spacetime.h +lib/ocaml/caml/stack.h +lib/ocaml/caml/stacks.h +lib/ocaml/caml/startup.h +lib/ocaml/caml/startup_aux.h +lib/ocaml/caml/sys.h +lib/ocaml/caml/ui.h lib/ocaml/caml/unixsupport.h lib/ocaml/caml/version.h +lib/ocaml/caml/weak.h lib/ocaml/camlheader lib/ocaml/camlheader_ur lib/ocaml/camlinternalFormat.cmi @@ -238,209 +294,564 @@ lib/ocaml/char.mli lib/ocaml/char.p.cmt lib/ocaml/compiler-libs/CSE.cmi lib/ocaml/compiler-libs/CSE.cmt +lib/ocaml/compiler-libs/CSE.cmx lib/ocaml/compiler-libs/CSEgen.cmi lib/ocaml/compiler-libs/CSEgen.cmt lib/ocaml/compiler-libs/CSEgen.cmti +lib/ocaml/compiler-libs/CSEgen.cmx +lib/ocaml/compiler-libs/CSEgen.mli +lib/ocaml/compiler-libs/afl_instrument.cmi +lib/ocaml/compiler-libs/afl_instrument.cmt +lib/ocaml/compiler-libs/afl_instrument.cmti +lib/ocaml/compiler-libs/afl_instrument.cmx +lib/ocaml/compiler-libs/afl_instrument.mli +lib/ocaml/compiler-libs/alias_analysis.cmi +lib/ocaml/compiler-libs/alias_analysis.cmt +lib/ocaml/compiler-libs/alias_analysis.cmti +lib/ocaml/compiler-libs/alias_analysis.mli +lib/ocaml/compiler-libs/allocated_const.cmi +lib/ocaml/compiler-libs/allocated_const.cmt +lib/ocaml/compiler-libs/allocated_const.cmti +lib/ocaml/compiler-libs/allocated_const.mli lib/ocaml/compiler-libs/annot.cmi lib/ocaml/compiler-libs/annot.cmti +lib/ocaml/compiler-libs/annot.mli lib/ocaml/compiler-libs/arch.cmi lib/ocaml/compiler-libs/arch.cmt +lib/ocaml/compiler-libs/arch.cmx +lib/ocaml/compiler-libs/arg_helper.cmi +lib/ocaml/compiler-libs/arg_helper.cmt +lib/ocaml/compiler-libs/arg_helper.cmti +lib/ocaml/compiler-libs/arg_helper.cmx +lib/ocaml/compiler-libs/arg_helper.mli lib/ocaml/compiler-libs/asmgen.cmi lib/ocaml/compiler-libs/asmgen.cmt lib/ocaml/compiler-libs/asmgen.cmti +lib/ocaml/compiler-libs/asmgen.cmx +lib/ocaml/compiler-libs/asmgen.mli lib/ocaml/compiler-libs/asmlibrarian.cmi lib/ocaml/compiler-libs/asmlibrarian.cmt lib/ocaml/compiler-libs/asmlibrarian.cmti +lib/ocaml/compiler-libs/asmlibrarian.cmx +lib/ocaml/compiler-libs/asmlibrarian.mli lib/ocaml/compiler-libs/asmlink.cmi lib/ocaml/compiler-libs/asmlink.cmt lib/ocaml/compiler-libs/asmlink.cmti +lib/ocaml/compiler-libs/asmlink.cmx +lib/ocaml/compiler-libs/asmlink.mli lib/ocaml/compiler-libs/asmpackager.cmi lib/ocaml/compiler-libs/asmpackager.cmt lib/ocaml/compiler-libs/asmpackager.cmti +lib/ocaml/compiler-libs/asmpackager.cmx +lib/ocaml/compiler-libs/asmpackager.mli lib/ocaml/compiler-libs/ast_helper.cmi lib/ocaml/compiler-libs/ast_helper.cmt lib/ocaml/compiler-libs/ast_helper.cmti +lib/ocaml/compiler-libs/ast_helper.cmx +lib/ocaml/compiler-libs/ast_helper.mli +lib/ocaml/compiler-libs/ast_invariants.cmi +lib/ocaml/compiler-libs/ast_invariants.cmt +lib/ocaml/compiler-libs/ast_invariants.cmti +lib/ocaml/compiler-libs/ast_invariants.cmx +lib/ocaml/compiler-libs/ast_invariants.mli +lib/ocaml/compiler-libs/ast_iterator.cmi *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906241014.x5OAEvgn033719>