kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lang/ocaml: Update to 4.08.1

Browse source 
This update allows (and for some requires) to also update dependencies
to newer versions. Where possible I updated to the latest version.

The ocaml port now is MAKE_JOBS safe.

Changes to dependent ports included in this commit:

- devel/ocaml-sexplib: Rename to devel/ocaml-sexplib0 adapting to
  upstream. Update to 0.16.0
- devel/coccinelle: Update to 1.1.1, moved to github
- devel/ocaml-camlp4: Update to 4.08+1
- devel/ocaml-camomile: Use dune for build, adapt port
- devel/ocaml-cppo: Fix lib files installation [1]
- devel/ocaml-dune: Update to 3.7.1 [2]
- devel/ocaml-findlib: Update to 1.9.6 [3]
- devel/ocaml-ipaddr: Update to 3.1.0
- devel/ocaml-parmap: Update to 1.2.4, use dune for build [4]
- devel/ocaml-ppx-tools: Update to 6.6, use dune for build
- graphics/ocaml-cairo: Update to 0.6.4
- net-p2p/mldonkey: Update to 3.1.7-2 [2]
- net/unison: Remove ocaml 4.07 compatibility patches
- net/unison232: Mark broken, fails to build with newer ocaml [5]
- security/ocaml-ssl: Update to 0.5.13 [2]
- x11-toolkits/ocaml-labltk: Update to 8.06.7 [2]

Dune now requires full path as argument to --libdir, so various
ports have been patched accordingly.

Bumping PORTREVISION for all dependent ports that were not updated.

PR:			272067
Approved by:		michipili@gmail.com (maintainer timeout),
			eduardo (maintainer timeout) [1],
			danfe [2],
			hrs (maintainer timeout) [3],
			dumbbell (maintainer timeout) [4],
			mandree (implicit) [5]
Differential Revision:	https://reviews.freebsd.org/D40599
This commit is contained in:
Guido Falsi 2023-07-05 11:51:47 +02:00
parent 57afac98ba
commit 2b40e46093
166 changed files with 3493 additions and 2526 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -7762,3 +7762,4 @@ www/kristall||2023-07-02|Has expired: Requires older openssl
sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released
devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs
devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed

2
archivers/ocaml-bz2/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= bz2
PORTVERSION= 0.6.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= archivers
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/72/
PKGNAMEPREFIX= ocaml-

1
archivers/ocaml-zip/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= zip
PORTVERSION= 1.11
PORTREVISION= 1
CATEGORIES= archivers
PKGNAMEPREFIX= ocaml-
DISTNAME= caml${PORTNAME}-${PORTVERSION}

1
converters/ocaml-base64/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= base64
PORTVERSION= 2.0.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= converters
PKGNAMEPREFIX= ocaml-

1
converters/ocaml-jsonm/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= jsonm
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= https://erratique.ch/software/jsonm/releases/
PKGNAMEPREFIX= ocaml-

1
databases/ocaml-dbm/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= dbm
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/728/
PKGNAMEPREFIX= ocaml-

1
databases/ocaml-mysql/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= mysql
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://ygrek.org.ua/p/release/ocaml-mysql/
PKGNAMEPREFIX= ocaml-

1
databases/ocaml-sqlite3/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= sqlite3
PORTVERSION= 4.0.5
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= databases
PKGNAMEPREFIX= ocaml-

2
devel/Makefile
View file

@ -1678,7 +1678,7 @@
SUBDIR += ocaml-result
SUBDIR += ocaml-sdl
SUBDIR += ocaml-sem
SUBDIR += ocaml-sexplib
SUBDIR += ocaml-sexplib0
SUBDIR += ocaml-topkg
SUBDIR += ocaml-type_conv
SUBDIR += ocaml-uchar

1
devel/aifad/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= aifad
PORTVERSION= 2.0.8
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

2
devel/cil/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= cil
PORTVERSION= 1.7.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}

6
devel/coccinelle/Makefile
View file

@ -1,8 +1,6 @@
PORTNAME= coccinelle
PORTVERSION= 1.0.7
PORTREVISION= 1
PORTVERSION= 1.1.1
CATEGORIES= devel
MASTER_SITES= http://coccinelle.lip6.fr/distrib/
MAINTAINER= ports@FreeBSD.org
COMMENT= Program matching and transformation engine
@ -27,6 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
MAKE_ARGS= PYTHON_VERSION="${PYTHON_VER}"
USE_GITHUB= yes
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen

6
devel/coccinelle/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1578014897
SHA256 (coccinelle-1.0.7.tar.gz) = 475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b
SIZE (coccinelle-1.0.7.tar.gz) = 6607407
TIMESTAMP = 1683065204
SHA256 (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 095919e129ac563586d880ebbc5aac829fec224177090aebe34dc34ed5f142bf
SIZE (coccinelle-coccinelle-1.1.1_GH0.tar.gz) = 2743457

26
devel/coccinelle/files/patch-bundles_pyml_Makefile
View file

@ -1,26 +0,0 @@
--- bundles/pyml/Makefile.orig 2018-08-31 14:36:59 UTC
+++ bundles/pyml/Makefile
@@ -21,16 +21,18 @@ CLEANOTHERS=pyml-current/generate pyml-current/generat
pyml-current/pyml.cma pyml-current/pyml.cmxa \
pyml-current/dllpyml_stubs.so
-ARCH:=$(shell uname)
+UNAME_ARCH:=$(shell uname)
-ifeq ($(ARCH),Linux)
+ifeq ($(UNAME_ARCH),Linux)
PYML_ARCH=pyml_arch_linux.ml
-else ifeq ($(ARCH),Darwin)
+else ifeq ($(UNAME_ARCH),Darwin)
PYML_ARCH=pyml_arch_darwin.ml
-else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN)
+else ifeq ($(UNAME_ARCH),FreeBSD)
+ PYML_ARCH=pyml_arch_freebsd.ml
+else ifeq ($(findstring CYGWIN,$(UNAME_ARCH)),CYGWIN)
PYML_ARCH=pyml_arch_cygwin.ml
else
- $(error Unsupported OS $(ARCH)
+ $(error Unsupported OS $(UNAME_ARCH))
endif
include ../Makefile.bundles

15
devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml
View file

@ -1,15 +0,0 @@
--- bundles/pyml/pyml-current/pyml_arch_freebsd.ml.orig 2020-01-03 01:59:43 UTC
+++ bundles/pyml/pyml-current/pyml_arch_freebsd.ml
@@ -0,0 +1,12 @@
+let library_patterns: (int -> int -> string, unit, string) format list =
+ ["libpython%d.%dm.so"; "libpython%d.%d.so"]
+
+let library_suffix = ".so"
+
+let ensure_executable_suffix executable = executable
+
+let which = "which"
+
+external fd_of_int: int -> Unix.file_descr = "%identity"
+
+let path_separator = ":"

39
devel/coccinelle/files/patch-stdcompat-fix Normal file
View file

@ -0,0 +1,39 @@
From fa4d4abc816a1fe1d0ac98a0b9520bae5ea559d6 Mon Sep 17 00:00:00 2001
From: Thierry Martinez <Thierry.Martinez@inria.fr>
Date: Thu, 4 Nov 2021 14:22:08 +0100
Subject: [PATCH] Add empty rule to make .cmt targets depend on .cmx
Fix bug reported by Sabyrzhan Tasbolatov
---
bundles/stdcompat/stdcompat-current/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bundles/stdcompat/stdcompat-current/Makefile.am b/bundles/stdcompat/stdcompat-current/Makefile.am
index f0d8dbc38..1b955cf86 100644
--- bundles/stdcompat/stdcompat-current/Makefile.am
+++ bundles/stdcompat/stdcompat-current/Makefile.am
@@ -71,10 +71,12 @@ mypkg_SCRIPTS = META $(MODULES_native) $(MODULES_native:.ml=.cmi) \
if OCAML_SUPPORTS_BYTECODE
mypkg_SCRIPTS += stdcompat.cma
+BEST_SUFFIX := .cmo
endif
if OCAML_SUPPORTS_NATIVE
mypkg_SCRIPTS += stdcompat.cmxa stdcompat.a $(MODULES_native:.ml=.cmx)
+BEST_SUFFIX := .cmx
endif
if OCAML_SUPPORTS_SHARED
@@ -113,6 +115,8 @@ SUFFIXES = .ml .mli .cmi .cmo .cmx .cmxa .cmxs .cmt
.ml.cmx :
$(OCAMLOPT) -c $(OCAMLCFLAGS) $< -o $@
+$(BEST_SUFFIX).cmt : ;
+
stdcompat__stubs.$(OBJEXT) : stdcompat__stubs.c
$(OCAMLC) -c $<
--
GitLab

9
devel/coccinelle/pkg-plist
View file

@ -54,15 +54,6 @@ lib/coccinelle/ocaml/visitor_c.cmx
lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmx
lib/coccinelle/python/coccilib/__init__.py
lib/coccinelle/python/coccilib/coccigui/__init__.py
lib/coccinelle/python/coccilib/coccigui/coccigui.py
lib/coccinelle/python/coccilib/coccigui/pycoccimodel.py
lib/coccinelle/python/coccilib/coccigui/pygui.glade
lib/coccinelle/python/coccilib/coccigui/pygui.gladep
lib/coccinelle/python/coccilib/coccigui/vim.py
lib/coccinelle/python/coccilib/coccigui/vimcom.py
lib/coccinelle/python/coccilib/coccigui/vimeditor.py
lib/coccinelle/python/coccilib/coccigui/vimembed.py
lib/coccinelle/python/coccilib/elems.py
lib/coccinelle/python/coccilib/iteration.py
lib/coccinelle/python/coccilib/org.py

1
devel/menhir/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= menhir
PORTVERSION= 20170712
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/

2
devel/ocaml-annexlib/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= annexlib
PORTVERSION= 0.13.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://raevnos.pennmush.org/code/extlib/
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-calendar/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= calendar
PORTVERSION= 2.03.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/915/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-camljava/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= camljava
PORTVERSION= 0.3
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel java
MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-camlp4/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= camlp4
PORTVERSION= 4.07+1
PORTVERSION= 4.08+1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

6
devel/ocaml-camlp4/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1520427832
SHA256 (ocaml-camlp4-4.07+1_GH0.tar.gz) = ecdb8963063f41b387412317685f79823a26b3f53744f0472058991876877090
SIZE (ocaml-camlp4-4.07+1_GH0.tar.gz) = 648842
TIMESTAMP = 1681674686
SHA256 (ocaml-camlp4-4.08+1_GH0.tar.gz) = 655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88
SIZE (ocaml-camlp4-4.08+1_GH0.tar.gz) = 649830

11
devel/ocaml-camlp4/files/patch-camlp4_Camlp4_Debug.ml Normal file
View file

@ -0,0 +1,11 @@
--- camlp4/Camlp4/Debug.ml.orig 2019-08-07 13:03:46 UTC
+++ camlp4/Camlp4/Debug.ml
@@ -29,7 +29,7 @@ value out_channel =
open_out_gen [Open_wronly; Open_creat; Open_append; Open_text]
0o666 f
with
- [ Not_found -> Pervasives.stderr ];
+ [ Not_found -> Stdlib.stderr ];
module StringSet = Set.Make String;

1
devel/ocaml-camlp5/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= camlp5
PORTVERSION= 7.14
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-camomile-examples/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= camomile
PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ocaml-

5
devel/ocaml-camomile/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= camomile
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -9,7 +10,7 @@ WWW= http://camomile.sourceforge.net/
LICENSE= LGPL21
BUILD_DEPENDS= jbuilder:devel/ocaml-dune
BUILD_DEPENDS= dune:devel/ocaml-dune
USES= gmake
USE_GITHUB= yes
@ -17,7 +18,7 @@ GH_ACCOUNT= yoriyuki
GH_PROJECT= Camomile
USE_OCAML= yes
MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}"
MAKE_ENV= LIBDIR="${PREFIX}/${OCAML_SITELIBDIR}"
DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
PORTDOCS= CHANGES.md LICENSE.md README.md

