Updated package to latest version (1.06) and made it compatible with

ocaml 4.03 and the latest framework version. Discussed on packages@ and
OK'd by jperkin.

Changes include:
- Switch to "safe string" mode.  Some API functions that use to take
  strings now take byte sequences instead.  OCaml 4.02 or up is required.
- Update for OCaml 4.03.
- Avoid Zlib error when calling Gzip.output with length = 0.
- Improve support for ZIP files / ZIP file members greater than 2 Gbytes.

3 files changed, 15 insertions, 23 deletions

diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index b73476120d0..e531a9483a3 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2016/05/05 11:27:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/25 14:01:34 jaapb Exp $
 #
 
 PKGNAME=	ocaml-zip-${VERSION}
 DISTNAME=	camlzip-${VERSION}
-VERSION=	1.05
-PKGREVISION=	6
+VERSION=	1.06
 CATEGORIES=	archivers
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1037/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1616/
 LICENSE=	gnu-lgpl-v2.1
 
 MAINTAINER=	jaapb@NetBSD.org
@@ -16,16 +15,13 @@ COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
 BUILD_TARGET=	all
 INSTALL_TARGET=	install-findlib
 USE_TOOLS+=	gmake
+OCAML_USE_FINDLIB=	yes
 
-PLIST_VARS+=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
+.include "../../mk/ocaml.mk"
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET+=	allopt
-PLIST.opt=	yes
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ocaml-zip/PLIST b/archivers/ocaml-zip/PLIST
index bce2b514ca8..88654600f7d 100644
--- a/archivers/ocaml-zip/PLIST
+++ b/archivers/ocaml-zip/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2013/04/03 12:29:40 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/zip
+@comment $NetBSD: PLIST,v 1.5 2016/06/25 14:01:34 jaapb Exp $
 lib/ocaml/site-lib/zip/META
 lib/ocaml/site-lib/zip/dllcamlzip.so
 lib/ocaml/site-lib/zip/gzip.cmi
 lib/ocaml/site-lib/zip/gzip.mli
 lib/ocaml/site-lib/zip/libcamlzip.a
-${PLIST.opt}lib/ocaml/site-lib/zip/zip.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/zip/zip.a
 lib/ocaml/site-lib/zip/zip.cma
 lib/ocaml/site-lib/zip/zip.cmi
-${PLIST.opt}lib/ocaml/site-lib/zip/zip.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/zip/zip.cmxa
 lib/ocaml/site-lib/zip/zip.mli
 lib/ocaml/site-lib/zip/zlib.cmi
 lib/ocaml/site-lib/zip/zlib.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/zip
diff --git a/archivers/ocaml-zip/distinfo b/archivers/ocaml-zip/distinfo
index 58a4970436b..0805eefa969 100644
--- a/archivers/ocaml-zip/distinfo
+++ b/archivers/ocaml-zip/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2016/05/05 11:27:47 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2016/06/25 14:01:34 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
+SHA1 (camlzip-1.06.tar.gz) = fcf13339e836fe7e945907da62038271f814a00b
+RMD160 (camlzip-1.06.tar.gz) = 99f9366d4daff7923225166dc9f2d19b8dae86d9
+SHA512 (camlzip-1.06.tar.gz) = 5ef0172927106589620678897f12f054533503a5cf13df71bf4deda43f223d0cd6acce118977e87bce53afe289f367b851f192a8e693274c2bd13549121019dd
+Size (camlzip-1.06.tar.gz) = 26499 bytes