CVS commit: pkgsrc/net/ocamlnet

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue May  3 09:40:28 UTC 2022

Modified Files:
        pkgsrc/net/ocamlnet: Makefile buildlink3.mk distinfo options.mk
        pkgsrc/net/ocamlnet/patches: patch-src_netsys_netsys__c.c

Log Message:
Updated net/ocamlnet to version 4.1.9.

This adds support for OCaml 4.11 and 4.12 (and later), fixes the building
of cmxs files and includes some other minor bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/ocamlnet/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ocamlnet/options.mk
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c

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.82 pkgsrc/net/ocamlnet/Makefile:1.83
--- pkgsrc/net/ocamlnet/Makefile:1.82   Mon Apr 18 19:11:52 2022
+++ pkgsrc/net/ocamlnet/Makefile        Tue May  3 09:40:28 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2022/04/18 19:11:52 adam Exp $
+# $NetBSD: Makefile,v 1.83 2022/05/03 09:40:28 jaapb Exp $
 #
 
-DISTNAME=              ocamlnet-4.1.7
-PKGREVISION=           10
+DISTNAME=              ocamlnet-4.1.9
 CATEGORIES=            net
 MASTER_SITES=          http://download.camlcity.org/download/
 

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.15 pkgsrc/net/ocamlnet/buildlink3.mk:1.16
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.15      Thu Apr 23 12:28:50 2020
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Tue May  3 09:40:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/04/23 12:28:50 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2022/05/03 09:40:28 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocamlnet
 OCAMLNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.2
-BUILDLINK_ABI_DEPENDS.ocamlnet+=       ocamlnet>=4.1.7
+BUILDLINK_ABI_DEPENDS.ocamlnet+=       ocamlnet>=4.1.9
 BUILDLINK_PKGSRCDIR.ocamlnet?=         ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK

Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.31 pkgsrc/net/ocamlnet/distinfo:1.32
--- pkgsrc/net/ocamlnet/distinfo:1.31   Tue Oct 26 11:06:10 2021
+++ pkgsrc/net/ocamlnet/distinfo        Tue May  3 09:40:28 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 11:06:10 nia Exp $
+$NetBSD: distinfo,v 1.32 2022/05/03 09:40:28 jaapb Exp $
 
-BLAKE2s (ocamlnet-4.1.7.tar.gz) = 975a3ecf44e63cee41a8e75235759c67e05d9ff9be75f2b34baaeacc9e60c458
-SHA512 (ocamlnet-4.1.7.tar.gz) = d8dc554f686fb7c9e2f3e0abcb9f40b04a90e1eedd998831231055242e510a2f80c05fd74ab41642f0b24a734af17d403163b94746a4da744c297f478f91c716
-Size (ocamlnet-4.1.7.tar.gz) = 4620021 bytes
-SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
+BLAKE2s (ocamlnet-4.1.9.tar.gz) = 861dd6efd600d3d9ab18437096309d060ab52af4edc95bc6aa742576324ac7f8
+SHA512 (ocamlnet-4.1.9.tar.gz) = a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
+Size (ocamlnet-4.1.9.tar.gz) = 4628747 bytes
+SHA1 (patch-src_netsys_netsys__c.c) = 2fe5c7db2e76a894b8fde36f381caf46661fa73b

Index: pkgsrc/net/ocamlnet/options.mk
diff -u pkgsrc/net/ocamlnet/options.mk:1.10 pkgsrc/net/ocamlnet/options.mk:1.11
--- pkgsrc/net/ocamlnet/options.mk:1.10 Thu Oct 10 14:16:33 2019
+++ pkgsrc/net/ocamlnet/options.mk      Tue May  3 09:40:28 2022
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.10 2019/10/10 14:16:33 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2022/05/03 09:40:28 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocamlnet
 PKG_SUPPORTED_OPTIONS= gtk2 gnutls
 PKG_SUGGESTED_OPTIONS= gnutls
 
-PLIST_VARS+=           gnutls cmxs
+PLIST_VARS+=           gnutls
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
diff -u pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c:1.6 pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c:1.7
--- pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c:1.6        Wed Feb  3 13:19:33 2016
+++ pkgsrc/net/ocamlnet/patches/patch-src_netsys_netsys__c.c    Tue May  3 09:40:28 2022
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_netsys_netsys__c.c,v 1.6 2016/02/03 13:19:33 jaapb Exp $
+$NetBSD: patch-src_netsys_netsys__c.c,v 1.7 2022/05/03 09:40:28 jaapb Exp $
 
 Work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
+
 --- src/netsys/netsys_c.c.orig 2015-06-21 15:26:42.000000000 +0000
 +++ src/netsys/netsys_c.c
 @@ -432,6 +432,10 @@ CAMLprim value netsys_at_fdcwd(value dum