11
devel/ocaml-camomile/files/patch-Camomile_internal_byte__labeled__dag.ml Normal file
View file

@ -0,0 +1,11 @@
--- Camomile/internal/byte_labeled_dag.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/internal/byte_labeled_dag.ml
@@ -87,7 +87,7 @@ let make_bytes def vs =
branch.(Char.code c') <- Some node;
scan d c leaf branch rest
in
- let comp (s1, _) (s2, _) = Pervasives.compare s1 s2 in
+ let comp (s1, _) (s2, _) = Stdlib.compare s1 s2 in
let vs = List.sort comp vs in
match vs with
(_, _) :: _ ->

17
devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.ml Normal file
View file

@ -0,0 +1,17 @@
--- Camomile/public/charEncoding.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/charEncoding.ml
@@ -131,12 +131,12 @@ module type Interface = sig
{!OOChannel.obj_output_channel} which
receives Unicode characters and outputs them to [outchan] using
the encoding [enc]. *)
- class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel
+ class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel
(** [new in_channel enc inchan] creates the intput channel object
{!OOChannel.obj_input_channel} which
reads bytes from [inchan] and converts them to Unicode characters. *)
- class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel
+ class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel
(** [ustream_of enc chars] converts the byte stream [chars]
to the Unicode character stream by the encoding [enc]. *)

17
devel/ocaml-camomile/files/patch-Camomile_public_charEncoding.mli Normal file
View file

@ -0,0 +1,17 @@
--- Camomile/public/charEncoding.mli.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/charEncoding.mli
@@ -130,12 +130,12 @@ module type Interface = sig
{!OOChannel.obj_output_channel} which
receives Unicode characters and outputs them to [outchan] using
the encoding [enc]. *)
- class out_channel : t -> Pervasives.out_channel -> [UChar.t] obj_output_channel
+ class out_channel : t -> Stdlib.out_channel -> [UChar.t] obj_output_channel
(** [new in_channel enc inchan] creates the intput channel object
{!OOChannel.obj_input_channel} which
reads bytes from [inchan] and converts them to Unicode characters. *)
- class in_channel : t -> Pervasives.in_channel -> [UChar.t] obj_input_channel
+ class in_channel : t -> Stdlib.in_channel -> [UChar.t] obj_input_channel
(** [ustream_of enc chars] converts the byte stream [chars]
to the Unicode character stream by the encoding [enc]. *)

12
devel/ocaml-camomile/files/patch-Camomile_public_oOChannel.mli Normal file
View file

@ -0,0 +1,12 @@
--- Camomile/public/oOChannel.mli.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/oOChannel.mli
@@ -113,7 +113,7 @@ class char_obj_output_channel_of : char_output_channel
[char] obj_output_channel
(** Convert an OCaml input channel to an OO-based character input channel *)
-class of_in_channel : Pervasives.in_channel -> char_input_channel
+class of_in_channel : Stdlib.in_channel -> char_input_channel
(** Convert an OCaml output channel to an OO-based character output channel *)
-class of_out_channel : Pervasives.out_channel -> char_output_channel
+class of_out_channel : Stdlib.out_channel -> char_output_channel

9
devel/ocaml-camomile/files/patch-Camomile_public_uCS4.ml Normal file
View file

@ -0,0 +1,9 @@
--- Camomile/public/uCS4.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/uCS4.ml
@@ -140,5 +140,5 @@ let compare (a:t) (b:t) =
let compare (a:t) (b:t) =
match Array1.dim a - Array1.dim b with
- 0 -> Pervasives.compare a b
+ 0 -> Stdlib.compare a b
| sgn -> sgn

37
devel/ocaml-camomile/files/patch-Camomile_public_uCol.ml Normal file
View file

@ -0,0 +1,37 @@
--- Camomile/public/uCol.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/uCol.ml
@@ -52,14 +52,14 @@ sig
If [prec] is omitted, the maximum possible strength is used.
If [variable] is omitted, the default of the locale
(usually [`Shifted]) is used.
- The meaning of the returned value is similar to Pervasives.compare *)
+ The meaning of the returned value is similar to Stdlib.compare *)
val compare :
?locale:string -> ?prec:precision -> ?variable:variable_option ->
text -> text -> int
(** Binary comparison of sort_key gives the same result as [compare].
i.e.
- [compare t1 t2 = Pervasives.compare (sort_key t1) (sort_key t2)]
+ [compare t1 t2 = Stdlib.compare (sort_key t1) (sort_key t2)]
If the same texts are repeatedly compared,
pre-computation of sort_key gives better performance. *)
val sort_key :
@@ -731,7 +731,7 @@ module Make (Config : ConfigInt.Type) (Text : UnicodeS
| _ ->
let key1 = key_of_inc prec col_info x1 in
let key2 = key_of_inc prec col_info x2 in
- Pervasives.compare key1 key2
+ Stdlib.compare key1 key2
let compare ?locale ?prec ?variable t1 t2 =
let col_info =
@@ -782,7 +782,7 @@ module Make (Config : ConfigInt.Type) (Text : UnicodeS
| _ ->
let key = key_of_inc prec col_info x in
(* Printf.printf "key_of_inc %s\n" (String.escaped key);*)
- Pervasives.compare k key
+ Stdlib.compare k key
let compare_with_key ?locale ?prec ?variable k t =
let col_info =

19
devel/ocaml-camomile/files/patch-Camomile_public_uCol.mli Normal file
View file

@ -0,0 +1,19 @@
--- Camomile/public/uCol.mli.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/uCol.mli
@@ -65,14 +65,14 @@ sig
If [prec] is omitted, the maximum possible strength is used.
If [variable] is omitted, the default of the locale
(usually [`Shifted]) is used.
- The meaning of the returned value is similar to Pervasives.compare *)
+ The meaning of the returned value is similar to Stdlib.compare *)
val compare :
?locale:string -> ?prec:precision -> ?variable:variable_option ->
text -> text -> int
(** Binary comparison of sort_key gives the same result as [compare].
i.e.
- [compare t1 t2 = Pervasives.compare (sort_key t1) (sort_key t2)]
+ [compare t1 t2 = Stdlib.compare (sort_key t1) (sort_key t2)]
If the same texts are repeatedly compared,
pre-computation of sort_key gives better performance. *)
val sort_key :

11
devel/ocaml-camomile/files/patch-Camomile_public_uTF8.ml Normal file
View file

@ -0,0 +1,11 @@
--- Camomile/public/uTF8.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/public/uTF8.ml
@@ -194,7 +194,7 @@ let iter proc s = iter_aux proc s 0
let iter proc s = iter_aux proc s 0
-let compare s1 s2 = Pervasives.compare s1 s2
+let compare s1 s2 = Stdlib.compare s1 s2
exception Malformed_code

11
devel/ocaml-camomile/files/patch-Camomile_toolslib_absCe.ml Normal file
View file

@ -0,0 +1,11 @@
--- Camomile/toolslib/absCe.ml.orig 2019-08-08 07:10:33 UTC
+++ Camomile/toolslib/absCe.ml
@@ -49,7 +49,7 @@ type elt =
| `FirstImplicit
| `FirstTrailing ]
-module Elt = struct type t = elt let compare = Pervasives.compare end
+module Elt = struct type t = elt let compare = Stdlib.compare end
module EltMap = Map.Make (Elt)
type ce = AbsOrd.point * AbsOrd.point * AbsOrd.point

154
devel/ocaml-camomile/pkg-plist
View file

