Updated package to latest version, 2.0.0beta3 (this sadly needs to be done

now as several packages rely on this version for building).

Changes include:
Changes prefixed with "(*)" are potentially breaking to scripts or existing
repositories (changes that are automatically handled by the format upgrade tools
are not marked).

2.0.0~beta3
* (*) Renamed `--soft-request` to `--best-effort`
* Fixed and improved speed of the package file tracking mechanism
* Added `--ignore-constraints-on` to temporarily bypass version constraints on
  some dependencies
* Fields `build-test:`, `build-doc:` are now deprecated, in favor of specifying
  conditions on the `with-test` and `with-doc` variables within the `build:`
  field, and of the new `run-test:` field
* (*) The command-line options have been renamed accordingly to `--with-test`
  and `--with-doc`
* Removed the `opam build` command
* Allow directories in place of package specifications for the `install`,
  `remove`, `upgrade`, `reinstall` and `show` commands. `opam` files can also be
  specified for `install` and `show`
* On local switch creation, check for package definitions and choose a
  compatible compiler if possible
* Add `opam install|remove --destdir` to copy the package's installed files
  somewhere else
* Allow `opam init --config=URL`

2.0~beta2
* Fixes (mainly to `opam build`)
* Faster coinstallability check

2.0~beta
* New, by-hash package archive caching system
* Simpler HTTP repository update
* Allow specification of multiple checksums per file
* Add `opam reinstall --pending`, to handle reinstallations of changed packages
* Support for defining trust anchors and repository validation hooks (for use
  with Conex)
* (*) Added `opam install --working-dir`, removed "mixed mode" for pinned packages
* Added `opam install --soft-request`, a non-failing "do what can be done"
  install mode
* Simplified, better conflict messages
* Added `opam list --coinstallable-with PKG`
* Added command `opam clean`
* Added `opam upgrade --all PKGS`, to do a full upgrade while guaranteeing
  `PKGS` are kept installed
* Allow `&` in conflict version constraints, e.g. `conflicts: "foo" {>= "3" & <
  "4"}`
* Added an `opam admin` command, with various, better organised repository admin
  commands, and remove the `opam-admin` tool
* Added an `opam build` command, to handle `opam` files found in the current
  directory
* Internally upgrade repositories in 1.2 format automatically to 2.0 (on `init`,
  `update` or `repo add`)

2.0~alpha5
* Merge stdout and stderr of child processes by default
* Fixed regression on solver call times
* Added a few shorter command aliases: `opam var` `opam exec`, `opam env` for
  the corresponding `opam config` commands
* (*) Simplified `opam repo` to only use `add` and `remove` in normal use,
  always meaning the current switch (only) if not specified otherwise
* (*) Restrict package names and versions to a reasonable character set
* Added support for SHA256 and SHA512 checksums
* Separated the opam format lexer/parser/printers into a separate
  `opam-file-format` library
* Reporting on package definition file errors only when the file will be used,
  and on by default (rather than all-off by default, and optionally all-on)
* `opam lint` now accept multiple input files
* `opam pin` interface yet improved, allow pinning all at once when a source
  directory contains multiple packages. `opam unpin <dir>` now allowed to cancel
  `opam pin <dir>`
* Updated version of the dose lib dependency
* (*) All patch files used in package definitions are now assumed to apply with
  `-p1`.

2.0~alpha4
* Added pre and post hooks for package command sections; allowed per-switch
  configuration
* Re-packaged the libraries and opam into 7 individual packages
* Convert opam 1.2 files on the fly when pinning
* `opam list` can now match patterns on versions
* Allow switches to be created below arbitrary directories using `opam switch
  create <dir>`. Automatically select a switch found in `$PWD`
* Add `install --reuse-build-dir` to be used together with `--keep-build-dir`
  and allow incremental recompilations
* Add `install --inplace-build` to build locally pinned packages directly in
  their source directory

2.0~alpha3
* (*) Refactored 'opam switch' command, creation of new switches no longer implicit
* (*) Allow per-switch selection of repositories
* Better update of the environment variables across switches or opam roots
* Add `opam install --restore` to recover packages that got removed due to
  errors or interruptions
* Added `synopsis:` and `description:` fields to integrate package descriptions
  in a single package definition file
* Removed the clever hack to skip downloads when uninstalling packages with
  `ocamlfind remove`; this now needs to be explicit through the
  `light-uninstall` flag.
* Provide `opam admin upgrade-format` to migrate package repositories to the new
  format, and create the proper OCaml compiler package wrappers
* Allow initialisation parameters from a .opamrc file, possibly completely
  overriding OCaml and opam.ocaml.org repository defaults

2.0~alpha2
* Extended the `opam lint` command-line options (package descriptions from opam
  metadata, warnings selection)
* Allow to create a new switch with `opam switch import`
* (*) Rewritten, much more flexible `opam list` command, with composable filters and
  output selection
* Delay the removals of packages as much as possible, avoiding most cases of
  mass uninstalled packages after a build failure
* Use a specific `opam` user-agent for downloads
* Remove globalisation of compiler package variables and support for
  `available:` constraints depending on those. Rewrite the repository
  accordingly to use explicit dependencies towards the compiler version.

