Update to 0.4.6, from Jaap Boender.

0.4.6 (2011-10-16)
=====
* Added write_certificate function.
* Remove support for SSLv2, which was dropped upstream (thanks Dario Teixeira).
* Added support for compiling under Win32 (thanks David Allsopp), see
  README.win32.
* Check for pthreads in configure.

0.4.5 (2011-03-01)
=====
* Use pthread mutexes for locking thread-safe version of ssl.

0.4.4 (2010-01-06)
=====
* Use SSL_CTX_use_certificate_chain_file instead of
  SSL_CTX_use_certificate_file.
* Added support for --enable-debugging configure option.
* Don't link with unix library and don't build in custom mode.

0.4.3 (2008-12-18)
=====
* Don't use blocking sections in finalizers since it causes segfaults (thanks
  Grégoire Henry and Stéphane Glondu).

6 files changed, 27 insertions, 24 deletions

diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 759760a8b48..227559f1593 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2011/12/06 00:19:25 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/14 21:23:49 wiz Exp $
 #
 
-DISTNAME=	ocaml-ssl-0.4.2
-PKGREVISION=	2
+DISTNAME=	ocaml-ssl-0.4.6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=savonet/}
 
 MAINTAINER=	jaapb@kerguelen.org
 HOMEPAGE=	http://savonet.sourceforge.net/wiki/OCamlLibs
 COMMENT=	SSL library for OCaml
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,13 +19,13 @@ USE_TOOLS+=	gmake
 BUILD_TARGET+=	all
 
 .include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS=	opt
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST_SRC+=	PLIST.opt
+PLIST.opt=	yes
 .endif
 
-PLIST_SRC+=	PLIST
-
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ocaml-ssl/PLIST b/security/ocaml-ssl/PLIST
index 6606541633f..6aad581e0e9 100644
--- a/security/ocaml-ssl/PLIST
+++ b/security/ocaml-ssl/PLIST
@@ -1,14 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:33 joerg Exp $
+@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/dllssl_stubs.so
-lib/ocaml/site-lib/ssl/dllssl_threads_stubs.so
 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
diff --git a/security/ocaml-ssl/PLIST.opt b/security/ocaml-ssl/PLIST.opt
deleted file mode 100644
index 0f9ad246a30..00000000000
--- a/security/ocaml-ssl/PLIST.opt
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2007/01/15 14:21:10 tonio Exp $
-lib/ocaml/site-lib/ssl/ssl.a
-lib/ocaml/site-lib/ssl/ssl.cmxa
-lib/ocaml/site-lib/ssl/ssl_threads.a
-lib/ocaml/site-lib/ssl/ssl_threads.cmxa
diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk
index db1c813659e..8ad2bc930f3 100644
--- a/security/ocaml-ssl/buildlink3.mk
+++ b/security/ocaml-ssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2012/05/07 01:53:57 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2012/07/14 21:23:49 wiz Exp $
 
 BUILDLINK_TREE+=	ocaml-ssl
 
@@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.0
 BUILDLINK_ABI_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.2nb1
 BUILDLINK_PKGSRCDIR.ocaml-ssl?=	../../security/ocaml-ssl
 
+.include "../../lang/ocaml/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif # OCAML_SSL_BUILDLINK3_MK
 
diff --git a/security/ocaml-ssl/distinfo b/security/ocaml-ssl/distinfo
index 4885c4a3c3d..756fae308a9 100644
--- a/security/ocaml-ssl/distinfo
+++ b/security/ocaml-ssl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/02/14 19:16:25 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/07/14 21:23:49 wiz Exp $
 
-SHA1 (ocaml-ssl-0.4.2.tar.gz) = ec6362b681aa5498143ec0c4ddd77fbbe745a2aa
-RMD160 (ocaml-ssl-0.4.2.tar.gz) = ba5b4106d19e0b3d50e9a19d705ef18a5b20948c
-Size (ocaml-ssl-0.4.2.tar.gz) = 109090 bytes
-SHA1 (patch-aa) = 5a1b4b6282b083f0d86bfa0448cef75602c64785
+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 (patch-src_Makefile) = fa5e74f567aff37d8e25fd93ef2db7fdd5b0b17a
diff --git a/security/ocaml-ssl/patches/patch-aa b/security/ocaml-ssl/patches/patch-src_Makefile
index 6053fa4134e..3c4ce5d1152 100644
--- a/security/ocaml-ssl/patches/patch-aa
+++ b/security/ocaml-ssl/patches/patch-src_Makefile
@@ -1,9 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2010/02/14 19:16:25 joerg Exp $
+$NetBSD: patch-src_Makefile,v 1.1 2012/07/14 21:23:49 wiz Exp $
 
---- src/Makefile.in.orig	2010-01-30 19:40:05.000000000 +0000
+Fix ocamlfind installation procedure w/r/t DESTDIR
+--- src/Makefile.in.orig	2011-03-01 07:57:16.000000000 +0000
 +++ src/Makefile.in
-@@ -50,7 +50,8 @@ byte: byte-code-library
- opt: native-code-library
+@@ -53,7 +53,8 @@ opt: native-code-library
+ native-code-library: byte-code-library
  
  install:
 -	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)