CVS commit: pkgsrc/misc/ocaml-opam

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 25 18:07:44 UTC 2026

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

Log Message:
ocaml-opam: update to 2.5.2.

Provided by upstream, Kate, in wip.

- update from 2.1.3 to 2.5.2 (fixing two CVEs in the process)
- the -full tarball is now used instead of the one autogenerated by
  github
- rsync is now a runtime dependency (it is technically optional but it
  helps users to have it for the moment)
- ocaml-dune is now explicitly a build dependency but no longer used
  as-is. It is now used through gmake
- ocaml-cmdliner, ocaml-re, ocamlgraph, dose3, ocaml-cudf and
  ocaml-opam-file-format are no longer dependencies
- the vendored versions of all the dependencies contained by the -full
  archive is now used. This allows to simplify the build process
  greatly and avoids having to import all the new dependencies on new opam
  releases. This is also what a majority of BSD, Linux and macOS distributions
  out-there do.
- The opam-solver library is no longer installed. This could not be used
  on its own anyway because the OCaml build process would require other
  modules that are not installed whose checksum wouldn't match if they
  were built separately.
- Dummy and unused META, dune-package and opam files generated by dune
  are no longer installed
- CHANGES, LICENSE and README.md are no longer installed


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/misc/ocaml-opam/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/ocaml-opam/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/ocaml-opam/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 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.62 pkgsrc/misc/ocaml-opam/Makefile:1.63
--- pkgsrc/misc/ocaml-opam/Makefile:1.62        Sun Mar  1 12:38:36 2026
+++ pkgsrc/misc/ocaml-opam/Makefile     Tue Aug 25 18:07:44 2026
@@ -1,34 +1,28 @@
-# $NetBSD: Makefile,v 1.62 2026/03/01 12:38:36 gdt Exp $
+# $NetBSD: Makefile,v 1.63 2026/08/25 18:07:44 wiz Exp $
 
-DISTNAME=      opam-2.1.3
-PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   12
+DISTNAME=      opam-full-2.5.2
+PKGNAME=       ocaml-${DISTNAME:S/-full//}
 CATEGORIES=    misc
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
-GITHUB_PROJECT=        opam
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/opam/releases/download/${PKGVERSION_NOREV}/}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    kit-ty-kate%exn.st@localhost
 HOMEPAGE=      https://opam.ocaml.org/
 COMMENT=       OCaml package manager
 LICENSE=       gnu-lgpl-v3
 
+TOOL_DEPENDS+= ocaml-dune-[0-9]*:../../devel/ocaml-dune
+
 DEPENDS+=      curl-[0-9]*:../../www/curl
+DEPENDS+=      rsync-[0-9]*:../../net/rsync
 
 MAKE_JOBS_SAFE=        no
-
-USE_LANGUAGES+=        c++
-
+USE_LANGUAGES+=        c c++
 HAS_CONFIGURE= yes
-OCAML_USE_DUNE=        yes
+USE_TOOLS+=    gmake
 
-OCAML_FINDLIB_DIRS+=   opam-installer opam-solver
-OPAM_INSTALL_FILES=    opam opam-installer opam-solver
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=       --with-vendored-deps --with-mccs
 
-.include "../../devel/ocaml-cmdliner/buildlink3.mk"
-.include "../../devel/ocaml-re/buildlink3.mk"
-.include "../../devel/ocamlgraph/buildlink3.mk"
-.include "../../misc/dose3/buildlink3.mk" # with ocamlgraph option
-.include "../../misc/ocaml-cudf/buildlink3.mk"
-.include "../../misc/ocaml-opam-file-format/buildlink3.mk"
 .include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/ocaml-opam/PLIST
