Update to 1.2

3 files changed, 102 insertions, 91 deletions

diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index 6f98994ceb72..a1e3abe1ed4b 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cryptokit
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	security
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
@@ -25,6 +25,8 @@ ALL_TARGET=	all allopt
 ALL_TARGET+=	doc
 .endif
 
+DOC_FILES=	Changes LICENSE README
+
 post-configure:
 # CFLAGS,PREFIX safeness
 	@${REINPLACE_CMD} -E -e \
@@ -44,8 +46,11 @@ pre-install:
 
 post-install:
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/doc
+	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc
+.for file in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/ocaml-cryptokit/distinfo b/security/ocaml-cryptokit/distinfo
index d468c98bf048..d17bb4ce507d 100644
--- a/security/ocaml-cryptokit/distinfo
+++ b/security/ocaml-cryptokit/distinfo
@@ -1,2 +1,2 @@
-MD5 (cryptokit-1.1.tar.gz) = c4f22e4dd3d44eeab4f3bcdb25b95980
-SIZE (cryptokit-1.1.tar.gz) = 103406
+MD5 (cryptokit-1.2.tar.gz) = 0249135953f10c1515e88985b45ee4c9
+SIZE (cryptokit-1.2.tar.gz) = 106543
diff --git a/security/ocaml-cryptokit/pkg-plist b/security/ocaml-cryptokit/pkg-plist
index 42842b220daa..ab5597b0df05 100644
--- a/security/ocaml-cryptokit/pkg-plist
+++ b/security/ocaml-cryptokit/pkg-plist
@@ -1,93 +1,99 @@
+lib/ocaml/cryptokit.a
 lib/ocaml/cryptokit.cma
 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%%share/doc/cryptokit/Cryptokit.Base64.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.aes_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.aes_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.block_cipher.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cbc_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cbc_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cfb_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cfb_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cipher.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cipher_padded_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.cipher_padded_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.des_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.des_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.mac.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.mac_final_triple.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.ofb.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.triple_des_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Block.triple_des_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Cipher.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.DH.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Hash.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Hexa.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.MAC.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Padding.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Padding.scheme.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.RSA.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Random.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Random.rng.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Stream.arcfour.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Stream.cipher.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Stream.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Stream.stream_cipher.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.Zlib.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.hash.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.html
-%%PORTDOCS%%share/doc/cryptokit/Cryptokit.transform.html
-%%PORTDOCS%%share/doc/cryptokit/index.html
-%%PORTDOCS%%share/doc/cryptokit/index_attributes.html
-%%PORTDOCS%%share/doc/cryptokit/index_class_types.html
-%%PORTDOCS%%share/doc/cryptokit/index_classes.html
-%%PORTDOCS%%share/doc/cryptokit/index_exceptions.html
-%%PORTDOCS%%share/doc/cryptokit/index_methods.html
-%%PORTDOCS%%share/doc/cryptokit/index_module_types.html
-%%PORTDOCS%%share/doc/cryptokit/index_modules.html
-%%PORTDOCS%%share/doc/cryptokit/index_types.html
-%%PORTDOCS%%share/doc/cryptokit/index_values.html
-%%PORTDOCS%%share/doc/cryptokit/style.css
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Base64.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.aes_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.aes_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.block_cipher.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cbc_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cbc_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cfb_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cfb_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cipher.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cipher_padded_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.cipher_padded_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.des_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.des_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.mac.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.mac_final_triple.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.ofb.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.triple_des_decrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Block.triple_des_encrypt.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Cipher.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.DH.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Hash.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Hexa.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.MAC.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Padding.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Padding.scheme.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.RSA.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Random.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Random.rng.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Stream.arcfour.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Stream.cipher.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Stream.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Stream.stream_cipher.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.Zlib.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.hash.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.html
-%%PORTDOCS%%share/doc/cryptokit/type_Cryptokit.transform.html
-%%PORTDOCS%%@dirrm share/doc/cryptokit
+%%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%%
 @unexec rmdir %D/lib/ocaml 2>/dev/null || true