2.0~alpha
* Changed license to LGPL 2.1 with linking exception, like OCaml (#2573)
* Track files installed by packages for cleaner removal and listing, add `opam
  search --owns-file` (#502, #1215) *this requires packages to properly separate
  build and install*, or unrelated files could get removed on package uninstall.
* Allow command wrappers around package build/install/remove commands to be
  defined in `~/.opam/config`; include sample Linux wrappers to restrict process
  permissions (e.g. ensure `build:` doesn't install)
* (*) Reworked `opam show`, with more fields and the ability to select raw fields
  from the opam file (#2122)
* Dropped ability to compile opam with OCaml earlier than 4.01.0
* Version constraints in `depopts:` allowed again, but with consistent semantics
* Allow mixing filters within dependency constraints
* More flexible `opam pin` command interface
* New internal file-lock handling, less obtrusive and safer
* New `switch export` format, now including local (pinned) package definitions
* No longer uses insecure arguments of curl/wget (#55, #2006, #2460)
* Installed package source and metadata are now handled per-switch, which is
  more reliable
* `opam pin edit` now allows changing version and even URL; better editor
  handling
* Discarded built-in variables based on polling OCaml (they are now defined by
  the compiler package at installation)
* Discarded compiler files, `opam switch` now based on packages with the
  `compiler` flag set
* Extended package configuration files
* Allow initialised opam without switch, initialised switch without compiler.
  Better handling of compiler install failure
* (*) Large API rework, switch and repository state now handled separately, used in
  functional style and avoiding many loads
* Git submodules are now automatically fetched by the git backend
* (*) Package definition files now prioritize `&` higher than `|`, like is most
  common
* (*) `opam list -a` now lists all available packages, even if they can't be
  installed (missing depends...), which is much faster (#2370)
* Added ability to reprint files with reduced diffs (#2363)
* Url and description can now be included within a single package definition
  `opam` file (#2328)
* Internal switch state now all below `<switch-dir>/.opam-switch/`, state in a
  single `switch-state` file (#2340)
* Add a `setenv:` field to package definitions, allowing to export environment
  variables (#2337, #2361)
* Built-in support for alternative solver `mccs` (#2333)
* `opam upgrade pkg` now prompts to install `pkg` if absent (#2327)
* (*) Assume plugin package and exec names start with "opam-" (#2316, #2317)
* Reworked, cleaner and bidirectional file manipulation library (kind of lenses)
  (#2325)
* Allow packages to specify extra remote overlay files within their definition
  files
* Heuristic to detect bad solutions and print a hint when no solver is available
* (*) Proper URL handling with version-control + transport handling (e.g.
  `git+https://`)
* Allow unescaped strings enclosed between `"""` markers in package definition
  files
* Don't rely on '.zip' extension for downloaded archive handling (#2289)
* `opam config` extended with `set`, `unset`, `expand` subcommands, allows
  variables in `exec` argument (#2268)
* `conflict:` field is now handled as a disjunction in all regards (#2267)
* Better handling of concurrent removal/build/install actions (#2161, #2266,
  #2370)
* Allow fields `x-fieldname` in package definition files, for use by external
  tools (#2265)
* Extended, more useful JSON output (including full package failure logs)
  (#2236)
* Use the switch paths that are defined in the switch configuration file (#2185)
* Allow package definition files to reference the package's own variables
  through "%{_:varname}%" (#2184)
* Initialise number of jobs from host's number of processors (#2180)

9 files changed, 396 insertions, 274 deletions

diff --git a/misc/ocaml-opam/Makefile b/misc/ocaml-opam/Makefile
index 94052a7a684..b107113c86d 100644
--- a/misc/ocaml-opam/Makefile
+++ b/misc/ocaml-opam/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2017/04/30 01:21:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2017/07/11 10:46:23 jaapb Exp $
 
-VERSION=	1.2.2
+VERSION=	2.0.0_beta3
 GITHUB_PROJECT=	opam
+GITHUB_TAG=	${VERSION:S/_/-/}
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -30,6 +30,7 @@ INSTALL_ENV+=	LIBINSTALL_DIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}
 .include "../../lang/camlp4/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 "../../textproc/ocaml-jsonm/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/ocaml.mk"
diff --git a/misc/ocaml-opam/PLIST b/misc/ocaml-opam/PLIST
index 292b4ae5071..c7d3308b4ce 100644
--- a/misc/ocaml-opam/PLIST
+++ b/misc/ocaml-opam/PLIST
@@ -1,192 +1,387 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/19 23:23:02 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/07/11 10:46:23 jaapb Exp $
 bin/opam
-bin/opam-admin
-bin/opam-admin.top
 bin/opam-installer
-${OCAML_SITELIB}/opam-lib/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-client.a
-${OCAML_SITELIB}/opam-lib/opam-client.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-client.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-core.a
-${OCAML_SITELIB}/opam-lib/opam-core.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-core.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-repositories.a
-${OCAML_SITELIB}/opam-lib/opam-repositories.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-repositories.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-solver.a
-${OCAML_SITELIB}/opam-lib/opam-solver.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opam-solver.cmxa
-${OCAML_SITELIB}/opam-lib/opamAction.cmi
-${OCAML_SITELIB}/opam-lib/opamAction.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamAction.cmx
-${OCAML_SITELIB}/opam-lib/opamAction.mli
-${OCAML_SITELIB}/opam-lib/opamActionGraph.cmi
-${OCAML_SITELIB}/opam-lib/opamActionGraph.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamActionGraph.cmx
-${OCAML_SITELIB}/opam-lib/opamActionGraph.mli
-${OCAML_SITELIB}/opam-lib/opamClient.cmi
-${OCAML_SITELIB}/opam-lib/opamClient.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamClient.cmx
-${OCAML_SITELIB}/opam-lib/opamClient.mli
-${OCAML_SITELIB}/opam-lib/opamCompiler.cmi
-${OCAML_SITELIB}/opam-lib/opamCompiler.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamCompiler.cmx
-${OCAML_SITELIB}/opam-lib/opamCompiler.mli
-${OCAML_SITELIB}/opam-lib/opamConfigCommand.cmi
-${OCAML_SITELIB}/opam-lib/opamConfigCommand.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamConfigCommand.cmx
-${OCAML_SITELIB}/opam-lib/opamConfigCommand.mli
-${OCAML_SITELIB}/opam-lib/opamCudf.cmi
-${OCAML_SITELIB}/opam-lib/opamCudf.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamCudf.cmx
-${OCAML_SITELIB}/opam-lib/opamCudf.mli
-${OCAML_SITELIB}/opam-lib/opamDarcs.cmi
-${OCAML_SITELIB}/opam-lib/opamDarcs.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamDarcs.cmx
-${OCAML_SITELIB}/opam-lib/opamDarcs.mli
-${OCAML_SITELIB}/opam-lib/opamFile.cmi
-${OCAML_SITELIB}/opam-lib/opamFile.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamFile.cmx
-${OCAML_SITELIB}/opam-lib/opamFile.mli
-${OCAML_SITELIB}/opam-lib/opamFilename.cmi
-${OCAML_SITELIB}/opam-lib/opamFilename.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamFilename.cmx
-${OCAML_SITELIB}/opam-lib/opamFilename.mli
-${OCAML_SITELIB}/opam-lib/opamFilter.cmi
-${OCAML_SITELIB}/opam-lib/opamFilter.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamFilter.cmx
-${OCAML_SITELIB}/opam-lib/opamFilter.mli
-${OCAML_SITELIB}/opam-lib/opamFormat.cmi
-${OCAML_SITELIB}/opam-lib/opamFormat.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamFormat.cmx
-${OCAML_SITELIB}/opam-lib/opamFormat.mli
-${OCAML_SITELIB}/opam-lib/opamFormula.cmi
-${OCAML_SITELIB}/opam-lib/opamFormula.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamFormula.cmx
-${OCAML_SITELIB}/opam-lib/opamFormula.mli
-${OCAML_SITELIB}/opam-lib/opamGit.cmi
-${OCAML_SITELIB}/opam-lib/opamGit.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamGit.cmx
-${OCAML_SITELIB}/opam-lib/opamGit.mli
-${OCAML_SITELIB}/opam-lib/opamGlobals.cmi
-${OCAML_SITELIB}/opam-lib/opamGlobals.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamGlobals.cmx
-${OCAML_SITELIB}/opam-lib/opamGlobals.mli
-${OCAML_SITELIB}/opam-lib/opamHTTP.cmi
-${OCAML_SITELIB}/opam-lib/opamHTTP.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamHTTP.cmx
-${OCAML_SITELIB}/opam-lib/opamHTTP.mli
-${OCAML_SITELIB}/opam-lib/opamHeuristic.cmi
-${OCAML_SITELIB}/opam-lib/opamHeuristic.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamHeuristic.cmx
-${OCAML_SITELIB}/opam-lib/opamHeuristic.mli
-${OCAML_SITELIB}/opam-lib/opamHg.cmi
-${OCAML_SITELIB}/opam-lib/opamHg.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamHg.cmx
-${OCAML_SITELIB}/opam-lib/opamHg.mli
-${OCAML_SITELIB}/opam-lib/opamJson.cmi
-${OCAML_SITELIB}/opam-lib/opamJson.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamJson.cmx
-${OCAML_SITELIB}/opam-lib/opamJson.mli
-${OCAML_SITELIB}/opam-lib/opamLexer.cmi
-${OCAML_SITELIB}/opam-lib/opamLexer.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamLexer.cmx
-${OCAML_SITELIB}/opam-lib/opamLexer.mli
-${OCAML_SITELIB}/opam-lib/opamLineLexer.cmi
-${OCAML_SITELIB}/opam-lib/opamLineLexer.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamLineLexer.cmx
-${OCAML_SITELIB}/opam-lib/opamLineLexer.mli
-${OCAML_SITELIB}/opam-lib/opamLocal.cmi
-${OCAML_SITELIB}/opam-lib/opamLocal.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamLocal.cmx
-${OCAML_SITELIB}/opam-lib/opamLocal.mli
-${OCAML_SITELIB}/opam-lib/opamMisc.cmi
-${OCAML_SITELIB}/opam-lib/opamMisc.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamMisc.cmx
-${OCAML_SITELIB}/opam-lib/opamMisc.mli
-${OCAML_SITELIB}/opam-lib/opamPackage.cmi
-${OCAML_SITELIB}/opam-lib/opamPackage.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamPackage.cmx
-${OCAML_SITELIB}/opam-lib/opamPackage.mli
-${OCAML_SITELIB}/opam-lib/opamParallel.cmi
-${OCAML_SITELIB}/opam-lib/opamParallel.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamParallel.cmx
-${OCAML_SITELIB}/opam-lib/opamParallel.mli
-${OCAML_SITELIB}/opam-lib/opamParser.cmi
-${OCAML_SITELIB}/opam-lib/opamParser.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamParser.cmx
-${OCAML_SITELIB}/opam-lib/opamParser.mli
-${OCAML_SITELIB}/opam-lib/opamPath.cmi
-${OCAML_SITELIB}/opam-lib/opamPath.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamPath.cmx
-${OCAML_SITELIB}/opam-lib/opamPath.mli
-${OCAML_SITELIB}/opam-lib/opamPinCommand.cmi
-${OCAML_SITELIB}/opam-lib/opamPinCommand.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamPinCommand.cmx
-${OCAML_SITELIB}/opam-lib/opamPinCommand.mli
-${OCAML_SITELIB}/opam-lib/opamProcess.cmi
-${OCAML_SITELIB}/opam-lib/opamProcess.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamProcess.cmx
-${OCAML_SITELIB}/opam-lib/opamProcess.mli
-${OCAML_SITELIB}/opam-lib/opamRepository.cmi
-${OCAML_SITELIB}/opam-lib/opamRepository.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamRepository.cmx
-${OCAML_SITELIB}/opam-lib/opamRepository.mli
-${OCAML_SITELIB}/opam-lib/opamRepositoryCommand.cmi
-${OCAML_SITELIB}/opam-lib/opamRepositoryCommand.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamRepositoryCommand.cmx
-${OCAML_SITELIB}/opam-lib/opamRepositoryCommand.mli
-${OCAML_SITELIB}/opam-lib/opamRepositoryName.cmi
-${OCAML_SITELIB}/opam-lib/opamRepositoryName.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamRepositoryName.cmx
-${OCAML_SITELIB}/opam-lib/opamRepositoryName.mli
-${OCAML_SITELIB}/opam-lib/opamScript.cmi
-${OCAML_SITELIB}/opam-lib/opamScript.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamScript.cmx
-${OCAML_SITELIB}/opam-lib/opamScript.mli
-${OCAML_SITELIB}/opam-lib/opamSolution.cmi
-${OCAML_SITELIB}/opam-lib/opamSolution.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamSolution.cmx
-${OCAML_SITELIB}/opam-lib/opamSolution.mli
-${OCAML_SITELIB}/opam-lib/opamSolver.cmi
-${OCAML_SITELIB}/opam-lib/opamSolver.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamSolver.cmx
-${OCAML_SITELIB}/opam-lib/opamSolver.mli
-${OCAML_SITELIB}/opam-lib/opamState.cmi
-${OCAML_SITELIB}/opam-lib/opamState.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamState.cmx
-${OCAML_SITELIB}/opam-lib/opamState.mli
-${OCAML_SITELIB}/opam-lib/opamSwitch.cmi
-${OCAML_SITELIB}/opam-lib/opamSwitch.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamSwitch.cmx
-${OCAML_SITELIB}/opam-lib/opamSwitch.mli
-${OCAML_SITELIB}/opam-lib/opamSwitchCommand.cmi
-${OCAML_SITELIB}/opam-lib/opamSwitchCommand.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamSwitchCommand.cmx
-${OCAML_SITELIB}/opam-lib/opamSwitchCommand.mli
-${OCAML_SITELIB}/opam-lib/opamSystem.cmi
-${OCAML_SITELIB}/opam-lib/opamSystem.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamSystem.cmx
-${OCAML_SITELIB}/opam-lib/opamSystem.mli
-${OCAML_SITELIB}/opam-lib/opamTypes.cmi
-${OCAML_SITELIB}/opam-lib/opamTypes.cmti
-${OCAML_SITELIB}/opam-lib/opamTypes.mli
-${OCAML_SITELIB}/opam-lib/opamTypesBase.cmi
-${OCAML_SITELIB}/opam-lib/opamTypesBase.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamTypesBase.cmx
-${OCAML_SITELIB}/opam-lib/opamTypesBase.mli
-${OCAML_SITELIB}/opam-lib/opamVCS.cmi
-${OCAML_SITELIB}/opam-lib/opamVCS.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamVCS.cmx
-${OCAML_SITELIB}/opam-lib/opamVCS.mli
-${OCAML_SITELIB}/opam-lib/opamVariable.cmi
-${OCAML_SITELIB}/opam-lib/opamVariable.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamVariable.cmx
-${OCAML_SITELIB}/opam-lib/opamVariable.mli
-${OCAML_SITELIB}/opam-lib/opamVersion.cmi
-${OCAML_SITELIB}/opam-lib/opamVersion.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-lib/opamVersion.cmx
-${OCAML_SITELIB}/opam-lib/opamVersion.mli
-${OCAML_SITELIB}/opam-lib/opam_admin_top.cmi
-${OCAML_SITELIB}/opam-lib/opam_admin_top.cmti
-${OCAML_SITELIB}/opam-lib/opam_admin_top.mli
+${OCAML_SITELIB}/opam-client/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opam-client.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opam-client.cmxa
+${OCAML_SITELIB}/opam-client/opamAction.cmi
+${OCAML_SITELIB}/opam-client/opamAction.cmo
+${OCAML_SITELIB}/opam-client/opamAction.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamAction.cmx
+${OCAML_SITELIB}/opam-client/opamAction.mli
+${OCAML_SITELIB}/opam-client/opamAdminCommand.cmi
+${OCAML_SITELIB}/opam-client/opamAdminCommand.cmo
+${OCAML_SITELIB}/opam-client/opamAdminCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamAdminCommand.cmx
+${OCAML_SITELIB}/opam-client/opamAdminCommand.mli
+${OCAML_SITELIB}/opam-client/opamAdminRepoUpgrade.cmi
+${OCAML_SITELIB}/opam-client/opamAdminRepoUpgrade.cmo
+${OCAML_SITELIB}/opam-client/opamAdminRepoUpgrade.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamAdminRepoUpgrade.cmx
+${OCAML_SITELIB}/opam-client/opamAdminRepoUpgrade.mli
+${OCAML_SITELIB}/opam-client/opamArg.cmi
+${OCAML_SITELIB}/opam-client/opamArg.cmo
+${OCAML_SITELIB}/opam-client/opamArg.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamArg.cmx
+${OCAML_SITELIB}/opam-client/opamArg.mli
+${OCAML_SITELIB}/opam-client/opamAuxCommands.cmi
+${OCAML_SITELIB}/opam-client/opamAuxCommands.cmo
+${OCAML_SITELIB}/opam-client/opamAuxCommands.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamAuxCommands.cmx
+${OCAML_SITELIB}/opam-client/opamAuxCommands.mli
+${OCAML_SITELIB}/opam-client/opamClient.cmi
+${OCAML_SITELIB}/opam-client/opamClient.cmo
+${OCAML_SITELIB}/opam-client/opamClient.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamClient.cmx
+${OCAML_SITELIB}/opam-client/opamClient.mli
+${OCAML_SITELIB}/opam-client/opamClientConfig.cmi
+${OCAML_SITELIB}/opam-client/opamClientConfig.cmo
+${OCAML_SITELIB}/opam-client/opamClientConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamClientConfig.cmx
+${OCAML_SITELIB}/opam-client/opamClientConfig.mli
+${OCAML_SITELIB}/opam-client/opamCommands.cmi
+${OCAML_SITELIB}/opam-client/opamCommands.cmo
+${OCAML_SITELIB}/opam-client/opamCommands.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamCommands.cmx
+${OCAML_SITELIB}/opam-client/opamCommands.mli
+${OCAML_SITELIB}/opam-client/opamConfigCommand.cmi
+${OCAML_SITELIB}/opam-client/opamConfigCommand.cmo
+${OCAML_SITELIB}/opam-client/opamConfigCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamConfigCommand.cmx
+${OCAML_SITELIB}/opam-client/opamConfigCommand.mli
+${OCAML_SITELIB}/opam-client/opamGitVersion.cmi
+${OCAML_SITELIB}/opam-client/opamGitVersion.cmo
+${OCAML_SITELIB}/opam-client/opamGitVersion.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamGitVersion.cmx
+${OCAML_SITELIB}/opam-client/opamGitVersion.mli
+${OCAML_SITELIB}/opam-client/opamInitDefaults.cmi
+${OCAML_SITELIB}/opam-client/opamInitDefaults.cmo
+${OCAML_SITELIB}/opam-client/opamInitDefaults.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamInitDefaults.cmx
+${OCAML_SITELIB}/opam-client/opamInitDefaults.mli
+${OCAML_SITELIB}/opam-client/opamListCommand.cmi
+${OCAML_SITELIB}/opam-client/opamListCommand.cmo
+${OCAML_SITELIB}/opam-client/opamListCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamListCommand.cmx
+${OCAML_SITELIB}/opam-client/opamListCommand.mli
+${OCAML_SITELIB}/opam-client/opamPinCommand.cmi
+${OCAML_SITELIB}/opam-client/opamPinCommand.cmo
+${OCAML_SITELIB}/opam-client/opamPinCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamPinCommand.cmx
+${OCAML_SITELIB}/opam-client/opamPinCommand.mli
+${OCAML_SITELIB}/opam-client/opamRepositoryCommand.cmi
+${OCAML_SITELIB}/opam-client/opamRepositoryCommand.cmo
+${OCAML_SITELIB}/opam-client/opamRepositoryCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamRepositoryCommand.cmx
+${OCAML_SITELIB}/opam-client/opamRepositoryCommand.mli
+${OCAML_SITELIB}/opam-client/opamSolution.cmi
+${OCAML_SITELIB}/opam-client/opamSolution.cmo
+${OCAML_SITELIB}/opam-client/opamSolution.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamSolution.cmx
+${OCAML_SITELIB}/opam-client/opamSolution.mli
+${OCAML_SITELIB}/opam-client/opamSwitchCommand.cmi
+${OCAML_SITELIB}/opam-client/opamSwitchCommand.cmo
+${OCAML_SITELIB}/opam-client/opamSwitchCommand.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-client/opamSwitchCommand.cmx
+${OCAML_SITELIB}/opam-client/opamSwitchCommand.mli
+${OCAML_SITELIB}/opam-core/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opam-core.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opam-core.cmxa
+${OCAML_SITELIB}/opam-core/opamCompat.cmi
+${OCAML_SITELIB}/opam-core/opamCompat.cmo
+${OCAML_SITELIB}/opam-core/opamCompat.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamCompat.cmx
+${OCAML_SITELIB}/opam-core/opamCompat.mli
+${OCAML_SITELIB}/opam-core/opamConsole.cmi
+${OCAML_SITELIB}/opam-core/opamConsole.cmo
+${OCAML_SITELIB}/opam-core/opamConsole.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamConsole.cmx
+${OCAML_SITELIB}/opam-core/opamConsole.mli
+${OCAML_SITELIB}/opam-core/opamCoreConfig.cmi
+${OCAML_SITELIB}/opam-core/opamCoreConfig.cmo
+${OCAML_SITELIB}/opam-core/opamCoreConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamCoreConfig.cmx
+${OCAML_SITELIB}/opam-core/opamCoreConfig.mli
+${OCAML_SITELIB}/opam-core/opamDirTrack.cmi
+${OCAML_SITELIB}/opam-core/opamDirTrack.cmo
+${OCAML_SITELIB}/opam-core/opamDirTrack.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamDirTrack.cmx
+${OCAML_SITELIB}/opam-core/opamDirTrack.mli
+${OCAML_SITELIB}/opam-core/opamFilename.cmi
+${OCAML_SITELIB}/opam-core/opamFilename.cmo
+${OCAML_SITELIB}/opam-core/opamFilename.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamFilename.cmx
+${OCAML_SITELIB}/opam-core/opamFilename.mli
+${OCAML_SITELIB}/opam-core/opamHash.cmi
+${OCAML_SITELIB}/opam-core/opamHash.cmo
+${OCAML_SITELIB}/opam-core/opamHash.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamHash.cmx
+${OCAML_SITELIB}/opam-core/opamHash.mli
+${OCAML_SITELIB}/opam-core/opamJson.cmi
+${OCAML_SITELIB}/opam-core/opamJson.cmo
+${OCAML_SITELIB}/opam-core/opamJson.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamJson.cmx
+${OCAML_SITELIB}/opam-core/opamJson.mli
+${OCAML_SITELIB}/opam-core/opamParallel.cmi
+${OCAML_SITELIB}/opam-core/opamParallel.cmo
+${OCAML_SITELIB}/opam-core/opamParallel.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamParallel.cmx
+${OCAML_SITELIB}/opam-core/opamParallel.mli
+${OCAML_SITELIB}/opam-core/opamProcess.cmi
+${OCAML_SITELIB}/opam-core/opamProcess.cmo
+${OCAML_SITELIB}/opam-core/opamProcess.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamProcess.cmx
+${OCAML_SITELIB}/opam-core/opamProcess.mli
+${OCAML_SITELIB}/opam-core/opamSHA.cmi
+${OCAML_SITELIB}/opam-core/opamSHA.cmo
+${OCAML_SITELIB}/opam-core/opamSHA.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamSHA.cmx
+${OCAML_SITELIB}/opam-core/opamSHA.mli
+${OCAML_SITELIB}/opam-core/opamStd.cmi
+${OCAML_SITELIB}/opam-core/opamStd.cmo
+${OCAML_SITELIB}/opam-core/opamStd.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamStd.cmx
+${OCAML_SITELIB}/opam-core/opamStd.mli
+${OCAML_SITELIB}/opam-core/opamSystem.cmi
+${OCAML_SITELIB}/opam-core/opamSystem.cmo
+${OCAML_SITELIB}/opam-core/opamSystem.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamSystem.cmx
+${OCAML_SITELIB}/opam-core/opamSystem.mli
+${OCAML_SITELIB}/opam-core/opamUrl.cmi
+${OCAML_SITELIB}/opam-core/opamUrl.cmo
+${OCAML_SITELIB}/opam-core/opamUrl.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamUrl.cmx
+${OCAML_SITELIB}/opam-core/opamUrl.mli
+${OCAML_SITELIB}/opam-core/opamVersion.cmi
+${OCAML_SITELIB}/opam-core/opamVersion.cmo
+${OCAML_SITELIB}/opam-core/opamVersion.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamVersion.cmx
+${OCAML_SITELIB}/opam-core/opamVersion.mli
+${OCAML_SITELIB}/opam-core/opamVersionCompare.cmi
+${OCAML_SITELIB}/opam-core/opamVersionCompare.cmo
+${OCAML_SITELIB}/opam-core/opamVersionCompare.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-core/opamVersionCompare.cmx
+${OCAML_SITELIB}/opam-core/opamVersionCompare.mli
+${OCAML_SITELIB}/opam-format/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opam-format.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opam-format.cmxa
+${OCAML_SITELIB}/opam-format/opamFile.cmi
+${OCAML_SITELIB}/opam-format/opamFile.cmo
+${OCAML_SITELIB}/opam-format/opamFile.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamFile.cmx
+${OCAML_SITELIB}/opam-format/opamFile.mli
+${OCAML_SITELIB}/opam-format/opamFilter.cmi
+${OCAML_SITELIB}/opam-format/opamFilter.cmo
+${OCAML_SITELIB}/opam-format/opamFilter.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamFilter.cmx
+${OCAML_SITELIB}/opam-format/opamFilter.mli
+${OCAML_SITELIB}/opam-format/opamFormat.cmi
+${OCAML_SITELIB}/opam-format/opamFormat.cmo
+${OCAML_SITELIB}/opam-format/opamFormat.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamFormat.cmx
+${OCAML_SITELIB}/opam-format/opamFormat.mli
+${OCAML_SITELIB}/opam-format/opamFormatConfig.cmi
+${OCAML_SITELIB}/opam-format/opamFormatConfig.cmo
+${OCAML_SITELIB}/opam-format/opamFormatConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamFormatConfig.cmx
+${OCAML_SITELIB}/opam-format/opamFormatConfig.mli
+${OCAML_SITELIB}/opam-format/opamFormula.cmi
+${OCAML_SITELIB}/opam-format/opamFormula.cmo
+${OCAML_SITELIB}/opam-format/opamFormula.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamFormula.cmx
+${OCAML_SITELIB}/opam-format/opamFormula.mli
+${OCAML_SITELIB}/opam-format/opamLineLexer.cmi
+${OCAML_SITELIB}/opam-format/opamLineLexer.cmo
+${OCAML_SITELIB}/opam-format/opamLineLexer.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamLineLexer.cmx
+${OCAML_SITELIB}/opam-format/opamLineLexer.mli
+${OCAML_SITELIB}/opam-format/opamPackage.cmi
+${OCAML_SITELIB}/opam-format/opamPackage.cmo
+${OCAML_SITELIB}/opam-format/opamPackage.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamPackage.cmx
+${OCAML_SITELIB}/opam-format/opamPackage.mli
+${OCAML_SITELIB}/opam-format/opamPp.cmi
+${OCAML_SITELIB}/opam-format/opamPp.cmo
+${OCAML_SITELIB}/opam-format/opamPp.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamPp.cmx
+${OCAML_SITELIB}/opam-format/opamPp.mli
+${OCAML_SITELIB}/opam-format/opamRepositoryName.cmi
+${OCAML_SITELIB}/opam-format/opamRepositoryName.cmo
+${OCAML_SITELIB}/opam-format/opamRepositoryName.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamRepositoryName.cmx
+${OCAML_SITELIB}/opam-format/opamRepositoryName.mli
+${OCAML_SITELIB}/opam-format/opamSwitch.cmi
+${OCAML_SITELIB}/opam-format/opamSwitch.cmo
+${OCAML_SITELIB}/opam-format/opamSwitch.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamSwitch.cmx
+${OCAML_SITELIB}/opam-format/opamSwitch.mli
+${OCAML_SITELIB}/opam-format/opamTypes.cmi
+${OCAML_SITELIB}/opam-format/opamTypes.cmti
+${OCAML_SITELIB}/opam-format/opamTypes.mli
+${OCAML_SITELIB}/opam-format/opamTypesBase.cmi
+${OCAML_SITELIB}/opam-format/opamTypesBase.cmo
+${OCAML_SITELIB}/opam-format/opamTypesBase.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamTypesBase.cmx
+${OCAML_SITELIB}/opam-format/opamTypesBase.mli
+${OCAML_SITELIB}/opam-format/opamVariable.cmi
+${OCAML_SITELIB}/opam-format/opamVariable.cmo
+${OCAML_SITELIB}/opam-format/opamVariable.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-format/opamVariable.cmx
+${OCAML_SITELIB}/opam-format/opamVariable.mli
+${OCAML_SITELIB}/opam-repository/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opam-repository.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opam-repository.cmxa
+${OCAML_SITELIB}/opam-repository/opamDarcs.cmi
+${OCAML_SITELIB}/opam-repository/opamDarcs.cmo
+${OCAML_SITELIB}/opam-repository/opamDarcs.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamDarcs.cmx
+${OCAML_SITELIB}/opam-repository/opamDarcs.mli
+${OCAML_SITELIB}/opam-repository/opamDownload.cmi
+${OCAML_SITELIB}/opam-repository/opamDownload.cmo
+${OCAML_SITELIB}/opam-repository/opamDownload.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamDownload.cmx
+${OCAML_SITELIB}/opam-repository/opamDownload.mli
+${OCAML_SITELIB}/opam-repository/opamGit.cmi
+${OCAML_SITELIB}/opam-repository/opamGit.cmo
+${OCAML_SITELIB}/opam-repository/opamGit.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamGit.cmx
+${OCAML_SITELIB}/opam-repository/opamGit.mli
+${OCAML_SITELIB}/opam-repository/opamHTTP.cmi
+${OCAML_SITELIB}/opam-repository/opamHTTP.cmo
+${OCAML_SITELIB}/opam-repository/opamHTTP.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamHTTP.cmx
+${OCAML_SITELIB}/opam-repository/opamHTTP.mli
+${OCAML_SITELIB}/opam-repository/opamHg.cmi
+${OCAML_SITELIB}/opam-repository/opamHg.cmo
+${OCAML_SITELIB}/opam-repository/opamHg.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamHg.cmx
+${OCAML_SITELIB}/opam-repository/opamHg.mli
+${OCAML_SITELIB}/opam-repository/opamLocal.cmi
+${OCAML_SITELIB}/opam-repository/opamLocal.cmo
+${OCAML_SITELIB}/opam-repository/opamLocal.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamLocal.cmx
+${OCAML_SITELIB}/opam-repository/opamLocal.mli
+${OCAML_SITELIB}/opam-repository/opamRepository.cmi
+${OCAML_SITELIB}/opam-repository/opamRepository.cmo
+${OCAML_SITELIB}/opam-repository/opamRepository.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamRepository.cmx
+${OCAML_SITELIB}/opam-repository/opamRepository.mli
+${OCAML_SITELIB}/opam-repository/opamRepositoryBackend.cmi
+${OCAML_SITELIB}/opam-repository/opamRepositoryBackend.cmo
+${OCAML_SITELIB}/opam-repository/opamRepositoryBackend.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamRepositoryBackend.cmx
+${OCAML_SITELIB}/opam-repository/opamRepositoryBackend.mli
+${OCAML_SITELIB}/opam-repository/opamRepositoryConfig.cmi
+${OCAML_SITELIB}/opam-repository/opamRepositoryConfig.cmo
+${OCAML_SITELIB}/opam-repository/opamRepositoryConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamRepositoryConfig.cmx
+${OCAML_SITELIB}/opam-repository/opamRepositoryConfig.mli
+${OCAML_SITELIB}/opam-repository/opamRepositoryPath.cmi
+${OCAML_SITELIB}/opam-repository/opamRepositoryPath.cmo
+${OCAML_SITELIB}/opam-repository/opamRepositoryPath.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamRepositoryPath.cmx
+${OCAML_SITELIB}/opam-repository/opamRepositoryPath.mli
+${OCAML_SITELIB}/opam-repository/opamVCS.cmi
+${OCAML_SITELIB}/opam-repository/opamVCS.cmo
+${OCAML_SITELIB}/opam-repository/opamVCS.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-repository/opamVCS.cmx
+${OCAML_SITELIB}/opam-repository/opamVCS.mli
+${OCAML_SITELIB}/opam-solver/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam-solver.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam-solver.cmxa
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmi
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmo
+${OCAML_SITELIB}/opam-solver/opamActionGraph.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamActionGraph.cmx
+${OCAML_SITELIB}/opam-solver/opamActionGraph.mli
+${OCAML_SITELIB}/opam-solver/opamCudf.cmi
+${OCAML_SITELIB}/opam-solver/opamCudf.cmo
+${OCAML_SITELIB}/opam-solver/opamCudf.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamCudf.cmx
+${OCAML_SITELIB}/opam-solver/opamCudf.mli
+${OCAML_SITELIB}/opam-solver/opamHeuristic.cmi
+${OCAML_SITELIB}/opam-solver/opamHeuristic.cmo
+${OCAML_SITELIB}/opam-solver/opamHeuristic.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamHeuristic.cmx
+${OCAML_SITELIB}/opam-solver/opamHeuristic.mli
+${OCAML_SITELIB}/opam-solver/opamSolver.cmi
+${OCAML_SITELIB}/opam-solver/opamSolver.cmo
+${OCAML_SITELIB}/opam-solver/opamSolver.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamSolver.cmx
+${OCAML_SITELIB}/opam-solver/opamSolver.mli
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmi
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmo
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmx
+${OCAML_SITELIB}/opam-solver/opamSolverConfig.mli
+${OCAML_SITELIB}/opam-state/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opam-state.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opam-state.cmxa
+${OCAML_SITELIB}/opam-state/opamEnv.cmi
+${OCAML_SITELIB}/opam-state/opamEnv.cmo
+${OCAML_SITELIB}/opam-state/opamEnv.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamEnv.cmx
+${OCAML_SITELIB}/opam-state/opamEnv.mli
+${OCAML_SITELIB}/opam-state/opamFileTools.cmi
+${OCAML_SITELIB}/opam-state/opamFileTools.cmo
+${OCAML_SITELIB}/opam-state/opamFileTools.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamFileTools.cmx
+${OCAML_SITELIB}/opam-state/opamFileTools.mli
+${OCAML_SITELIB}/opam-state/opamFormatUpgrade.cmi
+${OCAML_SITELIB}/opam-state/opamFormatUpgrade.cmo
+${OCAML_SITELIB}/opam-state/opamFormatUpgrade.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamFormatUpgrade.cmx
+${OCAML_SITELIB}/opam-state/opamFormatUpgrade.mli
+${OCAML_SITELIB}/opam-state/opamGlobalState.cmi
+${OCAML_SITELIB}/opam-state/opamGlobalState.cmo
+${OCAML_SITELIB}/opam-state/opamGlobalState.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamGlobalState.cmx
+${OCAML_SITELIB}/opam-state/opamGlobalState.mli
+${OCAML_SITELIB}/opam-state/opamPackageVar.cmi
+${OCAML_SITELIB}/opam-state/opamPackageVar.cmo
+${OCAML_SITELIB}/opam-state/opamPackageVar.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamPackageVar.cmx
+${OCAML_SITELIB}/opam-state/opamPackageVar.mli
+${OCAML_SITELIB}/opam-state/opamPath.cmi
+${OCAML_SITELIB}/opam-state/opamPath.cmo
+${OCAML_SITELIB}/opam-state/opamPath.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamPath.cmx
+${OCAML_SITELIB}/opam-state/opamPath.mli
+${OCAML_SITELIB}/opam-state/opamPinned.cmi
+${OCAML_SITELIB}/opam-state/opamPinned.cmo
+${OCAML_SITELIB}/opam-state/opamPinned.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamPinned.cmx
+${OCAML_SITELIB}/opam-state/opamPinned.mli
+${OCAML_SITELIB}/opam-state/opamRepositoryState.cmi
+${OCAML_SITELIB}/opam-state/opamRepositoryState.cmo
+${OCAML_SITELIB}/opam-state/opamRepositoryState.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamRepositoryState.cmx
+${OCAML_SITELIB}/opam-state/opamRepositoryState.mli
+${OCAML_SITELIB}/opam-state/opamScript.cmi
+${OCAML_SITELIB}/opam-state/opamScript.cmo
+${OCAML_SITELIB}/opam-state/opamScript.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamScript.cmx
+${OCAML_SITELIB}/opam-state/opamScript.mli
+${OCAML_SITELIB}/opam-state/opamStateConfig.cmi
+${OCAML_SITELIB}/opam-state/opamStateConfig.cmo
+${OCAML_SITELIB}/opam-state/opamStateConfig.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamStateConfig.cmx
+${OCAML_SITELIB}/opam-state/opamStateConfig.mli
+${OCAML_SITELIB}/opam-state/opamStateTypes.cmi
+${OCAML_SITELIB}/opam-state/opamStateTypes.cmti
+${OCAML_SITELIB}/opam-state/opamStateTypes.mli
+${OCAML_SITELIB}/opam-state/opamSwitchAction.cmi
+${OCAML_SITELIB}/opam-state/opamSwitchAction.cmo
+${OCAML_SITELIB}/opam-state/opamSwitchAction.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamSwitchAction.cmx
+${OCAML_SITELIB}/opam-state/opamSwitchAction.mli
+${OCAML_SITELIB}/opam-state/opamSwitchState.cmi
+${OCAML_SITELIB}/opam-state/opamSwitchState.cmo
+${OCAML_SITELIB}/opam-state/opamSwitchState.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamSwitchState.cmx
+${OCAML_SITELIB}/opam-state/opamSwitchState.mli
+${OCAML_SITELIB}/opam-state/opamUpdate.cmi
+${OCAML_SITELIB}/opam-state/opamUpdate.cmo
+${OCAML_SITELIB}/opam-state/opamUpdate.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-state/opamUpdate.cmx
+${OCAML_SITELIB}/opam-state/opamUpdate.mli
diff --git a/misc/ocaml-opam/buildlink3.mk b/misc/ocaml-opam/buildlink3.mk
index 36d2daca94a..0c114097a28 100644
--- a/misc/ocaml-opam/buildlink3.mk
+++ b/misc/ocaml-opam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/06/19 23:23:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:46:23 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-opam
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-opam
 OCAML_OPAM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-opam+=	ocaml-opam>=1.2.2
+BUILDLINK_ABI_DEPENDS.ocaml-opam+=	ocaml-opam>=2.0.0_beta3
 BUILDLINK_PKGSRCDIR.ocaml-opam?=	../../misc/ocaml-opam
 
 .endif	# OCAML_OPAM_BUILDLINK3_MK
diff --git a/misc/ocaml-opam/distinfo b/misc/ocaml-opam/distinfo
index da7cb25c43f..a95af0998aa 100644
--- a/misc/ocaml-opam/distinfo
+++ b/misc/ocaml-opam/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/06/19 23:23:02 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/07/11 10:46:23 jaapb Exp $
 
-SHA1 (opam-1.2.2.tar.gz) = 40d6ea499c06254ace4bed1d280a6e401cec0945
-RMD160 (opam-1.2.2.tar.gz) = a940f513f0247715b592bbbe13dc0f395acb3fca
-SHA512 (opam-1.2.2.tar.gz) = 12105b5219a14d4c4cb29c387dd5af858d2b4a2a1bad7dcd70e4c284fc52848df82933396571b85251d904b3c14cdf02db55060c1ba29dc34b8bab3721d05f54
-Size (opam-1.2.2.tar.gz) = 648951 bytes
-SHA1 (patch-src_core_opamCompiler.ml) = 535b329701864500f95365026304bc7a1a0e69fa
-SHA1 (patch-src_core_opamFilter.ml) = bb8759d42a3761e0bb989358b01a7c083258dd8e
-SHA1 (patch-src_core_opamPackage.ml) = c5c6105aab369251da355ba31515e2e4d9d54552
-SHA1 (patch-src_core_opamVersion.ml.in) = 77e12dad3cd0c5265b99af4271ba4d89439c6be2
-SHA1 (patch-src_solver_opamCudf.ml) = 1dd3710694657f9d956397cc527d92b4cbdf0fce
+SHA1 (opam-2.0.0_beta3.tar.gz) = de59b6359778dbb61897cdcd1d69725555e41584
+RMD160 (opam-2.0.0_beta3.tar.gz) = 4eb13e973435007452926c78fe0420dc272b7349
+SHA512 (opam-2.0.0_beta3.tar.gz) = a8571f80014d3a903cf79306502029b21ca528a52a541736984e0f2d0664c9d652e8d22bc8cf6ec5fcef71bb36f287b4400ef746959f2c4c3464c0a462c237d0
+Size (opam-2.0.0_beta3.tar.gz) = 767076 bytes
diff --git a/misc/ocaml-opam/patches/patch-src_core_opamCompiler.ml b/misc/ocaml-opam/patches/patch-src_core_opamCompiler.ml
deleted file mode 100644
index 4f0e9240231..00000000000
--- a/misc/ocaml-opam/patches/patch-src_core_opamCompiler.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_core_opamCompiler.ml,v 1.1 2016/06/19 23:23:02 jaapb Exp $
-
-Reflect API change in dose3
---- src/core/opamCompiler.ml.orig	2015-04-27 07:46:51.000000000 +0000
-+++ src/core/opamCompiler.ml
-@@ -30,7 +30,7 @@ module Version = struct
- 
-   type constr = (OpamFormula.relop * t) OpamFormula.formula
- 
--  let compare v1 v2 = Debian.Version.compare (to_string v1) (to_string v2)
-+  let compare v1 v2 = Versioning.Debian.compare (to_string v1) (to_string v2)
- 
-   let eval_relop relop v1 v2 = OpamFormula.check_relop relop (compare v1 v2)
- 
diff --git a/misc/ocaml-opam/patches/patch-src_core_opamFilter.ml b/misc/ocaml-opam/patches/patch-src_core_opamFilter.ml
deleted file mode 100644
index 1d0f8249c85..00000000000
--- a/misc/ocaml-opam/patches/patch-src_core_opamFilter.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_core_opamFilter.ml,v 1.1 2016/06/19 23:23:02 jaapb Exp $
-
-Reflect API change in dose3
---- src/core/opamFilter.ml.orig	2015-04-27 07:46:51.000000000 +0000
-+++ src/core/opamFilter.ml
-@@ -203,7 +203,7 @@ let rec reduce_aux env = function
-      | FUndef, _ | _, FUndef -> FUndef
-      | e,f ->
-        FBool (OpamFormula.check_relop relop
--                (Debian.Version.compare (value_string e) (value_string f))))
-+                (Versioning.Debian.compare (value_string e) (value_string f))))
-   | FAnd (e,f) -> logop2 (&&) false (reduce env e) (reduce env f)
-   | FOr (e,f) -> logop2 (||) true (reduce env e) (reduce env f)
-   | FNot e -> logop1 not (reduce env e)
diff --git a/misc/ocaml-opam/patches/patch-src_core_opamPackage.ml b/misc/ocaml-opam/patches/patch-src_core_opamPackage.ml
deleted file mode 100644
index b409e9220df..00000000000
--- a/misc/ocaml-opam/patches/patch-src_core_opamPackage.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_core_opamPackage.ml,v 1.1 2016/06/19 23:23:02 jaapb Exp $
-
-Reflect API change in dose3
---- src/core/opamPackage.ml.orig	2015-04-27 07:46:51.000000000 +0000
-+++ src/core/opamPackage.ml
-@@ -29,7 +29,7 @@ module Version = struct
- 
-   let of_string x = x
- 
--  let compare = Debian.Version.compare
-+  let compare = Versioning.Debian.compare
- 
-   let to_json x =
-     `String (to_string x)
diff --git a/misc/ocaml-opam/patches/patch-src_core_opamVersion.ml.in b/misc/ocaml-opam/patches/patch-src_core_opamVersion.ml.in
deleted file mode 100644
index a9375465ef5..00000000000
--- a/misc/ocaml-opam/patches/patch-src_core_opamVersion.ml.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_core_opamVersion.ml.in,v 1.1 2016/06/19 23:23:02 jaapb Exp $
-
-Reflect API change in dose3
---- src/core/opamVersion.ml.in.orig	2015-04-27 07:46:51.000000000 +0000
-+++ src/core/opamVersion.ml.in
-@@ -27,7 +27,7 @@ let compare v w =
-   let cut s = match OpamMisc.cut_at s '-' with
-     | Some (s,_) -> s
-     | None -> s in
--  Debian.Version.compare (cut v) (cut w)
-+  Versioning.Debian.compare (cut v) (cut w)
- 
- module O = struct
-   type t = string
diff --git a/misc/ocaml-opam/patches/patch-src_solver_opamCudf.ml b/misc/ocaml-opam/patches/patch-src_solver_opamCudf.ml
deleted file mode 100644
index 58999e133f7..00000000000
--- a/misc/ocaml-opam/patches/patch-src_solver_opamCudf.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_solver_opamCudf.ml,v 1.1 2016/06/19 23:23:02 jaapb Exp $
-
-Reflect API change in dose3
---- src/solver/opamCudf.ml.orig	2015-04-27 07:46:51.000000000 +0000
-+++ src/solver/opamCudf.ml
-@@ -611,7 +611,7 @@ let check_cudf_version =
-           `Compat
-         | s::_ ->
-           match OpamMisc.split s ' ' with
--          | "aspcud"::_::v::_ when Debian.Version.compare v "1.9" >= 0 ->
-+          | "aspcud"::_::v::_ when Versioning.Debian.compare v "1.9" >= 0 ->
-             log "Solver is aspcud > 1.9: using latest version criteria";
-             `Latest
-           | _ ->