@ -32,6 +32,38 @@
%%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.cmxa
%%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.cmxs
%%OCAML_SITELIBDIR%%/camomile/dyn/camomileLibraryDyn.ml
%%OCAML_SITELIBDIR%%/camomile/internal/avlTree.ml
%%OCAML_SITELIBDIR%%/camomile/internal/avlTree.mli
%%OCAML_SITELIBDIR%%/camomile/internal/bitsvect.ml
%%OCAML_SITELIBDIR%%/camomile/internal/bitsvect.mli
%%OCAML_SITELIBDIR%%/camomile/internal/byte_labeled_dag.ml
%%OCAML_SITELIBDIR%%/camomile/internal/byte_labeled_dag.mli
%%OCAML_SITELIBDIR%%/camomile/internal/bytesvect.ml
%%OCAML_SITELIBDIR%%/camomile/internal/bytesvect.mli
%%OCAML_SITELIBDIR%%/camomile/internal/charmap.ml
%%OCAML_SITELIBDIR%%/camomile/internal/charmap.mli
%%OCAML_SITELIBDIR%%/camomile/internal/database.ml
%%OCAML_SITELIBDIR%%/camomile/internal/database.mli
%%OCAML_SITELIBDIR%%/camomile/internal/hangul.ml
%%OCAML_SITELIBDIR%%/camomile/internal/hangul.mli
%%OCAML_SITELIBDIR%%/camomile/internal/iMap.ml
%%OCAML_SITELIBDIR%%/camomile/internal/iMap.mli
%%OCAML_SITELIBDIR%%/camomile/internal/iSet.ml
%%OCAML_SITELIBDIR%%/camomile/internal/iSet.mli
%%OCAML_SITELIBDIR%%/camomile/internal/stringPrep_data.ml
%%OCAML_SITELIBDIR%%/camomile/internal/stringPrep_data.mli
%%OCAML_SITELIBDIR%%/camomile/internal/tbl31.ml
%%OCAML_SITELIBDIR%%/camomile/internal/tbl31.mli
%%OCAML_SITELIBDIR%%/camomile/internal/uReStrLexer.ml
%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParser.ml
%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParser.mli
%%OCAML_SITELIBDIR%%/camomile/internal/uReStrParserType.ml
%%OCAML_SITELIBDIR%%/camomile/internal/unidata.ml
%%OCAML_SITELIBDIR%%/camomile/internal/unidata.mli
%%OCAML_SITELIBDIR%%/camomile/internal/unimap.ml
%%OCAML_SITELIBDIR%%/camomile/internal/unimap.mli
%%OCAML_SITELIBDIR%%/camomile/internal/xArray.ml
%%OCAML_SITELIBDIR%%/camomile/internal/xArray.mli
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.a
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cma
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmi
@ -40,14 +72,6 @@
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmxa
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.cmxs
%%OCAML_SITELIBDIR%%/camomile/lib_default/camomileLibraryDefault.ml
%%OCAML_SITELIBDIR%%/camomile/library/avlTree.ml
%%OCAML_SITELIBDIR%%/camomile/library/avlTree.mli
%%OCAML_SITELIBDIR%%/camomile/library/bitsvect.ml
%%OCAML_SITELIBDIR%%/camomile/library/bitsvect.mli
%%OCAML_SITELIBDIR%%/camomile/library/byte_labeled_dag.ml
%%OCAML_SITELIBDIR%%/camomile/library/byte_labeled_dag.mli
%%OCAML_SITELIBDIR%%/camomile/library/bytesvect.ml
%%OCAML_SITELIBDIR%%/camomile/library/bytesvect.mli
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.a
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.cma
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary.cmi
@ -220,77 +244,53 @@
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmt
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmti
%%OCAML_SITELIBDIR%%/camomile/library/camomileLibrary__XString.cmx
%%OCAML_SITELIBDIR%%/camomile/library/caseMap.ml
%%OCAML_SITELIBDIR%%/camomile/library/caseMap.mli
%%OCAML_SITELIBDIR%%/camomile/library/charEncoding.ml
%%OCAML_SITELIBDIR%%/camomile/library/charEncoding.mli
%%OCAML_SITELIBDIR%%/camomile/library/charmap.ml
%%OCAML_SITELIBDIR%%/camomile/library/charmap.mli
%%OCAML_SITELIBDIR%%/camomile/library/configInt.ml
%%OCAML_SITELIBDIR%%/camomile/library/database.ml
%%OCAML_SITELIBDIR%%/camomile/library/database.mli
%%OCAML_SITELIBDIR%%/camomile/library/hangul.ml
%%OCAML_SITELIBDIR%%/camomile/library/hangul.mli
%%OCAML_SITELIBDIR%%/camomile/library/iMap.ml
%%OCAML_SITELIBDIR%%/camomile/library/iMap.mli
%%OCAML_SITELIBDIR%%/camomile/library/iSet.ml
%%OCAML_SITELIBDIR%%/camomile/library/iSet.mli
%%OCAML_SITELIBDIR%%/camomile/library/locale.ml
%%OCAML_SITELIBDIR%%/camomile/library/locale.mli
%%OCAML_SITELIBDIR%%/camomile/library/oOChannel.ml
%%OCAML_SITELIBDIR%%/camomile/library/oOChannel.mli
%%OCAML_SITELIBDIR%%/camomile/library/stringPrep.ml
%%OCAML_SITELIBDIR%%/camomile/library/stringPrep.mli
%%OCAML_SITELIBDIR%%/camomile/library/stringPrep_data.ml
%%OCAML_SITELIBDIR%%/camomile/library/stringPrep_data.mli
%%OCAML_SITELIBDIR%%/camomile/library/subText.ml
%%OCAML_SITELIBDIR%%/camomile/library/subText.mli
%%OCAML_SITELIBDIR%%/camomile/library/tbl31.ml
%%OCAML_SITELIBDIR%%/camomile/library/tbl31.mli
%%OCAML_SITELIBDIR%%/camomile/library/uCS4.ml
%%OCAML_SITELIBDIR%%/camomile/library/uCS4.mli
%%OCAML_SITELIBDIR%%/camomile/library/uChar.ml
%%OCAML_SITELIBDIR%%/camomile/library/uChar.mli
%%OCAML_SITELIBDIR%%/camomile/library/uCharInfo.ml
%%OCAML_SITELIBDIR%%/camomile/library/uCharInfo.mli
%%OCAML_SITELIBDIR%%/camomile/library/uCharTbl.ml
%%OCAML_SITELIBDIR%%/camomile/library/uCharTbl.mli
%%OCAML_SITELIBDIR%%/camomile/library/uCol.ml
%%OCAML_SITELIBDIR%%/camomile/library/uCol.mli
%%OCAML_SITELIBDIR%%/camomile/library/uLine.ml
%%OCAML_SITELIBDIR%%/camomile/library/uLine.mli
%%OCAML_SITELIBDIR%%/camomile/library/uMap.ml
%%OCAML_SITELIBDIR%%/camomile/library/uMap.mli
%%OCAML_SITELIBDIR%%/camomile/library/uNF.ml
%%OCAML_SITELIBDIR%%/camomile/library/uNF.mli
%%OCAML_SITELIBDIR%%/camomile/library/uPervasives.ml
%%OCAML_SITELIBDIR%%/camomile/library/uPervasives.mli
%%OCAML_SITELIBDIR%%/camomile/library/uRe.ml
%%OCAML_SITELIBDIR%%/camomile/library/uRe.mli
%%OCAML_SITELIBDIR%%/camomile/library/uReStr.ml
%%OCAML_SITELIBDIR%%/camomile/library/uReStr.mli
%%OCAML_SITELIBDIR%%/camomile/library/uReStrLexer.ml
%%OCAML_SITELIBDIR%%/camomile/library/uReStrParser.ml
%%OCAML_SITELIBDIR%%/camomile/library/uReStrParser.mli
%%OCAML_SITELIBDIR%%/camomile/library/uReStrParserType.ml
%%OCAML_SITELIBDIR%%/camomile/library/uSet.ml
%%OCAML_SITELIBDIR%%/camomile/library/uSet.mli
%%OCAML_SITELIBDIR%%/camomile/library/uTF16.ml
%%OCAML_SITELIBDIR%%/camomile/library/uTF16.mli
%%OCAML_SITELIBDIR%%/camomile/library/uTF8.ml
%%OCAML_SITELIBDIR%%/camomile/library/uTF8.mli
%%OCAML_SITELIBDIR%%/camomile/library/uText.ml
%%OCAML_SITELIBDIR%%/camomile/library/uText.mli
%%OCAML_SITELIBDIR%%/camomile/library/unicodeString.ml
%%OCAML_SITELIBDIR%%/camomile/library/unidata.ml
%%OCAML_SITELIBDIR%%/camomile/library/unidata.mli
%%OCAML_SITELIBDIR%%/camomile/library/unimap.ml
%%OCAML_SITELIBDIR%%/camomile/library/unimap.mli
%%OCAML_SITELIBDIR%%/camomile/library/xArray.ml
%%OCAML_SITELIBDIR%%/camomile/library/xArray.mli
%%OCAML_SITELIBDIR%%/camomile/library/xString.ml
%%OCAML_SITELIBDIR%%/camomile/library/xString.mli
%%OCAML_SITELIBDIR%%/camomile/opam
%%OCAML_SITELIBDIR%%/camomile/public/caseMap.ml
%%OCAML_SITELIBDIR%%/camomile/public/caseMap.mli
%%OCAML_SITELIBDIR%%/camomile/public/charEncoding.ml
%%OCAML_SITELIBDIR%%/camomile/public/charEncoding.mli
%%OCAML_SITELIBDIR%%/camomile/public/locale.ml
%%OCAML_SITELIBDIR%%/camomile/public/locale.mli
%%OCAML_SITELIBDIR%%/camomile/public/oOChannel.ml
%%OCAML_SITELIBDIR%%/camomile/public/oOChannel.mli
%%OCAML_SITELIBDIR%%/camomile/public/stringPrep.ml
%%OCAML_SITELIBDIR%%/camomile/public/stringPrep.mli
%%OCAML_SITELIBDIR%%/camomile/public/subText.ml
%%OCAML_SITELIBDIR%%/camomile/public/subText.mli
%%OCAML_SITELIBDIR%%/camomile/public/uCS4.ml
%%OCAML_SITELIBDIR%%/camomile/public/uCS4.mli
%%OCAML_SITELIBDIR%%/camomile/public/uChar.ml
%%OCAML_SITELIBDIR%%/camomile/public/uChar.mli
%%OCAML_SITELIBDIR%%/camomile/public/uCharInfo.ml
%%OCAML_SITELIBDIR%%/camomile/public/uCharInfo.mli
%%OCAML_SITELIBDIR%%/camomile/public/uCharTbl.ml
%%OCAML_SITELIBDIR%%/camomile/public/uCharTbl.mli
%%OCAML_SITELIBDIR%%/camomile/public/uCol.ml
%%OCAML_SITELIBDIR%%/camomile/public/uCol.mli
%%OCAML_SITELIBDIR%%/camomile/public/uLine.ml
%%OCAML_SITELIBDIR%%/camomile/public/uLine.mli
%%OCAML_SITELIBDIR%%/camomile/public/uMap.ml
%%OCAML_SITELIBDIR%%/camomile/public/uMap.mli
%%OCAML_SITELIBDIR%%/camomile/public/uNF.ml
%%OCAML_SITELIBDIR%%/camomile/public/uNF.mli
%%OCAML_SITELIBDIR%%/camomile/public/uPervasives.ml
%%OCAML_SITELIBDIR%%/camomile/public/uPervasives.mli
%%OCAML_SITELIBDIR%%/camomile/public/uRe.ml
%%OCAML_SITELIBDIR%%/camomile/public/uRe.mli
%%OCAML_SITELIBDIR%%/camomile/public/uReStr.ml
%%OCAML_SITELIBDIR%%/camomile/public/uReStr.mli
%%OCAML_SITELIBDIR%%/camomile/public/uSet.ml
%%OCAML_SITELIBDIR%%/camomile/public/uSet.mli
%%OCAML_SITELIBDIR%%/camomile/public/uTF16.ml
%%OCAML_SITELIBDIR%%/camomile/public/uTF16.mli
%%OCAML_SITELIBDIR%%/camomile/public/uTF8.ml
%%OCAML_SITELIBDIR%%/camomile/public/uTF8.mli
%%OCAML_SITELIBDIR%%/camomile/public/uText.ml
%%OCAML_SITELIBDIR%%/camomile/public/uText.mli
%%OCAML_SITELIBDIR%%/camomile/public/unicodeString.ml
%%OCAML_SITELIBDIR%%/camomile/public/xString.ml
%%OCAML_SITELIBDIR%%/camomile/public/xString.mli
%%DATADIR%%/charmaps/1026.mar
%%DATADIR%%/charmaps/1047.mar
%%DATADIR%%/charmaps/437.mar

