[pkgsrc/trunk]: pkgsrc/security/sks "or" has been deprecated, and the warning...

[is <is%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4845099584c
branches:  trunk
changeset: 626411:f4845099584c
user:      is <is%pkgsrc.org@localhost>
date:      Mon Nov 11 15:14:13 2013 +0000

description:
"or" has been deprecated, and the warning about it from ocaml 4.01.x
aborts the build. Use '||' instead. Upstream's "HEAD" equivalent has
the fix already.

diffstat:

 security/sks/distinfo                |   4 +++-
 security/sks/patches/patch-mArray.ml |  13 +++++++++++++
 security/sks/patches/patch-prime.ml  |  13 +++++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r edff9d472029 -r f4845099584c security/sks/distinfo
--- a/security/sks/distinfo     Mon Nov 11 13:07:23 2013 +0000
+++ b/security/sks/distinfo     Mon Nov 11 15:14:13 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/11/10 14:24:44 pettai Exp $
+$NetBSD: distinfo,v 1.3 2013/11/11 15:14:13 is Exp $
 
 SHA1 (sks-1.1.4.tgz) = d0b3b387653115d106ebbcae13aeda06f0034909
 RMD160 (sks-1.1.4.tgz) = 4b6deb6610c8f43e55b3172761904cf2e06e18b2
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5
 SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad
 SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c
+SHA1 (patch-mArray.ml) = 8f375f9ad5e83608510d18a77e879d2de0fd3c74
+SHA1 (patch-prime.ml) = 00be3cb4e410e0ef57e4debe975f2629c5cd0664
diff -r edff9d472029 -r f4845099584c security/sks/patches/patch-mArray.ml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sks/patches/patch-mArray.ml      Mon Nov 11 15:14:13 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-mArray.ml,v 1.1 2013/11/11 15:14:13 is Exp $
+
+--- mArray.ml.orig     2012-10-07 19:59:39.000000000 +0000
++++ mArray.ml
+@@ -57,7 +57,7 @@ let for_all ~f:test array =
+   Array.fold_left ~f:(fun a b -> a && (test b)) ~init:true array
+ 
+ let exists ~f:test array =
+-  Array.fold_left ~f:(fun a b -> a or (test b)) ~init:false array
++  Array.fold_left ~f:(fun a b -> a || (test b)) ~init:false array
+ 
+ let mem el array =
+   let length = Array.length array in
diff -r edff9d472029 -r f4845099584c security/sks/patches/patch-prime.ml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sks/patches/patch-prime.ml       Mon Nov 11 15:14:13 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-prime.ml,v 1.1 2013/11/11 15:14:13 is Exp $
+
+--- prime.ml.orig      2012-10-07 19:59:39.000000000 +0000
++++ prime.ml
+@@ -87,7 +87,7 @@ let miller_rabin rfunc n t =
+   let test () =
+     let a = randrange rfunc two (n -! one) in
+     let y = Number.powmod a r n in
+-    if y =! one or y =! neg_one then Prime
++    if y =! one || y =! neg_one then Prime
+     else
+       let rec loop y j =
+         if y =! neg_one then Prime