Updated package to latest version 1.9. Package now uses ocaml.mk.

Changes include:
 - More fixes to build in Windows with zlib (mingw and msvc).
 - Build .cmxs with C bindings (Closes: #1303)
 - Use advapi32 on Windows (Close: #1055)
 - Allow to define --zlib-include and --zlib-libdir if zlib is not installed in
   the standard location.
 - Added SHA-3 hash function.

5 files changed, 17 insertions, 42 deletions

diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index ff63df769df..f45d00c9fe3 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -1,41 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2014/10/09 22:28:12 jaapb Exp $
 #
 
-DISTNAME=	cryptokit-1.6
-PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	2
+DISTNAME=	cryptokit-1.9
 CATEGORIES=	security
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/891/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1229/
 
 MAINTAINER=	jaapb@kerguelen.org
 HOMEPAGE=	http://forge.ocamlcore.org/projects/cryptokit/
 COMMENT=	Cryptographic primitives library for Objective Caml
 LICENSE=	gnu-lgpl-v2 # with static compilation exception
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--destdir "${DESTDIR}" --prefix "${PREFIX}"
+OCAML_USE_OASIS=	yes
 
-USE_TOOLS+=	gmake
-PLIST_SRC=	PLIST
-
-SUBST_CLASSES+=		destdir
-SUBST_STAGE.destdir=	post-configure
-SUBST_MESSAGE.destdir=	Changing install location to DESTDIR
-SUBST_FILES.destdir=	setup.ml
-SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
-
-BUILD_TARGET=	build
+.include "../../mk/ocaml.mk"
 
-PLIST_VARS+=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-.endif
-
-pre-install:
-	${MKDIR} ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib
+USE_TOOLS+=	gmake
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ocaml-cryptokit/PLIST b/security/ocaml-cryptokit/PLIST
index 50fbd8ffa7b..28f9f876888 100644
--- a/security/ocaml-cryptokit/PLIST
+++ b/security/ocaml-cryptokit/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2012/08/15 08:24:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/09 22:28:12 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/cryptokit
 lib/ocaml/site-lib/cryptokit/META
 lib/ocaml/site-lib/cryptokit/dllcryptokit_stubs.so
 lib/ocaml/site-lib/cryptokit/libcryptokit_stubs.a
-${PLIST.opt}lib/ocaml/site-lib/cryptokit/cryptokit.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.a
 lib/ocaml/site-lib/cryptokit/cryptokit.cma
 lib/ocaml/site-lib/cryptokit/cryptokit.cmi
-${PLIST.opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmx
-${PLIST.opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxa
-${PLIST.opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxs
 lib/ocaml/site-lib/cryptokit/cryptokit.mli
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/cryptokit
diff --git a/security/ocaml-cryptokit/PLIST.opt b/security/ocaml-cryptokit/PLIST.opt
deleted file mode 100644
index 90244a8d2fb..00000000000
--- a/security/ocaml-cryptokit/PLIST.opt
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2012/05/12 17:53:40 wiz Exp $
-lib/ocaml/site-lib/cryptokit/cryptokit.a
-lib/ocaml/site-lib/cryptokit/cryptokit.cmxa
-lib/ocaml/site-lib/cryptokit/cryptokit.cmxs
diff --git a/security/ocaml-cryptokit/buildlink3.mk b/security/ocaml-cryptokit/buildlink3.mk
index 9e0e2a84fda..553f138afed 100644
--- a/security/ocaml-cryptokit/buildlink3.mk
+++ b/security/ocaml-cryptokit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/10/09 22:28:12 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-cryptokit
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-cryptokit
 OCAML_CRYPTOKIT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cryptokit+=	ocaml-cryptokit>=1.5
-BUILDLINK_ABI_DEPENDS.ocaml-cryptokit?=	ocaml-cryptokit>=1.6nb2
+BUILDLINK_ABI_DEPENDS.ocaml-cryptokit?=	ocaml-cryptokit>=1.7
 BUILDLINK_PKGSRCDIR.ocaml-cryptokit?=	../../security/ocaml-cryptokit
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/security/ocaml-cryptokit/distinfo b/security/ocaml-cryptokit/distinfo
index 7f6f70c3744..15e325c838c 100644
--- a/security/ocaml-cryptokit/distinfo
+++ b/security/ocaml-cryptokit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/08/15 08:24:58 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/10/09 22:28:12 jaapb Exp $
 
-SHA1 (cryptokit-1.6.tar.gz) = 470d42baf7088cfbd97f4673d5a982fccfdeb274
-RMD160 (cryptokit-1.6.tar.gz) = 83daed01f9407292e2c3c5294c076b61685987f4
-Size (cryptokit-1.6.tar.gz) = 133031 bytes
+SHA1 (cryptokit-1.9.tar.gz) = 2e90f27d05fe68a79747e64eef481835291babf4
+RMD160 (cryptokit-1.9.tar.gz) = f161aefe0cfb0b706a926015566e4d5c0f8dd6fa
+Size (cryptokit-1.9.tar.gz) = 143494 bytes