3
devel/ocaml-cfg/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= cfg
PORTVERSION= 2.2.0
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -26,7 +27,7 @@ do-build:
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--prefix=${PREFIX} --libdir=${OCAML_SITELIBDIR}
--libdir=${PREFIX}/${OCAML_SITELIBDIR}
post-install-EXAMPLES-on:
@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})

1
devel/ocaml-classes/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= classes
PORTVERSION= 4.00
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-cmdliner/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= cmdliner
PORTVERSION= 1.0.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://erratique.ch/software/cmdliner/releases/
PKGNAMEPREFIX= ocaml-

3
devel/ocaml-cppo/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= cppo
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.9
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -22,6 +23,6 @@ OPTIONS_DEFINE= DOCS
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cppo
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib:${PREFIX}/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
.include <bsd.port.mk>

32
devel/ocaml-cppo/pkg-plist
View file

@ -1,20 +1,20 @@
bin/cppo
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/META
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/dune-package
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/opam
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/META
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/dune-package
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli
%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/opam
lib/ocaml/cppo/META
lib/ocaml/cppo/dune-package
lib/ocaml/cppo/opam
lib/ocaml/cppo_ocamlbuild/META
lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a
lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma
lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
lib/ocaml/cppo_ocamlbuild/dune-package
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml
lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli
lib/ocaml/cppo_ocamlbuild/opam
%%PORTDOCS%%share/doc/ocaml/cppo/LICENSE.md
%%PORTDOCS%%share/doc/ocaml/cppo/README.md
%%PORTDOCS%%share/doc/ocaml/cppo_ocamlbuild/LICENSE.md

18
devel/ocaml-dune/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= dune
PORTVERSION= 1.11.4
PORTVERSION= 3.7.1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -14,21 +14,27 @@ USE_GITHUB= yes
GH_ACCOUNT= ocaml
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
SUB_FILES= setup.ml
SUB_LIST= OCAML_SITELIBDIR="${PREFIX}/${OCAML_SITELIBDIR}" \
OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" \
OCAML_DOCSDIR="${OCAML_DOCSDIR}" \
MANPREFIX="${MANPREFIX}"
CONFLICTS_INSTALL= wdune
ALL_TARGET= release
MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}"
MAKE_ENV= LIBDIR="${PREFIX}/${OCAML_SITELIBDIR}"
DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
PORTDOCS= *.md
OPTIONS_DEFINE= DOCS
post-patch:
# FreeBSD-specific hack, do not nag upstream (for now)
@${REINPLACE_CMD} -e '/let doc_root/ \
@${REINPLACE_CMD} -e '/doc_root = Path.relative/ \
s:"doc:"${OCAML_DOCSDIR:S,^${PREFIX}/,,}:' \
${WRKSRC}/src/install.ml
${WRKSRC}/src/dune_rules/install.ml
pre-configure:
@${MV} ${WRKDIR}/setup.ml ${WRKSRC}/src/dune_rules/setup.ml
.include <bsd.port.mk>

6
devel/ocaml-dune/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1570592252
SHA256 (ocaml-dune-1.11.4_GH0.tar.gz) = 325e6744a55b9b2033dc92b562196337bf9cd99b86bd153f5e7941f6fbfbf9fb
SIZE (ocaml-dune-1.11.4_GH0.tar.gz) = 849090
TIMESTAMP = 1683281166
SHA256 (ocaml-dune-3.7.1_GH0.tar.gz) = 9ddc1dae09e7be6d0bf22b7d1584d95a1b3d4f5d1bae1d4095dc4e1833fa86b2
SIZE (ocaml-dune-3.7.1_GH0.tar.gz) = 2011275

29
devel/ocaml-dune/files/patch-Makefile Normal file
View file

@ -0,0 +1,29 @@
--- Makefile.orig 2023-04-04 11:30:10 UTC
+++ Makefile
@@ -44,7 +44,7 @@ release: $(BIN)
.PHONY: release
release: $(BIN)
- @$(BIN) build @install -p dune --profile dune-bootstrap
+ @$(BIN) build @install -p dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs,dune-site,dune-rpc,dyn,stdune,ordering,xdg --profile dune-bootstrap
$(BIN):
@ocaml boot/bootstrap.ml
@@ -58,6 +58,17 @@ install:
.PHONY: install
install:
$(BIN) install $(INSTALL_ARGS) dune
+ $(BIN) install $(INSTALL_ARGS) dune-action-plugin
+ $(BIN) install $(INSTALL_ARGS) dune-build-info
+ $(BIN) install $(INSTALL_ARGS) dune-configurator
+ $(BIN) install $(INSTALL_ARGS) dune-glob
+ $(BIN) install $(INSTALL_ARGS) dune-private-libs
+ $(BIN) install $(INSTALL_ARGS) dune-site
+ $(BIN) install $(INSTALL_ARGS) dune-rpc
+ $(BIN) install $(INSTALL_ARGS) dyn
+ $(BIN) install $(INSTALL_ARGS) stdune
+ $(BIN) install $(INSTALL_ARGS) ordering
+ $(BIN) install $(INSTALL_ARGS) xdg
.PHONY: uninstall
uninstall:

12
devel/ocaml-dune/files/setup.ml.in Normal file
View file

@ -0,0 +1,12 @@
let library_path = ["%%OCAML_LIBDIR%%"; "%%OCAML_SITELIBDIR%%"]
let roots : string option Install.Section.Paths.Roots.t =
{ lib_root = Some "%%OCAML_LIBDIR%%"
; man = Some "%%MANPREFIX%%/man"
; doc_root = Some "%%OCAML_DOCSDIR%%"
; etc_root = Some "%%PREFIX%%/etc"
; share_root = Some "%%PREFIX%%/share"
; bin = Some "%%PREFIX%%/bin"
; sbin = Some "%%PREFIX%%/sbin"
; libexec_root = Some "%%OCAML_LIBDIR%%"
}

1556
devel/ocaml-dune/pkg-plist
View file

File diff suppressed because it is too large Load diff

1
devel/ocaml-extlib/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= extlib
DISTVERSION= 1.7.9
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/ygrek/ocaml-extlib/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-findlib/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= findlib
PORTVERSION= 1.8.1
PORTVERSION= 1.9.6
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-

6
devel/ocaml-findlib/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1564402014
SHA256 (findlib-1.8.1.tar.gz) = 8e85cfa57e8745715432df3116697c8f41cb24b5ec16d1d5acd25e0196d34303
SIZE (findlib-1.8.1.tar.gz) = 261544
TIMESTAMP = 1683284992
SHA256 (findlib-1.9.6.tar.gz) = 2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2
SIZE (findlib-1.9.6.tar.gz) = 271246

61
devel/ocaml-findlib/files/patch-Makefile
View file

@ -1,64 +1,11 @@
--- Makefile.orig 2016-11-18 13:04:45 UTC
--- Makefile.orig 2022-09-24 15:13:16 UTC
+++ Makefile
@@ -17,14 +17,14 @@ opt:
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
install:
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
$(MAKE) install-config
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
$(MAKE) install-meta
test -z "$(NUMTOP)" || { cd src/findlib; $(MAKE) install-num-top; }
if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
+ ${BSD_INSTALL_SCRIPT} tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
fi
$(MAKE) install-doc
@@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in
USE_CYGPATH="$(USE_CYGPATH)"; \
export USE_CYGPATH; \
cat findlib.conf.in | \
- $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
+ $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf
$(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \
- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf
+ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH):$(OCAML_LIBDIR)' -p >findlib.conf
if ./tools/cmd_from_same_dir ocamlc; then \
echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
fi
@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
+ -cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
.PHONY: uninstall-doc
uninstall-doc:
@@ -86,7 +86,7 @@ uninstall-doc:
.PHONY: install-meta
install-meta:
- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: uninstall-meta
uninstall-meta:
@@ -94,9 +94,9 @@ uninstall-meta:
.PHONY: install-config
install-config:
- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || ${BSD_INSTALL_DATA} findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
.PHONY: uninstall-config
uninstall-config:

