[pkgsrc/trunk]: pkgsrc/net/ocamlnet Updated package to latest version, 4.1.2....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/ocamlnet Updated package to latest version, 4.1.2....
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:27:59 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4a7b0668e3b
branches:  trunk
changeset: 356384:e4a7b0668e3b
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Dec 30 11:48:41 2016 +0000

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

diffstat:

 net/ocamlnet/Makefile                                      |   5 +-
 net/ocamlnet/PLIST                                         |  20 ++++++++-
 net/ocamlnet/buildlink3.mk                                 |   4 +-
 net/ocamlnet/distinfo                                      |  13 ++---
 net/ocamlnet/options.mk                                    |  19 +++++++-
 net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml |  14 ------
 net/ocamlnet/patches/patch-src_netstring_netasn1.ml        |  14 ------
 net/ocamlnet/patches/patch-src_netsys_netlog.ml            |  30 --------------
 8 files changed, 44 insertions(+), 75 deletions(-)

diffs (187 lines):

diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/Makefile
--- a/net/ocamlnet/Makefile     Fri Dec 30 11:45:51 2016 +0000
+++ b/net/ocamlnet/Makefile     Fri Dec 30 11:48:41 2016 +0000
@@ -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/
 
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/PLIST
--- a/net/ocamlnet/PLIST        Fri Dec 30 11:45:51 2016 +0000
+++ b/net/ocamlnet/PLIST        Fri Dec 30 11:48:41 2016 +0000
@@ -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.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
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/buildlink3.mk
--- a/net/ocamlnet/buildlink3.mk        Fri Dec 30 11:45:51 2016 +0000
+++ b/net/ocamlnet/buildlink3.mk        Fri Dec 30 11:48:41 2016 +0000
@@ -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
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/distinfo
--- a/net/ocamlnet/distinfo     Fri Dec 30 11:45:51 2016 +0000
+++ b/net/ocamlnet/distinfo     Fri Dec 30 11:48:41 2016 +0000
@@ -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
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/options.mk
--- a/net/ocamlnet/options.mk   Fri Dec 30 11:45:51 2016 +0000
+++ b/net/ocamlnet/options.mk   Fri Dec 30 11:48:41 2016 +0000
@@ -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 @@
 .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
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml
--- a/net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml        Fri Dec 30 11:45:51 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_equeue_uq_engines_compat.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
-
-Temporary patch for ocaml 4.03 (from upstream git repository)
---- src/equeue/uq_engines_compat.ml.orig       2016-02-29 12:24:18.000000000 +0000
-+++ src/equeue/uq_engines_compat.ml
-@@ -7,7 +7,7 @@ class type server_socket_acceptor = serv
- class type client_socket_connector = client_endpoint_connector
-           
- 
--exception Mem_not_supported = Uq_multiplex.Mem_not_supported
-+(* exception Mem_not_supported = Uq_multiplex.Mem_not_supported *)
- 
- let create_multiplex_controller_for_connected_socket =
-   Uq_multiplex.create_multiplex_controller_for_connected_socket
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/patches/patch-src_netstring_netasn1.ml
--- a/net/ocamlnet/patches/patch-src_netstring_netasn1.ml       Fri Dec 30 11:45:51 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_netstring_netasn1.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
-
-Temporary patch for ocaml 4.03 (from package's git repository)
---- src/netstring/netasn1.ml.orig      2016-02-29 12:24:17.000000000 +0000
-+++ src/netstring/netasn1.ml
-@@ -437,7 +437,7 @@ module Value = struct
-                let hour = int_of_string (Netstring_str.matched_group m 4 s) in
-                let minute = int_of_string (Netstring_str.matched_group m 5 s) in
-                let second = int_of_string (Netstring_str.matched_group m 6 s) in
--               let zonestr = Netstring_str.matched_group m 8s in
-+               let zonestr = Netstring_str.matched_group m 8 s in
-                let zone = get_zone zonestr in
-                if month = 0 || month > 12 || day = 0 || day > 31 ||
-                     hour > 23 || minute > 59 || second > 59 
diff -r e087ef899997 -r e4a7b0668e3b net/ocamlnet/patches/patch-src_netsys_netlog.ml
--- a/net/ocamlnet/patches/patch-src_netsys_netlog.ml   Fri Dec 30 11:45:51 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_netsys_netlog.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
-
-Temporary patch for ocaml 4.03 (from package's git repository)
---- src/netsys/netlog.ml.orig  2016-02-29 12:24:18.000000000 +0000
-+++ src/netsys/netlog.ml
-@@ -8,6 +8,15 @@ type level =
- type logger =
-     level -> string -> unit
- 
-+type timespec = float * int
-+type clock_id
-+type clock =
-+  | CLOCK_REALTIME
-+  | CLOCK_MONOTONIC
-+  | CLOCK_ID of clock_id
-+
-+external clock_gettime : clock -> timespec = "netsys_clock_gettime"
-+
- let level_weight =
-   function
-     | `Emerg   -> 0
-@@ -95,7 +104,7 @@ let current_formatter =
- let channel_logger ch max_lev lev msg = 
-   if level_weight lev <= level_weight max_lev then (
-     let (sec,ns) =
--      try Netsys_posix.clock_gettime Netsys_posix.CLOCK_REALTIME
-+      try clock_gettime CLOCK_REALTIME
-       with Invalid_argument _ ->
-       (Unix.gettimeofday(), 0) in
-     let s =   (* Netdate is unavailable here *)
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk Corrected an inaccurate comment. No actual changes ...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/readline Remove unneeded dragonfly workaround.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk Corrected an inaccurate comment. No actual changes ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/readline Remove unneeded dragonfly workaround.
Indexes:
Home | Main Index | Thread Index | Old Index