3 files changed, 13 insertions, 96 deletions

diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index dfd7d4a23349..b04f79e2d907 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cryptokit
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	security
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
@@ -22,6 +22,8 @@ ALL_TARGET=	all allopt
 
 .ifndef(NOPORTDOCS)
 ALL_TARGET+=	doc
+
+PORTDOCS=	*
 .endif
 
 DOC_FILES=	Changes LICENSE README
@@ -41,7 +43,7 @@ pre-install:
 		's|cp |${INSTALL_DATA} |' \
 		${WRKSRC}/Makefile
 # create installation dir
-	@${MKDIR} ${PREFIX}/lib/ocaml
+	@${MKDIR} ${PREFIX}/lib/ocaml/stublibs
 
 post-install:
 .ifndef(NOPORTDOCS)
@@ -52,4 +54,8 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+.include <bsd.port.post.mk>
diff --git a/security/ocaml-cryptokit/distinfo b/security/ocaml-cryptokit/distinfo
index d17bb4ce507d..6512b2cd0e27 100644
--- a/security/ocaml-cryptokit/distinfo
+++ b/security/ocaml-cryptokit/distinfo
@@ -1,2 +1,2 @@
-MD5 (cryptokit-1.2.tar.gz) = 0249135953f10c1515e88985b45ee4c9
-SIZE (cryptokit-1.2.tar.gz) = 106543
+MD5 (cryptokit-1.3.tar.gz) = d7de01d0702d16b3491c9e794ebb2cc3
+SIZE (cryptokit-1.3.tar.gz) = 112689
diff --git a/security/ocaml-cryptokit/pkg-plist b/security/ocaml-cryptokit/pkg-plist
index ab5597b0df05..3b2ae4f7cbaa 100644
--- a/security/ocaml-cryptokit/pkg-plist
+++ b/security/ocaml-cryptokit/pkg-plist
@@ -4,96 +4,7 @@ lib/ocaml/cryptokit.cmi
 lib/ocaml/cryptokit.cmx
 lib/ocaml/cryptokit.cmxa
 lib/ocaml/cryptokit.mli
-lib/ocaml/dllcryptokit.so
 lib/ocaml/libcryptokit.a
-%%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Base64.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.aes_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.aes_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.block_cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cbc_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cbc_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cfb_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cfb_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cipher_padded_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.cipher_padded_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.des_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.des_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.mac.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.mac_final_triple.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.ofb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.triple_des_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Block.triple_des_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.DH.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Hash.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Hexa.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.MAC.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Padding.scheme.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.RSA.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Random.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Random.rng.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Stream.arcfour.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Stream.cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Stream.stream_cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.Zlib.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.hash.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/Cryptokit.transform.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_class_types.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_exceptions.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_methods.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_module_types.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_modules.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_types.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index_values.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/style.css
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Base64.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.aes_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.aes_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.block_cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cbc_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cbc_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cfb_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cfb_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cipher_padded_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.cipher_padded_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.des_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.des_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.mac.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.mac_final_triple.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.ofb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.triple_des_decrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Block.triple_des_encrypt.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.DH.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Hash.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Hexa.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.MAC.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Padding.scheme.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.RSA.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Random.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Random.rng.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Stream.arcfour.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Stream.cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Stream.stream_cipher.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.Zlib.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.hash.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/type_Cryptokit.transform.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/ocaml/stublibs/dllcryptokit.so
+@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true
 @unexec rmdir %D/lib/ocaml 2>/dev/null || true