15
devel/ocaml-findlib/files/patch-src__bytes__Makefile
View file

@ -1,15 +0,0 @@
--- src/bytes/Makefile.orig 2016-11-18 13:04:46 UTC
+++ src/bytes/Makefile
@@ -19,9 +19,9 @@ opt:
$(OCAMLBUILD) $$files
install: all
- mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes"
- cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
- cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"
+ cd _build/ && cp ../META $(BYTE_FILES) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"
+ cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
uninstall:
rm -rf "$(prefix)$(OCAML_SITELIB)/bytes"

12
devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
View file

@ -1,12 +0,0 @@
--- src/findlib-toolbox/Makefile.orig 2016-11-18 13:04:46 UTC
+++ src/findlib-toolbox/Makefile
@@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
install:
- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
+ mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
+ ${BSD_INSTALL_DATA} make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard

42
devel/ocaml-findlib/files/patch-src_findlib_Makefile
View file

@ -1,42 +0,0 @@
--- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC
+++ src/findlib/Makefile
@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
OCAMLLEX = ocamllex
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo --
+OCAML_LIBBIN=${PREFIX}/lib/ocaml
OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
@@ -119,23 +120,23 @@ clean:
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
install: all
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
# the following "if" block is only needed for 4.00beta2
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
fi
install-num-top:
- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
cp num_top.cma num_top.cmi num_top_printers.cmi \
- "$(prefix)$(OCAML_SITELIB)/num-top"
+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
# Note: uninstall-num-top is part of the removal of the META files.

10
devel/ocaml-findlib/pkg-plist
View file

@ -8,12 +8,15 @@ bin/safe_camlp4
%%OCAML_SITELIBDIR%%/dynlink/META
%%OCAML_SITELIBDIR%%/findlib/META
%%OCAML_SITELIBDIR%%/findlib/Makefile.config
%%OCAML_SITELIBDIR%%/findlib/Makefile.packages
%%OCAML_SITELIBDIR%%/findlib/findlib.a
%%OCAML_SITELIBDIR%%/findlib/findlib.cma
%%OCAML_SITELIBDIR%%/findlib/findlib.cmi
%%OCAML_SITELIBDIR%%/findlib/findlib.cmxa
%%OCAML_SITELIBDIR%%/findlib/findlib.cmxs
%%OCAML_SITELIBDIR%%/findlib/findlib.mli
%%OCAML_SITELIBDIR%%/findlib/findlib_config.cmi
%%OCAML_SITELIBDIR%%/findlib/findlib_config.ml
%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.a
%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma
%%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa
@ -22,13 +25,19 @@ bin/safe_camlp4
%%OCAML_SITELIBDIR%%/findlib/findlib_top.cma
%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa
%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs
%%OCAML_SITELIBDIR%%/findlib/fl_args.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli
%%OCAML_SITELIBDIR%%/findlib/fl_lint.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_meta.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_metascanner.mli
%%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli
%%OCAML_SITELIBDIR%%/findlib/fl_split.cmi
%%OCAML_SITELIBDIR%%/findlib/fl_topo.cmi
%%OCAML_SITELIBDIR%%/findlib/ocaml_args.cmi
%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard
%%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
%%OCAML_SITELIBDIR%%/findlib/topfind.cmi
@ -37,7 +46,6 @@ bin/safe_camlp4
%%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/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

18
devel/ocaml-ipaddr/Makefile
View file

@ -1,35 +1,33 @@
PORTNAME= ipaddr
PORTVERSION= 2.6.1
DISTVERSIONPREFIX= v
PORTVERSION= 3.1.0
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
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
BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0 \
dune:devel/ocaml-dune
RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0
USE_GITHUB= yes
GH_ACCOUNT= mirage
GH_PROJECT= ocaml-ipaddr
USES= gmake
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
post-patch:
@${REINPLACE_CMD} -e '/^SETUP =/s,ocaml,& -unsafe-string,' \
${WRKSRC}/Makefile
do-configure:
cd ${CONFIGURE_WRKSRC} && ocaml -unsafe-string setup.ml \
-configure ${CONFIGURE_ARGS}
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--prefix=${PREFIX} --libdir=${PREFIX}/${OCAML_SITELIBDIR}
.include <bsd.port.mk>

