Updated package to latest version, 0.4.7. Package now uses ocaml.mk.

Changes:
* Add support for TLS1.1 and TLS1.2 (thanks Thomas Calderon).
* Add function to initialize Diffie-Hellman and elliptic curve parameters
  (thanks Thomas Calderon and Edwin Török).
* Add set_client_SNI_hostname to specify client-side SNI hostname (thanks
  Mauricio Fernandez).
* Fix double leave of blocking section in ocaml_ssl_accept (thanks Edwin Török).
* Check for errors in SSL_connect/SSL_accept (thanks Jérôme Vouillon).
* Clear the error queue before calling SSL_read and similar functions;
  SSL_get_error does not work reliably otherwise (thanks Jérôme Vouillon).
* Allow static linking on Mingw64 (thanks schadinger).

4 files changed, 32 insertions, 39 deletions

diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 780ea3161a2..b386321ee14 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/02/12 23:18:34 tron Exp $
+# $NetBSD: Makefile,v 1.14 2014/10/09 21:06:57 jaapb Exp $
 #
 
-DISTNAME=	ocaml-ssl-0.4.6
-PKGREVISION=	4
+PKGNAME=	${DISTNAME} # to avoid prefixing with ocaml-
+DISTNAME=	ocaml-ssl-0.4.7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=savonet/}
 
@@ -11,20 +11,13 @@ HOMEPAGE=	http://savonet.sourceforge.net/wiki/OCamlLibs
 COMMENT=	SSL library for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
-DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
 HAS_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-BUILD_TARGET+=	all
 
-.include "../../mk/bsd.prefs.mk"
+OCAML_USE_FINDLIB=	yes
 
-PLIST_VARS=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ocaml-ssl/PLIST b/security/ocaml-ssl/PLIST
index 6aad581e0e9..6b49f792ad1 100644
--- a/security/ocaml-ssl/PLIST
+++ b/security/ocaml-ssl/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 2012/07/14 21:23:49 wiz Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/ssl
-lib/ocaml/site-lib/ssl/META
-lib/ocaml/site-lib/ssl/libssl_stubs.a
-lib/ocaml/site-lib/ssl/libssl_threads_stubs.a
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl.a
-lib/ocaml/site-lib/ssl/ssl.cma
-lib/ocaml/site-lib/ssl/ssl.cmi
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl.cmx
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl.cmxa
-lib/ocaml/site-lib/ssl/ssl.mli
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl_threads.a
-lib/ocaml/site-lib/ssl/ssl_threads.cma
-lib/ocaml/site-lib/ssl/ssl_threads.cmi
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl_threads.cmx
-${PLIST.opt}lib/ocaml/site-lib/ssl/ssl_threads.cmxa
-lib/ocaml/site-lib/ssl/ssl_threads.mli
-lib/ocaml/site-lib/ssl/dllssl_stubs.so
-lib/ocaml/site-lib/ssl/dllssl_threads_stubs.so
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/ssl
+@comment $NetBSD: PLIST,v 1.4 2014/10/09 21:06:57 jaapb Exp $
+@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/ssl
+${OCAML_SITELIB}/ssl/META
+${OCAML_SITELIB}/ssl/libssl_stubs.a
+${OCAML_SITELIB}/ssl/libssl_threads_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl.a
+${OCAML_SITELIB}/ssl/ssl.cma
+${OCAML_SITELIB}/ssl/ssl.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl.cmxa
+${OCAML_SITELIB}/ssl/ssl.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl_threads.a
+${OCAML_SITELIB}/ssl/ssl_threads.cma
+${OCAML_SITELIB}/ssl/ssl_threads.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl_threads.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl_threads.cmxa
+${OCAML_SITELIB}/ssl/ssl_threads.mli
+${OCAML_SITELIB}/ssl/dllssl_stubs.so
+${OCAML_SITELIB}/ssl/dllssl_threads_stubs.so
+@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/ssl
diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk
index 7586535575e..c2419ed3bc5 100644
--- a/security/ocaml-ssl/buildlink3.mk
+++ b/security/ocaml-ssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2014/02/12 23:18:34 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2014/10/09 21:06:57 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ssl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-ssl
 OCAML_SSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.0
-BUILDLINK_ABI_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.6nb4
+BUILDLINK_ABI_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.7
 BUILDLINK_PKGSRCDIR.ocaml-ssl?=	../../security/ocaml-ssl
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/security/ocaml-ssl/distinfo b/security/ocaml-ssl/distinfo
index 756fae308a9..f808e319797 100644
--- a/security/ocaml-ssl/distinfo
+++ b/security/ocaml-ssl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/07/14 21:23:49 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/10/09 21:06:57 jaapb Exp $
 
-SHA1 (ocaml-ssl-0.4.6.tar.gz) = e42e9518a982ef559f249a22e1fe37cddc45360f
-RMD160 (ocaml-ssl-0.4.6.tar.gz) = 9d2fe7275debb969693d6e679230ac05a1bbf3d6
-Size (ocaml-ssl-0.4.6.tar.gz) = 118798 bytes
+SHA1 (ocaml-ssl-0.4.7.tar.gz) = 3261b53f610e16b44da48828542afcfe4143c8ae
+RMD160 (ocaml-ssl-0.4.7.tar.gz) = 54ef57097a11e6d3ce307645265d2b44251b2c48
+Size (ocaml-ssl-0.4.7.tar.gz) = 119209 bytes
 SHA1 (patch-src_Makefile) = fa5e74f567aff37d8e25fd93ef2db7fdd5b0b17a