Revbump associated with ocaml update. Also added patches to make package

compile with newest zlib/ocaml.

5 files changed, 35 insertions, 5 deletions

diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index b2c256ba96b..b73476120d0 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2015/08/07 11:20:33 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2016/05/05 11:27:47 jaapb Exp $
 #
 
 PKGNAME=	ocaml-zip-${VERSION}
 DISTNAME=	camlzip-${VERSION}
 VERSION=	1.05
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	archivers
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1037/
 LICENSE=	gnu-lgpl-v2.1
diff --git a/archivers/ocaml-zip/buildlink3.mk b/archivers/ocaml-zip/buildlink3.mk
index 1672586ba65..db01852e592 100644
--- a/archivers/ocaml-zip/buildlink3.mk
+++ b/archivers/ocaml-zip/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/02/03 12:57:14 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/05/05 11:27:47 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-zip
 
 .if !defined(OCAML_ZIP_BUILDLINK3_MK)
 OCAML_ZIP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-zip+=	ocaml-zip>=1.05nb5
+BUILDLINK_API_DEPENDS.ocaml-zip+=	ocaml-zip>=1.05nb6
 BUILDLINK_PKGSRCDIR.ocaml-zip?=	../../archivers/ocaml-zip
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/archivers/ocaml-zip/distinfo b/archivers/ocaml-zip/distinfo
index e178c3d875f..58a4970436b 100644
--- a/archivers/ocaml-zip/distinfo
+++ b/archivers/ocaml-zip/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 00:56:24 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/05/05 11:27:47 jaapb Exp $
 
 SHA1 (camlzip-1.05.tar.gz) = 0c32485958dd1a9c18f6f0abe1d2bf8e62caef74
 RMD160 (camlzip-1.05.tar.gz) = f54260638f4bbf43275907285d811a319077c0c8
 SHA512 (camlzip-1.05.tar.gz) = 5128243fc7528e5ec6cbb7d9b121e8cb0b6d486a95a82161cd74cafe05454602c9952ed6fee3d38a53614e5ecdc20ef88437681107c5952bf85b8f8c78bf042d
 Size (camlzip-1.05.tar.gz) = 25817 bytes
+SHA1 (patch-zip.ml) = d3ff0fcd82a13882767c3ad648b9775e2d9d0b73
+SHA1 (patch-zlibstubs.c) = ee597e402c37e221ff504e8a4d7cbada28c9cb9a
diff --git a/archivers/ocaml-zip/patches/patch-zip.ml b/archivers/ocaml-zip/patches/patch-zip.ml
new file mode 100644
index 00000000000..ee43337f2f0
--- /dev/null
+++ b/archivers/ocaml-zip/patches/patch-zip.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-zip.ml,v 1.1 2016/05/05 11:27:47 jaapb Exp $
+
+Remove redundant definition
+--- zip.ml.orig	2012-10-12 03:36:07.000000000 +0000
++++ zip.ml
+@@ -73,7 +73,7 @@ type out_file =
+     mutable of_entries: entry list;
+     of_comment: string }
+ 
+-exception Error of string * string * string
++(* exception Error of string * string * string *)
+ 
+ (* Return the position of the last occurrence of s1 in s2, or -1 if not
+    found. *)
diff --git a/archivers/ocaml-zip/patches/patch-zlibstubs.c b/archivers/ocaml-zip/patches/patch-zlibstubs.c
new file mode 100644
index 00000000000..840c0baa9f6
--- /dev/null
+++ b/archivers/ocaml-zip/patches/patch-zlibstubs.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-zlibstubs.c,v 1.1 2016/05/05 11:27:47 jaapb Exp $
+
+Use proper definition of zlib crc32 function
+--- zlibstubs.c.orig	2012-10-12 03:36:07.000000000 +0000
++++ zlibstubs.c
+@@ -168,7 +168,7 @@ value camlzip_inflateEnd(value vzs)
+ 
+ value camlzip_update_crc32(value crc, value buf, value pos, value len)
+ {
+-  return caml_copy_int32(crc32((uint32) Int32_val(crc), 
++  return caml_copy_int32(crc32((uLong) Int32_val(crc), 
+                           &Byte_u(buf, Long_val(pos)),
+                           Long_val(len)));
+ }