CVS commit: pkgsrc/net/ocaml-conduit

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed May 11 10:40:58 UTC 2022

Modified Files:
        pkgsrc/net/ocaml-conduit: Makefile PLIST buildlink3.mk distinfo
            options.mk

Log Message:
Updated net/ocaml-conduit to version 5.1.0.

There are many upstream bugfixes and additions, but nothing breaking.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/ocaml-conduit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ocaml-conduit/PLIST \
    pkgsrc/net/ocaml-conduit/buildlink3.mk \
    pkgsrc/net/ocaml-conduit/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ocaml-conduit/distinfo

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

Modified files:

Index: pkgsrc/net/ocaml-conduit/Makefile
diff -u pkgsrc/net/ocaml-conduit/Makefile:1.5 pkgsrc/net/ocaml-conduit/Makefile:1.6
--- pkgsrc/net/ocaml-conduit/Makefile:1.5       Mon Mar  8 08:13:04 2021
+++ pkgsrc/net/ocaml-conduit/Makefile   Wed May 11 10:40:58 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:13:04 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/11 10:40:58 jaapb Exp $
 
 GITHUB_PROJECT=        ocaml-conduit
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      ${GITHUB_PROJECT}-2.1.0
-PKGREVISION=   2
+DISTNAME=      ${GITHUB_PROJECT}-5.1.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mirage/}
 
@@ -16,13 +15,14 @@ USE_LANGUAGES=      # none
 
 OCAML_USE_DUNE=                yes
 DUNE_BUILD_PACKAGES=   conduit
-OPAM_INSTALL_FILES=    conduit
+OPAM_INSTALL_FILES=    ${DUNE_BUILD_PACKAGES}
+OCAML_FINDLIB_DIRS=    ${DUNE_BUILD_PACKAGES}
 
 .include "options.mk"
 .include "../../devel/ocaml-astring/buildlink3.mk"
 .include "../../devel/ocaml-logs/buildlink3.mk"
 .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk"
-.include "../../devel/ocaml-result/buildlink3.mk"
+#.include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../devel/ocaml-sexplib/buildlink3.mk"
 .include "../../net/ocaml-ipaddr/buildlink3.mk"
 .include "../../www/ocaml-uri/buildlink3.mk"

Index: pkgsrc/net/ocaml-conduit/PLIST
diff -u pkgsrc/net/ocaml-conduit/PLIST:1.2 pkgsrc/net/ocaml-conduit/PLIST:1.3
--- pkgsrc/net/ocaml-conduit/PLIST:1.2  Wed Apr  8 12:46:24 2020
+++ pkgsrc/net/ocaml-conduit/PLIST      Wed May 11 10:40:58 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/08 12:46:24 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/05/11 10:40:58 jaapb Exp $
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/META
 ${PLIST.async}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-async/conduit_async.a
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async.cma
@@ -53,8 +53,10 @@ ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_server.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmt
+${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmti
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmx
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.ml
+${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.mli
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.a
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.cma
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.cmi
@@ -67,8 +69,10 @@ ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmt
+${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmti
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmx
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.ml
+${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/dune-package
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/opam
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/resolver_lwt_unix.cmi
Index: pkgsrc/net/ocaml-conduit/buildlink3.mk
diff -u pkgsrc/net/ocaml-conduit/buildlink3.mk:1.2 pkgsrc/net/ocaml-conduit/buildlink3.mk:1.3
--- pkgsrc/net/ocaml-conduit/buildlink3.mk:1.2  Wed Apr  8 12:46:24 2020
+++ pkgsrc/net/ocaml-conduit/buildlink3.mk      Wed May 11 10:40:58 2022
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/08 12:46:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/11 10:40:58 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-conduit
 
 .if !defined(OCAML_CONDUIT_BUILDLINK3_MK)
 OCAML_CONDUIT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-conduit+=  ocaml-conduit>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-conduit+=  ocaml-conduit>=2.1.0
+BUILDLINK_API_DEPENDS.ocaml-conduit+=  ocaml-conduit>=3.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-conduit+=  ocaml-conduit>=5.1.0
 BUILDLINK_PKGSRCDIR.ocaml-conduit?=    ../../net/ocaml-conduit
 
 .endif # OCAML_CONDUIT_BUILDLINK3_MK
Index: pkgsrc/net/ocaml-conduit/options.mk
diff -u pkgsrc/net/ocaml-conduit/options.mk:1.2 pkgsrc/net/ocaml-conduit/options.mk:1.3
--- pkgsrc/net/ocaml-conduit/options.mk:1.2     Mon Jun 29 10:15:07 2020
+++ pkgsrc/net/ocaml-conduit/options.mk Wed May 11 10:40:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/06/29 10:15:07 yyamano Exp $
+# $NetBSD: options.mk,v 1.3 2022/05/11 10:40:58 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-conduit
 PKG_SUPPORTED_OPTIONS= async lwt
@@ -15,6 +15,8 @@ PLIST_VARS+=  async lwt
 ###
 .if !empty(PKG_OPTIONS:Masync)
 .include "../../devel/ocaml-async/buildlink3.mk"
+.include "../../devel/ocaml-core/buildlink3.mk"
+.include "../../devel/ocaml-ppx_here/buildlink3.mk"
 DUNE_BUILD_PACKAGES+=  conduit-async
 OPAM_INSTALL_FILES+=   conduit-async
 PLIST.async=   yes

Index: pkgsrc/net/ocaml-conduit/distinfo
diff -u pkgsrc/net/ocaml-conduit/distinfo:1.4 pkgsrc/net/ocaml-conduit/distinfo:1.5
--- pkgsrc/net/ocaml-conduit/distinfo:1.4       Tue Oct 26 11:06:10 2021
+++ pkgsrc/net/ocaml-conduit/distinfo   Wed May 11 10:40:58 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:06:10 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/05/11 10:40:58 jaapb Exp $
 
-BLAKE2s (ocaml-conduit-2.1.0.tar.gz) = 2434fe9477719707a411fbfbc802bbc128a9f339b95a87129e4b4857d8cdaa6a
-SHA512 (ocaml-conduit-2.1.0.tar.gz) = c65f55933d00f17f281474d756064e89424226defa10a1e82716ed8f50ceb5f2c8c005b42f25ef32702ccb2ce827f605da4d88425e24198962c264689f48ac82
-Size (ocaml-conduit-2.1.0.tar.gz) = 41641 bytes
+BLAKE2s (ocaml-conduit-5.1.0.tar.gz) = 3feddff26a003c6e988a1e934e4dd5e4a9069491da51e5a815f7857d5c6807ac
+SHA512 (ocaml-conduit-5.1.0.tar.gz) = 5308803f4653d30399b1549cd4f27d0132b2f0202cc626cd1344620684bd8a7e08b8de1887cad73a0eba4c677946192aa05199bce8c0844fecf3695338156b09
+Size (ocaml-conduit-5.1.0.tar.gz) = 41320 bytes