From f5fd6f0fd2dbf4cccd6566c8ecc310b4b593dc9d Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 24 Jun 2016 15:59:11 +0000 Subject: [PATCH] Upgrade Ocaml to 4.3.0 and tweak ports the minimal amount to keep them all compiling. Tweaks include updating ocaml-batteries 2.3.1 -> 2.5.0 ocaml-lwt 2.4.8 -> 2.5.2 ocaml-ppx-tools 0.99.2 -> 4.03.0 ocaml-camlp4 4.02+6 -> 4.03+1 utop 1.15 -> 1.19.2 and fixes to coccinelle and wyrd to let them build on bytecode archs. Other necessary tweaks from the various homes of the projects. Everything still builds on amd64 (native and bytecode) and sparc64 (bytecode). ok anil@ sthen@ so final 4.3.0 tweaks can be done in-tree. --- devel/coccinelle/Makefile | 6 +- devel/coccinelle/pkg/PLIST | 3 +- devel/ocaml-batteries/Makefile | 4 +- devel/ocaml-batteries/distinfo | 4 +- devel/ocaml-batteries/pkg/PFRAG.native | 5 +- devel/ocaml-batteries/pkg/PLIST | 56 ++- devel/ocaml-lwt/Makefile | 6 +- devel/ocaml-lwt/distinfo | 4 +- devel/ocaml-mlgmp/patches/patch-config_h | 17 + .../patch-src_equeue_uq_engines_compat_ml | 12 + .../patches/patch-src_netsys_netlog_ml | 11 + devel/ocaml-parmap/Makefile | 5 +- devel/ocaml-parmap/patches/patch-Makefile_in | 11 + .../ocaml-parmap/patches/patch-parmap_mldylib | 7 + devel/ocaml-parmap/patches/patch-parmap_mllib | 7 + devel/ocaml-parmap/pkg/PFRAG.native | 6 +- devel/ocaml-ppx-tools/Makefile | 15 +- devel/ocaml-ppx-tools/distinfo | 4 +- devel/ocaml-ppx-tools/patches/patch-Makefile | 21 +- devel/utop/Makefile | 13 +- devel/utop/distinfo | 4 +- devel/utop/pkg/PFRAG.dynlink-native | 3 +- devel/utop/pkg/PFRAG.native | 9 +- devel/utop/pkg/PLIST | 13 +- lang/ocaml-camlp4/Makefile | 4 +- lang/ocaml-camlp4/distinfo | 4 +- lang/ocaml/Makefile | 8 +- lang/ocaml/distinfo | 8 +- lang/ocaml/patches/patch-configure | 18 +- lang/ocaml/pkg/PFRAG.native-main | 409 +++++++++++++++++- lang/ocaml/pkg/PLIST-graphics | 23 +- lang/ocaml/pkg/PLIST-main | 248 ++++++++++- math/coq/patches/patch-coqmktmp_ml | 19 + ...patch-src_networks_donkey_donkeyGlobals_ml | 10 + .../patches/patch-src_utils_cdk_gdstubs_c | 19 + .../patches/patch-src_utils_cdk_zip_ml | 11 + .../patches/patch-src_utils_lib_options_ml4 | 57 +++ .../patches/patch-system_system_generic_ml | 12 + productivity/wyrd/Makefile | 9 +- productivity/wyrd/patches/patch-Makefile_in | 15 + .../patches/patch-src_ml_text_bigarray_c | 28 ++ .../ocaml-text/patches/patch-src_ml_text_c | 28 ++ 42 files changed, 1057 insertions(+), 119 deletions(-) create mode 100644 devel/ocaml-mlgmp/patches/patch-config_h create mode 100644 devel/ocaml-net/patches/patch-src_equeue_uq_engines_compat_ml create mode 100644 devel/ocaml-net/patches/patch-src_netsys_netlog_ml create mode 100644 devel/ocaml-parmap/patches/patch-Makefile_in create mode 100644 devel/ocaml-parmap/patches/patch-parmap_mldylib create mode 100644 devel/ocaml-parmap/patches/patch-parmap_mllib create mode 100644 math/coq/patches/patch-coqmktmp_ml create mode 100644 net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals_ml create mode 100644 net/mldonkey/patches/patch-src_utils_cdk_gdstubs_c create mode 100644 net/mldonkey/patches/patch-src_utils_cdk_zip_ml create mode 100644 net/mldonkey/patches/patch-src_utils_lib_options_ml4 create mode 100644 net/unison/patches/patch-system_system_generic_ml create mode 100644 productivity/wyrd/patches/patch-Makefile_in create mode 100644 textproc/ocaml-text/patches/patch-src_ml_text_bigarray_c create mode 100644 textproc/ocaml-text/patches/patch-src_ml_text_c diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index 8096370ec7e..70d76ee1bc0 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2016/03/20 16:12:23 naddy Exp $ - -BROKEN-alpha = yes_prepare_ocamlcocci.cmi does not exist -BROKEN-powerpc = yes_prepare_ocamlcocci.cmi does not exist -BROKEN-sparc64 = yes_prepare_ocamlcocci.cmi does not exist +# $OpenBSD: Makefile,v 1.32 2016/06/24 15:59:11 krw Exp $ COMMENT = program matching and transformation engine diff --git a/devel/coccinelle/pkg/PLIST b/devel/coccinelle/pkg/PLIST index cd75bdfc69c..dd3ad855df8 100644 --- a/devel/coccinelle/pkg/PLIST +++ b/devel/coccinelle/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2015/10/29 15:41:36 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.12 2016/06/24 15:59:11 krw Exp $ %%dynlink%% bin/pycocci bin/spatch @@ -25,7 +25,6 @@ lib/coccinelle/ocaml/regexp.cmi lib/coccinelle/ocaml/run_ocamlcocci.cmi lib/coccinelle/ocaml/type_cocci.cmi lib/coccinelle/ocaml/visitor_c.cmi -lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi lib/coccinelle/python/ lib/coccinelle/python/coccilib/ lib/coccinelle/python/coccilib/__init__.py diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile index e7e21427413..c7fb11a3d5f 100644 --- a/devel/ocaml-batteries/Makefile +++ b/devel/ocaml-batteries/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2016/06/23 19:23:53 krw Exp $ +# $OpenBSD: Makefile,v 1.16 2016/06/24 15:59:12 krw Exp $ COMMENT = OCaml Batteries Included - OCaml foundation library CATEGORIES = devel -V = 2.3.1 +V = 2.5.0 GH_ACCOUNT = ocaml-batteries-team GH_PROJECT = batteries-included GH_TAGNAME = v$V diff --git a/devel/ocaml-batteries/distinfo b/devel/ocaml-batteries/distinfo index 855b0332d52..9230b62392b 100644 --- a/devel/ocaml-batteries/distinfo +++ b/devel/ocaml-batteries/distinfo @@ -1,2 +1,2 @@ -SHA256 (batteries-included-2.3.1.tar.gz) = 33eLkPzbJiiNnZKoblHddda7fG5BiIx0jHUI6OpYsdQ= -SIZE (batteries-included-2.3.1.tar.gz) = 729285 +SHA256 (batteries-included-2.5.0.tar.gz) = nG0icD5jlpy8xFk5EjuAIUSY3gNsqNZJDrKfMjYEUJ0= +SIZE (batteries-included-2.5.0.tar.gz) = 746575 diff --git a/devel/ocaml-batteries/pkg/PFRAG.native b/devel/ocaml-batteries/pkg/PFRAG.native index 5aef785033f..69013a1bca4 100644 --- a/devel/ocaml-batteries/pkg/PFRAG.native +++ b/devel/ocaml-batteries/pkg/PFRAG.native @@ -1,19 +1,20 @@ -@comment $OpenBSD: PFRAG.native,v 1.5 2015/08/30 15:52:33 avsm Exp $ +@comment $OpenBSD: PFRAG.native,v 1.6 2016/06/24 15:59:12 krw Exp $ %%dynlink%% lib/ocaml/batteries/batArray.cmx lib/ocaml/batteries/batAvlTree.cmx lib/ocaml/batteries/batBase64.cmx -lib/ocaml/batteries/batBytes.cmx lib/ocaml/batteries/batBig_int.cmx lib/ocaml/batteries/batBigarray.cmx lib/ocaml/batteries/batBitSet.cmx lib/ocaml/batteries/batBool.cmx lib/ocaml/batteries/batBounded.cmx lib/ocaml/batteries/batBuffer.cmx +lib/ocaml/batteries/batBytes.cmx lib/ocaml/batteries/batCache.cmx lib/ocaml/batteries/batChar.cmx lib/ocaml/batteries/batCharParser.cmx lib/ocaml/batteries/batComplex.cmx +lib/ocaml/batteries/batConcreteQueue_403.cmx lib/ocaml/batteries/batConcurrent.cmx lib/ocaml/batteries/batDeque.cmx lib/ocaml/batteries/batDigest.cmx diff --git a/devel/ocaml-batteries/pkg/PLIST b/devel/ocaml-batteries/pkg/PLIST index 7d06c1023c4..7bde3737399 100644 --- a/devel/ocaml-batteries/pkg/PLIST +++ b/devel/ocaml-batteries/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2015/08/30 15:52:33 avsm Exp $ +@comment $OpenBSD: PLIST,v 1.7 2016/06/24 15:59:12 krw Exp $ %%native%% lib/ocaml/batteries/ lib/ocaml/batteries/META @@ -30,6 +30,8 @@ lib/ocaml/batteries/batCharParser.cmi lib/ocaml/batteries/batCharParser.mli lib/ocaml/batteries/batComplex.cmi lib/ocaml/batteries/batComplex.mli +lib/ocaml/batteries/batConcreteQueue_403.cmi +lib/ocaml/batteries/batConcreteQueue_403.mli lib/ocaml/batteries/batConcurrent.cmi lib/ocaml/batteries/batConcurrent.mli lib/ocaml/batteries/batDeque.cmi @@ -297,11 +299,12 @@ share/doc/ocaml-batteries/html/api/BatHeap.Make.html share/doc/ocaml-batteries/html/api/BatHeap.html share/doc/ocaml-batteries/html/api/BatIMap.Infix.html share/doc/ocaml-batteries/html/api/BatIMap.html -share/doc/ocaml-batteries/html/api/BatIO.Incubator.Array.html -share/doc/ocaml-batteries/html/api/BatIO.Incubator.Enum.html -share/doc/ocaml-batteries/html/api/BatIO.Incubator.List.html -share/doc/ocaml-batteries/html/api/BatIO.Incubator.html +share/doc/ocaml-batteries/html/api/BatIO.BigEndian.html share/doc/ocaml-batteries/html/api/BatIO.html +share/doc/ocaml-batteries/html/api/BatIO.in_channel-c.html +share/doc/ocaml-batteries/html/api/BatIO.in_chars-c.html +share/doc/ocaml-batteries/html/api/BatIO.out_channel-c.html +share/doc/ocaml-batteries/html/api/BatIO.out_chars-c.html share/doc/ocaml-batteries/html/api/BatISet.html share/doc/ocaml-batteries/html/api/BatInnerIO.Input.html share/doc/ocaml-batteries/html/api/BatInnerIO.Output.html @@ -315,6 +318,8 @@ share/doc/ocaml-batteries/html/api/BatInt.Safe_int.Compare.html share/doc/ocaml-batteries/html/api/BatInt.Safe_int.Infix.html share/doc/ocaml-batteries/html/api/BatInt.Safe_int.html share/doc/ocaml-batteries/html/api/BatInt.html +share/doc/ocaml-batteries/html/api/BatInt32.Compare.html +share/doc/ocaml-batteries/html/api/BatInt32.Infix.html share/doc/ocaml-batteries/html/api/BatInt32.html share/doc/ocaml-batteries/html/api/BatInt64.Compare.html share/doc/ocaml-batteries/html/api/BatInt64.Infix.html @@ -372,16 +377,12 @@ share/doc/ocaml-batteries/html/api/BatNumber.Bounded.html share/doc/ocaml-batteries/html/api/BatNumber.Compare.html share/doc/ocaml-batteries/html/api/BatNumber.Discrete.html share/doc/ocaml-batteries/html/api/BatNumber.Infix.html -share/doc/ocaml-batteries/html/api/BatNumber.MakeCompare.html -share/doc/ocaml-batteries/html/api/BatNumber.MakeInfix.html -share/doc/ocaml-batteries/html/api/BatNumber.MakeNumeric.html -share/doc/ocaml-batteries/html/api/BatNumber.MakeRefOps.html -share/doc/ocaml-batteries/html/api/BatNumber.NUMERIC_BASE.html share/doc/ocaml-batteries/html/api/BatNumber.Numeric.Compare.html share/doc/ocaml-batteries/html/api/BatNumber.Numeric.Infix.html share/doc/ocaml-batteries/html/api/BatNumber.Numeric.html share/doc/ocaml-batteries/html/api/BatNumber.RefOps.html share/doc/ocaml-batteries/html/api/BatNumber.html +share/doc/ocaml-batteries/html/api/BatOo.Internal.html share/doc/ocaml-batteries/html/api/BatOo.html share/doc/ocaml-batteries/html/api/BatOptParse.Formatter.html share/doc/ocaml-batteries/html/api/BatOptParse.Opt.html @@ -439,10 +440,15 @@ share/doc/ocaml-batteries/html/api/BatSeq.Exceptionless.html share/doc/ocaml-batteries/html/api/BatSeq.Infix.html share/doc/ocaml-batteries/html/api/BatSeq.html share/doc/ocaml-batteries/html/api/BatSet.Incubator.html +share/doc/ocaml-batteries/html/api/BatSet.Infix.html share/doc/ocaml-batteries/html/api/BatSet.Make.html +share/doc/ocaml-batteries/html/api/BatSet.Make2.Product.html +share/doc/ocaml-batteries/html/api/BatSet.Make2.html share/doc/ocaml-batteries/html/api/BatSet.OrderedType.html +share/doc/ocaml-batteries/html/api/BatSet.PSet.Infix.html share/doc/ocaml-batteries/html/api/BatSet.PSet.html share/doc/ocaml-batteries/html/api/BatSet.S.Exceptionless.html +share/doc/ocaml-batteries/html/api/BatSet.S.Infix.html share/doc/ocaml-batteries/html/api/BatSet.S.Labels.html share/doc/ocaml-batteries/html/api/BatSet.S.html share/doc/ocaml-batteries/html/api/BatSet.html @@ -485,6 +491,8 @@ share/doc/ocaml-batteries/html/api/BatUnit.html share/doc/ocaml-batteries/html/api/BatUnix.LargeFile.html share/doc/ocaml-batteries/html/api/BatUnix.html share/doc/ocaml-batteries/html/api/BatUref.html +share/doc/ocaml-batteries/html/api/BatVect.Make.html +share/doc/ocaml-batteries/html/api/BatVect.RANDOMACCESS.html share/doc/ocaml-batteries/html/api/BatVect.html share/doc/ocaml-batteries/html/api/Batteries.Array.html share/doc/ocaml-batteries/html/api/Batteries.Base64.html @@ -521,7 +529,6 @@ share/doc/ocaml-batteries/html/api/Batteries.ISet.html share/doc/ocaml-batteries/html/api/Batteries.Incubator.Bounded.html share/doc/ocaml-batteries/html/api/Batteries.Incubator.Log.html share/doc/ocaml-batteries/html/api/Batteries.Incubator.PathGen.html -share/doc/ocaml-batteries/html/api/Batteries.Incubator.Substring.html share/doc/ocaml-batteries/html/api/Batteries.Incubator.html share/doc/ocaml-batteries/html/api/Batteries.Int.html share/doc/ocaml-batteries/html/api/Batteries.Int32.html @@ -602,6 +609,7 @@ share/doc/ocaml-batteries/html/api/Batteries.Splay.html share/doc/ocaml-batteries/html/api/Batteries.Stack.html share/doc/ocaml-batteries/html/api/Batteries.Stream.html share/doc/ocaml-batteries/html/api/Batteries.String.html +share/doc/ocaml-batteries/html/api/Batteries.Substring.html share/doc/ocaml-batteries/html/api/Batteries.Sys.html share/doc/ocaml-batteries/html/api/Batteries.Text.html share/doc/ocaml-batteries/html/api/Batteries.Tuple.html @@ -782,11 +790,12 @@ share/doc/ocaml-batteries/html/api/type_BatHeap.Make.html share/doc/ocaml-batteries/html/api/type_BatHeap.html share/doc/ocaml-batteries/html/api/type_BatIMap.Infix.html share/doc/ocaml-batteries/html/api/type_BatIMap.html -share/doc/ocaml-batteries/html/api/type_BatIO.Incubator.Array.html -share/doc/ocaml-batteries/html/api/type_BatIO.Incubator.Enum.html -share/doc/ocaml-batteries/html/api/type_BatIO.Incubator.List.html -share/doc/ocaml-batteries/html/api/type_BatIO.Incubator.html +share/doc/ocaml-batteries/html/api/type_BatIO.BigEndian.html share/doc/ocaml-batteries/html/api/type_BatIO.html +share/doc/ocaml-batteries/html/api/type_BatIO.in_channel.html +share/doc/ocaml-batteries/html/api/type_BatIO.in_chars.html +share/doc/ocaml-batteries/html/api/type_BatIO.out_channel.html +share/doc/ocaml-batteries/html/api/type_BatIO.out_chars.html share/doc/ocaml-batteries/html/api/type_BatISet.html share/doc/ocaml-batteries/html/api/type_BatInnerIO.Input.html share/doc/ocaml-batteries/html/api/type_BatInnerIO.Output.html @@ -800,6 +809,8 @@ share/doc/ocaml-batteries/html/api/type_BatInt.Safe_int.Compare.html share/doc/ocaml-batteries/html/api/type_BatInt.Safe_int.Infix.html share/doc/ocaml-batteries/html/api/type_BatInt.Safe_int.html share/doc/ocaml-batteries/html/api/type_BatInt.html +share/doc/ocaml-batteries/html/api/type_BatInt32.Compare.html +share/doc/ocaml-batteries/html/api/type_BatInt32.Infix.html share/doc/ocaml-batteries/html/api/type_BatInt32.html share/doc/ocaml-batteries/html/api/type_BatInt64.Compare.html share/doc/ocaml-batteries/html/api/type_BatInt64.Infix.html @@ -857,16 +868,12 @@ share/doc/ocaml-batteries/html/api/type_BatNumber.Bounded.html share/doc/ocaml-batteries/html/api/type_BatNumber.Compare.html share/doc/ocaml-batteries/html/api/type_BatNumber.Discrete.html share/doc/ocaml-batteries/html/api/type_BatNumber.Infix.html -share/doc/ocaml-batteries/html/api/type_BatNumber.MakeCompare.html -share/doc/ocaml-batteries/html/api/type_BatNumber.MakeInfix.html -share/doc/ocaml-batteries/html/api/type_BatNumber.MakeNumeric.html -share/doc/ocaml-batteries/html/api/type_BatNumber.MakeRefOps.html -share/doc/ocaml-batteries/html/api/type_BatNumber.NUMERIC_BASE.html share/doc/ocaml-batteries/html/api/type_BatNumber.Numeric.Compare.html share/doc/ocaml-batteries/html/api/type_BatNumber.Numeric.Infix.html share/doc/ocaml-batteries/html/api/type_BatNumber.Numeric.html share/doc/ocaml-batteries/html/api/type_BatNumber.RefOps.html share/doc/ocaml-batteries/html/api/type_BatNumber.html +share/doc/ocaml-batteries/html/api/type_BatOo.Internal.html share/doc/ocaml-batteries/html/api/type_BatOo.html share/doc/ocaml-batteries/html/api/type_BatOptParse.Formatter.html share/doc/ocaml-batteries/html/api/type_BatOptParse.Opt.html @@ -924,10 +931,15 @@ share/doc/ocaml-batteries/html/api/type_BatSeq.Exceptionless.html share/doc/ocaml-batteries/html/api/type_BatSeq.Infix.html share/doc/ocaml-batteries/html/api/type_BatSeq.html share/doc/ocaml-batteries/html/api/type_BatSet.Incubator.html +share/doc/ocaml-batteries/html/api/type_BatSet.Infix.html share/doc/ocaml-batteries/html/api/type_BatSet.Make.html +share/doc/ocaml-batteries/html/api/type_BatSet.Make2.Product.html +share/doc/ocaml-batteries/html/api/type_BatSet.Make2.html share/doc/ocaml-batteries/html/api/type_BatSet.OrderedType.html +share/doc/ocaml-batteries/html/api/type_BatSet.PSet.Infix.html share/doc/ocaml-batteries/html/api/type_BatSet.PSet.html share/doc/ocaml-batteries/html/api/type_BatSet.S.Exceptionless.html +share/doc/ocaml-batteries/html/api/type_BatSet.S.Infix.html share/doc/ocaml-batteries/html/api/type_BatSet.S.Labels.html share/doc/ocaml-batteries/html/api/type_BatSet.S.html share/doc/ocaml-batteries/html/api/type_BatSet.html @@ -970,6 +982,8 @@ share/doc/ocaml-batteries/html/api/type_BatUnit.html share/doc/ocaml-batteries/html/api/type_BatUnix.LargeFile.html share/doc/ocaml-batteries/html/api/type_BatUnix.html share/doc/ocaml-batteries/html/api/type_BatUref.html +share/doc/ocaml-batteries/html/api/type_BatVect.Make.html +share/doc/ocaml-batteries/html/api/type_BatVect.RANDOMACCESS.html share/doc/ocaml-batteries/html/api/type_BatVect.html share/doc/ocaml-batteries/html/api/type_Batteries.Array.html share/doc/ocaml-batteries/html/api/type_Batteries.Base64.html @@ -1006,7 +1020,6 @@ share/doc/ocaml-batteries/html/api/type_Batteries.ISet.html share/doc/ocaml-batteries/html/api/type_Batteries.Incubator.Bounded.html share/doc/ocaml-batteries/html/api/type_Batteries.Incubator.Log.html share/doc/ocaml-batteries/html/api/type_Batteries.Incubator.PathGen.html -share/doc/ocaml-batteries/html/api/type_Batteries.Incubator.Substring.html share/doc/ocaml-batteries/html/api/type_Batteries.Incubator.html share/doc/ocaml-batteries/html/api/type_Batteries.Int.html share/doc/ocaml-batteries/html/api/type_Batteries.Int32.html @@ -1087,6 +1100,7 @@ share/doc/ocaml-batteries/html/api/type_Batteries.Splay.html share/doc/ocaml-batteries/html/api/type_Batteries.Stack.html share/doc/ocaml-batteries/html/api/type_Batteries.Stream.html share/doc/ocaml-batteries/html/api/type_Batteries.String.html +share/doc/ocaml-batteries/html/api/type_Batteries.Substring.html share/doc/ocaml-batteries/html/api/type_Batteries.Sys.html share/doc/ocaml-batteries/html/api/type_Batteries.Text.html share/doc/ocaml-batteries/html/api/type_Batteries.Tuple.html diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 1f34384a121..49eeb26904e 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.21 2016/06/23 19:23:53 krw Exp $ +# $OpenBSD: Makefile,v 1.22 2016/06/24 15:59:12 krw Exp $ COMMENT = cooperative lightweight thread library CATEGORIES = devel GH_ACCOUNT = ocsigen GH_PROJECT = lwt -GH_TAGNAME = 2.4.8 -REVISION = 2 +GH_TAGNAME = 2.5.2 +REVISION = 0 # This is not the latest upstream version, but the last one that is most # compatible due to an API change. Be careful about upgrading to lwt-2.5.0 # without checking that no in-tree ports break due to new buffer APIs. diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo index 03ee7ed2d97..9f41e188563 100644 --- a/devel/ocaml-lwt/distinfo +++ b/devel/ocaml-lwt/distinfo @@ -1,2 +1,2 @@ -SHA256 (lwt-2.4.8.tar.gz) = ytqSocfOnGeK3GffoKjFH1gjWOmbvoOezi3s1oZs+jg= -SIZE (lwt-2.4.8.tar.gz) = 262232 +SHA256 (lwt-2.5.2.tar.gz) = sxlRTPUWVngKj2CaY+rQjTBSpEJUayGFMM4UbTe/YzE= +SIZE (lwt-2.5.2.tar.gz) = 268168 diff --git a/devel/ocaml-mlgmp/patches/patch-config_h b/devel/ocaml-mlgmp/patches/patch-config_h new file mode 100644 index 00000000000..6993b578132 --- /dev/null +++ b/devel/ocaml-mlgmp/patches/patch-config_h @@ -0,0 +1,17 @@ +--- config.h.orig Wed May 18 15:06:19 2016 ++++ config.h Wed May 18 15:07:05 2016 +@@ -58,11 +58,11 @@ + #define MPFR_SIZE_ARCH32 16 + #define MPFR_SIZE_ARCH64 24 + +-extern void serialize_int_4(int32 i); ++extern void serialize_int_4(int32_t i); + extern void serialize_block_1(void * data, long len); + +-extern uint32 deserialize_uint_4(void); +-extern int32 deserialize_sint_4(void); ++extern int32_t deserialize_uint_4(void); ++extern int32_t deserialize_sint_4(void); + extern void deserialize_block_1(void * data, long len); + + #endif /* SERIALIZE */ diff --git a/devel/ocaml-net/patches/patch-src_equeue_uq_engines_compat_ml b/devel/ocaml-net/patches/patch-src_equeue_uq_engines_compat_ml new file mode 100644 index 00000000000..685f78d0056 --- /dev/null +++ b/devel/ocaml-net/patches/patch-src_equeue_uq_engines_compat_ml @@ -0,0 +1,12 @@ +--- src/equeue/uq_engines_compat.ml.orig Thu May 19 07:52:09 2016 ++++ src/equeue/uq_engines_compat.ml Thu May 19 07:53:57 2016 +@@ -5,9 +5,7 @@ + class type server_socket_listener = server_endpoint_listener + class type server_socket_acceptor = server_endpoint_acceptor + class type client_socket_connector = client_endpoint_connector +- + +-exception Mem_not_supported = Uq_multiplex.Mem_not_supported + + let create_multiplex_controller_for_connected_socket = + Uq_multiplex.create_multiplex_controller_for_connected_socket diff --git a/devel/ocaml-net/patches/patch-src_netsys_netlog_ml b/devel/ocaml-net/patches/patch-src_netsys_netlog_ml new file mode 100644 index 00000000000..1fffbea13ac --- /dev/null +++ b/devel/ocaml-net/patches/patch-src_netsys_netlog_ml @@ -0,0 +1,11 @@ +--- src/netsys/netlog.ml.orig Thu May 19 12:19:50 2016 ++++ src/netsys/netlog.ml Thu May 19 12:20:06 2016 +@@ -95,8 +95,6 @@ + let channel_logger ch max_lev lev msg = + if level_weight lev <= level_weight max_lev then ( + let (sec,ns) = +- try Netsys_posix.clock_gettime Netsys_posix.CLOCK_REALTIME +- with Invalid_argument _ -> + (Unix.gettimeofday(), 0) in + let s = (* Netdate is unavailable here *) + sprintf diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index b7185a637bf..ac3feb4919e 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/06/23 19:23:53 krw Exp $ +# $OpenBSD: Makefile,v 1.6 2016/06/24 15:59:12 krw Exp $ COMMENT = OCaml parallel map primitive for multicores CATEGORIES = devel @@ -28,4 +28,7 @@ FAKE_FLAGS = DESTDIR=${WRKINST}${TRUEPREFIX} TEST_TARGET = tests TEST_DEPENDS = ${BASE_PKGPATH} +post-patch: + cp ${WRKSRC}/setcore.mli ${WRKSRC}/setcore.ml + .include diff --git a/devel/ocaml-parmap/patches/patch-Makefile_in b/devel/ocaml-parmap/patches/patch-Makefile_in new file mode 100644 index 00000000000..d8fdbf51e65 --- /dev/null +++ b/devel/ocaml-parmap/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu May 19 21:55:55 2016 ++++ Makefile.in Thu May 19 21:56:08 2016 +@@ -78,7 +78,7 @@ + + + INSTALL_STUFF = META +-INSTALL_STUFF += $(wildcard _build/*.cma _build/*.cmxa _build/*.cmxs) ++INSTALL_STUFF += $(wildcard _build/*.cma _build/*.cmx _build/*.cmxa _build/*.cmxs) + INSTALL_STUFF += $(filter-out $(wildcard _build/myocamlbuild.*),$(wildcard _build/*.mli _build/*.cmi)) + INSTALL_STUFF += $(wildcard _build/*.so _build/*.a) + diff --git a/devel/ocaml-parmap/patches/patch-parmap_mldylib b/devel/ocaml-parmap/patches/patch-parmap_mldylib new file mode 100644 index 00000000000..0e48ee604b8 --- /dev/null +++ b/devel/ocaml-parmap/patches/patch-parmap_mldylib @@ -0,0 +1,7 @@ +--- parmap.mldylib.orig Thu Sep 17 10:34:21 2015 ++++ parmap.mldylib Thu May 19 21:58:28 2016 +@@ -1,3 +1,4 @@ + Parmap + Bytearray + Parmap_utils ++Setcore diff --git a/devel/ocaml-parmap/patches/patch-parmap_mllib b/devel/ocaml-parmap/patches/patch-parmap_mllib new file mode 100644 index 00000000000..ddfe77e6ee0 --- /dev/null +++ b/devel/ocaml-parmap/patches/patch-parmap_mllib @@ -0,0 +1,7 @@ +--- parmap.mllib.orig Thu Sep 17 10:34:21 2015 ++++ parmap.mllib Thu May 19 22:00:26 2016 +@@ -1,3 +1,4 @@ + Parmap + Bytearray + Parmap_utils ++Setcore diff --git a/devel/ocaml-parmap/pkg/PFRAG.native b/devel/ocaml-parmap/pkg/PFRAG.native index fa2cb56aaa9..4fab56e3d98 100644 --- a/devel/ocaml-parmap/pkg/PFRAG.native +++ b/devel/ocaml-parmap/pkg/PFRAG.native @@ -1,4 +1,8 @@ -@comment $OpenBSD: PFRAG.native,v 1.1 2015/09/17 17:18:35 jca Exp $ +@comment $OpenBSD: PFRAG.native,v 1.2 2016/06/24 15:59:12 krw Exp $ %%dynlink%% lib/ocaml/parmap/parmap.a +lib/ocaml/parmap/bytearray.cmx +lib/ocaml/parmap/parmap.cmx lib/ocaml/parmap/parmap.cmxa +lib/ocaml/parmap/parmap_utils.cmx +lib/ocaml/parmap/setcore.cmx diff --git a/devel/ocaml-ppx-tools/Makefile b/devel/ocaml-ppx-tools/Makefile index 172b7817a31..7c9aeff0cfb 100644 --- a/devel/ocaml-ppx-tools/Makefile +++ b/devel/ocaml-ppx-tools/Makefile @@ -1,14 +1,19 @@ -# $OpenBSD: Makefile,v 1.3 2016/02/27 22:50:39 mmcc Exp $ +# $OpenBSD: Makefile,v 1.4 2016/06/24 15:59:12 krw Exp $ COMMENT = tools for authors of OCaml ppx rewriters CATEGORIES = devel -V = 0.99.2 +V = 4.03.0 GH_ACCOUNT = alainfrisch GH_PROJECT = ppx_tools -GH_TAGNAME = ppx_tools_${V} +GH_TAGNAME = v${V} PKGNAME = ocaml-ppx-tools-${V} +MODULES = lang/ocaml +BUILD_DEPENDS = sysutils/findlib +USE_GMAKE = Yes +NO_TEST = Yes + ALL_TARGET = byte .include .if ${PROPERTIES:Mocaml_native} @@ -21,9 +26,5 @@ ALL_TARGET += dyn # MIT PERMIT_PACKAGE_CDROM = Yes -MODULES = lang/ocaml -BUILD_DEPENDS = sysutils/findlib -USE_GMAKE = Yes -NO_TEST = Yes .include diff --git a/devel/ocaml-ppx-tools/distinfo b/devel/ocaml-ppx-tools/distinfo index 850b28cd252..b3e51ee6389 100644 --- a/devel/ocaml-ppx-tools/distinfo +++ b/devel/ocaml-ppx-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (ppx_tools-ppx_tools_0.99.2.tar.gz) = mBKAIuoFdNdpomPrm3O+BiAO7EusmtuNxE3yiad8Tew= -SIZE (ppx_tools-ppx_tools_0.99.2.tar.gz) = 15877 +SHA256 (ppx_tools-4.03.0.tar.gz) = IH1BQPsI9Ei416DvIDPbBvGR/Jm3PY6t0/56rb/qX6g= +SIZE (ppx_tools-4.03.0.tar.gz) = 16865 diff --git a/devel/ocaml-ppx-tools/patches/patch-Makefile b/devel/ocaml-ppx-tools/patches/patch-Makefile index 00b27c852c8..74208753143 100644 --- a/devel/ocaml-ppx-tools/patches/patch-Makefile +++ b/devel/ocaml-ppx-tools/patches/patch-Makefile @@ -1,27 +1,16 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2015/08/30 15:47:06 avsm Exp $ ---- Makefile.orig Mon Sep 29 11:13:30 2014 -+++ Makefile Thu Aug 13 13:40:05 2015 -@@ -12,9 +12,11 @@ OCAMLC = ocamlc +--- Makefile.orig Wed May 18 22:18:08 2016 ++++ Makefile Wed May 18 22:18:55 2016 +@@ -12,8 +12,11 @@ OCAMLOPT = ocamlopt COMPFLAGS = -w +A-4-17-44-45 -I +compiler-libs -safe-string -.PHONY: all -all: genlifter$(EXE) dumpast$(EXE) ppx_metaquot$(EXE) rewriter$(EXE) ast_mapper_class.cmo ppx_tools.cma --all: ppx_tools.cmxa ppx_tools.cmxs +.PHONY: all byte opt dyn +all: byte opt dyn +byte: genlifter$(EXE) dumpast$(EXE) ppx_metaquot$(EXE) rewriter$(EXE) ast_mapper_class.cmo ppx_tools.cma +opt: ppx_tools.cmxa +dyn: ppx_tools.cmxs - genlifter$(EXE): ppx_tools.cma genlifter.cmo - $(OCAMLC) $(COMPFLAGS) -o genlifter$(EXE) ocamlcommon.cma ppx_tools.cma genlifter.cmo -@@ -73,7 +75,7 @@ clean: - - INSTALL = META \ - genlifter$(EXE) dumpast$(EXE) ppx_metaquot$(EXE) rewriter$(EXE) \ -- ppx_tools.cma ppx_tools.cmxa ppx_tools$(EXT_LIB) \ -+ ppx_tools.cma -optional ppx_tools.cmxa ppx_tools$(EXT_LIB) \ - ppx_tools.cmxs \ - ast_convenience.cmi ast_convenience.cmx \ - ast_mapper_class.cmi ast_mapper_class.cmx + ifneq ($(ARCH),none) + all: ppx_tools.cmxa diff --git a/devel/utop/Makefile b/devel/utop/Makefile index 98dfff65e5a..c597fe88ad1 100644 --- a/devel/utop/Makefile +++ b/devel/utop/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.11 2016/06/23 19:23:53 krw Exp $ +# $OpenBSD: Makefile,v 1.12 2016/06/24 15:59:12 krw Exp $ COMMENT = enhanced OCaml toplevel CATEGORIES = devel -V = 1.15 +V = 1.19.2 GH_ACCOUNT = diml GH_PROJECT = utop GH_TAGNAME = ${V} DISTNAME = ${GH_PROJECT}-$V -REVISION = 2 +REVISION = 0 MAINTAINER = Edd Barrett @@ -21,12 +21,7 @@ CONFIGURE_ARGS += --enable-tests MODULES = lang/ocaml RUN_DEPENDS = devel/ocaml-lambda-term BUILD_DEPENDS = ${RUN_DEPENDS} sysutils/findlib lang/ocaml-camlp4 \ - devel/ocaml-ocamlbuild - -# silence a warning -post-extract: - # already shipped by the OCaml package - rm ${WRKBUILD}/src/lib/errors.mli + devel/ocaml-cppo post-install: ${INSTALL_DATA} \ diff --git a/devel/utop/distinfo b/devel/utop/distinfo index 8e5aa3ffaf8..527f642e308 100644 --- a/devel/utop/distinfo +++ b/devel/utop/distinfo @@ -1,2 +1,2 @@ -SHA256 (utop-1.15.tar.gz) = Odd52QLsWhwBaDty3a3CsR/N/63jOFnfB6ELpU0H24A= -SIZE (utop-1.15.tar.gz) = 106190 +SHA256 (utop-1.19.2.tar.gz) = UJqybxPPXQz0AfsKMTdR7Rlye23/Ze99+BrAXPFcvkM= +SIZE (utop-1.19.2.tar.gz) = 104616 diff --git a/devel/utop/pkg/PFRAG.dynlink-native b/devel/utop/pkg/PFRAG.dynlink-native index e7ad2877259..50c3f280b59 100644 --- a/devel/utop/pkg/PFRAG.dynlink-native +++ b/devel/utop/pkg/PFRAG.dynlink-native @@ -1,3 +1,2 @@ -@comment $OpenBSD: PFRAG.dynlink-native,v 1.1.1.1 2013/07/17 21:57:24 edd Exp $ -@bin lib/ocaml/utop/utop-camlp4.cmxs +@comment $OpenBSD: PFRAG.dynlink-native,v 1.2 2016/06/24 15:59:12 krw Exp $ @bin lib/ocaml/utop/utop.cmxs diff --git a/devel/utop/pkg/PFRAG.native b/devel/utop/pkg/PFRAG.native index 3462519c475..67d06b82346 100644 --- a/devel/utop/pkg/PFRAG.native +++ b/devel/utop/pkg/PFRAG.native @@ -1,15 +1,10 @@ -@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2013/07/17 21:57:24 edd Exp $ +@comment $OpenBSD: PFRAG.native,v 1.2 2016/06/24 15:59:12 krw Exp $ %%dynlink%% -lib/ocaml/utop/uTop.cmx -lib/ocaml/utop/uTop_camlp4.cmx -lib/ocaml/utop/uTop_complete.cmx +lib/ocaml/utop/uTop_cmt_lifter.cmx lib/ocaml/utop/uTop_lexer.cmx -lib/ocaml/utop/uTop_main.cmx lib/ocaml/utop/uTop_private.cmx lib/ocaml/utop/uTop_styles.cmx lib/ocaml/utop/uTop_token.cmx lib/ocaml/utop/uTop_version.cmx -lib/ocaml/utop/utop-camlp4.a -lib/ocaml/utop/utop-camlp4.cmxa lib/ocaml/utop/utop.a lib/ocaml/utop/utop.cmxa diff --git a/devel/utop/pkg/PLIST b/devel/utop/pkg/PLIST index 527eee9ba99..66f4fbcaa60 100644 --- a/devel/utop/pkg/PLIST +++ b/devel/utop/pkg/PLIST @@ -1,16 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.3 2014/09/01 13:07:51 chrisz Exp $ +@comment $OpenBSD: PLIST,v 1.4 2016/06/24 15:59:12 krw Exp $ %%native%% bin/utop bin/utop-full lib/ocaml/utop/ lib/ocaml/utop/META +lib/ocaml/utop/uTop.annot lib/ocaml/utop/uTop.cmi +lib/ocaml/utop/uTop.cmt +lib/ocaml/utop/uTop.cmti lib/ocaml/utop/uTop.mli -lib/ocaml/utop/uTop_camlp4.cmi -lib/ocaml/utop/uTop_camlp4.mli +lib/ocaml/utop/uTop_main.annot lib/ocaml/utop/uTop_main.cmi +lib/ocaml/utop/uTop_main.cmt +lib/ocaml/utop/uTop_main.cmti lib/ocaml/utop/uTop_main.mli -lib/ocaml/utop/utop-camlp4.cma lib/ocaml/utop/utop.cma @man man/man1/utop-full.1 @man man/man1/utop.1 @@ -38,4 +41,6 @@ share/doc/utop/api/type_UTop.html share/doc/utop/api/type_UTop_main.html share/doc/utop/utoprc-dark share/doc/utop/utoprc-light +share/emacs/ +share/emacs/site-lisp/ share/emacs/site-lisp/utop.el diff --git a/lang/ocaml-camlp4/Makefile b/lang/ocaml-camlp4/Makefile index aea37a69441..240cfab2b83 100644 --- a/lang/ocaml-camlp4/Makefile +++ b/lang/ocaml-camlp4/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2016/06/23 19:23:54 krw Exp $ +# $OpenBSD: Makefile,v 1.7 2016/06/24 15:59:12 krw Exp $ COMMENT = OCaml Preprocessor and Pretty-Printer CATEGORIES = lang -V = 4.02+6 +V = 4.03+1 GH_ACCOUNT = ocaml GH_PROJECT = camlp4 GH_TAGNAME = ${V} diff --git a/lang/ocaml-camlp4/distinfo b/lang/ocaml-camlp4/distinfo index 8dffef180f5..f4aaade5a3e 100644 --- a/lang/ocaml-camlp4/distinfo +++ b/lang/ocaml-camlp4/distinfo @@ -1,2 +1,2 @@ -SHA256 (camlp4-4.02+6.tar.gz) = ggw1tp/f8yJb2mBF+r/+XXxU3aAPsVdESsi9peF3jUU= -SIZE (camlp4-4.02+6.tar.gz) = 647140 +SHA256 (camlp4-4.03+1.tar.gz) = bu/qzO2BzKWd35DCU4UF/VzWWWo/waz0lx6XlsLn8q4= +SIZE (camlp4-4.03+1.tar.gz) = 648030 diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 10c42a91d13..416d062cc1a 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2016/06/23 19:23:54 krw Exp $ +# $OpenBSD: Makefile,v 1.74 2016/06/24 15:59:12 krw Exp $ MULTI_PACKAGES = -graphics -main @@ -8,8 +8,8 @@ COMMENT-graphics = OCaml Graphics library providing basic drawing primitives # XXX Don't even think of updating ocaml alone. # Do check that the ports that depend on it still work, or repair them. # Don't forget to bump version in ocaml.port.mk, too! -VERSION=4.02.3 -REVISION= 2 +VERSION=4.03.0 +REVISION= 0 PKGNAME-main = ocaml-${VERSION} PKGNAME-graphics = ocaml-graphics-${VERSION} @@ -32,7 +32,7 @@ MAINTAINER= Anil Madhavapeddy PERMIT_PACKAGE_CDROM= Yes CONFIGURE_STYLE= simple dest -CONFIGURE_ARGS+=-prefix ${PREFIX} -no-ocamlbuild +CONFIGURE_ARGS+=-prefix ${PREFIX} CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}' CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib CONFIGURE_ENV+=OPENBSD_LOCALBASE="${LOCALBASE}" diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index fca1aa0c4ca..7d2633c5111 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -SHA256 (ocaml-4.02-refman-html.tar.gz) = HTt+VJTAddhsdg9jIKy6CG1obnQJy3X4JnvM+2rV86g= -SHA256 (ocaml-4.02.3.tar.gz) = ko+19k9OFBmAulZ/9Xti2Nx7lRtYvpWQ/7G+IXKIenI= -SIZE (ocaml-4.02-refman-html.tar.gz) = 612839 -SIZE (ocaml-4.02.3.tar.gz) = 3108892 +SHA256 (ocaml-4.03-refman-html.tar.gz) = 4qMHU54zMZN2B+lvjPqp5Dbd7sq7DX4l+ILP/LJ/1+k= +SHA256 (ocaml-4.03.0.tar.gz) = f98oDMbAot5PyYkdC/RjPqQXBG7OYZ8BH9RFQPz8jaI= +SIZE (ocaml-4.03-refman-html.tar.gz) = 814882 +SIZE (ocaml-4.03.0.tar.gz) = 3388739 diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 1f4c51c5e93..1646db24513 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,8 +1,8 @@ -$OpenBSD: patch-configure,v 1.19 2014/10/25 11:55:54 chrisz Exp $ ---- configure.orig Fri Oct 3 21:25:46 2014 -+++ configure Sat Oct 18 12:19:58 2014 -@@ -822,6 +822,8 @@ case "$target" in - if $arch64;then model=ppc64;else model=ppc;fi;; +$OpenBSD: patch-configure,v 1.20 2016/06/24 15:59:12 krw Exp $ +--- configure.orig Mon Apr 25 09:36:01 2016 ++++ configure Wed May 18 13:01:05 2016 +@@ -839,6 +839,8 @@ + s390x*-*-linux*) arch=s390x; model=z10; system=elf;; armv6*-*-linux-gnueabihf) arch=arm; model=armv6; system=linux_eabihf;; arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;; + arm*-*-openbsd*) arch=arm; system=bsd;; @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.19 2014/10/25 11:55:54 chrisz Exp $ armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;; armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;; armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;; -@@ -1602,11 +1604,11 @@ echo "X11_LINK=$x11_link" >> Makefile +@@ -1673,11 +1675,11 @@ # Look for BFD library @@ -22,6 +22,6 @@ $OpenBSD: patch-configure,v 1.19 2014/10/25 11:55:54 chrisz Exp $ echo "#define HAS_LIBBFD" >> s.h - echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile + echo "LIBBFD_LINK=-I${OPENBSD_LOCALBASE}/include -L${OPENBSD_LOCALBASE}/lib -lbfd -liberty -lz" >> Makefile - else - wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files." - echo "LIBBFD_LINK=" >> Makefile + echo LIBBFD_INCLUDE= >>Makefile + elif sh ./hasgot -DPACKAGE=ocaml -I/opt/local/include -i bfd.h && \ + sh ./hasgot -DPACKAGE=ocaml -L/opt/local/lib -lbfd -ldl \ diff --git a/lang/ocaml/pkg/PFRAG.native-main b/lang/ocaml/pkg/PFRAG.native-main index eb0bc36546b..e6f7d2adb77 100644 --- a/lang/ocaml/pkg/PFRAG.native-main +++ b/lang/ocaml/pkg/PFRAG.native-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.native-main,v 1.5 2016/06/23 19:23:54 krw Exp $ +@comment $OpenBSD: PFRAG.native-main,v 1.6 2016/06/24 15:59:12 krw Exp $ %%dynlink%% @bin bin/ocamlc.opt @bin bin/ocamldep.opt @@ -39,30 +39,146 @@ lib/ocaml/camlinternalOO.p.cmx lib/ocaml/char.cmx lib/ocaml/char.p.cmx lib/ocaml/compiler-libs/CSE.cmi +lib/ocaml/compiler-libs/CSE.cmx lib/ocaml/compiler-libs/CSEgen.cmi +lib/ocaml/compiler-libs/CSEgen.cmx +lib/ocaml/compiler-libs/alias_analysis.cmi +lib/ocaml/compiler-libs/allocated_const.cmi lib/ocaml/compiler-libs/arch.cmi +lib/ocaml/compiler-libs/arch.cmx +lib/ocaml/compiler-libs/arg_helper.cmx lib/ocaml/compiler-libs/asmgen.cmi +lib/ocaml/compiler-libs/asmgen.cmx lib/ocaml/compiler-libs/asmlibrarian.cmi +lib/ocaml/compiler-libs/asmlibrarian.cmx lib/ocaml/compiler-libs/asmlink.cmi +lib/ocaml/compiler-libs/asmlink.cmx lib/ocaml/compiler-libs/asmpackager.cmi +lib/ocaml/compiler-libs/asmpackager.cmx +lib/ocaml/compiler-libs/ast_helper.cmx +lib/ocaml/compiler-libs/ast_invariants.cmx +lib/ocaml/compiler-libs/ast_iterator.cmx +lib/ocaml/compiler-libs/ast_mapper.cmx +lib/ocaml/compiler-libs/attr_helper.cmx +lib/ocaml/compiler-libs/augment_specialised_args.cmi +lib/ocaml/compiler-libs/backend_intf.cmi +lib/ocaml/compiler-libs/branch_relaxation.cmx +lib/ocaml/compiler-libs/branch_relaxation_intf.cmx +lib/ocaml/compiler-libs/btype.cmx +lib/ocaml/compiler-libs/build_export_info.cmi +lib/ocaml/compiler-libs/build_export_info.cmx +lib/ocaml/compiler-libs/builtin_attributes.cmx +lib/ocaml/compiler-libs/bytegen.cmx +lib/ocaml/compiler-libs/bytelibrarian.cmx +lib/ocaml/compiler-libs/bytelink.cmx +lib/ocaml/compiler-libs/bytepackager.cmx +lib/ocaml/compiler-libs/bytesections.cmx +lib/ocaml/compiler-libs/ccomp.cmx lib/ocaml/compiler-libs/clambda.cmi +lib/ocaml/compiler-libs/clambda.cmx +lib/ocaml/compiler-libs/clflags.cmx lib/ocaml/compiler-libs/closure.cmi +lib/ocaml/compiler-libs/closure.cmx +lib/ocaml/compiler-libs/closure_conversion.cmi +lib/ocaml/compiler-libs/closure_conversion_aux.cmi +lib/ocaml/compiler-libs/closure_element.cmi +lib/ocaml/compiler-libs/closure_id.cmi +lib/ocaml/compiler-libs/closure_offsets.cmi +lib/ocaml/compiler-libs/closure_offsets.cmx +lib/ocaml/compiler-libs/cmi_format.cmx lib/ocaml/compiler-libs/cmm.cmi +lib/ocaml/compiler-libs/cmm.cmx lib/ocaml/compiler-libs/cmmgen.cmi +lib/ocaml/compiler-libs/cmmgen.cmx +lib/ocaml/compiler-libs/cmt_format.cmx lib/ocaml/compiler-libs/cmx_format.cmi lib/ocaml/compiler-libs/coloring.cmi +lib/ocaml/compiler-libs/coloring.cmx lib/ocaml/compiler-libs/comballoc.cmi +lib/ocaml/compiler-libs/comballoc.cmx +lib/ocaml/compiler-libs/compenv.cmx +lib/ocaml/compiler-libs/compilation_unit.cmi +lib/ocaml/compiler-libs/compile.cmx lib/ocaml/compiler-libs/compilenv.cmi +lib/ocaml/compiler-libs/compilenv.cmx +lib/ocaml/compiler-libs/compmisc.cmx +lib/ocaml/compiler-libs/config.cmx +lib/ocaml/compiler-libs/consistbl.cmx +lib/ocaml/compiler-libs/ctype.cmx +lib/ocaml/compiler-libs/datarepr.cmx lib/ocaml/compiler-libs/deadcode.cmi +lib/ocaml/compiler-libs/deadcode.cmx lib/ocaml/compiler-libs/debuginfo.cmi +lib/ocaml/compiler-libs/debuginfo.cmx +lib/ocaml/compiler-libs/dll.cmx +lib/ocaml/compiler-libs/docstrings.cmx +lib/ocaml/compiler-libs/effect_analysis.cmi lib/ocaml/compiler-libs/emit.cmi +lib/ocaml/compiler-libs/emit.cmx lib/ocaml/compiler-libs/emitaux.cmi +lib/ocaml/compiler-libs/emitaux.cmx +lib/ocaml/compiler-libs/emitcode.cmx +lib/ocaml/compiler-libs/env.cmx +lib/ocaml/compiler-libs/envaux.cmx +lib/ocaml/compiler-libs/errors.cmx +lib/ocaml/compiler-libs/export_id.cmi +lib/ocaml/compiler-libs/export_info.cmi +lib/ocaml/compiler-libs/export_info.cmx +lib/ocaml/compiler-libs/export_info_for_pack.cmi +lib/ocaml/compiler-libs/export_info_for_pack.cmx +lib/ocaml/compiler-libs/extract_projections.cmi +lib/ocaml/compiler-libs/find_recursive_functions.cmi +lib/ocaml/compiler-libs/flambda.cmi +lib/ocaml/compiler-libs/flambda_invariants.cmi +lib/ocaml/compiler-libs/flambda_iterators.cmi +lib/ocaml/compiler-libs/flambda_to_clambda.cmi +lib/ocaml/compiler-libs/flambda_to_clambda.cmx +lib/ocaml/compiler-libs/flambda_utils.cmi +lib/ocaml/compiler-libs/freshening.cmi +lib/ocaml/compiler-libs/id_types.cmi +lib/ocaml/compiler-libs/ident.cmx +lib/ocaml/compiler-libs/identifiable.cmx +lib/ocaml/compiler-libs/import_approx.cmi +lib/ocaml/compiler-libs/import_approx.cmx +lib/ocaml/compiler-libs/includeclass.cmx +lib/ocaml/compiler-libs/includecore.cmx +lib/ocaml/compiler-libs/includemod.cmx +lib/ocaml/compiler-libs/inconstant_idents.cmi +lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi +lib/ocaml/compiler-libs/inline_and_simplify.cmi +lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi +lib/ocaml/compiler-libs/inlining_cost.cmi +lib/ocaml/compiler-libs/inlining_decision.cmi +lib/ocaml/compiler-libs/inlining_decision_intf.cmi +lib/ocaml/compiler-libs/inlining_stats.cmi +lib/ocaml/compiler-libs/inlining_stats_types.cmi +lib/ocaml/compiler-libs/inlining_transforms.cmi lib/ocaml/compiler-libs/interf.cmi +lib/ocaml/compiler-libs/interf.cmx +lib/ocaml/compiler-libs/lambda.cmx +lib/ocaml/compiler-libs/lexer.cmx +lib/ocaml/compiler-libs/lift_code.cmi +lib/ocaml/compiler-libs/lift_constants.cmi +lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi lib/ocaml/compiler-libs/linearize.cmi +lib/ocaml/compiler-libs/linearize.cmx +lib/ocaml/compiler-libs/linkage_name.cmi lib/ocaml/compiler-libs/liveness.cmi +lib/ocaml/compiler-libs/liveness.cmx +lib/ocaml/compiler-libs/location.cmx +lib/ocaml/compiler-libs/longident.cmx lib/ocaml/compiler-libs/mach.cmi +lib/ocaml/compiler-libs/mach.cmx lib/ocaml/compiler-libs/main.cmx lib/ocaml/compiler-libs/main.o +lib/ocaml/compiler-libs/main_args.cmx +lib/ocaml/compiler-libs/matching.cmx +lib/ocaml/compiler-libs/meta.cmx +lib/ocaml/compiler-libs/middle_end.cmi +lib/ocaml/compiler-libs/misc.cmx +lib/ocaml/compiler-libs/mtype.cmx +lib/ocaml/compiler-libs/mutable_variable.cmi +lib/ocaml/compiler-libs/numbers.cmx lib/ocaml/compiler-libs/ocamlbytecomp.a lib/ocaml/compiler-libs/ocamlbytecomp.cmxa lib/ocaml/compiler-libs/ocamlcommon.a @@ -70,31 +186,129 @@ lib/ocaml/compiler-libs/ocamlcommon.cmxa lib/ocaml/compiler-libs/ocamloptcomp.a lib/ocaml/compiler-libs/ocamloptcomp.cma lib/ocaml/compiler-libs/ocamloptcomp.cmxa +lib/ocaml/compiler-libs/opcodes.cmx +lib/ocaml/compiler-libs/oprint.cmx lib/ocaml/compiler-libs/optcompile.cmi +lib/ocaml/compiler-libs/optcompile.cmx lib/ocaml/compiler-libs/opterrors.cmi +lib/ocaml/compiler-libs/opterrors.cmx lib/ocaml/compiler-libs/optmain.cmi lib/ocaml/compiler-libs/optmain.cmo lib/ocaml/compiler-libs/optmain.cmx lib/ocaml/compiler-libs/optmain.o +lib/ocaml/compiler-libs/parmatch.cmx +lib/ocaml/compiler-libs/parse.cmx +lib/ocaml/compiler-libs/parser.cmx +lib/ocaml/compiler-libs/pass_wrapper.cmi +lib/ocaml/compiler-libs/path.cmx +lib/ocaml/compiler-libs/pparse.cmx +lib/ocaml/compiler-libs/pprintast.cmx +lib/ocaml/compiler-libs/predef.cmx +lib/ocaml/compiler-libs/primitive.cmx +lib/ocaml/compiler-libs/printast.cmx lib/ocaml/compiler-libs/printclambda.cmi +lib/ocaml/compiler-libs/printclambda.cmx lib/ocaml/compiler-libs/printcmm.cmi +lib/ocaml/compiler-libs/printcmm.cmx +lib/ocaml/compiler-libs/printinstr.cmx +lib/ocaml/compiler-libs/printlambda.cmx lib/ocaml/compiler-libs/printlinear.cmi +lib/ocaml/compiler-libs/printlinear.cmx lib/ocaml/compiler-libs/printmach.cmi +lib/ocaml/compiler-libs/printmach.cmx +lib/ocaml/compiler-libs/printtyp.cmx +lib/ocaml/compiler-libs/printtyped.cmx lib/ocaml/compiler-libs/proc.cmi +lib/ocaml/compiler-libs/proc.cmx +lib/ocaml/compiler-libs/projection.cmi +lib/ocaml/compiler-libs/ref_to_variables.cmi lib/ocaml/compiler-libs/reg.cmi +lib/ocaml/compiler-libs/reg.cmx lib/ocaml/compiler-libs/reload.cmi +lib/ocaml/compiler-libs/reload.cmx lib/ocaml/compiler-libs/reloadgen.cmi +lib/ocaml/compiler-libs/reloadgen.cmx +lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi +lib/ocaml/compiler-libs/remove_unused_arguments.cmi +lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi +lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi +lib/ocaml/compiler-libs/runtimedef.cmx lib/ocaml/compiler-libs/schedgen.cmi +lib/ocaml/compiler-libs/schedgen.cmx lib/ocaml/compiler-libs/scheduling.cmi +lib/ocaml/compiler-libs/scheduling.cmx lib/ocaml/compiler-libs/selectgen.cmi +lib/ocaml/compiler-libs/selectgen.cmx lib/ocaml/compiler-libs/selection.cmi +lib/ocaml/compiler-libs/selection.cmx +lib/ocaml/compiler-libs/semantics_of_primitives.cmi +lib/ocaml/compiler-libs/set_of_closures_id.cmi +lib/ocaml/compiler-libs/set_of_closures_origin.cmi +lib/ocaml/compiler-libs/share_constants.cmi +lib/ocaml/compiler-libs/simple_value_approx.cmi +lib/ocaml/compiler-libs/simplif.cmx +lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi +lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi +lib/ocaml/compiler-libs/simplify_common.cmi +lib/ocaml/compiler-libs/simplify_primitives.cmi lib/ocaml/compiler-libs/spill.cmi +lib/ocaml/compiler-libs/spill.cmx lib/ocaml/compiler-libs/split.cmi +lib/ocaml/compiler-libs/split.cmx +lib/ocaml/compiler-libs/static_exception.cmi lib/ocaml/compiler-libs/strmatch.cmi +lib/ocaml/compiler-libs/strmatch.cmx +lib/ocaml/compiler-libs/strongly_connected_components.cmx +lib/ocaml/compiler-libs/stypes.cmx +lib/ocaml/compiler-libs/subst.cmx +lib/ocaml/compiler-libs/switch.cmx +lib/ocaml/compiler-libs/symbol.cmi +lib/ocaml/compiler-libs/symtable.cmx +lib/ocaml/compiler-libs/syntaxerr.cmx +lib/ocaml/compiler-libs/tag.cmi +lib/ocaml/compiler-libs/tast_mapper.cmx +lib/ocaml/compiler-libs/tbl.cmx +lib/ocaml/compiler-libs/terminfo.cmx +lib/ocaml/compiler-libs/timings.cmx +lib/ocaml/compiler-libs/translattribute.cmx +lib/ocaml/compiler-libs/translclass.cmx +lib/ocaml/compiler-libs/translcore.cmx +lib/ocaml/compiler-libs/translmod.cmx +lib/ocaml/compiler-libs/translobj.cmx +lib/ocaml/compiler-libs/typeclass.cmx +lib/ocaml/compiler-libs/typecore.cmx +lib/ocaml/compiler-libs/typedecl.cmx +lib/ocaml/compiler-libs/typedtree.cmx +lib/ocaml/compiler-libs/typedtreeIter.cmx +lib/ocaml/compiler-libs/typedtreeMap.cmx +lib/ocaml/compiler-libs/typemod.cmx +lib/ocaml/compiler-libs/typeopt.cmx +lib/ocaml/compiler-libs/types.cmx +lib/ocaml/compiler-libs/typetexp.cmx +lib/ocaml/compiler-libs/un_anf.cmi +lib/ocaml/compiler-libs/un_anf.cmx +lib/ocaml/compiler-libs/unbox_closures.cmi +lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi +lib/ocaml/compiler-libs/unbox_specialised_args.cmi +lib/ocaml/compiler-libs/untypeast.cmx +lib/ocaml/compiler-libs/var_within_closure.cmi +lib/ocaml/compiler-libs/variable.cmi +lib/ocaml/compiler-libs/warnings.cmx +lib/ocaml/compiler-libs/x86_ast.cmi +lib/ocaml/compiler-libs/x86_dsl.cmi +lib/ocaml/compiler-libs/x86_dsl.cmx +lib/ocaml/compiler-libs/x86_gas.cmi +lib/ocaml/compiler-libs/x86_gas.cmx +lib/ocaml/compiler-libs/x86_masm.cmi +lib/ocaml/compiler-libs/x86_masm.cmx +lib/ocaml/compiler-libs/x86_proc.cmi +lib/ocaml/compiler-libs/x86_proc.cmx lib/ocaml/complex.cmx lib/ocaml/complex.p.cmx lib/ocaml/digest.cmx lib/ocaml/digest.p.cmx +lib/ocaml/ephemeron.cmx +lib/ocaml/ephemeron.p.cmx lib/ocaml/filename.cmx lib/ocaml/filename.p.cmx lib/ocaml/format.cmx @@ -137,8 +351,55 @@ lib/ocaml/nums.a lib/ocaml/nums.cmxa lib/ocaml/obj.cmx lib/ocaml/obj.p.cmx +lib/ocaml/ocamldoc/odoc.cmx +lib/ocaml/ocamldoc/odoc_analyse.cmx +lib/ocaml/ocamldoc/odoc_args.cmx +lib/ocaml/ocamldoc/odoc_ast.cmx +lib/ocaml/ocamldoc/odoc_class.cmx +lib/ocaml/ocamldoc/odoc_comments.cmx +lib/ocaml/ocamldoc/odoc_comments_global.cmx +lib/ocaml/ocamldoc/odoc_config.cmx +lib/ocaml/ocamldoc/odoc_control.cmx +lib/ocaml/ocamldoc/odoc_cross.cmx +lib/ocaml/ocamldoc/odoc_dag2html.cmx +lib/ocaml/ocamldoc/odoc_dep.cmx +lib/ocaml/ocamldoc/odoc_dot.cmx +lib/ocaml/ocamldoc/odoc_env.cmx +lib/ocaml/ocamldoc/odoc_exception.cmx +lib/ocaml/ocamldoc/odoc_extension.cmx +lib/ocaml/ocamldoc/odoc_gen.cmx +lib/ocaml/ocamldoc/odoc_global.cmx +lib/ocaml/ocamldoc/odoc_html.cmx lib/ocaml/ocamldoc/odoc_info.a +lib/ocaml/ocamldoc/odoc_info.cmx lib/ocaml/ocamldoc/odoc_info.cmxa +lib/ocaml/ocamldoc/odoc_inherit.cmx +lib/ocaml/ocamldoc/odoc_latex.cmx +lib/ocaml/ocamldoc/odoc_latex_style.cmx +lib/ocaml/ocamldoc/odoc_lexer.cmx +lib/ocaml/ocamldoc/odoc_man.cmx +lib/ocaml/ocamldoc/odoc_merge.cmx +lib/ocaml/ocamldoc/odoc_messages.cmx +lib/ocaml/ocamldoc/odoc_misc.cmx +lib/ocaml/ocamldoc/odoc_module.cmx +lib/ocaml/ocamldoc/odoc_name.cmx +lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx +lib/ocaml/ocamldoc/odoc_parameter.cmx +lib/ocaml/ocamldoc/odoc_parser.cmx +lib/ocaml/ocamldoc/odoc_print.cmx +lib/ocaml/ocamldoc/odoc_scan.cmx +lib/ocaml/ocamldoc/odoc_search.cmx +lib/ocaml/ocamldoc/odoc_see_lexer.cmx +lib/ocaml/ocamldoc/odoc_sig.cmx +lib/ocaml/ocamldoc/odoc_str.cmx +lib/ocaml/ocamldoc/odoc_texi.cmx +lib/ocaml/ocamldoc/odoc_text.cmx +lib/ocaml/ocamldoc/odoc_text_lexer.cmx +lib/ocaml/ocamldoc/odoc_text_parser.cmx +lib/ocaml/ocamldoc/odoc_to_text.cmx +lib/ocaml/ocamldoc/odoc_type.cmx +lib/ocaml/ocamldoc/odoc_types.cmx +lib/ocaml/ocamldoc/odoc_value.cmx lib/ocaml/oo.cmx lib/ocaml/oo.p.cmx lib/ocaml/parsing.cmx @@ -192,6 +453,8 @@ lib/ocaml/threads/thread.cmx lib/ocaml/threads/threadUnix.cmx lib/ocaml/threads/threads.a lib/ocaml/threads/threads.cmxa +lib/ocaml/uchar.cmx +lib/ocaml/uchar.p.cmx lib/ocaml/unix.a lib/ocaml/unix.cmx lib/ocaml/unix.cmxa @@ -223,6 +486,7 @@ lib/ocaml/compiler-libs/typetexp.cmt lib/ocaml/compiler-libs/typetexp.cmti lib/ocaml/complex.p.cmt lib/ocaml/digest.p.cmt +lib/ocaml/ephemeron.p.cmt lib/ocaml/filename.p.cmt lib/ocaml/format.p.cmt lib/ocaml/gc.p.cmt @@ -262,8 +526,12 @@ lib/ocaml/weak.p.cmt lib/ocaml/compiler-libs/CSE.cmt lib/ocaml/compiler-libs/CSEgen.cmt lib/ocaml/compiler-libs/CSEgen.cmti +lib/ocaml/compiler-libs/alias_analysis.cmt +lib/ocaml/compiler-libs/alias_analysis.cmti lib/ocaml/compiler-libs/arch.cmt lib/ocaml/compiler-libs/asmgen.cmt +lib/ocaml/compiler-libs/allocated_const.cmt +lib/ocaml/compiler-libs/allocated_const.cmti lib/ocaml/compiler-libs/asmgen.cmti lib/ocaml/compiler-libs/asmlibrarian.cmt lib/ocaml/compiler-libs/asmlibrarian.cmti @@ -271,15 +539,30 @@ lib/ocaml/compiler-libs/asmlink.cmt lib/ocaml/compiler-libs/asmlink.cmti lib/ocaml/compiler-libs/asmpackager.cmt lib/ocaml/compiler-libs/asmpackager.cmti +lib/ocaml/compiler-libs/augment_specialised_args.cmt +lib/ocaml/compiler-libs/augment_specialised_args.cmti +lib/ocaml/compiler-libs/backend_intf.cmti lib/ocaml/compiler-libs/branch_relaxation.cmi lib/ocaml/compiler-libs/branch_relaxation.cmt lib/ocaml/compiler-libs/branch_relaxation.cmti lib/ocaml/compiler-libs/branch_relaxation_intf.cmi lib/ocaml/compiler-libs/branch_relaxation_intf.cmt +lib/ocaml/compiler-libs/build_export_info.cmt +lib/ocaml/compiler-libs/build_export_info.cmti lib/ocaml/compiler-libs/clambda.cmt lib/ocaml/compiler-libs/clambda.cmti lib/ocaml/compiler-libs/closure.cmt lib/ocaml/compiler-libs/closure.cmti +lib/ocaml/compiler-libs/closure_conversion.cmt +lib/ocaml/compiler-libs/closure_conversion.cmti +lib/ocaml/compiler-libs/closure_conversion_aux.cmt +lib/ocaml/compiler-libs/closure_conversion_aux.cmti +lib/ocaml/compiler-libs/closure_element.cmt +lib/ocaml/compiler-libs/closure_element.cmti +lib/ocaml/compiler-libs/closure_id.cmt +lib/ocaml/compiler-libs/closure_id.cmti +lib/ocaml/compiler-libs/closure_offsets.cmt +lib/ocaml/compiler-libs/closure_offsets.cmti lib/ocaml/compiler-libs/cmm.cmt lib/ocaml/compiler-libs/cmm.cmti lib/ocaml/compiler-libs/cmmgen.cmt @@ -289,30 +572,97 @@ lib/ocaml/compiler-libs/coloring.cmt lib/ocaml/compiler-libs/coloring.cmti lib/ocaml/compiler-libs/comballoc.cmt lib/ocaml/compiler-libs/comballoc.cmti +lib/ocaml/compiler-libs/compilation_unit.cmt +lib/ocaml/compiler-libs/compilation_unit.cmti lib/ocaml/compiler-libs/compilenv.cmt lib/ocaml/compiler-libs/compilenv.cmti lib/ocaml/compiler-libs/deadcode.cmt lib/ocaml/compiler-libs/deadcode.cmti lib/ocaml/compiler-libs/debuginfo.cmt lib/ocaml/compiler-libs/debuginfo.cmti +lib/ocaml/compiler-libs/effect_analysis.cmt +lib/ocaml/compiler-libs/effect_analysis.cmti lib/ocaml/compiler-libs/emit.cmt lib/ocaml/compiler-libs/emit.cmti lib/ocaml/compiler-libs/emitaux.cmt lib/ocaml/compiler-libs/emitaux.cmti +lib/ocaml/compiler-libs/export_id.cmt +lib/ocaml/compiler-libs/export_id.cmti +lib/ocaml/compiler-libs/export_info.cmt +lib/ocaml/compiler-libs/export_info.cmti +lib/ocaml/compiler-libs/export_info_for_pack.cmt +lib/ocaml/compiler-libs/export_info_for_pack.cmti +lib/ocaml/compiler-libs/extract_projections.cmt +lib/ocaml/compiler-libs/extract_projections.cmti +lib/ocaml/compiler-libs/find_recursive_functions.cmt +lib/ocaml/compiler-libs/find_recursive_functions.cmti +lib/ocaml/compiler-libs/flambda.cmt +lib/ocaml/compiler-libs/flambda.cmti +lib/ocaml/compiler-libs/flambda_invariants.cmt +lib/ocaml/compiler-libs/flambda_invariants.cmti +lib/ocaml/compiler-libs/flambda_iterators.cmt +lib/ocaml/compiler-libs/flambda_iterators.cmti +lib/ocaml/compiler-libs/flambda_to_clambda.cmt +lib/ocaml/compiler-libs/flambda_to_clambda.cmti +lib/ocaml/compiler-libs/flambda_utils.cmt +lib/ocaml/compiler-libs/flambda_utils.cmti +lib/ocaml/compiler-libs/freshening.cmt +lib/ocaml/compiler-libs/freshening.cmti +lib/ocaml/compiler-libs/id_types.cmt +lib/ocaml/compiler-libs/id_types.cmti +lib/ocaml/compiler-libs/import_approx.cmt +lib/ocaml/compiler-libs/import_approx.cmti +lib/ocaml/compiler-libs/inconstant_idents.cmt +lib/ocaml/compiler-libs/inconstant_idents.cmti +lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt +lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti +lib/ocaml/compiler-libs/inline_and_simplify.cmt +lib/ocaml/compiler-libs/inline_and_simplify.cmti +lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt +lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti +lib/ocaml/compiler-libs/inlining_cost.cmt +lib/ocaml/compiler-libs/inlining_cost.cmti +lib/ocaml/compiler-libs/inlining_decision.cmt +lib/ocaml/compiler-libs/inlining_decision.cmti +lib/ocaml/compiler-libs/inlining_decision_intf.cmti +lib/ocaml/compiler-libs/inlining_stats.cmt +lib/ocaml/compiler-libs/inlining_stats.cmti +lib/ocaml/compiler-libs/inlining_stats_types.cmt +lib/ocaml/compiler-libs/inlining_stats_types.cmti +lib/ocaml/compiler-libs/inlining_transforms.cmt +lib/ocaml/compiler-libs/inlining_transforms.cmti +lib/ocaml/compiler-libs/instruct.cmx lib/ocaml/compiler-libs/interf.cmt lib/ocaml/compiler-libs/interf.cmti +lib/ocaml/compiler-libs/invariant_params.cmi +lib/ocaml/compiler-libs/invariant_params.cmt +lib/ocaml/compiler-libs/invariant_params.cmti +lib/ocaml/compiler-libs/lift_code.cmt +lib/ocaml/compiler-libs/lift_code.cmti +lib/ocaml/compiler-libs/lift_constants.cmt +lib/ocaml/compiler-libs/lift_constants.cmti +lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt +lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti lib/ocaml/compiler-libs/linearize.cmt lib/ocaml/compiler-libs/linearize.cmti +lib/ocaml/compiler-libs/linkage_name.cmt +lib/ocaml/compiler-libs/linkage_name.cmti lib/ocaml/compiler-libs/liveness.cmt lib/ocaml/compiler-libs/liveness.cmti lib/ocaml/compiler-libs/mach.cmt lib/ocaml/compiler-libs/mach.cmti +lib/ocaml/compiler-libs/middle_end.cmt +lib/ocaml/compiler-libs/middle_end.cmti +lib/ocaml/compiler-libs/mutable_variable.cmt +lib/ocaml/compiler-libs/mutable_variable.cmti lib/ocaml/compiler-libs/optcompile.cmt lib/ocaml/compiler-libs/optcompile.cmti lib/ocaml/compiler-libs/opterrors.cmt lib/ocaml/compiler-libs/opterrors.cmti lib/ocaml/compiler-libs/optmain.cmt lib/ocaml/compiler-libs/optmain.cmti +lib/ocaml/compiler-libs/pass_wrapper.cmt +lib/ocaml/compiler-libs/pass_wrapper.cmti lib/ocaml/compiler-libs/printclambda.cmt lib/ocaml/compiler-libs/printclambda.cmti lib/ocaml/compiler-libs/printcmm.cmt @@ -323,12 +673,24 @@ lib/ocaml/compiler-libs/printmach.cmt lib/ocaml/compiler-libs/printmach.cmti lib/ocaml/compiler-libs/proc.cmt lib/ocaml/compiler-libs/proc.cmti +lib/ocaml/compiler-libs/projection.cmt +lib/ocaml/compiler-libs/projection.cmti +lib/ocaml/compiler-libs/ref_to_variables.cmt +lib/ocaml/compiler-libs/ref_to_variables.cmti lib/ocaml/compiler-libs/reg.cmt lib/ocaml/compiler-libs/reg.cmti lib/ocaml/compiler-libs/reload.cmt lib/ocaml/compiler-libs/reload.cmti lib/ocaml/compiler-libs/reloadgen.cmt lib/ocaml/compiler-libs/reloadgen.cmti +lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt +lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti +lib/ocaml/compiler-libs/remove_unused_arguments.cmt +lib/ocaml/compiler-libs/remove_unused_arguments.cmti +lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt +lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti +lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt +lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti lib/ocaml/compiler-libs/schedgen.cmt lib/ocaml/compiler-libs/schedgen.cmti lib/ocaml/compiler-libs/scheduling.cmt @@ -337,9 +699,54 @@ lib/ocaml/compiler-libs/selectgen.cmt lib/ocaml/compiler-libs/selectgen.cmti lib/ocaml/compiler-libs/selection.cmt lib/ocaml/compiler-libs/selection.cmti +lib/ocaml/compiler-libs/semantics_of_primitives.cmt +lib/ocaml/compiler-libs/semantics_of_primitives.cmti +lib/ocaml/compiler-libs/set_of_closures_id.cmt +lib/ocaml/compiler-libs/set_of_closures_id.cmti +lib/ocaml/compiler-libs/set_of_closures_origin.cmt +lib/ocaml/compiler-libs/set_of_closures_origin.cmti +lib/ocaml/compiler-libs/share_constants.cmt +lib/ocaml/compiler-libs/share_constants.cmti +lib/ocaml/compiler-libs/simple_value_approx.cmt +lib/ocaml/compiler-libs/simple_value_approx.cmti +lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt +lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti +lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti +lib/ocaml/compiler-libs/simplify_common.cmt +lib/ocaml/compiler-libs/simplify_common.cmti +lib/ocaml/compiler-libs/simplify_primitives.cmt +lib/ocaml/compiler-libs/simplify_primitives.cmti lib/ocaml/compiler-libs/spill.cmt lib/ocaml/compiler-libs/spill.cmti lib/ocaml/compiler-libs/split.cmt lib/ocaml/compiler-libs/split.cmti +lib/ocaml/compiler-libs/static_exception.cmt +lib/ocaml/compiler-libs/static_exception.cmti lib/ocaml/compiler-libs/strmatch.cmt lib/ocaml/compiler-libs/strmatch.cmti +lib/ocaml/compiler-libs/symbol.cmt +lib/ocaml/compiler-libs/symbol.cmti +lib/ocaml/compiler-libs/tag.cmt +lib/ocaml/compiler-libs/tag.cmti +lib/ocaml/compiler-libs/un_anf.cmt +lib/ocaml/compiler-libs/un_anf.cmti +lib/ocaml/compiler-libs/unbox_closures.cmt +lib/ocaml/compiler-libs/unbox_closures.cmti +lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt +lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti +lib/ocaml/compiler-libs/unbox_specialised_args.cmt +lib/ocaml/compiler-libs/unbox_specialised_args.cmti +lib/ocaml/compiler-libs/var_within_closure.cmt +lib/ocaml/compiler-libs/var_within_closure.cmti +lib/ocaml/compiler-libs/variable.cmt +lib/ocaml/compiler-libs/variable.cmti +lib/ocaml/compiler-libs/x86_ast.cmti +lib/ocaml/compiler-libs/x86_dsl.cmt +lib/ocaml/compiler-libs/x86_dsl.cmti +lib/ocaml/compiler-libs/x86_gas.cmt +lib/ocaml/compiler-libs/x86_gas.cmti +lib/ocaml/compiler-libs/x86_masm.cmt +lib/ocaml/compiler-libs/x86_masm.cmti +lib/ocaml/compiler-libs/x86_proc.cmt +lib/ocaml/compiler-libs/x86_proc.cmti +lib/ocaml/uchar.p.cmt diff --git a/lang/ocaml/pkg/PLIST-graphics b/lang/ocaml/pkg/PLIST-graphics index 26954a84668..911caff346c 100644 --- a/lang/ocaml/pkg/PLIST-graphics +++ b/lang/ocaml/pkg/PLIST-graphics @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-graphics,v 1.2 2016/03/29 11:27:00 naddy Exp $ +@comment $OpenBSD: PLIST-graphics,v 1.3 2016/06/24 15:59:12 krw Exp $ %%native%% lib/ocaml/graphics.cma lib/ocaml/graphics.cmi @@ -7,3 +7,24 @@ lib/ocaml/graphicsX11.cmi lib/ocaml/graphicsX11.mli lib/ocaml/libgraphics.a lib/ocaml/stublibs/dllgraphics.so +@man man/man3/Ast_helper.Const.3o +@man man/man3/Ast_invariants.3o +@man man/man3/Ast_iterator.3o +@man man/man3/Attr_helper.3o +@man man/man3/Builtin_attributes.3o +@man man/man3/Ephemeron.3o +@man man/man3/Ephemeron.GenHashTable.3o +@man man/man3/Ephemeron.GenHashTable.MakeSeeded.3o +@man man/man3/Ephemeron.K1.3o +@man man/man3/Ephemeron.K1.Make.3o +@man man/man3/Ephemeron.K1.MakeSeeded.3o +@man man/man3/Ephemeron.K2.3o +@man man/man3/Ephemeron.K2.Make.3o +@man man/man3/Ephemeron.K2.MakeSeeded.3o +@man man/man3/Ephemeron.Kn.3o +@man man/man3/Ephemeron.Kn.Make.3o +@man man/man3/Ephemeron.Kn.MakeSeeded.3o +@man man/man3/Ephemeron.S.3o +@man man/man3/Ephemeron.SeededS.3o +@man man/man3/Obj.Ephemeron.3o +@man man/man3/Uchar.3o diff --git a/lang/ocaml/pkg/PLIST-main b/lang/ocaml/pkg/PLIST-main index f54d7777e9c..f7ba46f3f95 100644 --- a/lang/ocaml/pkg/PLIST-main +++ b/lang/ocaml/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.8 2016/06/23 19:23:54 krw Exp $ +@comment $OpenBSD: PLIST-main,v 1.9 2016/06/24 15:59:12 krw Exp $ %%native%% @bin bin/ocaml @bin bin/ocamlc @@ -115,17 +115,32 @@ lib/ocaml/char.mli lib/ocaml/compiler-libs/ lib/ocaml/compiler-libs/annot.cmi lib/ocaml/compiler-libs/annot.cmti +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/ast_helper.cmi lib/ocaml/compiler-libs/ast_helper.cmt lib/ocaml/compiler-libs/ast_helper.cmti +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_iterator.cmi +lib/ocaml/compiler-libs/ast_iterator.cmt +lib/ocaml/compiler-libs/ast_iterator.cmti lib/ocaml/compiler-libs/ast_mapper.cmi lib/ocaml/compiler-libs/ast_mapper.cmt lib/ocaml/compiler-libs/ast_mapper.cmti lib/ocaml/compiler-libs/asttypes.cmi lib/ocaml/compiler-libs/asttypes.cmti +lib/ocaml/compiler-libs/attr_helper.cmi +lib/ocaml/compiler-libs/attr_helper.cmt +lib/ocaml/compiler-libs/attr_helper.cmti lib/ocaml/compiler-libs/btype.cmi lib/ocaml/compiler-libs/btype.cmt lib/ocaml/compiler-libs/btype.cmti +lib/ocaml/compiler-libs/builtin_attributes.cmi +lib/ocaml/compiler-libs/builtin_attributes.cmt +lib/ocaml/compiler-libs/builtin_attributes.cmti lib/ocaml/compiler-libs/bytegen.cmi lib/ocaml/compiler-libs/bytegen.cmt lib/ocaml/compiler-libs/bytegen.cmti @@ -200,6 +215,9 @@ lib/ocaml/compiler-libs/genprintval.cmti lib/ocaml/compiler-libs/ident.cmi lib/ocaml/compiler-libs/ident.cmt lib/ocaml/compiler-libs/ident.cmti +lib/ocaml/compiler-libs/identifiable.cmi +lib/ocaml/compiler-libs/identifiable.cmt +lib/ocaml/compiler-libs/identifiable.cmti lib/ocaml/compiler-libs/includeclass.cmi lib/ocaml/compiler-libs/includeclass.cmt lib/ocaml/compiler-libs/includeclass.cmti @@ -243,6 +261,9 @@ lib/ocaml/compiler-libs/misc.cmti lib/ocaml/compiler-libs/mtype.cmi lib/ocaml/compiler-libs/mtype.cmt lib/ocaml/compiler-libs/mtype.cmti +lib/ocaml/compiler-libs/numbers.cmi +lib/ocaml/compiler-libs/numbers.cmt +lib/ocaml/compiler-libs/numbers.cmti lib/ocaml/compiler-libs/ocamlbytecomp.cma lib/ocaml/compiler-libs/ocamlcommon.cma lib/ocaml/compiler-libs/ocamltoplevel.cma @@ -298,6 +319,9 @@ lib/ocaml/compiler-libs/runtimedef.cmti lib/ocaml/compiler-libs/simplif.cmi lib/ocaml/compiler-libs/simplif.cmt lib/ocaml/compiler-libs/simplif.cmti +lib/ocaml/compiler-libs/strongly_connected_components.cmi +lib/ocaml/compiler-libs/strongly_connected_components.cmt +lib/ocaml/compiler-libs/strongly_connected_components.cmti lib/ocaml/compiler-libs/stypes.cmi lib/ocaml/compiler-libs/stypes.cmt lib/ocaml/compiler-libs/stypes.cmti @@ -313,12 +337,18 @@ lib/ocaml/compiler-libs/symtable.cmti lib/ocaml/compiler-libs/syntaxerr.cmi lib/ocaml/compiler-libs/syntaxerr.cmt lib/ocaml/compiler-libs/syntaxerr.cmti +lib/ocaml/compiler-libs/tast_mapper.cmi +lib/ocaml/compiler-libs/tast_mapper.cmt +lib/ocaml/compiler-libs/tast_mapper.cmti lib/ocaml/compiler-libs/tbl.cmi lib/ocaml/compiler-libs/tbl.cmt lib/ocaml/compiler-libs/tbl.cmti lib/ocaml/compiler-libs/terminfo.cmi lib/ocaml/compiler-libs/terminfo.cmt lib/ocaml/compiler-libs/terminfo.cmti +lib/ocaml/compiler-libs/timings.cmi +lib/ocaml/compiler-libs/timings.cmt +lib/ocaml/compiler-libs/timings.cmti lib/ocaml/compiler-libs/topdirs.cmi lib/ocaml/compiler-libs/topdirs.cmt lib/ocaml/compiler-libs/topdirs.cmti @@ -332,6 +362,9 @@ lib/ocaml/compiler-libs/topstart.cmt lib/ocaml/compiler-libs/trace.cmi lib/ocaml/compiler-libs/trace.cmt lib/ocaml/compiler-libs/trace.cmti +lib/ocaml/compiler-libs/translattribute.cmi +lib/ocaml/compiler-libs/translattribute.cmt +lib/ocaml/compiler-libs/translattribute.cmti lib/ocaml/compiler-libs/translclass.cmi lib/ocaml/compiler-libs/translclass.cmt lib/ocaml/compiler-libs/translclass.cmti @@ -370,6 +403,9 @@ lib/ocaml/compiler-libs/types.cmi lib/ocaml/compiler-libs/types.cmt lib/ocaml/compiler-libs/types.cmti lib/ocaml/compiler-libs/typetexp.cmi +lib/ocaml/compiler-libs/untypeast.cmi +lib/ocaml/compiler-libs/untypeast.cmt +lib/ocaml/compiler-libs/untypeast.cmti lib/ocaml/compiler-libs/warnings.cmi lib/ocaml/compiler-libs/warnings.cmt lib/ocaml/compiler-libs/warnings.cmti @@ -387,6 +423,11 @@ lib/ocaml/digest.mli lib/ocaml/dynlink.cma lib/ocaml/dynlink.cmi lib/ocaml/dynlink.mli +lib/ocaml/ephemeron.cmi +lib/ocaml/ephemeron.cmt +lib/ocaml/ephemeron.cmti +lib/ocaml/ephemeron.ml +lib/ocaml/ephemeron.mli lib/ocaml/event.mli lib/ocaml/expunge lib/ocaml/extract_crc @@ -646,6 +687,11 @@ lib/ocaml/threads/thread.cmi lib/ocaml/threads/threadUnix.cmi lib/ocaml/threads/threads.cma lib/ocaml/topdirs.cmi +lib/ocaml/uchar.cmi +lib/ocaml/uchar.cmt +lib/ocaml/uchar.cmti +lib/ocaml/uchar.ml +lib/ocaml/uchar.mli lib/ocaml/unix.cma lib/ocaml/unix.cmi lib/ocaml/unix.mli @@ -834,10 +880,10 @@ share/doc/ocaml/html/debugger.html share/doc/ocaml/html/depend.html share/doc/ocaml/html/expr.html share/doc/ocaml/html/extn.html +share/doc/ocaml/html/flambda.html share/doc/ocaml/html/foreword.html share/doc/ocaml/html/index.html share/doc/ocaml/html/intfc.html -share/doc/ocaml/html/keywords.html share/doc/ocaml/html/lablexamples.html share/doc/ocaml/html/language.html share/doc/ocaml/html/lex.html @@ -846,13 +892,44 @@ share/doc/ocaml/html/libbigarray.html share/doc/ocaml/html/libdynlink.html share/doc/ocaml/html/libgraph.gif share/doc/ocaml/html/libgraph.html -share/doc/ocaml/html/liblabltk.html share/doc/ocaml/html/libnum.html share/doc/ocaml/html/libref/ share/doc/ocaml/html/libref/Arg.html +share/doc/ocaml/html/libref/Arg_helper.Make.html +share/doc/ocaml/html/libref/Arg_helper.html share/doc/ocaml/html/libref/Arith_status.html share/doc/ocaml/html/libref/Array.html share/doc/ocaml/html/libref/ArrayLabels.html +share/doc/ocaml/html/libref/Ast_helper.Cf.html +share/doc/ocaml/html/libref/Ast_helper.Ci.html +share/doc/ocaml/html/libref/Ast_helper.Cl.html +share/doc/ocaml/html/libref/Ast_helper.Const.html +share/doc/ocaml/html/libref/Ast_helper.Csig.html +share/doc/ocaml/html/libref/Ast_helper.Cstr.html +share/doc/ocaml/html/libref/Ast_helper.Ctf.html +share/doc/ocaml/html/libref/Ast_helper.Cty.html +share/doc/ocaml/html/libref/Ast_helper.Exp.html +share/doc/ocaml/html/libref/Ast_helper.Incl.html +share/doc/ocaml/html/libref/Ast_helper.Mb.html +share/doc/ocaml/html/libref/Ast_helper.Md.html +share/doc/ocaml/html/libref/Ast_helper.Mod.html +share/doc/ocaml/html/libref/Ast_helper.Mtd.html +share/doc/ocaml/html/libref/Ast_helper.Mty.html +share/doc/ocaml/html/libref/Ast_helper.Opn.html +share/doc/ocaml/html/libref/Ast_helper.Pat.html +share/doc/ocaml/html/libref/Ast_helper.Sig.html +share/doc/ocaml/html/libref/Ast_helper.Str.html +share/doc/ocaml/html/libref/Ast_helper.Te.html +share/doc/ocaml/html/libref/Ast_helper.Typ.html +share/doc/ocaml/html/libref/Ast_helper.Type.html +share/doc/ocaml/html/libref/Ast_helper.Val.html +share/doc/ocaml/html/libref/Ast_helper.Vb.html +share/doc/ocaml/html/libref/Ast_helper.html +share/doc/ocaml/html/libref/Ast_invariants.html +share/doc/ocaml/html/libref/Ast_iterator.html +share/doc/ocaml/html/libref/Ast_mapper.html +share/doc/ocaml/html/libref/Asttypes.html +share/doc/ocaml/html/libref/Attr_helper.html share/doc/ocaml/html/libref/Big_int.html share/doc/ocaml/html/libref/Bigarray.Array1.html share/doc/ocaml/html/libref/Bigarray.Array2.html @@ -860,6 +937,7 @@ share/doc/ocaml/html/libref/Bigarray.Array3.html share/doc/ocaml/html/libref/Bigarray.Genarray.html share/doc/ocaml/html/libref/Bigarray.html share/doc/ocaml/html/libref/Buffer.html +share/doc/ocaml/html/libref/Builtin_attributes.html share/doc/ocaml/html/libref/Bytes.html share/doc/ocaml/html/libref/BytesLabels.html share/doc/ocaml/html/libref/Callback.html @@ -868,11 +946,32 @@ share/doc/ocaml/html/libref/CamlinternalFormatBasics.html share/doc/ocaml/html/libref/CamlinternalLazy.html share/doc/ocaml/html/libref/CamlinternalMod.html share/doc/ocaml/html/libref/CamlinternalOO.html +share/doc/ocaml/html/libref/Ccomp.html share/doc/ocaml/html/libref/Char.html +share/doc/ocaml/html/libref/Clflags.Float_arg_helper.html +share/doc/ocaml/html/libref/Clflags.Int_arg_helper.html +share/doc/ocaml/html/libref/Clflags.html share/doc/ocaml/html/libref/Complex.html share/doc/ocaml/html/libref/Condition.html +share/doc/ocaml/html/libref/Config.html +share/doc/ocaml/html/libref/Consistbl.html share/doc/ocaml/html/libref/Digest.html +share/doc/ocaml/html/libref/Docstrings.html share/doc/ocaml/html/libref/Dynlink.html +share/doc/ocaml/html/libref/Ephemeron.GenHashTable.MakeSeeded.html +share/doc/ocaml/html/libref/Ephemeron.GenHashTable.html +share/doc/ocaml/html/libref/Ephemeron.K1.Make.html +share/doc/ocaml/html/libref/Ephemeron.K1.MakeSeeded.html +share/doc/ocaml/html/libref/Ephemeron.K1.html +share/doc/ocaml/html/libref/Ephemeron.K2.Make.html +share/doc/ocaml/html/libref/Ephemeron.K2.MakeSeeded.html +share/doc/ocaml/html/libref/Ephemeron.K2.html +share/doc/ocaml/html/libref/Ephemeron.Kn.Make.html +share/doc/ocaml/html/libref/Ephemeron.Kn.MakeSeeded.html +share/doc/ocaml/html/libref/Ephemeron.Kn.html +share/doc/ocaml/html/libref/Ephemeron.S.html +share/doc/ocaml/html/libref/Ephemeron.SeededS.html +share/doc/ocaml/html/libref/Ephemeron.html share/doc/ocaml/html/libref/Event.html share/doc/ocaml/html/libref/Filename.html share/doc/ocaml/html/libref/Format.html @@ -887,17 +986,39 @@ share/doc/ocaml/html/libref/Hashtbl.S.html share/doc/ocaml/html/libref/Hashtbl.SeededHashedType.html share/doc/ocaml/html/libref/Hashtbl.SeededS.html share/doc/ocaml/html/libref/Hashtbl.html +share/doc/ocaml/html/libref/Identifiable.Make.html +share/doc/ocaml/html/libref/Identifiable.Pair.html +share/doc/ocaml/html/libref/Identifiable.S.Map.html +share/doc/ocaml/html/libref/Identifiable.S.Set.html +share/doc/ocaml/html/libref/Identifiable.S.T.html +share/doc/ocaml/html/libref/Identifiable.S.Tbl.html +share/doc/ocaml/html/libref/Identifiable.S.html +share/doc/ocaml/html/libref/Identifiable.Thing.html +share/doc/ocaml/html/libref/Identifiable.html share/doc/ocaml/html/libref/Int32.html share/doc/ocaml/html/libref/Int64.html share/doc/ocaml/html/libref/Lazy.html +share/doc/ocaml/html/libref/Lexer.html share/doc/ocaml/html/libref/Lexing.html share/doc/ocaml/html/libref/List.html share/doc/ocaml/html/libref/ListLabels.html +share/doc/ocaml/html/libref/Location.html +share/doc/ocaml/html/libref/Longident.html share/doc/ocaml/html/libref/Map.Make.html share/doc/ocaml/html/libref/Map.OrderedType.html share/doc/ocaml/html/libref/Map.S.html share/doc/ocaml/html/libref/Map.html share/doc/ocaml/html/libref/Marshal.html +share/doc/ocaml/html/libref/Misc.Color.html +share/doc/ocaml/html/libref/Misc.Int_literal_converter.html +share/doc/ocaml/html/libref/Misc.LongString.html +share/doc/ocaml/html/libref/Misc.Stdlib.List.html +share/doc/ocaml/html/libref/Misc.Stdlib.Option.html +share/doc/ocaml/html/libref/Misc.Stdlib.String.html +share/doc/ocaml/html/libref/Misc.Stdlib.html +share/doc/ocaml/html/libref/Misc.StringMap.html +share/doc/ocaml/html/libref/Misc.StringSet.html +share/doc/ocaml/html/libref/Misc.html share/doc/ocaml/html/libref/MoreLabels.Hashtbl.HashedType.html share/doc/ocaml/html/libref/MoreLabels.Hashtbl.Make.html share/doc/ocaml/html/libref/MoreLabels.Hashtbl.MakeSeeded.html @@ -917,11 +1038,21 @@ share/doc/ocaml/html/libref/MoreLabels.html share/doc/ocaml/html/libref/Mutex.html share/doc/ocaml/html/libref/Nativeint.html share/doc/ocaml/html/libref/Num.html +share/doc/ocaml/html/libref/Numbers.Float.html +share/doc/ocaml/html/libref/Numbers.Int.html +share/doc/ocaml/html/libref/Numbers.html +share/doc/ocaml/html/libref/Obj.Ephemeron.html share/doc/ocaml/html/libref/Obj.html share/doc/ocaml/html/libref/Oo.html +share/doc/ocaml/html/libref/Parse.html +share/doc/ocaml/html/libref/Parser.html +share/doc/ocaml/html/libref/Parsetree.html share/doc/ocaml/html/libref/Parsing.html share/doc/ocaml/html/libref/Pervasives.LargeFile.html share/doc/ocaml/html/libref/Pervasives.html +share/doc/ocaml/html/libref/Pprintast.html +share/doc/ocaml/html/libref/Pprintast.printer-c.html +share/doc/ocaml/html/libref/Printast.html share/doc/ocaml/html/libref/Printexc.Slot.html share/doc/ocaml/html/libref/Printexc.html share/doc/ocaml/html/libref/Printf.html @@ -946,13 +1077,23 @@ share/doc/ocaml/html/libref/Str.html share/doc/ocaml/html/libref/Stream.html share/doc/ocaml/html/libref/String.html share/doc/ocaml/html/libref/StringLabels.html +share/doc/ocaml/html/libref/Strongly_connected_components.Make.html +share/doc/ocaml/html/libref/Strongly_connected_components.S.Id.html +share/doc/ocaml/html/libref/Strongly_connected_components.S.html +share/doc/ocaml/html/libref/Strongly_connected_components.html +share/doc/ocaml/html/libref/Syntaxerr.html share/doc/ocaml/html/libref/Sys.html +share/doc/ocaml/html/libref/Tbl.html +share/doc/ocaml/html/libref/Terminfo.html share/doc/ocaml/html/libref/Thread.html share/doc/ocaml/html/libref/ThreadUnix.html +share/doc/ocaml/html/libref/Timings.html +share/doc/ocaml/html/libref/Uchar.html share/doc/ocaml/html/libref/Unix.LargeFile.html share/doc/ocaml/html/libref/Unix.html share/doc/ocaml/html/libref/UnixLabels.LargeFile.html share/doc/ocaml/html/libref/UnixLabels.html +share/doc/ocaml/html/libref/Warnings.html share/doc/ocaml/html/libref/Weak.Make.html share/doc/ocaml/html/libref/Weak.S.html share/doc/ocaml/html/libref/Weak.html @@ -969,9 +1110,41 @@ share/doc/ocaml/html/libref/index_types.html share/doc/ocaml/html/libref/index_values.html share/doc/ocaml/html/libref/style.css share/doc/ocaml/html/libref/type_Arg.html +share/doc/ocaml/html/libref/type_Arg_helper.Make.html +share/doc/ocaml/html/libref/type_Arg_helper.html share/doc/ocaml/html/libref/type_Arith_status.html share/doc/ocaml/html/libref/type_Array.html share/doc/ocaml/html/libref/type_ArrayLabels.html +share/doc/ocaml/html/libref/type_Ast_helper.Cf.html +share/doc/ocaml/html/libref/type_Ast_helper.Ci.html +share/doc/ocaml/html/libref/type_Ast_helper.Cl.html +share/doc/ocaml/html/libref/type_Ast_helper.Const.html +share/doc/ocaml/html/libref/type_Ast_helper.Csig.html +share/doc/ocaml/html/libref/type_Ast_helper.Cstr.html +share/doc/ocaml/html/libref/type_Ast_helper.Ctf.html +share/doc/ocaml/html/libref/type_Ast_helper.Cty.html +share/doc/ocaml/html/libref/type_Ast_helper.Exp.html +share/doc/ocaml/html/libref/type_Ast_helper.Incl.html +share/doc/ocaml/html/libref/type_Ast_helper.Mb.html +share/doc/ocaml/html/libref/type_Ast_helper.Md.html +share/doc/ocaml/html/libref/type_Ast_helper.Mod.html +share/doc/ocaml/html/libref/type_Ast_helper.Mtd.html +share/doc/ocaml/html/libref/type_Ast_helper.Mty.html +share/doc/ocaml/html/libref/type_Ast_helper.Opn.html +share/doc/ocaml/html/libref/type_Ast_helper.Pat.html +share/doc/ocaml/html/libref/type_Ast_helper.Sig.html +share/doc/ocaml/html/libref/type_Ast_helper.Str.html +share/doc/ocaml/html/libref/type_Ast_helper.Te.html +share/doc/ocaml/html/libref/type_Ast_helper.Typ.html +share/doc/ocaml/html/libref/type_Ast_helper.Type.html +share/doc/ocaml/html/libref/type_Ast_helper.Val.html +share/doc/ocaml/html/libref/type_Ast_helper.Vb.html +share/doc/ocaml/html/libref/type_Ast_helper.html +share/doc/ocaml/html/libref/type_Ast_invariants.html +share/doc/ocaml/html/libref/type_Ast_iterator.html +share/doc/ocaml/html/libref/type_Ast_mapper.html +share/doc/ocaml/html/libref/type_Asttypes.html +share/doc/ocaml/html/libref/type_Attr_helper.html share/doc/ocaml/html/libref/type_Big_int.html share/doc/ocaml/html/libref/type_Bigarray.Array1.html share/doc/ocaml/html/libref/type_Bigarray.Array2.html @@ -979,6 +1152,7 @@ share/doc/ocaml/html/libref/type_Bigarray.Array3.html share/doc/ocaml/html/libref/type_Bigarray.Genarray.html share/doc/ocaml/html/libref/type_Bigarray.html share/doc/ocaml/html/libref/type_Buffer.html +share/doc/ocaml/html/libref/type_Builtin_attributes.html share/doc/ocaml/html/libref/type_Bytes.html share/doc/ocaml/html/libref/type_BytesLabels.html share/doc/ocaml/html/libref/type_Callback.html @@ -987,11 +1161,32 @@ share/doc/ocaml/html/libref/type_CamlinternalFormatBasics.html share/doc/ocaml/html/libref/type_CamlinternalLazy.html share/doc/ocaml/html/libref/type_CamlinternalMod.html share/doc/ocaml/html/libref/type_CamlinternalOO.html +share/doc/ocaml/html/libref/type_Ccomp.html share/doc/ocaml/html/libref/type_Char.html +share/doc/ocaml/html/libref/type_Clflags.Float_arg_helper.html +share/doc/ocaml/html/libref/type_Clflags.Int_arg_helper.html +share/doc/ocaml/html/libref/type_Clflags.html share/doc/ocaml/html/libref/type_Complex.html share/doc/ocaml/html/libref/type_Condition.html +share/doc/ocaml/html/libref/type_Config.html +share/doc/ocaml/html/libref/type_Consistbl.html share/doc/ocaml/html/libref/type_Digest.html +share/doc/ocaml/html/libref/type_Docstrings.html share/doc/ocaml/html/libref/type_Dynlink.html +share/doc/ocaml/html/libref/type_Ephemeron.GenHashTable.MakeSeeded.html +share/doc/ocaml/html/libref/type_Ephemeron.GenHashTable.html +share/doc/ocaml/html/libref/type_Ephemeron.K1.Make.html +share/doc/ocaml/html/libref/type_Ephemeron.K1.MakeSeeded.html +share/doc/ocaml/html/libref/type_Ephemeron.K1.html +share/doc/ocaml/html/libref/type_Ephemeron.K2.Make.html +share/doc/ocaml/html/libref/type_Ephemeron.K2.MakeSeeded.html +share/doc/ocaml/html/libref/type_Ephemeron.K2.html +share/doc/ocaml/html/libref/type_Ephemeron.Kn.Make.html +share/doc/ocaml/html/libref/type_Ephemeron.Kn.MakeSeeded.html +share/doc/ocaml/html/libref/type_Ephemeron.Kn.html +share/doc/ocaml/html/libref/type_Ephemeron.S.html +share/doc/ocaml/html/libref/type_Ephemeron.SeededS.html +share/doc/ocaml/html/libref/type_Ephemeron.html share/doc/ocaml/html/libref/type_Event.html share/doc/ocaml/html/libref/type_Filename.html share/doc/ocaml/html/libref/type_Format.html @@ -1006,17 +1201,39 @@ share/doc/ocaml/html/libref/type_Hashtbl.S.html share/doc/ocaml/html/libref/type_Hashtbl.SeededHashedType.html share/doc/ocaml/html/libref/type_Hashtbl.SeededS.html share/doc/ocaml/html/libref/type_Hashtbl.html +share/doc/ocaml/html/libref/type_Identifiable.Make.html +share/doc/ocaml/html/libref/type_Identifiable.Pair.html +share/doc/ocaml/html/libref/type_Identifiable.S.Map.html +share/doc/ocaml/html/libref/type_Identifiable.S.Set.html +share/doc/ocaml/html/libref/type_Identifiable.S.T.html +share/doc/ocaml/html/libref/type_Identifiable.S.Tbl.html +share/doc/ocaml/html/libref/type_Identifiable.S.html +share/doc/ocaml/html/libref/type_Identifiable.Thing.html +share/doc/ocaml/html/libref/type_Identifiable.html share/doc/ocaml/html/libref/type_Int32.html share/doc/ocaml/html/libref/type_Int64.html share/doc/ocaml/html/libref/type_Lazy.html +share/doc/ocaml/html/libref/type_Lexer.html share/doc/ocaml/html/libref/type_Lexing.html share/doc/ocaml/html/libref/type_List.html share/doc/ocaml/html/libref/type_ListLabels.html +share/doc/ocaml/html/libref/type_Location.html +share/doc/ocaml/html/libref/type_Longident.html share/doc/ocaml/html/libref/type_Map.Make.html share/doc/ocaml/html/libref/type_Map.OrderedType.html share/doc/ocaml/html/libref/type_Map.S.html share/doc/ocaml/html/libref/type_Map.html share/doc/ocaml/html/libref/type_Marshal.html +share/doc/ocaml/html/libref/type_Misc.Color.html +share/doc/ocaml/html/libref/type_Misc.Int_literal_converter.html +share/doc/ocaml/html/libref/type_Misc.LongString.html +share/doc/ocaml/html/libref/type_Misc.Stdlib.List.html +share/doc/ocaml/html/libref/type_Misc.Stdlib.Option.html +share/doc/ocaml/html/libref/type_Misc.Stdlib.String.html +share/doc/ocaml/html/libref/type_Misc.Stdlib.html +share/doc/ocaml/html/libref/type_Misc.StringMap.html +share/doc/ocaml/html/libref/type_Misc.StringSet.html +share/doc/ocaml/html/libref/type_Misc.html share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.HashedType.html share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.Make.html share/doc/ocaml/html/libref/type_MoreLabels.Hashtbl.MakeSeeded.html @@ -1036,11 +1253,21 @@ share/doc/ocaml/html/libref/type_MoreLabels.html share/doc/ocaml/html/libref/type_Mutex.html share/doc/ocaml/html/libref/type_Nativeint.html share/doc/ocaml/html/libref/type_Num.html +share/doc/ocaml/html/libref/type_Numbers.Float.html +share/doc/ocaml/html/libref/type_Numbers.Int.html +share/doc/ocaml/html/libref/type_Numbers.html +share/doc/ocaml/html/libref/type_Obj.Ephemeron.html share/doc/ocaml/html/libref/type_Obj.html share/doc/ocaml/html/libref/type_Oo.html +share/doc/ocaml/html/libref/type_Parse.html +share/doc/ocaml/html/libref/type_Parser.html +share/doc/ocaml/html/libref/type_Parsetree.html share/doc/ocaml/html/libref/type_Parsing.html share/doc/ocaml/html/libref/type_Pervasives.LargeFile.html share/doc/ocaml/html/libref/type_Pervasives.html +share/doc/ocaml/html/libref/type_Pprintast.html +share/doc/ocaml/html/libref/type_Pprintast.printer.html +share/doc/ocaml/html/libref/type_Printast.html share/doc/ocaml/html/libref/type_Printexc.Slot.html share/doc/ocaml/html/libref/type_Printexc.html share/doc/ocaml/html/libref/type_Printf.html @@ -1065,13 +1292,23 @@ share/doc/ocaml/html/libref/type_Str.html share/doc/ocaml/html/libref/type_Stream.html share/doc/ocaml/html/libref/type_String.html share/doc/ocaml/html/libref/type_StringLabels.html +share/doc/ocaml/html/libref/type_Strongly_connected_components.Make.html +share/doc/ocaml/html/libref/type_Strongly_connected_components.S.Id.html +share/doc/ocaml/html/libref/type_Strongly_connected_components.S.html +share/doc/ocaml/html/libref/type_Strongly_connected_components.html +share/doc/ocaml/html/libref/type_Syntaxerr.html share/doc/ocaml/html/libref/type_Sys.html +share/doc/ocaml/html/libref/type_Tbl.html +share/doc/ocaml/html/libref/type_Terminfo.html share/doc/ocaml/html/libref/type_Thread.html share/doc/ocaml/html/libref/type_ThreadUnix.html +share/doc/ocaml/html/libref/type_Timings.html +share/doc/ocaml/html/libref/type_Uchar.html share/doc/ocaml/html/libref/type_Unix.LargeFile.html share/doc/ocaml/html/libref/type_Unix.html share/doc/ocaml/html/libref/type_UnixLabels.LargeFile.html share/doc/ocaml/html/libref/type_UnixLabels.html +share/doc/ocaml/html/libref/type_Warnings.html share/doc/ocaml/html/libref/type_Weak.Make.html share/doc/ocaml/html/libref/type_Weak.S.html share/doc/ocaml/html/libref/type_Weak.html @@ -1080,7 +1317,8 @@ share/doc/ocaml/html/libthreads.html share/doc/ocaml/html/libunix.html share/doc/ocaml/html/manual.css share/doc/ocaml/html/manual001.html -share/doc/ocaml/html/manual043.html +share/doc/ocaml/html/manual032.html +share/doc/ocaml/html/manual045.html share/doc/ocaml/html/modtypes.html share/doc/ocaml/html/moduleexamples.html share/doc/ocaml/html/modules.html @@ -1089,12 +1327,12 @@ share/doc/ocaml/html/native.html share/doc/ocaml/html/next_motif.gif share/doc/ocaml/html/objectexamples.html share/doc/ocaml/html/ocamldoc.html +share/doc/ocaml/html/parsing.html share/doc/ocaml/html/patterns.html share/doc/ocaml/html/previous_motif.gif share/doc/ocaml/html/profil.html share/doc/ocaml/html/runtime.html share/doc/ocaml/html/stdlib.html -share/doc/ocaml/html/threads.html share/doc/ocaml/html/toplevel.html share/doc/ocaml/html/typedecl.html share/doc/ocaml/html/types.html diff --git a/math/coq/patches/patch-coqmktmp_ml b/math/coq/patches/patch-coqmktmp_ml new file mode 100644 index 00000000000..227bc5de168 --- /dev/null +++ b/math/coq/patches/patch-coqmktmp_ml @@ -0,0 +1,19 @@ +--- scripts/coqmktop.ml.orig Wed Jun 1 19:03:26 2016 ++++ scripts/coqmktop.ml Wed Jun 1 19:05:51 2016 +@@ -269,14 +269,14 @@ + (* native code *) + if !top then failwith "no custom toplevel in native code !"; + let ocamloptexec = Filename.quote (Filename.concat camlbin "ocamlopt") in +- ocamloptexec^" -linkall" ++ ocamloptexec^" -linkall -warn-error -a" + end else + (* bytecode (we shunt ocamlmktop script which fails on win32) *) + let ocamlmktoplib = if is_ocaml4 + then " ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma" + else " toplevellib.cma" in + let ocamlcexec = Filename.quote (Filename.concat camlbin "ocamlc") in +- let ocamlccustom = Printf.sprintf "%s %s -linkall " ++ let ocamlccustom = Printf.sprintf "%s %s -linkall -warn-error -a " + ocamlcexec Coq_config.coqrunbyteflags in + (if !top then ocamlccustom^ocamlmktoplib else ocamlccustom) + in diff --git a/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals_ml b/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals_ml new file mode 100644 index 00000000000..bd42bc348ad --- /dev/null +++ b/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals_ml @@ -0,0 +1,10 @@ +--- src/networks/donkey/donkeyGlobals.ml.orig Wed May 18 21:26:47 2016 ++++ src/networks/donkey/donkeyGlobals.ml Wed May 18 21:27:00 2016 +@@ -781,7 +781,6 @@ + c.client_md4 <- md4; + end + +-exception ClientFound of client + let find_client_by_name name = + try + H.iter (fun c -> diff --git a/net/mldonkey/patches/patch-src_utils_cdk_gdstubs_c b/net/mldonkey/patches/patch-src_utils_cdk_gdstubs_c new file mode 100644 index 00000000000..bde18c1bc9e --- /dev/null +++ b/net/mldonkey/patches/patch-src_utils_cdk_gdstubs_c @@ -0,0 +1,19 @@ +--- src/utils/cdk/gdstubs.c.orig Wed May 18 21:11:18 2016 ++++ src/utils/cdk/gdstubs.c Wed May 18 21:11:50 2016 +@@ -23,6 +23,7 @@ + #include "../../../config/config.h" + + #include ++#include + #include + + #include +@@ -489,7 +490,7 @@ + CAMLlocal1 (v); + #ifdef HAVE_PNGVERSION + #include +- v = copy_int32 ((int32)png_access_version_number()); ++ v = copy_int32 ((int32_t)png_access_version_number()); + CAMLreturn (v); + #else + raise_constant(*(value *)caml_named_value("gd type not supported")); diff --git a/net/mldonkey/patches/patch-src_utils_cdk_zip_ml b/net/mldonkey/patches/patch-src_utils_cdk_zip_ml new file mode 100644 index 00000000000..5ca259a6b86 --- /dev/null +++ b/net/mldonkey/patches/patch-src_utils_cdk_zip_ml @@ -0,0 +1,11 @@ +--- src/utils/cdk/zip.ml.orig Wed May 18 21:06:49 2016 ++++ src/utils/cdk/zip.ml Wed May 18 21:07:02 2016 +@@ -72,8 +72,6 @@ + mutable of_entries: entry list; + of_comment: string } + +-exception Error of string * string * string +- + (* Return the position of the last occurrence of s1 in s2, or -1 if not + found. *) + diff --git a/net/mldonkey/patches/patch-src_utils_lib_options_ml4 b/net/mldonkey/patches/patch-src_utils_lib_options_ml4 new file mode 100644 index 00000000000..723fa356a5f --- /dev/null +++ b/net/mldonkey/patches/patch-src_utils_lib_options_ml4 @@ -0,0 +1,57 @@ +--- src/utils/lib/options.ml4.orig Thu May 19 13:07:14 2016 ++++ src/utils/lib/options.ml4 Thu May 19 13:09:55 2016 +@@ -330,45 +330,6 @@ + + let exit_exn = Exit + +- +-let unsafe_get = String.unsafe_get +-external is_printable : char -> bool = "caml_is_printable" +-let unsafe_set = String.unsafe_set +- +-let escaped s = +- let n = ref 0 in +- for i = 0 to String.length s - 1 do +- n := +- !n + +- (match unsafe_get s i with +- '"' | '\\' -> 2 +- | '\n' | '\t' -> 1 +- | c -> if is_printable c then 1 else 4) +- done; +- if !n = String.length s then s +- else +- let s' = String.create !n in +- n := 0; +- for i = 0 to String.length s - 1 do +- begin match unsafe_get s i with +- '"' | '\\' as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c +- | '\n' | '\t' as c -> unsafe_set s' !n c +- | c -> +- if is_printable c then unsafe_set s' !n c +- else +- let a = int_of_char c in +- unsafe_set s' !n '\\'; +- incr n; +- unsafe_set s' !n (char_of_int (48 + a / 100)); +- incr n; +- unsafe_set s' !n (char_of_int (48 + a / 10 mod 10)); +- incr n; +- unsafe_set s' !n (char_of_int (48 + a mod 10)) +- end; +- incr n +- done; +- s' +- + let safe_string s = + if s = "" then "\"\"" + else +@@ -388,7 +349,7 @@ + s + else raise exit_exn + with +- _ -> Printf.sprintf "\"%s\"" (escaped s) ++ _ -> Printf.sprintf "\"%s\"" (String.escaped s) + + let with_help = ref false + let save_private = ref false diff --git a/net/unison/patches/patch-system_system_generic_ml b/net/unison/patches/patch-system_system_generic_ml new file mode 100644 index 00000000000..f888b3d1e54 --- /dev/null +++ b/net/unison/patches/patch-system_system_generic_ml @@ -0,0 +1,12 @@ +--- system/system_generic.ml.orig Thu May 19 15:39:50 2016 ++++ system/system_generic.ml Thu May 19 15:40:43 2016 +@@ -57,7 +57,8 @@ + let readdir = Unix.readdir + let closedir = Unix.closedir + let readlink = Unix.readlink +-let symlink = Unix.symlink ++(* BCP 5/16: Eta-expand for backward compatibility with OCaml <=4.02 *) ++let symlink s1 s2 = Unix.symlink s1 s2 + let chdir = Sys.chdir + let getcwd = Sys.getcwd + diff --git a/productivity/wyrd/Makefile b/productivity/wyrd/Makefile index 8d462089b39..c97b7e0c159 100644 --- a/productivity/wyrd/Makefile +++ b/productivity/wyrd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2016/03/28 14:48:02 okan Exp $ +# $OpenBSD: Makefile,v 1.23 2016/06/24 15:59:13 krw Exp $ COMMENT= curses calendar front-end to remind @@ -20,6 +20,13 @@ MODULES= lang/ocaml CONFIGURE_STYLE= gnu USE_GMAKE= Yes +.include +.if ${PROPERTIES:Mocaml_native} +CONFIGURE_ENV += "" +.else +CONFIGURE_ENV += OCAMLOPT=no +.endif + BUILD_DEPENDS= ${RUN_DEPENDS} lang/ocaml-camlp4 RUN_DEPENDS= misc/remind diff --git a/productivity/wyrd/patches/patch-Makefile_in b/productivity/wyrd/patches/patch-Makefile_in new file mode 100644 index 00000000000..b5209665ffc --- /dev/null +++ b/productivity/wyrd/patches/patch-Makefile_in @@ -0,0 +1,15 @@ +--- Makefile.in.orig Sat Feb 2 22:40:39 2013 ++++ Makefile.in Tue Jun 14 19:33:34 2016 +@@ -93,7 +93,12 @@ + + + $(CURSES_CMA) $(CURSES_CMXA) .stamp_built_curses: ++ifeq ($(OCAMLBEST),opt) + $(MAKE) -C curses byte opt && touch .stamp_built_curses ++else ++ $(MAKE) -C curses byte && touch .stamp_built_curses ++endif ++ + + $(CMO) $(CMX): .stamp_built_curses + diff --git a/textproc/ocaml-text/patches/patch-src_ml_text_bigarray_c b/textproc/ocaml-text/patches/patch-src_ml_text_bigarray_c new file mode 100644 index 00000000000..3fc258f2bf0 --- /dev/null +++ b/textproc/ocaml-text/patches/patch-src_ml_text_bigarray_c @@ -0,0 +1,28 @@ +--- src/ml_text_bigarray.c.orig Thu May 19 19:06:50 2016 ++++ src/ml_text_bigarray.c Thu May 19 19:07:29 2016 +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + + #include +@@ -23,7 +24,7 @@ + { + CAMLparam4(cd_val, buf_val, pos_val, len_val); + +- uint32 code; ++ uint32_t code; + size_t len = Long_val(len_val); + size_t in_left = len; + char *in_bytes = (char*)Caml_ba_data_val(buf_val) + Long_val(pos_val); +@@ -47,7 +48,7 @@ + { + CAMLparam5(cd_val, buf_val, pos_val, len_val, code_val); + +- uint32 code = Int_val(code_val); ++ uint32_t code = Int_val(code_val); + size_t len = Long_val(len_val); + size_t in_left = 4; + char *in_bytes = (char*)&code; diff --git a/textproc/ocaml-text/patches/patch-src_ml_text_c b/textproc/ocaml-text/patches/patch-src_ml_text_c new file mode 100644 index 00000000000..1cf135e6b22 --- /dev/null +++ b/textproc/ocaml-text/patches/patch-src_ml_text_c @@ -0,0 +1,28 @@ +--- src/ml_text.c.orig Thu May 19 19:07:59 2016 ++++ src/ml_text.c Thu May 19 19:08:34 2016 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -107,7 +108,7 @@ + { + CAMLparam4(cd_val, buf_val, pos_val, len_val); + +- uint32 code; ++ uint32_t code; + size_t len = Long_val(len_val); + size_t in_left = len; + char *in_bytes = String_val(buf_val) + Long_val(pos_val); +@@ -152,7 +153,7 @@ + { + CAMLparam5(cd_val, buf_val, pos_val, len_val, code_val); + +- uint32 code = Int_val(code_val); ++ uint32_t code = Int_val(code_val); + size_t len = Long_val(len_val); + size_t in_left = 4; + char *in_bytes = (char*)&code;