5
devel/ocaml-ipaddr/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (mirage-ocaml-ipaddr-2.6.1_GH0.tar.gz) = 7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0
SIZE (mirage-ocaml-ipaddr-2.6.1_GH0.tar.gz) = 64458
TIMESTAMP = 1684858044
SHA256 (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 707d5f9bb6659ff1cb5850aa20f6424cbf60b681033264c4c2049af75bd923c2
SIZE (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 25889

33
devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml Normal file
View file

@ -0,0 +1,33 @@
--- lib/ipaddr.ml.orig 2019-03-03 17:12:39 UTC
+++ lib/ipaddr.ml
@@ -69,9 +69,9 @@ let int_of_char c = match c with
let char_A = int_of_char 'A'
let int_of_char c = match c with
- | '0'..'9' -> Pervasives.int_of_char c - char_0
- | 'a'..'f' -> 10 + Pervasives.int_of_char c - char_a
- | 'A'..'F' -> 10 + Pervasives.int_of_char c - char_A
+ | '0'..'9' -> Stdlib.int_of_char c - char_0
+ | 'a'..'f' -> 10 + Stdlib.int_of_char c - char_a
+ | 'A'..'F' -> 10 + Stdlib.int_of_char c - char_A
| _ -> -1
let bad_char i s =
@@ -258,7 +258,7 @@ module V4 = struct
let compare (pre,sz) (pre',sz') =
let c = compare pre pre' in
- if c = 0 then Pervasives.compare sz sz' else c
+ if c = 0 then Stdlib.compare sz sz' else c
let ip = make
@@ -706,7 +706,7 @@ module V6 = struct
let compare (pre,sz) (pre',sz') =
let c = compare pre pre' in
- if c = 0 then Pervasives.compare sz sz' else c
+ if c = 0 then Stdlib.compare sz sz' else c
let ip = make

80
devel/ocaml-ipaddr/pkg-plist Normal file
View file

@ -0,0 +1,80 @@
%%OCAML_SITELIBDIR%%/ipaddr/META
%%OCAML_SITELIBDIR%%/ipaddr/dune-package
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.a
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cma
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmi
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmt
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmti
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmx
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmxa
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.cmxs
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.ml
%%OCAML_SITELIBDIR%%/ipaddr/ipaddr.mli
%%OCAML_SITELIBDIR%%/ipaddr/opam
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.a
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cma
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmi
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmt
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmti
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmx
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxa
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxs
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.ml
%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.mli
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.a
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cma
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmi
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmt
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmti
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmx
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmxa
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmxs
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.ml
%%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.mli
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.a
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cma
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmi
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmt
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmti
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmx
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmxa
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmxs
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.ml
%%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.mli
%%OCAML_SITELIBDIR%%/macaddr/META
%%OCAML_SITELIBDIR%%/macaddr/dune-package
%%OCAML_SITELIBDIR%%/macaddr/macaddr.a
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cma
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmi
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmt
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmti
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmx
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmxa
%%OCAML_SITELIBDIR%%/macaddr/macaddr.cmxs
%%OCAML_SITELIBDIR%%/macaddr/macaddr.ml
%%OCAML_SITELIBDIR%%/macaddr/macaddr.mli
%%OCAML_SITELIBDIR%%/macaddr/opam
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.a
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cma
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmi
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmt
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmti
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmx
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxa
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxs
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.ml
%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.mli
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.a
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cma
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmi
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmt
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmx
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxa
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxs
%%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.ml
share/doc/ocaml/ipaddr/CHANGES.md
share/doc/ocaml/ipaddr/LICENSE.md
share/doc/ocaml/ipaddr/README.md
share/doc/ocaml/macaddr/CHANGES.md
share/doc/ocaml/macaddr/LICENSE.md
share/doc/ocaml/macaddr/README.md

2
devel/ocaml-lacaml/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= lacaml
PORTVERSION= 8.0.7
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-lwt/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= lwt
PORTVERSION= 2.5.2
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

12
devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml Normal file
View file

@ -0,0 +1,12 @@
--- src/unix/lwt_bytes.ml.orig 2016-04-25 14:32:43 UTC
+++ src/unix/lwt_bytes.ml
@@ -219,7 +219,8 @@ let map_file ~fd ?pos ~shared ?(size=(-1)) () =
+-----------------------------------------------------------------+ *)
let map_file ~fd ?pos ~shared ?(size=(-1)) () =
- Array1.map_file fd ?pos char c_layout shared size
+ Unix.map_file fd ?pos char c_layout shared [|size|]
+ |> Bigarray.array1_of_genarray
external mapped : t -> bool = "lwt_unix_mapped" "noalloc"

2
devel/ocaml-magic/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= magic
PORTVERSION= 0.7.3
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF/ocaml-${PORTNAME}/ocaml-${PORTNAME}/0.7
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-ocamlbuild/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= ocamlbuild
PORTVERSION= 0.14.2
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-opam/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= opam
DISTVERSION= 2.1.5
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-ounit/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= ounit
PORTVERSION= 1.0.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.xs4all.nl/~mmzeeman/ocaml/
PKGNAMEPREFIX= ocaml-

16
devel/ocaml-parmap/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= parmap
DISTVERSION= 1.0-rc9
DISTVERSION= 1.2.4
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -10,19 +10,23 @@ WWW= https://github.com/rdicosmo/parmap
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
BUILD_DEPENDS= dune:devel/ocaml-dune
USE_GITHUB= yes
GH_ACCOUNT= rdicosmo
USES= gmake
GNU_CONFIGURE= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_LDCONFIG= yes
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/parmap/*.cmxs
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/*.so
TARGETS= ${PORTNAME}
do-build:
cd ${BUILD_WRKSRC} && dune build --verbose -p ${TARGETS:ts,} -j ${MAKE_JOBS_NUMBER}
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--libdir=${PREFIX}/${OCAML_SITELIBDIR} ${TARGETS}
.include <bsd.port.mk>

6
devel/ocaml-parmap/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1519649954
SHA256 (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 8bccdb269e955b7ae6ab981117bfe64abf0f832788e4138c79b83385c9c9e16a
SIZE (rdicosmo-parmap-1.0-rc9_GH0.tar.gz) = 99394
TIMESTAMP = 1684362358
SHA256 (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 3c8835dc6dfc74bc9ad9b68ba5b3e6287434555bb09a27b3910c73f9b70ce140
SIZE (rdicosmo-parmap-1.2.4_GH0.tar.gz) = 47584

15
devel/ocaml-parmap/files/patch-Makefile.in
View file

@ -1,15 +0,0 @@
--- Makefile.in.orig 2015-02-09 10:42:28 UTC
+++ Makefile.in
@@ -20,9 +20,9 @@ INSTALL = $(OCAMLFIND) install
UNINSTALL = $(OCAMLFIND) remove
else
export OCAMLLIBDIR := lib/ocaml
-LIBDIR=$(DESTDIR)/$(OCAMLLIBDIR)
-BINDIR=$(DESTDIR)/bin
-MANDIR=$(DESTDIR)/man/man3
+LIBDIR=$(DESTDIR)$(prefix)/$(OCAMLLIBDIR)
+BINDIR=$(DESTDIR)$(exec_prefix)/bin
+MANDIR=$(DESTDIR)$(prefix)/man/man3
INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
endif

61
devel/ocaml-parmap/pkg-plist
View file

@ -1,22 +1,39 @@
lib/ocaml/parmap/META
lib/ocaml/parmap/bytearray.cmi
lib/ocaml/parmap/bytearray.cmx
lib/ocaml/parmap/bytearray.mli
lib/ocaml/parmap/libparmap_stubs.a
lib/ocaml/parmap/myocamlbuild.cmx
lib/ocaml/parmap/parmap_utils.cmi
lib/ocaml/parmap/parmap_utils.cmx
lib/ocaml/parmap/parmap_utils.mli
lib/ocaml/parmap/parmap.a
lib/ocaml/parmap/parmap.cma
lib/ocaml/parmap/parmap.cmi
lib/ocaml/parmap/parmap.cmx
lib/ocaml/parmap/parmap.cmxa
lib/ocaml/parmap/parmap.cmxs
lib/ocaml/parmap/parmap.mli
lib/ocaml/parmap/setcore.cmi
lib/ocaml/parmap/setcore.cmx
lib/ocaml/stublibs/dllparmap_stubs.so
lib/ocaml/stublibs/dllparmap_stubs.so.owner
man/man3/Parmap.3o.gz
@dir %%OCAML_SITELIBDIR%%
%%OCAML_SITELIBDIR%%/parmap/META
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmi
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmt
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmti
%%OCAML_SITELIBDIR%%/parmap/bytearray.cmx
%%OCAML_SITELIBDIR%%/parmap/bytearray.ml
%%OCAML_SITELIBDIR%%/parmap/bytearray.mli
%%OCAML_SITELIBDIR%%/parmap/dune-package
%%OCAML_SITELIBDIR%%/parmap/libparmap_stubs.a
%%OCAML_SITELIBDIR%%/parmap/opam
%%OCAML_SITELIBDIR%%/parmap/parmap.a
%%OCAML_SITELIBDIR%%/parmap/parmap.cma
%%OCAML_SITELIBDIR%%/parmap/parmap.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap.cmti
%%OCAML_SITELIBDIR%%/parmap/parmap.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap.cmxa
%%OCAML_SITELIBDIR%%/parmap/parmap.cmxs
%%OCAML_SITELIBDIR%%/parmap/parmap.ml
%%OCAML_SITELIBDIR%%/parmap/parmap.mli
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap_compat.ml
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmi
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmt
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmti
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.cmx
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.ml
%%OCAML_SITELIBDIR%%/parmap/parmap_utils.mli
%%OCAML_SITELIBDIR%%/parmap/setcore.cmi
%%OCAML_SITELIBDIR%%/parmap/setcore.cmt
%%OCAML_SITELIBDIR%%/parmap/setcore.cmx
%%OCAML_SITELIBDIR%%/parmap/setcore.ml
%%OCAML_SITELIBDIR%%/stublibs/dllparmap_stubs.so
share/doc/ocaml/parmap/CHANGES
share/doc/ocaml/parmap/LICENSE
share/doc/ocaml/parmap/README.md
share/doc/ocaml/parmap/odoc-pages/index.mld

2
devel/ocaml-pcre/Makefile
View file

@ -1,7 +1,7 @@
PORTNAME= pcre
PORTVERSION= 7.2.3
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

3
devel/ocaml-pomap/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= pomap
PORTVERSION= 4.1.1
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -26,7 +27,7 @@ do-build:
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--libdir=${OCAML_SITELIBDIR}
--libdir=${PREFIX}/${OCAML_SITELIBDIR}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/pomap/pomap.cmxs

14
devel/ocaml-ppx-tools/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= ppx-tools
PORTVERSION= 5.1
DISTVERSIONSUFFIX=+4.06.0
PORTVERSION= 6.6
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -10,15 +9,20 @@ WWW= https://github.com/ocaml-ppx/ppx_tools
LICENSE= MIT
BUILD_DEPENDS= dune:devel/ocaml-dune \
cppo:devel/ocaml-cppo
USES= gmake
ALL_TARGET= release
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
MAKE_JOBS_UNSAFE=yes
USE_GITHUB= yes
GH_ACCOUNT= ocaml-ppx
GH_PROJECT= ${PORTNAME:C/-/_/}
DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME:C/-/_/}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/ppx_tools/ppx_tools.cmxs
PORTDOCS= CHANGES LICENSE README.md
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

6
devel/ocaml-ppx-tools/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508834585
SHA256 (ocaml-ppx-ppx_tools-5.1+4.06.0_GH0.tar.gz) = 413e01444bdef2c4a231ddb1281b29bbc7b0c4bd780b7da47d9255b193bfcc56
SIZE (ocaml-ppx-ppx_tools-5.1+4.06.0_GH0.tar.gz) = 17943
TIMESTAMP = 1683062036
SHA256 (ocaml-ppx-ppx_tools-6.6_GH0.tar.gz) = 7a38f6dcd475dbdbb775fc1e9e1f4542de6d26737776b11391b16274b7cf651d
SIZE (ocaml-ppx-ppx_tools-6.6_GH0.tar.gz) = 19265

60
devel/ocaml-ppx-tools/pkg-plist
View file

@ -1,19 +1,41 @@
%%OCAML_SITELIBDIR%%/ppx_tools/META
%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmi
%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmt
%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmti
%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.cmx
%%OCAML_SITELIBDIR%%/ppx_tools/ast_convenience.mli
%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmi
%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmt
%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmti
%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.cmx
%%OCAML_SITELIBDIR%%/ppx_tools/ast_mapper_class.mli
%%OCAML_SITELIBDIR%%/ppx_tools/dumpast
%%OCAML_SITELIBDIR%%/ppx_tools/genlifter
%%OCAML_SITELIBDIR%%/ppx_tools/ppx_metaquot
%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.a
%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cma
%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cmxa
%%OCAML_SITELIBDIR%%/ppx_tools/ppx_tools.cmxs
%%OCAML_SITELIBDIR%%/ppx_tools/rewriter
lib/ppx_tools/META
lib/ppx_tools/ast_convenience.cmi
lib/ppx_tools/ast_convenience.cmt
lib/ppx_tools/ast_convenience.cmti
lib/ppx_tools/ast_convenience.cmx
lib/ppx_tools/ast_convenience.ml
lib/ppx_tools/ast_convenience.mli
lib/ppx_tools/ast_lifter/ast_lifter.a
lib/ppx_tools/ast_lifter/ast_lifter.cma
lib/ppx_tools/ast_lifter/ast_lifter.cmi
lib/ppx_tools/ast_lifter/ast_lifter.cmt
lib/ppx_tools/ast_lifter/ast_lifter.cmx
lib/ppx_tools/ast_lifter/ast_lifter.cmxa
lib/ppx_tools/ast_lifter/ast_lifter.cmxs
lib/ppx_tools/ast_lifter/ast_lifter.ml
lib/ppx_tools/ast_mapper_class.cmi
lib/ppx_tools/ast_mapper_class.cmt
lib/ppx_tools/ast_mapper_class.cmti
lib/ppx_tools/ast_mapper_class.cmx
lib/ppx_tools/ast_mapper_class.ml
lib/ppx_tools/ast_mapper_class.mli
lib/ppx_tools/dumpast
lib/ppx_tools/dune-package
lib/ppx_tools/genlifter
lib/ppx_tools/metaquot/ppx.exe
lib/ppx_tools/metaquot/ppx_metaquot.a
lib/ppx_tools/metaquot/ppx_metaquot.cma
lib/ppx_tools/metaquot/ppx_metaquot.cmi
lib/ppx_tools/metaquot/ppx_metaquot.cmt
lib/ppx_tools/metaquot/ppx_metaquot.cmx
lib/ppx_tools/metaquot/ppx_metaquot.cmxa
lib/ppx_tools/metaquot/ppx_metaquot.cmxs
lib/ppx_tools/metaquot/ppx_metaquot.ml
lib/ppx_tools/opam
lib/ppx_tools/ppx_metaquot
lib/ppx_tools/ppx_tools.a
lib/ppx_tools/ppx_tools.cma
lib/ppx_tools/ppx_tools.cmxa
lib/ppx_tools/ppx_tools.cmxs
lib/ppx_tools/rewriter
@dir %%OCAML_SITELIBDIR%%

1
devel/ocaml-re/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= re
PORTVERSION= 1.4.1
DISTVERSIONPREFIX= ${PKGNAMEPREFIX}${PORTNAME}-
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-react/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= react
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://erratique.ch/software/react/releases/
PKGNAMEPREFIX= ocaml-

3
devel/ocaml-res/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= res
PORTVERSION= 5.0.1
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -26,7 +27,7 @@ do-build:
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--libdir=${OCAML_SITELIBDIR}
--libdir=${PREFIX}/${OCAML_SITELIBDIR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

3
devel/ocaml-result/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= result
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
@ -18,7 +19,7 @@ USE_GITHUB= yes
GH_ACCOUNT= janestreet
ALL_TARGET= default
MAKE_ENV= LIBDIR=${OCAML_SITELIBDIR}
MAKE_ENV= LIBDIR=${PREFIX}/${OCAML_SITELIBDIR}
OPTIONS_DEFINE= DOCS

2
devel/ocaml-sdl/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= sdl
PORTVERSION= 0.9.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-sem/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= sem
PORTVERSION= 0.0.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://ocaml-sem.sourceforge.net/files/ \
SF/ocaml-${PORTNAME}/${PORTNAME}/${PORTVERSION}

43
devel/ocaml-sexplib/Makefile
View file

@ -1,43 +0,0 @@
PORTNAME= sexplib
PORTVERSION= 113.00.00
MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for working with S-expressions
WWW= https://janestreet.github.io/
LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= multi
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
BUILD_DEPENDS+= ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num
RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
OPTIONS_DEFINE= DOCS
CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX}
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USES= gmake
DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix
PORTDOCS= *
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib*/*.cmxs
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>

2
devel/ocaml-sexplib/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (sexplib-113.00.00.tar.gz) = df91f1b4aae3936856cbb00a621a2c40f6b56c06670e1513b2b60698ab8240e4
SIZE (sexplib-113.00.00.tar.gz) = 136960

54
devel/ocaml-sexplib/files/patch-lib_conv.ml
View file

@ -1,54 +0,0 @@
--- lib/conv.ml.orig 2015-08-18 11:17:27 UTC
+++ lib/conv.ml
@@ -92,9 +92,9 @@ let sexp_of_float_vec vec =
let sexp_of_bigstring (bstr : bigstring) =
let n = Array1.dim bstr in
- let str = String.create n in
- for i = 0 to n - 1 do str.[i] <- bstr.{i} done;
- Atom str
+ let str = Bytes.create n in
+ for i = 0 to n - 1 do Bytes.set str i bstr.{i} done;
+ Atom (Bytes.unsafe_to_string str)
let sexp_of_float32_vec (vec : float32_vec) = sexp_of_float_vec vec
let sexp_of_float64_vec (vec : float64_vec) = sexp_of_float_vec vec
@@ -183,7 +183,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
@@ -194,7 +194,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
@@ -203,13 +203,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)

