pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ocamlmod Revision bump for package devel/ocamlmod.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a3e6d02889a6
branches: trunk
changeset: 373861:a3e6d02889a6
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Wed Jan 10 16:19:00 2018 +0000
description:
Revision bump for package devel/ocamlmod.
No upstream changes, but the OASIS setup.ml file had to be regenerated
due to it no longer working with OCaml 4.06.
diffstat:
devel/ocamlmod/Makefile | 4 +-
devel/ocamlmod/buildlink3.mk | 6 +-
devel/ocamlmod/distinfo | 5 +-
devel/ocamlmod/patches/patch-__tags | 30 +
devel/ocamlmod/patches/patch-myocamlbuild.ml | 915 ++
devel/ocamlmod/patches/patch-setup.ml | 8913 ++++++++++++++++++++++++++
6 files changed, 9867 insertions(+), 6 deletions(-)
diffs (truncated from 9917 to 300 lines):
diff -r 9e64f48e1e9f -r a3e6d02889a6 devel/ocamlmod/Makefile
--- a/devel/ocamlmod/Makefile Wed Jan 10 16:17:05 2018 +0000
+++ b/devel/ocamlmod/Makefile Wed Jan 10 16:19:00 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/09/08 09:51:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2018/01/10 16:19:00 jaapb Exp $
DISTNAME= ocamlmod-0.0.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1544/
diff -r 9e64f48e1e9f -r a3e6d02889a6 devel/ocamlmod/buildlink3.mk
--- a/devel/ocamlmod/buildlink3.mk Wed Jan 10 16:17:05 2018 +0000
+++ b/devel/ocamlmod/buildlink3.mk Wed Jan 10 16:19:00 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/10 16:19:00 jaapb Exp $
BUILDLINK_TREE+= ocamlmod
@@ -6,8 +6,8 @@
OCAMLMOD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocamlmod+= ocamlmod>=0.0.7nb1
-BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8
-BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod
+BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8nb2
+BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod
.endif # OCAMLMOD_BUILDLINK3_MK
BUILDLINK_TREE+= -ocamlmod
diff -r 9e64f48e1e9f -r a3e6d02889a6 devel/ocamlmod/distinfo
--- a/devel/ocamlmod/distinfo Wed Jan 10 16:17:05 2018 +0000
+++ b/devel/ocamlmod/distinfo Wed Jan 10 16:19:00 2018 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2017/07/11 14:11:14 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2018/01/10 16:19:00 jaapb Exp $
SHA1 (ocamlmod-0.0.8.tar.gz) = 5c3d20f493ab9ae6d6f498f73fbe7a7135dbdc83
RMD160 (ocamlmod-0.0.8.tar.gz) = 0ac0def38a0e271e3759e2c6b41d47cff9a95db4
SHA512 (ocamlmod-0.0.8.tar.gz) = beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4
Size (ocamlmod-0.0.8.tar.gz) = 48985 bytes
+SHA1 (patch-__tags) = a92d60485688357270ee6fe562bd63d4c46f003d
+SHA1 (patch-myocamlbuild.ml) = 8dd1340cf9cc40f9478d24063285b5a2c534a6f2
+SHA1 (patch-setup.ml) = 9f28eaaddc123b5bc649eb7820cfe80fefc1447e
diff -r 9e64f48e1e9f -r a3e6d02889a6 devel/ocamlmod/patches/patch-__tags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocamlmod/patches/patch-__tags Wed Jan 10 16:19:00 2018 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-__tags,v 1.1 2018/01/10 16:19:01 jaapb Exp $
+
+Regenerated Oasis files (don't compile with 4.06)
+--- _tags.orig 2015-09-02 21:53:11.000000000 +0000
++++ _tags
+@@ -1,8 +1,9 @@
+ # OASIS_START
+-# DO NOT EDIT (digest: 624081c4aa54babe89f7a49402b5f68d)
++# DO NOT EDIT (digest: 7bfc612a7f85fad7a10e2cc4e4d0a0cc)
+ # Ignore VCS directories, you can use the same kind of rule outside
+ # OASIS_START/STOP if you want to exclude directories that contains
+ # useless stuff for the build process
++true: annot, bin_annot
+ <**/.svn>: -traverse
+ <**/.svn>: not_hygienic
+ ".bzr": -traverse
+@@ -15,10 +16,10 @@
+ "_darcs": not_hygienic
+ # Executable ocamlmod
+ "src/ocamlmod.byte": pkg_str
+-<src/*.ml{,i}>: pkg_str
++<src/*.ml{,i,y}>: pkg_str
+ # Executable test
+ "test/test.byte": pkg_oUnit
+ "test/test.byte": pkg_str
+-<test/*.ml{,i}>: pkg_oUnit
+-<test/*.ml{,i}>: pkg_str
++<test/*.ml{,i,y}>: pkg_oUnit
++<test/*.ml{,i,y}>: pkg_str
+ # OASIS_STOP
diff -r 9e64f48e1e9f -r a3e6d02889a6 devel/ocamlmod/patches/patch-myocamlbuild.ml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocamlmod/patches/patch-myocamlbuild.ml Wed Jan 10 16:19:00 2018 +0000
@@ -0,0 +1,915 @@
+$NetBSD: patch-myocamlbuild.ml,v 1.1 2018/01/10 16:19:01 jaapb Exp $
+
+Regenerated Oasis files (don't compile with 4.06)
+--- myocamlbuild.ml.orig 2015-09-02 21:53:11.000000000 +0000
++++ myocamlbuild.ml
+@@ -1,19 +1,12 @@
+ (* OASIS_START *)
+-(* DO NOT EDIT (digest: 5a9a2168dcb86db37476d58b8c0e25b3) *)
++(* DO NOT EDIT (digest: 9bd78b75e5e0b109a1abb54bf043b292) *)
+ module OASISGettext = struct
+ (* # 22 "src/oasis/OASISGettext.ml" *)
+
+
+- let ns_ str =
+- str
+-
+-
+- let s_ str =
+- str
+-
+-
+- let f_ (str: ('a, 'b, 'c, 'd) format4) =
+- str
++ let ns_ str = str
++ let s_ str = str
++ let f_ (str: ('a, 'b, 'c, 'd) format4) = str
+
+
+ let fn_ fmt1 fmt2 n =
+@@ -23,25 +16,338 @@ module OASISGettext = struct
+ fmt2^^""
+
+
+- let init =
+- []
++ let init = []
++end
+
++module OASISString = struct
++(* # 22 "src/oasis/OASISString.ml" *)
+
+-end
+
+-module OASISExpr = struct
+-(* # 22 "src/oasis/OASISExpr.ml" *)
++ (** Various string utilities.
+
++ Mostly inspired by extlib and batteries ExtString and BatString libraries.
+
++ @author Sylvain Le Gall
++ *)
+
+
++ let nsplitf str f =
++ if str = "" then
++ []
++ else
++ let buf = Buffer.create 13 in
++ let lst = ref [] in
++ let push () =
++ lst := Buffer.contents buf :: !lst;
++ Buffer.clear buf
++ in
++ let str_len = String.length str in
++ for i = 0 to str_len - 1 do
++ if f str.[i] then
++ push ()
++ else
++ Buffer.add_char buf str.[i]
++ done;
++ push ();
++ List.rev !lst
++
++
++ (** [nsplit c s] Split the string [s] at char [c]. It doesn't include the
++ separator.
++ *)
++ let nsplit str c =
++ nsplitf str ((=) c)
++
++
++ let find ~what ?(offset=0) str =
++ let what_idx = ref 0 in
++ let str_idx = ref offset in
++ while !str_idx < String.length str &&
++ !what_idx < String.length what do
++ if str.[!str_idx] = what.[!what_idx] then
++ incr what_idx
++ else
++ what_idx := 0;
++ incr str_idx
++ done;
++ if !what_idx <> String.length what then
++ raise Not_found
++ else
++ !str_idx - !what_idx
++
++
++ let sub_start str len =
++ let str_len = String.length str in
++ if len >= str_len then
++ ""
++ else
++ String.sub str len (str_len - len)
++
++
++ let sub_end ?(offset=0) str len =
++ let str_len = String.length str in
++ if len >= str_len then
++ ""
++ else
++ String.sub str 0 (str_len - len)
++
++
++ let starts_with ~what ?(offset=0) str =
++ let what_idx = ref 0 in
++ let str_idx = ref offset in
++ let ok = ref true in
++ while !ok &&
++ !str_idx < String.length str &&
++ !what_idx < String.length what do
++ if str.[!str_idx] = what.[!what_idx] then
++ incr what_idx
++ else
++ ok := false;
++ incr str_idx
++ done;
++ !what_idx = String.length what
++
++
++ let strip_starts_with ~what str =
++ if starts_with ~what str then
++ sub_start str (String.length what)
++ else
++ raise Not_found
++
++
++ let ends_with ~what ?(offset=0) str =
++ let what_idx = ref ((String.length what) - 1) in
++ let str_idx = ref ((String.length str) - 1) in
++ let ok = ref true in
++ while !ok &&
++ offset <= !str_idx &&
++ 0 <= !what_idx do
++ if str.[!str_idx] = what.[!what_idx] then
++ decr what_idx
++ else
++ ok := false;
++ decr str_idx
++ done;
++ !what_idx = -1
++
++
++ let strip_ends_with ~what str =
++ if ends_with ~what str then
++ sub_end str (String.length what)
++ else
++ raise Not_found
++
++
++ let replace_chars f s =
++ let buf = Buffer.create (String.length s) in
++ String.iter (fun c -> Buffer.add_char buf (f c)) s;
++ Buffer.contents buf
++
++ let lowercase_ascii =
++ replace_chars
++ (fun c ->
++ if (c >= 'A' && c <= 'Z') then
++ Char.chr (Char.code c + 32)
++ else
++ c)
++
++ let uncapitalize_ascii s =
++ if s <> "" then
++ (lowercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
++ else
++ s
++
++ let uppercase_ascii =
++ replace_chars
++ (fun c ->
++ if (c >= 'a' && c <= 'z') then
++ Char.chr (Char.code c - 32)
++ else
++ c)
++
++ let capitalize_ascii s =
++ if s <> "" then
++ (uppercase_ascii (String.sub s 0 1)) ^ (String.sub s 1 ((String.length s) - 1))
++ else
++ s
++
++end
++
++module OASISUtils = struct
++(* # 22 "src/oasis/OASISUtils.ml" *)
++
+
+ open OASISGettext
+
+
+- type test = string
++ module MapExt =
++ struct
++ module type S =
++ sig
++ include Map.S
++ val add_list: 'a t -> (key * 'a) list -> 'a t
++ val of_list: (key * 'a) list -> 'a t
++ val to_list: 'a t -> (key * 'a) list
++ end
+
++ module Make (Ord: Map.OrderedType) =
++ struct
Home |
Main Index |
Thread Index |
Old Index