CVS commit: pkgsrc/devel/ocaml-cmdliner

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon May  2 18:12:13 UTC 2022

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

Log Message:
Updated devel/ocaml-cmdliner to version 1.1.1.

There are several upstream changes, mostly minor, but 1.1.0 introduced a
new Cmd module and deprecated the Term module.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ocaml-cmdliner/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-cmdliner/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-cmdliner/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-cmdliner/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-cmdliner/Makefile
diff -u pkgsrc/devel/ocaml-cmdliner/Makefile:1.21 pkgsrc/devel/ocaml-cmdliner/Makefile:1.22
--- pkgsrc/devel/ocaml-cmdliner/Makefile:1.21   Mon Nov  1 19:50:50 2021
+++ pkgsrc/devel/ocaml-cmdliner/Makefile        Mon May  2 18:12:13 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2021/11/01 19:50:50 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/02 18:12:13 jaapb Exp $
 
-DISTNAME=      cmdliner-1.0.4
+DISTNAME=      cmdliner-1.1.1
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    devel
 MASTER_SITES=  http://erratique.ch/software/cmdliner/releases/

Index: pkgsrc/devel/ocaml-cmdliner/PLIST
diff -u pkgsrc/devel/ocaml-cmdliner/PLIST:1.4 pkgsrc/devel/ocaml-cmdliner/PLIST:1.5
--- pkgsrc/devel/ocaml-cmdliner/PLIST:1.4       Sat Apr  7 11:42:13 2018
+++ pkgsrc/devel/ocaml-cmdliner/PLIST   Mon May  2 18:12:13 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/07 11:42:13 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/05/02 18:12:13 jaapb Exp $
 ${OCAML_SITELIB}/cmdliner/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.a
 ${OCAML_SITELIB}/cmdliner/cmdliner.cma
@@ -11,14 +11,22 @@ ${OCAML_SITELIB}/cmdliner/cmdliner.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_arg.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_base.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_cline.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_cmd.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_docgen.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_eval.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_exit.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_info.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_manpage.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_msg.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_suggest.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_term.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_term_deprecated.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_trie.cmx
 ${OCAML_SITELIB}/cmdliner/opam
 share/doc/cmdliner/CHANGES.md
 share/doc/cmdliner/LICENSE.md
 share/doc/cmdliner/README.md
+share/doc/cmdliner/odoc-pages/cli.mld
+share/doc/cmdliner/odoc-pages/examples.mld
+share/doc/cmdliner/odoc-pages/index.mld
+share/doc/cmdliner/odoc-pages/tool_man.mld
+share/doc/cmdliner/odoc-pages/tutorial.mld

Index: pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
diff -u pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.15 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.16
--- pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.15      Mon Mar  8 08:12:49 2021
+++ pkgsrc/devel/ocaml-cmdliner/buildlink3.mk   Mon May  2 18:12:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2022/05/02 18:12:13 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-cmdliner
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-cmdliner
 OCAML_CMDLINER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cmdliner+= ocaml-cmdliner>=0.9.8
-BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.0.3nb1
+BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.1.1
 BUILDLINK_PKGSRCDIR.ocaml-cmdliner?=   ../../devel/ocaml-cmdliner
 
 .include "../../devel/ocaml-findlib/buildlink3.mk"

Index: pkgsrc/devel/ocaml-cmdliner/distinfo
diff -u pkgsrc/devel/ocaml-cmdliner/distinfo:1.11 pkgsrc/devel/ocaml-cmdliner/distinfo:1.12
--- pkgsrc/devel/ocaml-cmdliner/distinfo:1.11   Mon Nov  1 19:50:50 2021
+++ pkgsrc/devel/ocaml-cmdliner/distinfo        Mon May  2 18:12:13 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2021/11/01 19:50:50 wiz Exp $
+$NetBSD: distinfo,v 1.12 2022/05/02 18:12:13 jaapb Exp $
 
-BLAKE2s (cmdliner-1.0.4.tbz) = 9a9462195d5ca56c1c7919111f6bf7afa6ca38d849420157aa5c29208cba7ef1
-SHA512 (cmdliner-1.0.4.tbz) = 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
-Size (cmdliner-1.0.4.tbz) = 49558 bytes
-SHA1 (patch-Makefile) = f04f85db0f29e011ae6a3d2e2a77d7e2c1b883ae
+BLAKE2s (cmdliner-1.1.1.tbz) = 202965dc7deff2e6263ae12ad576799ddb227a135ea9e32bb463b9a6ac499051
+SHA512 (cmdliner-1.1.1.tbz) = 5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e
+Size (cmdliner-1.1.1.tbz) = 58054 bytes
+SHA1 (patch-Makefile) = c2474282031fdd3edf64c69e3b317a21db095d7c

Index: pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.3 pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.4
--- pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile:1.3      Mon Nov  1 19:50:50 2021
+++ pkgsrc/devel/ocaml-cmdliner/patches/patch-Makefile  Mon May  2 18:12:13 2022
@@ -1,8 +1,9 @@
-$NetBSD: patch-Makefile,v 1.3 2021/11/01 19:50:50 wiz Exp $
+$NetBSD: patch-Makefile,v 1.4 2022/05/02 18:12:13 jaapb Exp $
 
 PREFIX, LIBDIR and DOCDIR set by the package Makefile
 Use BSD_INSTALL_*
---- Makefile.orig      2019-06-14 09:55:03.000000000 +0000
+
+--- Makefile.orig      2022-02-06 14:17:34.000000000 +0000
 +++ Makefile
 @@ -12,9 +12,9 @@
  
@@ -17,18 +18,20 @@ Use BSD_INSTALL_*
  NATIVE=$(shell ocamlopt -version > /dev/null 2>&1 && echo true)
  # EXT_LIB     by default value of OCaml's Makefile.config
  # NATDYNLINK  by default value of OCaml's Makefile.config
-@@ -40,8 +40,8 @@ all: $(BUILD-TARGETS)
+@@ -40,9 +40,9 @@ all: $(BUILD-TARGETS)
  install: $(INSTALL-TARGETS)
  
  install-doc:
--      $(INSTALL) -d $(DOCDIR)
+-      $(INSTALL) -d $(DOCDIR)/odoc-pages
 -      $(INSTALL) CHANGES.md LICENSE.md README.md $(DOCDIR)
-+      $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
+-      $(INSTALL) doc/index.mld doc/cli.mld doc/examples.mld doc/tutorial.mld \
++      $(BSD_INSTALL_DATA_DIR) -d $(DOCDIR)/odoc-pages
 +      $(BSD_INSTALL_DATA) CHANGES.md LICENSE.md README.md $(DOCDIR)
++      $(BSD_INSTALL_DATA) doc/index.mld doc/cli.mld doc/examples.mld doc/tutorial.mld \
+                  doc/tool_man.mld $(DOCDIR)/odoc-pages
  
  clean:
-       ocaml build.ml clean
-@@ -59,18 +59,18 @@ create-libdir:
+@@ -61,18 +61,18 @@ create-libdir:
        $(INSTALL) -d $(LIBDIR)
  
  install-common: create-libdir