Updated package to latest version, 1.07. Changes include:

- Allocate Zlib data structures outside the OCaml heap for compatibility
  with recent versions of Zlib
  (Github issue #1, pull request #2, report and fix by Einar Lielmanis).
- Don't pass -L and -I options to the C compiler unless necessary.
- Compile and install the shared library zip.cmxs.
  (Contributed by E. Millon.)
- ocamlfind: install under 'zip' and 'camlzip' package names.

4 files changed, 32 insertions, 25 deletions

diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index 0a555a6a397..de0c65d3116 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.17 2016/12/30 11:16:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2017/07/11 10:00:51 jaapb Exp $
 #
 
+VERSION=	1.07
+GITHUB_PROJECT=	camlzip
+GITHUB_TAG=	rel${VERSION:S/.//}
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-zip-${VERSION}
-DISTNAME=	camlzip-${VERSION}
-VERSION=	1.06
-PKGREVISION=	2
 CATEGORIES=	archivers
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1616/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=xavierleroy/}
 LICENSE=	gnu-lgpl-v2.1
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://forge.ocamlcore.org/projects/camlzip/
+HOMEPAGE=	http://github.com/xavierleroy/camlzip
 COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
 
 BUILD_TARGET=	all
diff --git a/archivers/ocaml-zip/PLIST b/archivers/ocaml-zip/PLIST
index 88654600f7d..6b94b684200 100644
--- a/archivers/ocaml-zip/PLIST
+++ b/archivers/ocaml-zip/PLIST
@@ -1,13 +1,18 @@
-@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.ocaml-opt}lib/ocaml/site-lib/zip/zip.a
-lib/ocaml/site-lib/zip/zip.cma
-lib/ocaml/site-lib/zip/zip.cmi
-${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
+@comment $NetBSD: PLIST,v 1.6 2017/07/11 10:00:51 jaapb Exp $
+${OCAML_SITELIB}/camlzip/META
+${OCAML_SITELIB}/zip/META
+${OCAML_SITELIB}/zip/dllcamlzip.so
+${OCAML_SITELIB}/zip/gzip.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/gzip.cmx
+${OCAML_SITELIB}/zip/gzip.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/libcamlzip.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.a
+${OCAML_SITELIB}/zip/zip.cma
+${OCAML_SITELIB}/zip/zip.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zip.cmxs
+${OCAML_SITELIB}/zip/zip.mli
+${OCAML_SITELIB}/zip/zlib.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/zip/zlib.cmx
+${OCAML_SITELIB}/zip/zlib.mli
diff --git a/archivers/ocaml-zip/buildlink3.mk b/archivers/ocaml-zip/buildlink3.mk
index db01852e592..4f97cf55655 100644
--- a/archivers/ocaml-zip/buildlink3.mk
+++ b/archivers/ocaml-zip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/05/05 11:27:47 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:00:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-zip
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-zip
 OCAML_ZIP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-zip+=	ocaml-zip>=1.05nb6
+BUILDLINK_ABI_DEPENDS.ocaml-zip+=	ocaml-zip>=1.07
 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 187982e65c0..1ac2bc51c4e 100644
--- a/archivers/ocaml-zip/distinfo
+++ b/archivers/ocaml-zip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2016/07/03 10:20:21 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2017/07/11 10:00:51 jaapb Exp $
 
-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
+SHA1 (camlzip-1.07.tar.gz) = dc6bf21fd12b527e06df2e3f5ee9655585e46a44
+RMD160 (camlzip-1.07.tar.gz) = 71a16bfcb4cc2e6da4c6ce0e9d14fb9f687fbc5f
+SHA512 (camlzip-1.07.tar.gz) = b92e9db002b9b398fd132c6ecd8098fac4cc7ddb3f770cc412990dcdf4bd62ba358c762d31fb0b5cd6b32f20d3bf4b3410ca6e86c511a438b92ece940f9831bd
+Size (camlzip-1.07.tar.gz) = 26652 bytes