pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ocamlify Revision bump for package devel/ocamlify.
details: https://anonhg.NetBSD.org/pkgsrc/rev/9e64f48e1e9f
branches: trunk
changeset: 373860:9e64f48e1e9f
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Wed Jan 10 16:17:05 2018 +0000
description:
Revision bump for package devel/ocamlify.
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/ocamlify/Makefile | 4 +-
devel/ocamlify/buildlink3.mk | 6 +-
devel/ocamlify/distinfo | 5 +-
devel/ocamlify/patches/patch-__tags | 18 +
devel/ocamlify/patches/patch-myocamlbuild.ml | 1067 ++
devel/ocamlify/patches/patch-setup.ml | 9551 ++++++++++++++++++++++++++
6 files changed, 10645 insertions(+), 6 deletions(-)
diffs (truncated from 10695 to 300 lines):
diff -r 9c7578a1aa8d -r 9e64f48e1e9f devel/ocamlify/Makefile
--- a/devel/ocamlify/Makefile Wed Jan 10 16:14:20 2018 +0000
+++ b/devel/ocamlify/Makefile Wed Jan 10 16:17:05 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/08 09:51:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2018/01/10 16:17:05 jaapb Exp $
DISTNAME= ocamlify-0.0.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1209/
diff -r 9c7578a1aa8d -r 9e64f48e1e9f devel/ocamlify/buildlink3.mk
--- a/devel/ocamlify/buildlink3.mk Wed Jan 10 16:14:20 2018 +0000
+++ b/devel/ocamlify/buildlink3.mk Wed Jan 10 16:17:05 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:17:05 jaapb Exp $
BUILDLINK_TREE+= ocamlify
@@ -6,8 +6,8 @@
OCAMLIFY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocamlify+= ocamlify>=0.0.2nb1
-BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb5
-BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify
+BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb7
+BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify
.endif # OCAMLIFY_BUILDLINK3_MK
BUILDLINK_TREE+= -ocamlify
diff -r 9c7578a1aa8d -r 9e64f48e1e9f devel/ocamlify/distinfo
--- a/devel/ocamlify/distinfo Wed Jan 10 16:14:20 2018 +0000
+++ b/devel/ocamlify/distinfo Wed Jan 10 16:17:05 2018 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/01/10 16:17:05 jaapb Exp $
SHA1 (ocamlify-0.0.2.tar.gz) = 9c52cd2ce6ee9a48b5f0e5ee8cc8576b733f7e46
RMD160 (ocamlify-0.0.2.tar.gz) = 3462a5682975198096ca1f2b2ca88671db0172d0
SHA512 (ocamlify-0.0.2.tar.gz) = e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e
Size (ocamlify-0.0.2.tar.gz) = 53184 bytes
+SHA1 (patch-__tags) = 2283a7fbb030eb127e4267c15600414c7ae310f5
+SHA1 (patch-myocamlbuild.ml) = 97417a3e22d93581b880d810f68960fa786559f2
+SHA1 (patch-setup.ml) = 0baa0b5b05af6b5448017ed9fa6ab96470b52b46
diff -r 9c7578a1aa8d -r 9e64f48e1e9f devel/ocamlify/patches/patch-__tags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocamlify/patches/patch-__tags Wed Jan 10 16:17:05 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-__tags,v 1.1 2018/01/10 16:17:05 jaapb Exp $
+
+Regenerated Oasis files (don't compile with 4.06)
+--- _tags.orig 2013-06-25 22:08:31.000000000 +0000
++++ _tags
+@@ -1,8 +1,9 @@
+ # OASIS_START
+-# DO NOT EDIT (digest: d0ff94eb3e82a4875dd557595bea8eb3)
+-# Ignore VCS directories, you can use the same kind of rule outside
+-# OASIS_START/STOP if you want to exclude directories that contains
++# DO NOT EDIT (digest: b0a95a3908a35f1eadb2bb5d7f18ff09)
++# 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
diff -r 9c7578a1aa8d -r 9e64f48e1e9f devel/ocamlify/patches/patch-myocamlbuild.ml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocamlify/patches/patch-myocamlbuild.ml Wed Jan 10 16:17:05 2018 +0000
@@ -0,0 +1,1067 @@
+$NetBSD: patch-myocamlbuild.ml,v 1.1 2018/01/10 16:17:05 jaapb Exp $
+
+Regenerated Oasis files (don't compile with 4.06)
+--- myocamlbuild.ml.orig 2013-06-25 22:08:31.000000000 +0000
++++ myocamlbuild.ml
+@@ -1,16 +1,13 @@
+ (* OASIS_START *)
+-(* DO NOT EDIT (digest: c731f09030552f20f1d702a3c5473c9c) *)
++(* DO NOT EDIT (digest: 9bd78b75e5e0b109a1abb54bf043b292) *)
+ module OASISGettext = struct
+-# 21 "/home/gildor/programmation/oasis/src/oasis/OASISGettext.ml"
++(* # 22 "src/oasis/OASISGettext.ml" *)
+
+- let ns_ str =
+- str
+
+- let s_ str =
+- str
++ let ns_ str = str
++ let s_ str = str
++ let f_ (str: ('a, 'b, 'c, 'd) format4) = str
+
+- let f_ (str : ('a, 'b, 'c, 'd) format4) =
+- str
+
+ let fn_ fmt1 fmt2 n =
+ if n = 1 then
+@@ -18,21 +15,341 @@ module OASISGettext = struct
+ else
+ fmt2^^""
+
+- let init =
+- []
+
++ let init = []
+ end
+
+-module OASISExpr = struct
+-# 21 "/home/gildor/programmation/oasis/src/oasis/OASISExpr.ml"
++module OASISString = struct
++(* # 22 "src/oasis/OASISString.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
++
++
++ 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
++ include Map.Make(Ord)
++
++ let rec add_list t =
++ function
++ | (k, v) :: tl -> add_list (add k v t) tl
++ | [] -> t
++
++ let of_list lst = add_list empty lst
++
++ let to_list t = fold (fun k v acc -> (k, v) :: acc) t []
++ end
++ end
++
+
++ module MapString = MapExt.Make(String)
Home |
Main Index |
Thread Index |
Old Index