CVS commit: pkgsrc/misc/ocaml-opam

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Mar  4 09:27:35 UTC 2021

Modified Files:
        pkgsrc/misc/ocaml-opam: Makefile PLIST buildlink3.mk distinfo

Log Message:
Updated misc/ocaml-opam to version 2.0.8.

Minor changes and bugfixes. Details are in the distributions's
CHANGES file.

Also added opam-solver to the findlib directories.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/misc/ocaml-opam/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/ocaml-opam/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/ocaml-opam/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/ocaml-opam/distinfo

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

Modified files:

Index: pkgsrc/misc/ocaml-opam/Makefile
diff -u pkgsrc/misc/ocaml-opam/Makefile:1.38 pkgsrc/misc/ocaml-opam/Makefile:1.39
--- pkgsrc/misc/ocaml-opam/Makefile:1.38        Fri May 22 10:56:22 2020
+++ pkgsrc/misc/ocaml-opam/Makefile     Thu Mar  4 09:27:35 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2020/05/22 10:56:22 adam Exp $
+# $NetBSD: Makefile,v 1.39 2021/03/04 09:27:35 jaapb Exp $
 
-VERSION=       2.0.6
+VERSION=       2.0.8
 GITHUB_PROJECT=        opam
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -17,8 +16,8 @@ MAKE_JOBS_SAFE=       no
 HAS_CONFIGURE= yes
 OCAML_USE_DUNE=        yes
 
-OCAML_FINDLIB_DIRS+=   opam-installer
-OPAM_INSTALL_FILES=    opam opam-installer
+OCAML_FINDLIB_DIRS+=   opam-installer opam-solver
+OPAM_INSTALL_FILES=    opam opam-installer opam-solver
 
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-extlib/buildlink3.mk"

Index: pkgsrc/misc/ocaml-opam/PLIST
diff -u pkgsrc/misc/ocaml-opam/PLIST:1.7 pkgsrc/misc/ocaml-opam/PLIST:1.8
--- pkgsrc/misc/ocaml-opam/PLIST:1.7    Fri Jan 24 16:07:38 2020
+++ pkgsrc/misc/ocaml-opam/PLIST        Thu Mar  4 09:27:35 2021
@@ -1,9 +1,56 @@
-@comment $NetBSD: PLIST,v 1.7 2020/01/24 16:07:38 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/03/04 09:27:35 jaapb Exp $
 bin/opam
 bin/opam-installer
 ${OCAML_SITELIB}/opam-installer/META
 ${OCAML_SITELIB}/opam-installer/dune-package
 ${OCAML_SITELIB}/opam-installer/opam
+${OCAML_SITELIB}/opam-solver/META
+${OCAML_SITELIB}/opam-solver/dune-package
+${OCAML_SITELIB}/opam-solver/opam
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmi
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmt
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmti
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmx
+${OCAML_SITELIB}/opam-solver/opamActionGraph.ml
+${OCAML_SITELIB}/opam-solver/opamActionGraph.mli
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmi
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmt
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmti
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmx
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.ml
+${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.mli
+${OCAML_SITELIB}/opam-solver/opamCudf.cmi
+${OCAML_SITELIB}/opam-solver/opamCudf.cmt
+${OCAML_SITELIB}/opam-solver/opamCudf.cmti
+${OCAML_SITELIB}/opam-solver/opamCudf.cmx
+${OCAML_SITELIB}/opam-solver/opamCudf.ml
+${OCAML_SITELIB}/opam-solver/opamCudf.mli
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmi
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmt
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmti
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmx
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.ml
+${OCAML_SITELIB}/opam-solver/opamCudfSolver.mli
+${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmi
+${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmt
+${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmx
+${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.ml
+${OCAML_SITELIB}/opam-solver/opamSolver.cmi
+${OCAML_SITELIB}/opam-solver/opamSolver.cmt
+${OCAML_SITELIB}/opam-solver/opamSolver.cmti
+${OCAML_SITELIB}/opam-solver/opamSolver.cmx
+${OCAML_SITELIB}/opam-solver/opamSolver.ml
+${OCAML_SITELIB}/opam-solver/opamSolver.mli
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmi
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmt
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmti
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmx
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.ml
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.mli
+${OCAML_SITELIB}/opam-solver/opam_solver.a
+${OCAML_SITELIB}/opam-solver/opam_solver.cma
+${OCAML_SITELIB}/opam-solver/opam_solver.cmxa
+${OCAML_SITELIB}/opam-solver/opam_solver.cmxs
 ${OCAML_SITELIB}/opam/META
 ${OCAML_SITELIB}/opam/dune-package
 ${OCAML_SITELIB}/opam/opam
@@ -48,6 +95,9 @@ man/man1/opam.1
 share/doc/opam-installer/CHANGES
 share/doc/opam-installer/LICENSE
 share/doc/opam-installer/README.md
+share/doc/opam-solver/CHANGES
+share/doc/opam-solver/LICENSE
+share/doc/opam-solver/README.md
 share/doc/opam/CHANGES
 share/doc/opam/LICENSE
 share/doc/opam/README.md

Index: pkgsrc/misc/ocaml-opam/buildlink3.mk
diff -u pkgsrc/misc/ocaml-opam/buildlink3.mk:1.10 pkgsrc/misc/ocaml-opam/buildlink3.mk:1.11
--- pkgsrc/misc/ocaml-opam/buildlink3.mk:1.10   Fri Jan 24 16:07:38 2020
+++ pkgsrc/misc/ocaml-opam/buildlink3.mk        Thu Mar  4 09:27:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2020/01/24 16:07:38 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2021/03/04 09:27:35 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-opam
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-opam
 OCAML_OPAM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.6
+BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.8
 BUILDLINK_PKGSRCDIR.ocaml-opam?=       ../../misc/ocaml-opam
 
 .endif # OCAML_OPAM_BUILDLINK3_MK

Index: pkgsrc/misc/ocaml-opam/distinfo
diff -u pkgsrc/misc/ocaml-opam/distinfo:1.11 pkgsrc/misc/ocaml-opam/distinfo:1.12
--- pkgsrc/misc/ocaml-opam/distinfo:1.11        Fri Jan 24 16:07:38 2020
+++ pkgsrc/misc/ocaml-opam/distinfo     Thu Mar  4 09:27:35 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2020/01/24 16:07:38 jaapb Exp $
+$NetBSD: distinfo,v 1.12 2021/03/04 09:27:35 jaapb Exp $
 
-SHA1 (opam-2.0.6.tar.gz) = f150085e5d8c48dd4c109e71040a39c1775df229
-RMD160 (opam-2.0.6.tar.gz) = d034ec0a029d48d4f1dbd7c6310cabcfb24ed6d0
-SHA512 (opam-2.0.6.tar.gz) = c3dbd315550817d15e3d5dd4b5b030b725e5d65e36450f8ac064555e4710bda90df6fab457c386c7a334689e50d240de19992565ce325bc8a18163f145f09dfd
-Size (opam-2.0.6.tar.gz) = 636147 bytes
+SHA1 (opam-2.0.8.tar.gz) = aa2211e0ce0cff3cd54880367ec7a784d8373f09
+RMD160 (opam-2.0.8.tar.gz) = 78d97a910aeb471f949b65a5d16a4c3e34e6eb9c
+SHA512 (opam-2.0.8.tar.gz) = 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+Size (opam-2.0.8.tar.gz) = 643221 bytes