CVS commit: pkgsrc/www/ocaml-cohttp

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/ocaml-cohttp
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Wed, 11 May 2022 14:16:37 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed May 11 14:16:37 UTC 2022

Modified Files:
        pkgsrc/www/ocaml-cohttp: Makefile PLIST buildlink3.mk distinfo
            options.mk

Log Message:
Update www/ocaml-cohttp to version 5.0.0.

There are many changes, including API-breaking ones. Full details in the
CHANGES.md file included in the distribution.


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

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

Modified files:

Index: pkgsrc/www/ocaml-cohttp/Makefile
diff -u pkgsrc/www/ocaml-cohttp/Makefile:1.5 pkgsrc/www/ocaml-cohttp/Makefile:1.6
--- pkgsrc/www/ocaml-cohttp/Makefile:1.5        Mon Mar  8 08:13:08 2021
+++ pkgsrc/www/ocaml-cohttp/Makefile    Wed May 11 14:16:37 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/11 14:16:37 jaapb Exp $
 
-GITHUB_PROJECT=        ocaml-cohttp
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      ${GITHUB_PROJECT}-2.5.1
-PKGREVISION=   1
+DISTNAME=      ${GITHUB_PROJECT}-5.0.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mirage/}
+GITHUB_PROJECT=        ocaml-cohttp
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/mirage/ocaml-cohttp/
@@ -16,19 +15,16 @@ USE_LANGUAGES=      # none
 
 OCAML_USE_DUNE=                yes
 DUNE_BUILD_PACKAGES=   cohttp cohttp-top
-OPAM_INSTALL_FILES=    cohttp cohttp-top
+OPAM_INSTALL_FILES=    ${DUNE_BUILD_PACKAGES}
+OCAML_FINDLIB_DIRS=    ${DUNE_BUILD_PACKAGES}
 
 .include "options.mk"
 .include "../../devel/ocaml-base64/buildlink3.mk"
-.include "../../devel/ocaml-fmt/buildlink3.mk"
 .include "../../devel/ocaml-ppx_fields_conv/buildlink3.mk"
 .include "../../devel/ocaml-ppx_sexp_conv/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
 .include "../../devel/ocaml-sexplib0/buildlink3.mk"
-.include "../../devel/ocaml-stdlib-shims/buildlink3.mk"
 .include "../../devel/ocaml-stringext/buildlink3.mk"
-.include "../../net/ocaml-conduit/buildlink3.mk"
-.include "../../textproc/ocaml-jsonm/buildlink3.mk"
 .include "../../www/ocaml-uri/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ocaml-cohttp/PLIST
