kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated package to latest version, 1.2.2. Changes include:

Browse source 
1.2.2
* Fixed wrong locks being taken during `switch reinstall` (#2051)
* Fixed `config report` that wasn't displaying the external solver (#2059)
* Follow glibc standard on detecting an UTF8 locale (#2065)
* Fixed issues with fish shell init scripts (#2063)
* Restored printing of commands with `--verbose` and `--dry-run`
* More concise printing of conflicts, with accurate version numbers
* Small improvements to the causes of actions
* Fixed issue causing the state cache not to be used on some OSes (OSX) (#2077)
* Added numbers to lint checks, and some new checks
* Restored the handling of a simple path to an `aspcud`-compatible executable
  in variable OPAMEXTERNALSOLVER (#2085)
* Added package universe output to new PEF format for diagnostics
* Prioritise newer versions even when the latest can't be installed (#2109)
* Automatically install plugins on `opam plugin-name` (#2092)
* Fixed a fd leak on solver calls (#2134)
* Accept opam files with errors when no debug or strict options are set, for
  easier format updates
* Add `opam list --resolve` to get dependencies as a consistent set of packages
* Provide the expected checksum to download commands
* Changed return code of `opam list` when no patterns are supplied and the list
  is empty

1.2.1
* Non-system compiler definitions without source are now allowed
* Better handling of compiler "base" packages allows to move build instructions
  from compiler definitions to packages
* Rewritten action resolution mechanism to be based on atomic actions.
  Actions are not aborted anymore on first failure when there is no
  inter-dependency
* Rewritten parallel command execution engine
* Better display of actions, lots of improved messages
* `opam upgrade pkg` now fails if no new version of `pkg` can be installed
* fixed shell configuration for various shells
* Updated Dose dependency to 3.3
* Fixed behaviour of `opam switch` and related commands when a switch
  is locally set in a shell (through `OPAMSWITCH`)
* Better behaviour on failed `opam switch`
* New pinning mode: when pinning using version-control on a local path and
  without a branch specified, use current file tree, but limited to
  version-tracked files
* Faster and cleaner handling of downloads
* Now compiles with --safe-string on OCaml 4.02, better compatibility handling
* `opam unpin` now accepts multiple arguments
* `opam pin add <pkg>.<version> <target>` is now allowed to specify
  the advertised version
* Fixed bug leading to a bad `CAML_LD_LIBRARY_PATH` when switching from system
* Better `opam lint`, reporting warnings and errors, including format errors
* `opam config setup` now takes `--shell=` instead of `--sh`, `--csh`, `--fish`,
  `--zsh`
* Provisional feature: dependency flag `dev` is accepted (but does nothing)
* Provisional feature: field `features` in opam files implemented (beta), not
  for use in production
* Better definition of the `filter` language within opam files: propagates
  undefined values, bool-to-string converter syntax
* Provisional feature: `verbose` may be specified in package flags
* OPAM git-like plugins (commands of the form opam-xxx) are now searched in the
  correct OPAM path
* ~/.opam/config doesn't refer to OPAM's patch-version anymore, to allow
  downgrading
* Recognise <name>.opam files and directories when pinning a package to source
* Cleaned up debug and verbose messages, allow more control (`-v` can now be
  repeated)
* Pinning URL can now be explicit in the form `VC+URL`, e.g. `git+ssh://`,
  `hg+https://`...
* New flexible way to specify download and solver commands in `~/.opam/config`
  or in variables `OPAMFETCH` and `OPAMEXTERNALSOLVER`
* Lots of bug-fixes
This commit is contained in:
jaapb 2016-06-19 23:23:02 +00:00
parent 9b969e93c0
commit 61d3cd39fc
9 changed files with 184 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
misc/ocaml-opam/Makefile
View file

@ -1,15 +1,14 @@
# $NetBSD: Makefile,v 1.7 2016/05/05 11:45:40 jaapb Exp $
# $NetBSD: Makefile,v 1.8 2016/06/19 23:23:02 jaapb Exp $
VERSION= 1.2.0
PKGNAME= ocaml-opam-${VERSION}
DISTNAME= ${VERSION}
DIST_SUBDIR= ocaml-opam
PKGREVISION= 5
VERSION= 1.2.2
GITHUB_PROJECT= opam
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
PKGNAME= ocaml-${DISTNAME}
CATEGORIES= misc
MASTER_SITES= https://github.com/ocaml/opam/archive/
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
MAINTAINER= jaapb@NetBSD.org
HOMEPAGE= https://github.com/ocaml/opam/archive/
HOMEPAGE= http://opam.ocaml.org/
COMMENT= OCaml package manager
LICENSE= gnu-lgpl-v3
MAKE_JOBS_SAFE= no
@ -17,8 +16,6 @@ MAKE_JOBS_SAFE= no
HAS_CONFIGURE= yes
USE_TOOLS+= gawk gmake
WRKSRC= ${WRKDIR}/opam-${VERSION}
CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
BUILD_TARGET= all

107
misc/ocaml-opam/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2014/11/06 15:30:24 jaapb Exp $
@comment $NetBSD: PLIST,v 1.2 2016/06/19 23:23:02 jaapb Exp $
bin/opam
bin/opam-admin
bin/opam-admin.top
@ -6,104 +6,187 @@ 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
${OCAML_SITELIB}/${PLIST.ocaml-opt}opam-lib/opam-client.cmxa
${OCAML_SITELIB}/opam-lib/opam-cor${PLIST.ocaml-opt}e.a
${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
${OCAML_SITELIB}/opam-lib/opam-core.cmx${PLIST.ocaml-opt}a
${OCAML_SITELIB}/opam-lib/opam-repositories.${PLIST.ocaml-opt}a
${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
${OCAML_SITELIB}/opam-lib/opam-repositories.cmx${PLIST.ocaml-opt}a
${OCAML_SITELIB}/opam-lib/opam-solver.${PLIST.ocaml-opt}a
${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
${OCAML_SITELIB}/opam-lib/opam-solver.cmx${PLIST.ocaml-opt}a
${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
${OCAML_SITELIB}/opam-lib/opamArg.cmi
${OCAML_SITELIB}/opam-lib/opamArg.cmti
${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
${OCAML_SITELIB}/opam-lib/opamGitVersion.cmi
${OCAML_SITELIB}/opam-lib/opamGitVersion.cmt
${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

4
misc/ocaml-opam/buildlink3.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.1 2015/02/12 11:07:43 jaapb Exp $
# $NetBSD: buildlink3.mk,v 1.2 2016/06/19 23:23:02 jaapb Exp $
BUILDLINK_TREE+= ocaml-opam
.if !defined(OCAML_OPAM_BUILDLINK3_MK)
OCAML_OPAM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-opam+= ocaml-opam>=1.2.0nb1
BUILDLINK_API_DEPENDS.ocaml-opam+= ocaml-opam>=1.2.2
BUILDLINK_PKGSRCDIR.ocaml-opam?= ../../misc/ocaml-opam
.endif # OCAML_OPAM_BUILDLINK3_MK

15
misc/ocaml-opam/distinfo
View file

@ -1,6 +1,11 @@
$NetBSD: distinfo,v 1.2 2015/11/03 23:49:44 agc Exp $
$NetBSD: distinfo,v 1.3 2016/06/19 23:23:02 jaapb Exp $
SHA1 (ocaml-opam/1.2.0.tar.gz) = b7923516a853afe86e8439afd23c0dae5fa8ad57
RMD160 (ocaml-opam/1.2.0.tar.gz) = 34533715c2ab096c62bddab0e95d3a9ce2d8ca4c
SHA512 (ocaml-opam/1.2.0.tar.gz) = eed6e1f9242b5264f4874c00b3a4b319f5838a620782905a891a4dbaed2fef0366fad00808ffadb80ace82f419331d9bc6fc914c179ca5983cf178b44b2e4cba
Size (ocaml-opam/1.2.0.tar.gz) = 596525 bytes
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

14
misc/ocaml-opam/patches/patch-src_core_opamCompiler.ml Normal file
View file

@ -0,0 +1,14 @@
$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)

14
misc/ocaml-opam/patches/patch-src_core_opamFilter.ml Normal file
View file

@ -0,0 +1,14 @@
$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)

14
misc/ocaml-opam/patches/patch-src_core_opamPackage.ml Normal file
View file

@ -0,0 +1,14 @@
$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)

14
misc/ocaml-opam/patches/patch-src_core_opamVersion.ml.in Normal file
View file

@ -0,0 +1,14 @@
$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

14
misc/ocaml-opam/patches/patch-src_solver_opamCudf.ml Normal file
View file

@ -0,0 +1,14 @@
$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
| _ ->