[pkgsrc/trunk]: pkgsrc/net/ocamlnet Fix build against newer nettle.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8855227d0e41
branches:  trunk
changeset: 373658:8855227d0e41
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 07 21:01:09 2018 +0000

description:
Fix build against newer nettle.

diffstat:

 net/ocamlnet/distinfo                          |   3 ++-
 net/ocamlnet/patches/patch-src_nettls-nettle.c |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 51b954242610 -r 8855227d0e41 net/ocamlnet/distinfo
--- a/net/ocamlnet/distinfo     Sun Jan 07 21:00:23 2018 +0000
+++ b/net/ocamlnet/distinfo     Sun Jan 07 21:01:09 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2017/09/04 18:17:47 jaapb Exp $
+$NetBSD: distinfo,v 1.25 2018/01/07 21:01:09 joerg Exp $
 
 SHA1 (ocamlnet-4.1.4.tar.gz) = f7bb6e98f2c35850fb8dce428c061ce316d55ce2
 RMD160 (ocamlnet-4.1.4.tar.gz) = a71a5c894db5c540e5b47df750ea4a1468ea7bf8
@@ -7,3 +7,4 @@
 SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8
 SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
+SHA1 (patch-src_nettls-nettle.c) = 75748ff2fd30ff6f54f15b9646a22b420d108f28
diff -r 51b954242610 -r 8855227d0e41 net/ocamlnet/patches/patch-src_nettls-nettle.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ocamlnet/patches/patch-src_nettls-nettle.c    Sun Jan 07 21:01:09 2018 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_nettls-nettle.c,v 1.1 2018/01/07 21:01:09 joerg Exp $
+
+Newer nettle versions provide macros for this purpose.
+
+--- src/nettls-gnutls/nettle.c.orig    2017-08-14 13:16:50.-06639040 +0000
++++ src/nettls-gnutls/nettle.c
+@@ -98,7 +98,7 @@ static const char *net_nettle_cipher_nam
+     return cipher->name;
+ }
+ 
+-#ifndef HAVE_FUN_nettle_ciphers
++#if !defined(HAVE_FUN_nettle_ciphers) && !defined(nettle_ciphers)
+ const struct nettle_cipher * const nettle_ciphers[] = {
+   &nettle_aes128,
+   &nettle_aes192,
+@@ -337,7 +337,7 @@ static void net_nettle_hash_digest(net_n
+     hash->digest(ctx, length, dst);
+ }
+ 
+-#ifndef HAVE_FUN_nettle_hashes
++#if defined(HAVE_FUN_nettle_hashes) && !defined(nettle_hashes)
+ const struct nettle_hash * const nettle_hashes[] = {
+     &nettle_md2,
+     &nettle_md4,