diff -u pkgsrc/www/ocaml-cohttp/PLIST:1.1 pkgsrc/www/ocaml-cohttp/PLIST:1.2
--- pkgsrc/www/ocaml-cohttp/PLIST:1.1   Mon Jul  1 15:48:53 2019
+++ pkgsrc/www/ocaml-cohttp/PLIST       Wed May 11 14:16:37 2022
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/01 15:48:53 jaapb Exp $
-${PLIST.lwt}bin/cohttp-curl-lwt
-${PLIST.lwt}bin/cohttp-proxy-lwt
-${PLIST.lwt}bin/cohttp-server-lwt
+@comment $NetBSD: PLIST,v 1.2 2022/05/11 14:16:37 jaapb Exp $
+bin/cohttp-curl-lwt
+bin/cohttp-proxy-lwt
+bin/cohttp-server-lwt
 ${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/META
 ${PLIST.jsoo}${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.a
 ${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cma
+${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmi
+${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmt
+${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmti
+${PLIST.jsoo}${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmx
 ${PLIST.jsoo}${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmxa
 ${PLIST.jsoo}${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.cmxs
-${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.cmi
-${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.cmt
-${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.cmti
-${PLIST.jsoo}${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.cmx
-${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.ml
-${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_xhr.mli
+${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.ml
+${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/cohttp_lwt_jsoo.mli
 ${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/dune-package
 ${PLIST.jsoo}${OCAML_SITELIB}/cohttp-lwt-jsoo/opam
 ${PLIST.lwt}${OCAML_SITELIB}/cohttp-lwt-unix/META
@@ -138,7 +138,6 @@ ${OCAML_SITELIB}/cohttp/cohttp.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp/cohttp.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp/cohttp.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp/cohttp.cmxs
-${OCAML_SITELIB}/cohttp/dune-package
 ${OCAML_SITELIB}/cohttp/cohttp.ml
 ${OCAML_SITELIB}/cohttp/cohttp__.cmi
 ${OCAML_SITELIB}/cohttp/cohttp__.cmt
@@ -194,6 +193,10 @@ ${OCAML_SITELIB}/cohttp/cohttp__Link.cmi
 ${OCAML_SITELIB}/cohttp/cohttp__Link.cmt
 ${OCAML_SITELIB}/cohttp/cohttp__Link.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp/cohttp__Link.cmx
+${OCAML_SITELIB}/cohttp/cohttp__Path.cmi
+${OCAML_SITELIB}/cohttp/cohttp__Path.cmt
+${OCAML_SITELIB}/cohttp/cohttp__Path.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cohttp/cohttp__Path.cmx
 ${OCAML_SITELIB}/cohttp/cohttp__Request.cmi
 ${OCAML_SITELIB}/cohttp/cohttp__Request.cmt
 ${OCAML_SITELIB}/cohttp/cohttp__Request.cmti
@@ -223,6 +226,7 @@ ${OCAML_SITELIB}/cohttp/connection.ml
 ${OCAML_SITELIB}/cohttp/connection.mli
 ${OCAML_SITELIB}/cohttp/cookie.ml
 ${OCAML_SITELIB}/cohttp/cookie.mli
+${OCAML_SITELIB}/cohttp/dune-package
 ${OCAML_SITELIB}/cohttp/header.ml
 ${OCAML_SITELIB}/cohttp/header.mli
 ${OCAML_SITELIB}/cohttp/header_io.ml
@@ -230,6 +234,8 @@ ${OCAML_SITELIB}/cohttp/header_io.mli
 ${OCAML_SITELIB}/cohttp/link.ml
 ${OCAML_SITELIB}/cohttp/link.mli
 ${OCAML_SITELIB}/cohttp/opam
+${OCAML_SITELIB}/cohttp/path.ml
+${OCAML_SITELIB}/cohttp/path.mli
 ${OCAML_SITELIB}/cohttp/request.ml
 ${OCAML_SITELIB}/cohttp/request.mli
 ${OCAML_SITELIB}/cohttp/response.ml
@@ -241,15 +247,15 @@ ${OCAML_SITELIB}/cohttp/transfer.ml
 ${OCAML_SITELIB}/cohttp/transfer.mli
 ${OCAML_SITELIB}/cohttp/transfer_io.ml
 ${OCAML_SITELIB}/cohttp/transfer_io.mli
-${PLIST.jsoo}share/doc/cohttp-lwt-jsoo/CHANGES.md
-${PLIST.jsoo}share/doc/cohttp-lwt-jsoo/LICENSE.md
-${PLIST.jsoo}share/doc/cohttp-lwt-jsoo/README.md
-${PLIST.lwt}share/doc/cohttp-lwt-unix/CHANGES.md
-${PLIST.lwt}share/doc/cohttp-lwt-unix/LICENSE.md
-${PLIST.lwt}share/doc/cohttp-lwt-unix/README.md
-${PLIST.lwt}share/doc/cohttp-lwt/CHANGES.md
-${PLIST.lwt}share/doc/cohttp-lwt/LICENSE.md
-${PLIST.lwt}share/doc/cohttp-lwt/README.md
+share/doc/cohttp-lwt-jsoo/CHANGES.md
+share/doc/cohttp-lwt-jsoo/LICENSE.md
+share/doc/cohttp-lwt-jsoo/README.md
+share/doc/cohttp-lwt-unix/CHANGES.md
+share/doc/cohttp-lwt-unix/LICENSE.md
+share/doc/cohttp-lwt-unix/README.md
+share/doc/cohttp-lwt/CHANGES.md
+share/doc/cohttp-lwt/LICENSE.md
+share/doc/cohttp-lwt/README.md
 share/doc/cohttp-top/CHANGES.md
 share/doc/cohttp-top/LICENSE.md
 share/doc/cohttp-top/README.md

Index: pkgsrc/www/ocaml-cohttp/buildlink3.mk
diff -u pkgsrc/www/ocaml-cohttp/buildlink3.mk:1.2 pkgsrc/www/ocaml-cohttp/buildlink3.mk:1.3
--- pkgsrc/www/ocaml-cohttp/buildlink3.mk:1.2   Tue Apr 21 11:25:18 2020
+++ pkgsrc/www/ocaml-cohttp/buildlink3.mk       Wed May 11 14:16:37 2022
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/21 11:25:18 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/11 14:16:37 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-cohttp
 
 .if !defined(OCAML_COHTTP_BUILDLINK3_MK)
 OCAML_COHTTP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-cohttp+=   ocaml-cohttp>=2.1.2
-BUILDLINK_ABI_DEPENDS.ocaml-cohttp+=   ocaml-cohttp>=2.5.1
+BUILDLINK_API_DEPENDS.ocaml-cohttp+=   ocaml-cohttp>=5.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-cohttp+=   ocaml-cohttp>=5.0.0
 BUILDLINK_PKGSRCDIR.ocaml-cohttp?=     ../../www/ocaml-cohttp
 
 .endif # OCAML_COHTTP_BUILDLINK3_MK
Index: pkgsrc/www/ocaml-cohttp/options.mk
diff -u pkgsrc/www/ocaml-cohttp/options.mk:1.2 pkgsrc/www/ocaml-cohttp/options.mk:1.3
--- pkgsrc/www/ocaml-cohttp/options.mk:1.2      Fri Jan 10 21:19:20 2020
+++ pkgsrc/www/ocaml-cohttp/options.mk  Wed May 11 14:16:37 2022
@@ -1,31 +1,46 @@
-# $NetBSD: options.mk,v 1.2 2020/01/10 21:19:20 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2022/05/11 14:16:37 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-cohttp
-PKG_SUPPORTED_OPTIONS= async lwt js_of_ocaml
-PKG_SUGGESTED_OPTIONS= async lwt js_of_ocaml
+PKG_SUPPORTED_OPTIONS= lwt js_of_ocaml # async
+PKG_SUGGESTED_OPTIONS= lwt js_of_ocaml # async
 
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   lwt jsoo
+PLIST_VARS+=   lwt jsoo # async
 
 ###
 ### async support
 ###
-.if !empty(PKG_OPTIONS:Masync)
-DUNE_BUILD_PACKAGES+=  cohttp-async
-.endif
+# doesn't work on NetBSD for the moment
+#.if !empty(PKG_OPTIONS:Masync)
+#.include "../../devel/ocaml-async/buildlink3.mk"
+#.include "../../devel/ocaml-async_kernel/buildlink3.mk"
+#.include "../../devel/ocaml-async_unix/buildlink3.mk"
+#.include "../../devel/ocaml-base/buildlink3.mk"
+#.include "../../devel/ocaml-core_unix/buildlink3.mk"
+#.include "../../net/ocaml-ipaddr/buildlink3.mk"
+#PLIST.async=  yes
+#DUNE_BUILD_PACKAGES+= cohttp-async
+#OPAM_INSTALL_FILES+=  cohttp-async
+#OCAML_FINDLIB_DIRS+=  cohttp-async
+#.endif
 
 ###
 ### lwt support
 ###
 .if !empty(PKG_OPTIONS:Mlwt)
+.include "../../devel/ocaml-cmdliner/buildlink3.mk"
+.include "../../devel/ocaml-fmt/buildlink3.mk"
+.include "../../devel/ocaml-logs/buildlink3.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../misc/ocaml-magic-mime/buildlink3.mk"
+.include "../../net/ocaml-conduit/buildlink3.mk"
 PLIST.lwt=     yes
 DUNE_BUILD_PACKAGES+=  cohttp-lwt cohttp-lwt-unix
 OPAM_INSTALL_FILES+=   cohttp-lwt cohttp-lwt-unix
+OCAML_FINDLIB_DIRS+=   cohttp-lwt cohttp-lwt-unix
 .endif
 
 ###
@@ -36,4 +51,5 @@ OPAM_INSTALL_FILES+=  cohttp-lwt cohttp-l
 PLIST.jsoo=    yes
 DUNE_BUILD_PACKAGES+=  cohttp-lwt-jsoo
 OPAM_INSTALL_FILES+=   cohttp-lwt-jsoo
+OCAML_FINDLIB_DIRS+=   cohttp-lwt-jsoo
 .endif

Index: pkgsrc/www/ocaml-cohttp/distinfo
diff -u pkgsrc/www/ocaml-cohttp/distinfo:1.4 pkgsrc/www/ocaml-cohttp/distinfo:1.5
--- pkgsrc/www/ocaml-cohttp/distinfo:1.4        Tue Oct 26 11:29:41 2021
+++ pkgsrc/www/ocaml-cohttp/distinfo    Wed May 11 14:16:37 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:29:41 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/05/11 14:16:37 jaapb Exp $
 
-BLAKE2s (ocaml-cohttp-2.5.1.tar.gz) = 4d025e80a4f171d00a409ac23371dbf0ef9400ee74d9693cff0eca5169f56d21
-SHA512 (ocaml-cohttp-2.5.1.tar.gz) = 6a9a548ab66ceee311e7e689934ee57132d747598d24043b6a48314a1982149d08100c52f510bea2d12aa63ce0f22ea47537e88b8cae1367eeb4610ddaf0b4db
-Size (ocaml-cohttp-2.5.1.tar.gz) = 111677 bytes
+BLAKE2s (ocaml-cohttp-5.0.0.tar.gz) = f501a4a0ddd0185383f7d18d59f465a59e31991b85fd3291fc231f2d062079b1
+SHA512 (ocaml-cohttp-5.0.0.tar.gz) = 32f9c4cd3e3eda65a74ef01cfd1336f6a7fac30d8dde6b97b6452b887002b26ed54cb92e8abefb236486447742857f9eb712388fbd1ffd69d06d0a7698049458
+Size (ocaml-cohttp-5.0.0.tar.gz) = 134016 bytes

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index