CVS commit: pkgsrc/devel/ocaml-batteries

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Mar 12 11:12:45 UTC 2020

Modified Files:
        pkgsrc/devel/ocaml-batteries: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/devel/ocaml-batteries/patches: patch-Makefile

Log Message:
Updated devel/ocaml-batteries to verion 2.11.0.

This incorporates a few minor releases, mostly fixing stdlib compatibility
and adding support for newer version of OCaml (up to 4.10).

This fixes PR pkg/54967.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-batteries/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-batteries/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-batteries/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-batteries/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-batteries/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/ocaml-batteries/Makefile
diff -u pkgsrc/devel/ocaml-batteries/Makefile:1.19 pkgsrc/devel/ocaml-batteries/Makefile:1.20
--- pkgsrc/devel/ocaml-batteries/Makefile:1.19  Sun Nov  3 10:39:21 2019
+++ pkgsrc/devel/ocaml-batteries/Makefile       Thu Mar 12 11:12:45 2020
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2019/11/03 10:39:21 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/12 11:12:45 jaapb Exp $
 
-VERSION=       2.8.0
+VERSION=       2.11.0
 GITHUB_PROJECT=        batteries-included
 GITHUB_TAG=    v${VERSION}
 DISTNAME=      batteries-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml-batteries-team/}
 

Index: pkgsrc/devel/ocaml-batteries/PLIST
diff -u pkgsrc/devel/ocaml-batteries/PLIST:1.6 pkgsrc/devel/ocaml-batteries/PLIST:1.7
--- pkgsrc/devel/ocaml-batteries/PLIST:1.6      Wed Jan 10 14:44:52 2018
+++ pkgsrc/devel/ocaml-batteries/PLIST  Thu Mar 12 11:12:45 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/10 14:44:52 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/03/12 11:12:45 jaapb Exp $
 ${OCAML_SITELIB}/batteries/META
 ${OCAML_SITELIB}/batteries/batArray.cmi
 ${OCAML_SITELIB}/batteries/batArray.cmt
@@ -111,6 +111,11 @@ ${OCAML_SITELIB}/batteries/batFile.cmt
 ${OCAML_SITELIB}/batteries/batFile.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFile.cmx
 ${OCAML_SITELIB}/batteries/batFile.mli
+${OCAML_SITELIB}/batteries/batFilename.cmi
+${OCAML_SITELIB}/batteries/batFilename.cmt
+${OCAML_SITELIB}/batteries/batFilename.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFilename.cmx
+${OCAML_SITELIB}/batteries/batFilename.mli
 ${OCAML_SITELIB}/batteries/batFingerTree.cmi
 ${OCAML_SITELIB}/batteries/batFingerTree.cmt
 ${OCAML_SITELIB}/batteries/batFingerTree.cmti
@@ -272,11 +277,6 @@ ${OCAML_SITELIB}/batteries/batNumber.cmt
 ${OCAML_SITELIB}/batteries/batNumber.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batNumber.cmx
 ${OCAML_SITELIB}/batteries/batNumber.mli
-${OCAML_SITELIB}/batteries/batOo.cmi
-${OCAML_SITELIB}/batteries/batOo.cmt
-${OCAML_SITELIB}/batteries/batOo.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOo.cmx
-${OCAML_SITELIB}/batteries/batOo.mli
 ${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmi
 ${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmx

Index: pkgsrc/devel/ocaml-batteries/buildlink3.mk
diff -u pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.5 pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.6
--- pkgsrc/devel/ocaml-batteries/buildlink3.mk:1.5      Thu Jul 19 15:15:22 2018
+++ pkgsrc/devel/ocaml-batteries/buildlink3.mk  Thu Mar 12 11:12:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/07/19 15:15:22 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2020/03/12 11:12:45 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-batteries
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-batteries
 OCAML_BATTERIES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-batteries+=        ocaml-batteries>=2.0
-BUILDLINK_ABI_DEPENDS.ocaml-batteries+=        ocaml-batteries>=2.8.0nb2
+BUILDLINK_ABI_DEPENDS.ocaml-batteries+=        ocaml-batteries>=2.11.0
 BUILDLINK_PKGSRCDIR.ocaml-batteries?=  ../../devel/ocaml-batteries
 
 .endif # OCAML_BATTERIES_BUILDLINK3_MK

Index: pkgsrc/devel/ocaml-batteries/distinfo
diff -u pkgsrc/devel/ocaml-batteries/distinfo:1.10 pkgsrc/devel/ocaml-batteries/distinfo:1.11
--- pkgsrc/devel/ocaml-batteries/distinfo:1.10  Wed Jan 10 14:44:52 2018
+++ pkgsrc/devel/ocaml-batteries/distinfo       Thu Mar 12 11:12:45 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2018/01/10 14:44:52 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2020/03/12 11:12:45 jaapb Exp $
 
-SHA1 (batteries-2.8.0.tar.gz) = d6d7a23c440d63125f1d204e4c8ba2c9bf0802fd
-RMD160 (batteries-2.8.0.tar.gz) = 4763e01a97514b4c235c1437786c059522614174
-SHA512 (batteries-2.8.0.tar.gz) = 49943ed407ebf92bcf3cd859c51e7d292503e45e01c53583b0f2b0387f13954bb23f7c51d294fef7d154733fc21ea93e6cda1a38c344b16a8f63e34543854e67
-Size (batteries-2.8.0.tar.gz) = 774181 bytes
-SHA1 (patch-Makefile) = 461b36e023fd5d63202edc9a35c242c181e38def
+SHA1 (batteries-2.11.0.tar.gz) = 944ef2a96122bd861ee0f4cb01a6c7dfa023e7a2
+RMD160 (batteries-2.11.0.tar.gz) = 409b588495fde5f8ce43c527288509db4f6c731d
+SHA512 (batteries-2.11.0.tar.gz) = b266a1b2cc924acb64063fad56179fcf421134b8d5f194cf79d283dcd1d288a72a4681f647dddf5a45b3233e8c97800b6e216863ba40293ac8414683b795ddad
+Size (batteries-2.11.0.tar.gz) = 788284 bytes
+SHA1 (patch-Makefile) = c16d33d86c36bb050aab1c58d1823691fad3876f

Index: pkgsrc/devel/ocaml-batteries/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-batteries/patches/patch-Makefile:1.3 pkgsrc/devel/ocaml-batteries/patches/patch-Makefile:1.4
--- pkgsrc/devel/ocaml-batteries/patches/patch-Makefile:1.3     Tue Jul 11 11:34:25 2017
+++ pkgsrc/devel/ocaml-batteries/patches/patch-Makefile Thu Mar 12 11:12:45 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-Makefile,v 1.3 2017/07/11 11:34:25 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.4 2020/03/12 11:12:45 jaapb Exp $
 
 Install into DESTDIR
+
 --- Makefile.orig      2017-04-12 15:33:01.000000000 +0000
 +++ Makefile
 @@ -103,8 +103,9 @@ man: all batteries.odocl