29
devel/ocaml-sexplib/files/patch-lib_lexer.mll
View file

@ -1,29 +0,0 @@
--- lib/lexer.mll.orig 2015-08-18 11:17:27 UTC
+++ lib/lexer.mll
@@ -54,7 +54,7 @@
type t
val create : int -> t
val add_char : t -> char -> unit
- val add_substring : t -> string -> int -> int -> unit
+ val add_subbytes : t -> bytes -> int -> int -> unit
val add_lexeme : t -> lexbuf -> unit
val clear : t -> unit
val of_buffer : Buffer.t -> t
@@ -189,7 +189,7 @@ and scan_string buf start = parse
{
let ofs = lexbuf.lex_start_pos in
let len = lexbuf.lex_curr_pos - ofs in
- Quoted_string_buffer.add_substring buf lexbuf.lex_buffer ofs len;
+ Quoted_string_buffer.add_subbytes buf lexbuf.lex_buffer ofs len;
Quoted_string_buffer.add_lexeme buf lexbuf;
scan_string buf start lexbuf
}
@@ -294,7 +294,7 @@ and scan_block_comment buf locs = parse
let create n = {contents = Buffer.create n; lexeme = Buffer.create n}
let of_buffer contents = { contents; lexeme = Buffer.create 64 }
let add_char t ch = Buffer.add_char t.contents ch
- let add_substring t str ofs len = Buffer.add_substring t.contents str ofs len
+ let add_subbytes t str ofs len = Buffer.add_subbytes t.contents str ofs len
let add_lexeme t lexbuf = Buffer.add_string t.lexeme (Lexing.lexeme lexbuf)
let clear t = Buffer.clear t.lexeme; Buffer.clear t.contents
end

16
devel/ocaml-sexplib/files/patch-lib_path.ml
View file

@ -1,16 +0,0 @@
--- lib/path.ml.orig 2015-08-18 11:17:27 UTC
+++ lib/path.ml
@@ -74,10 +74,10 @@ and subst_path sexp = function
let implode lst =
let len = List.length lst in
- let str = String.create len in
+ let str = Bytes.create len in
let rec loop ix = function
- | h :: t -> str.[ix] <- h; loop (ix + 1) t
- | [] -> str in
+ | h :: t -> Bytes.set str ix h; loop (ix + 1) t
+ | [] -> Bytes.unsafe_to_string str in
loop 0 lst
let fail_parse msg = failwith ("Path.parse: " ^ msg)

139
devel/ocaml-sexplib/files/patch-lib_pre__sexp.ml
View file