diff -u pkgsrc/misc/ocaml-opam/PLIST:1.9 pkgsrc/misc/ocaml-opam/PLIST:1.10
--- pkgsrc/misc/ocaml-opam/PLIST:1.9    Fri Jan 26 18:54:14 2024
+++ pkgsrc/misc/ocaml-opam/PLIST        Tue Aug 25 18:07:44 2026
@@ -1,81 +1,19 @@
-@comment $NetBSD: PLIST,v 1.9 2024/01/26 18:54:14 abs Exp $
+@comment $NetBSD: PLIST,v 1.10 2026/08/25 18:07:44 wiz 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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamActionGraph.cmx
-${OCAML_SITELIB}/opam-solver/opamActionGraph.ml
-${OCAML_SITELIB}/opam-solver/opamActionGraph.mli
-${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmi
-${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmt
-${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmx
-${OCAML_SITELIB}/opam-solver/opamBuiltin0install.ml
-${OCAML_SITELIB}/opam-solver/opamBuiltin0install.mli
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmi
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmt
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmx
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.ml
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.mli
-${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmi
-${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmt
-${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmx
-${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.ml
-${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.mli
-${OCAML_SITELIB}/opam-solver/opamCudf.cmi
-${OCAML_SITELIB}/opam-solver/opamCudf.cmt
-${OCAML_SITELIB}/opam-solver/opamCudf.cmti
-${PLIST.ocaml-opt}${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
-${PLIST.ocaml-opt}${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
-${PLIST.ocaml-opt}${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
-${PLIST.ocaml-opt}${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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmx
-${OCAML_SITELIB}/opam-solver/opamSolverConfig.ml
-${OCAML_SITELIB}/opam-solver/opamSolverConfig.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.a
-${OCAML_SITELIB}/opam-solver/opam_solver.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.cmxs
-${OCAML_SITELIB}/opam/META
-${OCAML_SITELIB}/opam/dune-package
-${OCAML_SITELIB}/opam/opam
 man/man1/opam-admin-add-constraint.1
 man/man1/opam-admin-add-hashes.1
 man/man1/opam-admin-cache.1
 man/man1/opam-admin-check.1
+man/man1/opam-admin-compare-versions.1
 man/man1/opam-admin-filter.1
 man/man1/opam-admin-help.1
 man/man1/opam-admin-index.1
 man/man1/opam-admin-lint.1
 man/man1/opam-admin-list.1
 man/man1/opam-admin-make.1
+man/man1/opam-admin-migrate-extrafiles.1
+man/man1/opam-admin-update-extrafiles.1
 man/man1/opam-admin-upgrade.1
 man/man1/opam-admin.1
 man/man1/opam-clean.1
@@ -100,18 +38,11 @@ man/man1/opam-search.1
 man/man1/opam-show.1
 man/man1/opam-source.1
 man/man1/opam-switch.1
+man/man1/opam-tree.1
 man/man1/opam-uninstall.1
 man/man1/opam-unpin.1
 man/man1/opam-update.1
 man/man1/opam-upgrade.1
 man/man1/opam-var.1
+man/man1/opam-why.1
 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.11 pkgsrc/misc/ocaml-opam/buildlink3.mk:1.12
--- pkgsrc/misc/ocaml-opam/buildlink3.mk:1.11   Thu Mar  4 09:27:35 2021
+++ pkgsrc/misc/ocaml-opam/buildlink3.mk        Tue Aug 25 18:07:44 2026
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.11 2021/03/04 09:27:35 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2026/08/25 18:07:44 wiz Exp $
 
 BUILDLINK_TREE+=       ocaml-opam
 
 .if !defined(OCAML_OPAM_BUILDLINK3_MK)
 OCAML_OPAM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.8
+BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=2.5.0
+BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.5.2
 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.15 pkgsrc/misc/ocaml-opam/distinfo:1.16
--- pkgsrc/misc/ocaml-opam/distinfo:1.15        Fri Jan 26 18:54:14 2024
+++ pkgsrc/misc/ocaml-opam/distinfo     Tue Aug 25 18:07:44 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2024/01/26 18:54:14 abs Exp $
+$NetBSD: distinfo,v 1.16 2026/08/25 18:07:44 wiz Exp $
 
-BLAKE2s (opam-2.1.3.tar.gz) = 91ea09c12ae2f56fc6a3f31f44b12e6c56d11dbec92b14f274a187f172bc4dec
-SHA512 (opam-2.1.3.tar.gz) = 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-Size (opam-2.1.3.tar.gz) = 832450 bytes
+BLAKE2s (opam-full-2.5.2.tar.gz) = 467aa5dd04fd97c2a9c71bbd173b868a08ef43b7a865b8339cb3e9600ca14f1f
+SHA512 (opam-full-2.5.2.tar.gz) = 08ac70beddbcec75289b01f3037037e4f47d04c89119ff7203d1db655f5051688e94a5144b63a4a4bf5a361781ee687a0b3730fed6c25923fd35ff4f0c677e71
+Size (opam-full-2.5.2.tar.gz) = 14474162 bytes