CVS commit: pkgsrc/net/ocamlnet

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Dec 30 11:48:42 UTC 2016

Modified Files:
        pkgsrc/net/ocamlnet: Makefile PLIST buildlink3.mk distinfo options.mk
Removed Files:
        pkgsrc/net/ocamlnet/patches: patch-src_equeue_uq_engines_compat.ml
            patch-src_netstring_netasn1.ml patch-src_netsys_netlog.ml

Log Message:
Updated package to latest version, 4.1.2. No substantive changes except
for compatibility with 0caml 4.03 (and .04).


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/ocamlnet/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/ocamlnet/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ocamlnet/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml \
    pkgsrc/net/ocamlnet/patches/patch-src_netstring_netasn1.ml \
    pkgsrc/net/ocamlnet/patches/patch-src_netsys_netlog.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.33 pkgsrc/net/ocamlnet/Makefile:1.34
--- pkgsrc/net/ocamlnet/Makefile:1.33   Sun Dec  4 05:17:37 2016
+++ pkgsrc/net/ocamlnet/Makefile        Fri Dec 30 11:48:41 2016
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2016/12/04 05:17:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.34 2016/12/30 11:48:41 jaapb Exp $
 #
 
-DISTNAME=              ocamlnet-4.1.1
-PKGREVISION=   3
+DISTNAME=              ocamlnet-4.1.2
 CATEGORIES=            net
 MASTER_SITES=          http://download.camlcity.org/download/
 

Index: pkgsrc/net/ocamlnet/PLIST
diff -u pkgsrc/net/ocamlnet/PLIST:1.13 pkgsrc/net/ocamlnet/PLIST:1.14
--- pkgsrc/net/ocamlnet/PLIST:1.13      Mon Jun 20 15:36:04 2016
+++ pkgsrc/net/ocamlnet/PLIST   Fri Dec 30 11:48:41 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/06/20 15:36:04 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/12/30 11:48:41 jaapb Exp $
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
@@ -458,6 +458,24 @@ ${OCAML_SITELIB}/netsys/netsys_win32.cmi
 ${OCAML_SITELIB}/netsys/netsys_win32.mli
 ${OCAML_SITELIB}/netsys/netsys_xdr.cmi
 ${OCAML_SITELIB}/netsys/netsys_xdr.mli
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/META
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/dllnettls-gnutls.so
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/gnutls.mli
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.a
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.p.a
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettle.mli
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.a
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cma
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cmxa
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.a
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.cmxa
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls.cmi
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls.mli
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls_bindings.cmi
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls_bindings.mli
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls_config.cmi
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_nettle_bindings.cmi
+${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_nettle_bindings.mli
 ${OCAML_SITELIB}/netunidata/META
 ${OCAML_SITELIB}/netunidata/cmapf.adobe_standard_encoding.netdb
 ${OCAML_SITELIB}/netunidata/cmapf.adobe_symbol_encoding.netdb

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.3 pkgsrc/net/ocamlnet/buildlink3.mk:1.4
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.3       Mon Jun 20 15:36:04 2016
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Fri Dec 30 11:48:41 2016
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/06/20 15:36:04 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/12/30 11:48:41 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
 .if !defined(OCAMLNET_BUILDLINK3_MK)
 OCAMLNET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.1nb1
+BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.2
 BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK

Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.20 pkgsrc/net/ocamlnet/distinfo:1.21
--- pkgsrc/net/ocamlnet/distinfo:1.20   Thu May  5 16:04:21 2016
+++ pkgsrc/net/ocamlnet/distinfo        Fri Dec 30 11:48:41 2016
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.20 2016/05/05 16:04:21 jaapb Exp $
+$NetBSD: distinfo,v 1.21 2016/12/30 11:48:41 jaapb Exp $
 
-SHA1 (ocamlnet-4.1.1.tar.gz) = 16a5ba8e0155fa04c9fdb3de73db8b8417530ec5
-RMD160 (ocamlnet-4.1.1.tar.gz) = 04e74fea3478110d0fddaa3d0b4fe15bca6fcf58
-SHA512 (ocamlnet-4.1.1.tar.gz) = cd10f7fe622bed3208cc5ad66d65911c1c0992bdc6f4d1bc10d6e7ef197fe157226e6b8ca7857b91cd1c6d6103ac9c3d586d39f3cb32a9ccb9ab83e00bf4444d
-Size (ocamlnet-4.1.1.tar.gz) = 4561784 bytes
+SHA1 (ocamlnet-4.1.2.tar.gz) = d45ec92c700b4d431e7c6ebafcff1b57b0d39322
+RMD160 (ocamlnet-4.1.2.tar.gz) = c3807f66a5aa353d07d567b311693e76e604bf3c
+SHA512 (ocamlnet-4.1.2.tar.gz) = 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
+Size (ocamlnet-4.1.2.tar.gz) = 4623183 bytes
 SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
-SHA1 (patch-src_equeue_uq_engines_compat.ml) = 35ed1e404aafe5e34963dd6730c68c11e7903e86
-SHA1 (patch-src_netstring_netasn1.ml) = 4637b290ac05613a38e0d8c0853f07a904c7254c
-SHA1 (patch-src_netsys_netlog.ml) = 8de2d59aecd88c0e5fee000238efad625e28104b
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01

Index: pkgsrc/net/ocamlnet/options.mk
diff -u pkgsrc/net/ocamlnet/options.mk:1.4 pkgsrc/net/ocamlnet/options.mk:1.5
--- pkgsrc/net/ocamlnet/options.mk:1.4  Thu May  5 16:04:21 2016
+++ pkgsrc/net/ocamlnet/options.mk      Fri Dec 30 11:48:41 2016
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.4 2016/05/05 16:04:21 jaapb Exp $
+# $NetBSD: options.mk,v 1.5 2016/12/30 11:48:41 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocamlnet
-PKG_SUPPORTED_OPTIONS= gtk gtk2
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= gtk gtk2 gnutls
+PKG_SUGGESTED_OPTIONS= gnutls
+
+PLIST_VARS+=           gnutls
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -38,3 +40,14 @@ CONFIGURE_ARGS+=     -enable-gtk2
 .else
 CONFIGURE_ARGS+=       -disable-gtk2
 .endif
+
+###
+### GNU TLS support
+###
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+PLIST.gnutls=          yes
+CONFIGURE_ARGS+=       -enable-gnutls
+.else
+CONFIGURE_ARGS+=       -disable-gnutls
+.endif