@ -1,139 +0,0 @@
--- lib/pre_sexp.ml.orig 2015-08-18 11:17:27 UTC
+++ lib/pre_sexp.ml
@@ -32,11 +32,11 @@ let must_escape str =
let esc_str str =
let estr = String.escaped str in
let elen = String.length estr in
- let res = String.create (elen + 2) in
+ let res = Bytes.create (elen + 2) in
String.blit estr 0 res 1 elen;
- res.[0] <- '"';
- res.[elen + 1] <- '"';
- res
+ Bytes.set res 0 '"';
+ Bytes.set res (elen + 1) '"';
+ Bytes.unsafe_to_string res
let index_of_newline str start =
try Some (String.index_from str start '\n')
@@ -898,7 +898,7 @@ let mk_cont_parser cont_parse = (); fun _state str ~ma
PARSE state str ~max_pos ~pos
MK_PARSER(
- string, String.length, parse_str, str.[pos],
+ string, String.length, parse_str, String.get str pos,
state.pstack, state.pstack <- pstack,
,,
Atom pbuf_str, List sexp_lst, [], `Sexp
@@ -906,7 +906,6 @@ MK_PARSER(
let parse = parse_str
-
(* Annot parsers *)
let get_glob_ofs parse_pos pos =
@@ -954,7 +953,7 @@ let mk_annot_list parse_state annot_lst pos =
let init_annot_pstate () = { Annot.positions = []; stack = [] }
MK_PARSER(
- string, String.length, parse_str_annot, str.[pos],
+ string, String.length, parse_str_annot, String.get str pos,
state.pstack.Annot.stack, state.pstack.Annot.stack <- pstack,
add_annot_pos state pos;,add_annot_pos1 state pos;,
mk_annot_atom state pbuf_str pos, mk_annot_list state sexp_lst pos,
@@ -995,11 +994,11 @@ let mk_this_parse ?parse_pos my_parse = (); fun ~pos ~
my_parse ?parse_pos:(Some parse_pos) ?len:(Some len) str
let gen_input_sexp my_parse ?parse_pos ic =
- let buf = String.create 1 in
+ let buf = Bytes.create 1 in
let rec loop this_parse =
let c = input_char ic in
- buf.[0] <- c;
- match this_parse ~pos:0 ~len:1 buf with
+ Bytes.set buf 0 c;
+ match this_parse ~pos:0 ~len:1 (Bytes.unsafe_to_string buf) with
| Done (sexp, _) -> sexp
| Cont (_, this_parse) -> loop this_parse
in
@@ -1007,12 +1006,12 @@ let gen_input_sexp my_parse ?parse_pos ic =
let input_sexp ?parse_pos ic = gen_input_sexp parse ?parse_pos ic
-let gen_input_rev_sexps my_parse ?parse_pos ?(buf = String.create 8192) ic =
+let gen_input_rev_sexps my_parse ?parse_pos ?(buf = Bytes.create 8192) ic =
let rev_sexps_ref = ref [] in
- let buf_len = String.length buf in
+ let buf_len = Bytes.length buf in
let rec loop this_parse ~pos ~len ~cont_state =
if len > 0 then
- match this_parse ~pos ~len buf with
+ match this_parse ~pos ~len (Bytes.unsafe_to_string buf) with
| Done (sexp, ({ Parse_pos.buf_pos; _ } as parse_pos)) ->
rev_sexps_ref := sexp :: !rev_sexps_ref;
let n_parsed = buf_pos - pos in
@@ -1073,9 +1072,9 @@ let of_string str =
of_string_bigstring "of_string" parse " " String.length String.sub str
let get_bstr_sub_str bstr pos len =
- let str = String.create len in
- for i = 0 to len - 1 do str.[i] <- bstr.{pos + i} done;
- str
+ let str = Bytes.create len in
+ for i = 0 to len - 1 do Bytes.set str i (bstr.{pos + i}) done;
+ Bytes.unsafe_to_string str
let bstr_ws_buf = Array1.create char c_layout 1
let () = bstr_ws_buf.{0} <- ' '
@@ -1101,8 +1100,8 @@ let load_sexps ?buf file = List.rev (load_rev_sexps ?b
let gen_load_sexp_loc = "Sexplib.Sexp.gen_load_sexp"
-let gen_load_sexp my_parse ?(strict = true) ?(buf = String.create 8192) file =
- let buf_len = String.length buf in
+let gen_load_sexp my_parse ?(strict = true) ?(buf = Bytes.create 8192) file =
+ let buf_len = Bytes.length buf in
let ic = open_in file in
let rec loop this_parse ~cont_state =
let len = input ic buf 0 buf_len in
@@ -1111,10 +1110,10 @@ let gen_load_sexp my_parse ?(strict = true) ?(buf = St
sprintf "%s: EOF in %s while in state %s"
gen_load_sexp_loc file (Cont_state.to_string cont_state))
else
- match this_parse ~pos:0 ~len buf with
+ match this_parse ~pos:0 ~len (Bytes.unsafe_to_string buf) with
| Done (sexp, ({ Parse_pos.buf_pos; _ } as parse_pos)) when strict ->
let rec strict_loop this_parse ~pos ~len =
- match this_parse ~pos ~len buf with
+ match this_parse ~pos ~len (Bytes.unsafe_to_string buf) with
| Done _ ->
failwith (
sprintf "%s: more than one S-expression in file %s"
@@ -1186,7 +1185,7 @@ module Annotated = struct
Of_sexp_error (Annot.Conv_exn (loc, exc), get_sexp annot_sexp)
end
-let load_sexp_conv ?(strict = true) ?(buf = String.create 8192) file f =
+let load_sexp_conv ?(strict = true) ?(buf = Bytes.create 8192) file f =
let sexp = load_sexp ~strict ~buf file in
try `Result (f sexp)
with Of_sexp_error _ ->
@@ -1200,7 +1199,7 @@ let raise_conv_exn ~file = function
let load_sexp_conv_exn ?strict ?buf file f =
raise_conv_exn ~file (load_sexp_conv ?strict ?buf file f)
-let load_sexps_conv ?(buf = String.create 8192) file f =
+let load_sexps_conv ?(buf = Bytes.create 8192) file f =
let rev_sexps = load_rev_sexps ~buf file in
try List.rev_map (fun sexp -> `Result (f sexp)) rev_sexps
with Of_sexp_error _ as e ->
@@ -1212,7 +1211,7 @@ let load_sexps_conv ?(buf = String.create 8192) file f
List.rev_map (fun annot_sexp -> Annotated.conv f annot_sexp)
rev_annot_sexps
-let load_sexps_conv_exn ?(buf = String.create 8192) file f =
+let load_sexps_conv_exn ?(buf = Bytes.create 8192) file f =
let rev_sexps = load_rev_sexps ~buf file in
try List.rev_map f rev_sexps
with Of_sexp_error _ as e ->

133
devel/ocaml-sexplib/files/patch-lib_sexp__intf.ml
View file

@ -1,133 +0,0 @@
--- lib/sexp_intf.ml.orig 2015-08-18 11:17:27 UTC
+++ lib/sexp_intf.ml
@@ -192,12 +192,12 @@ module type S = sig
annotated S-expression instead. *)
val input_sexps :
- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list
+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list
(** [input_sexps ?parse_pos ?buf ic] like {!input_sexps}, but returns
a list of annotated S-expressions. *)
val input_rev_sexps :
- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list
+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list
(** [input_sexps ?parse_pos ?buf ic] like {!input_rev_sexps}, but
returns a list of annotated S-expressions. *)
@@ -207,15 +207,15 @@ module type S = sig
(** NOTE: these functions should only be used if an annotated S-expression
is required. *)
- val load_sexp : ?strict : bool -> ?buf : string -> string -> t
+ val load_sexp : ?strict : bool -> ?buf : bytes -> string -> t
(** [load_sexp ?strict ?buf file] like {!load_sexp}, but returns an
annotated S-expression. *)
- val load_sexps : ?buf : string -> string -> t list
+ val load_sexps : ?buf : bytes -> string -> t list
(** [load_sexps ?buf file] like {!load_sexps}, but returns a list of
annotated S-expressions. *)
- val load_rev_sexps : ?buf : string -> string -> t list
+ val load_rev_sexps : ?buf : bytes -> string -> t list
(** [load_rev_sexps ?buf file] like {!load_rev_sexps}, but returns a
list of annotated S-expressions. *)
@@ -311,7 +311,7 @@ module type S = sig
*)
val input_sexps :
- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list
+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list
(** [input_sexps ?parse_pos ?buf ic] parses whitespace separated
S-expressions from input channel [ic] until EOF is reached. Faster than
the scan-functions.
@@ -320,7 +320,7 @@ module type S = sig
*)
val input_rev_sexps :
- ?parse_pos : Parse_pos.t -> ?buf : string -> in_channel -> t list
+ ?parse_pos : Parse_pos.t -> ?buf : bytes -> in_channel -> t list
(** [input_rev_sexps ?parse_pos ?buf ic] same as {!Sexp.input_sexps},
but returns a reversed list of S-expressions, which is slightly more
efficient. *)
@@ -328,7 +328,7 @@ module type S = sig
(** {6 Loading of (converted) S-expressions} *)
- val load_sexp : ?strict : bool -> ?buf : string -> string -> t
+ val load_sexp : ?strict : bool -> ?buf : bytes -> string -> t
(** [load_sexp ?strict ?buf file] reads one S-expression from [file] using
buffer [buf] for storing intermediate data. Faster than the
scan-functions.
@@ -344,7 +344,7 @@ module type S = sig
@param strict default = [true]
*)
- val load_sexps : ?buf : string -> string -> t list
+ val load_sexps : ?buf : bytes -> string -> t list
(** [load_sexps ?buf file] reads a list of whitespace separated S-expressions
from [file] using buffer [buf] for storing intermediate data.
Faster than the scan-functions.
@@ -355,12 +355,12 @@ module type S = sig
S-expression could be fully read.
*)
- val load_rev_sexps : ?buf : string -> string -> t list
+ val load_rev_sexps : ?buf : bytes -> string -> t list
(** [load_rev_sexps ?buf file] same as {!Sexp.load_sexps}, but returns a
reversed list of S-expressions, which is slightly more efficient. *)
val load_sexp_conv :
- ?strict : bool -> ?buf : string -> string -> (t -> 'a) -> 'a Annotated.conv
+ ?strict : bool -> ?buf : bytes -> string -> (t -> 'a) -> 'a Annotated.conv
(** [load_sexp_conv ?strict ?buf file f] like {!Sexp.load_sexp}, but
performs a conversion on the fly using [f]. Performance is equivalent
to executing {!Sexp.load_sexp} and performing conversion when there
@@ -375,13 +375,13 @@ module type S = sig
*)
val load_sexp_conv_exn :
- ?strict : bool -> ?buf : string -> string -> (t -> 'a) -> 'a
+ ?strict : bool -> ?buf : bytes -> string -> (t -> 'a) -> 'a
(** [load_sexp_conv_exn ?strict ?buf file f] like {!load_sexp_conv},
but returns the converted value or raises [Of_sexp_error] with exact
location information in the case of a conversion error. *)
val load_sexps_conv :
- ?buf : string -> string -> (t -> 'a) -> 'a Annotated.conv list
+ ?buf : bytes -> string -> (t -> 'a) -> 'a Annotated.conv list
(** [load_sexps_conv ?buf file f] like {!Sexp.load_sexps}, but performs
a conversion on the fly using [f]. Performance is equivalent to
executing {!Sexp.load_sexps} and performing conversion when there
@@ -395,7 +395,7 @@ module type S = sig
S-expression could be fully read.
*)
- val load_sexps_conv_exn : ?buf : string -> string -> (t -> 'a) -> 'a list
+ val load_sexps_conv_exn : ?buf : bytes -> string -> (t -> 'a) -> 'a list
(** [load_sexps_conv_exn ?buf file f] like {!load_sexps_conv}, but returns
the converted value or raises [Of_sexp_error] with exact location
information in the case of a conversion error. *)
@@ -611,14 +611,16 @@ module type S = sig
type pos = Src_pos.Relative.t = { row : int; col : int }
val sexp_of_pos : pos -> Type.t
- (** S-expressions annotated with relative source positions and comments *)
- type t =
+ (** S-expressions annotated with relative source positions and comments. All the
+ positions are relative to the opening paren of the enclosing list, or the first
+ character of the file. *)
+ type t = Type_with_layout.t =
| Atom of pos * string * string option (* second is quoted representation *)
| List of pos * t_or_comment list * pos (* positions of left and right parens *)
- and t_or_comment =
+ and t_or_comment = Type_with_layout.t_or_comment =
| Sexp of t
| Comment of comment
- and comment =
+ and comment = Type_with_layout.comment =
| Plain_comment of pos * string (* line or block comment *)
| Sexp_comment of pos * comment list * t (* position of #; *)

47
devel/ocaml-sexplib0/Makefile Normal file
View file

@ -0,0 +1,47 @@
PORTNAME= sexplib0
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.0
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for working with S-expressions
WWW= https://janestreet.github.io/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
BUILD_DEPENDS= dune:devel/ocaml-dune \
ocaml-type_conv>=0:devel/ocaml-type_conv \
${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num
RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
USES= gmake
ALL_TARGET= default
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX}
USE_GITHUB= yes
GH_ACCOUNT= janestreet
OPTIONS_DEFINE= DOCS
DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME}
OCAML_PKGDIRS= ${PORTNAME} ${PORTNAME}_num ${PORTNAME}_unix
PORTDOCS= *
do-install:
cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
--prefix=${PREFIX} --libdir=${PREFIX}/${OCAML_SITELIBDIR}
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/sexplib*/*.cmxs
#post-install-DOCS-on:
# ${MKDIR} ${STAGEDIR}${DOCSDIR}/
# cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES.md README.md ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>

3
devel/ocaml-sexplib0/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1684854162
SHA256 (janestreet-sexplib0-v0.16.0_GH0.tar.gz) = 73002106488074187a174992da6e76f36f543e6daa80dbf6039a3e10e46adc80
SIZE (janestreet-sexplib0-v0.16.0_GH0.tar.gz) = 22171

0
devel/ocaml-sexplib/pkg-descr → devel/ocaml-sexplib0/pkg-descr
View file

1
devel/ocaml-topkg/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= topkg
PORTVERSION= 1.0.7
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://erratique.ch/software/topkg/releases/
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-type_conv/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= type_conv
PORTVERSION= 113.00.02
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://ocaml.janestreet.com/ocaml-core/${PORTVERSION:R}/files/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-uchar/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= uchar
PORTVERSION= 0.0.2
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-ulex/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= ulex
PORTVERSION= 1.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.cduce.org/download/
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-uutf/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= uutf
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://erratique.ch/software/uutf/releases/
PKGNAMEPREFIX= ocaml-

2
devel/ocaml-xstr/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= xstr
PORTVERSION= 0.2.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-

1
devel/ocaml-xstrp4/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= xstrp4
PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-

1
devel/omake/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= omake
DISTVERSION= 0.10.6
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/

1
ftp/ocaml-ocurl/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= ocurl
PORTVERSION= 0.9.2
PORTREVISION= 1
CATEGORIES= ftp
PKGNAMEPREFIX= ocaml-

Some files were not shown because too many files have changed in this diff Show more