Updated package to latest version, 5.0~rc2. Changes include:

dose3 (5.0) UNRELEASED; urgency=low
 * finally implement keep_package/version/feature properly. The globalid
   index that was used to optionally encode the global constraints is
   now disappeared. This simplify the interface of the solver.
 * massive refactoring. Change of API . All functions in Depsolver*
   accept a new paramenter "global_constraints" that is a vpkgformula
   enconding all packages that must be co-installed by by default with
   each request. This is used to properly encode debian essential packages
   without abusing 'Keep_package as before.
 * Depsolver_int.{solve,init_solver_unit,init_solver_cache} have a new optional
   argument 'explain'. When false, reduce the memory footprint.
 * Depsolver.{check_request,check_request_using} accept a new parameter dummy
   that can be used to pass arbitrary contraints as a cudf.package that is going
   to be coinstalled as part of the request and filtered out in the result.
 * improvements to the documentation and test units
 * add --compare to ceve when used with pef://
 * improvements to distcheck --lowmem
 * StdOptions.lastest now returns an integer to consider only the last n versions
   of each package
 * API change : CudfAdd.latest
 * API change : CudfAdd.inttovar -> CudfAdd.inttopkg
 * API change : add parameter to check_request and check_request_using
 * apt-cudf : package up or downgrades are expressed in a single
   "Install" request and that these do not show up as a "Remove" request anymore.
 * StdOptions.DistribOptions.add_options are now different for each input ( ex.
   StdOptions.DistribOptions.add_debian_options )uu
 * Debian.Printer.pp_* functions are now methods of the Debian.package class

 -- Pietro Abate <pietro.abate@inria.fr>  Thur, 06 Jun 2016 13:13:06 +0200

dose3 (4.3) UNRELEASED; urgency=low
 * Fix exitcode problem with apt-cudf
 * Add new comparison functions to parse npm like versions
 * Make ocamlgraph a hard dependency of dose.
 * Switch to ocamlgraph based explanation graphs by default
 * add {foregin,native}-architecture field to distcheck output
 * bump output-version to 1.2
 * add --lowmem option to distcheck (slow, but consumes less memory)
 * remove build-essential field from buildcheck
 * add --deb-drop-b-d-indep and --deb-profiles to ceve
 * API Change. Debian.Debutil.debvpkg is replaced by Pef.Pefcudf.pefvpkg
 * API Change. Depsolver_int.solve has a addition argument "explain"
 * add new option to ditcheck and ceve --compare to specify a comparison
   function to be used with the pef format.

 -- Pietro Abate <pietro.abate@inria.fr>  Thur, 21 Apr 2016 13:13:06 +0200

dose3 (4.2) UNRELEASED; urgency=low

 * Fix META file and other compilation problems (notably on 32 bits architectures)
 * Add back the "Enhances" field in the debian printer
 * the new yaml format also drops the architecture suffix in the package and
   unsat-dependency fields
 * Add new function Depsolver.is_consistent and Debian.Debcudf.get_real_name
 * Expose Diagnostic.request and Diagnostic.result
 * Update the yaml output of outdated (no more cudf-related cruft in package names)
 * bump yaml output-version to 1.1

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Thur, 14 Jan 2016 13:13:06 +0200

dose3 (4.1) UNRELEASED; urgency=low
  * New optimization criteria parser. apt-cudf now accepts only optimization criterias in
    misc2012 format.
  * the extended MISC 2012 syntax extends the count criteria allowing the
    following additional forms:
      count(selector,field:=/plain/)
      count(selector,field:~/regex/)
  * Update Documentation
  * Modules are renamed (compiled with -pack) :
    Versioning.Debian
    Versioning.Semver
  * API change : Debian.Debcudf.get_real_version tables now returns
    a tuple (name, version) . Name is the original Debian name without
    encoding ( "src:" , ":$arch" , "--virtual-" ).
  * Implement versioned provides
  * strict dependency ocamlgraph >= 1.8.6
  * strict dependency extlib >= 1.7.0
  * new cudf property for deb/edsp types
    native is 1 if the pkg architecture is equal to the native architecture,
    0 otherwise. This can be used to maximise the number of packages
    belonging to the native architecture ( +sum(solution,active) )
  * better parsing and error reporting
  * More Module refactoring (algo/deb/pef/opam)

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Tue, 01 Dec 2015 13:13:06 +0200

dose3 (4.0) UNRELEASED; urgency=low
  * Minor Bugs
  * Add opam module
  * Major refactoring of parsing functions Pef/Deb/Opam

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Mon, 29 June 2015 13:13:06 +0200


dose3 (4.0-rc3) UNRELEASED; urgency=low
  * Minor Bugs

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Mon, 29 June 2015 13:13:06 +0200

dose3 (4.0-rc2) UNRELEASED; urgency=low
  * Add new module Versioning to group all the comparison functions
  * Add a new comparison schema (http://semver.org/)
  * Add new two new ceve output formats: deb and debsrc

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Fri, 26 June 2015 13:13:06 +0200

dose3 (4.0-rc1) UNRELEASED; urgency=low
  * Remove dependency to camlp4. Add build dependency to cppo
  * Add option --dot to create explanation graphs in dot format
  * add 'out-version' field to yaml format
  * Debian Essential packages are now kept into account while
    generating strong dependencies. You must pass
    --deb-ignore-essential to restore the previous behaviour
  * Add --latest to challenged
  * Add new format PEF : package export format
  * Drop eclipse format (superceded by PEF)
  * Drop cv format (superceded by PEF)
  * Ceve can read source packages
  * Add grep-able one line explanations (success/failure) to distcheck
  * Switch architecture and name around in cudf representation for debian packages
  * Add new function to detect unsused dependencies/conflicts
  * API change : Diagnostic.request, Depsolver.request, StdLoaders.load_list,
    Debcudf.init_tables,
  * add debsrc input format to ceve

 -- Pietro Abate <pietro.abate@pps.univ-paris-diderot.fr>  Wed, 24 June 2015 13:13:06 +0200

7 files changed, 84 insertions, 102 deletions

diff --git a/misc/dose3/Makefile b/misc/dose3/Makefile
index f6da4902aab..16215d4132e 100644
--- a/misc/dose3/Makefile
+++ b/misc/dose3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2016/05/07 07:55:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/19 10:36:58 jaapb Exp $
 
-DISTNAME=	dose3-3.3-beta2
-PKGNAME= dose3-3.3beta2
-PKGREVISION=	4
+DISTNAME=	dose3-5.0~rc2
+PKGNAME=	dose3-5.0rc2
 CATEGORIES=	misc
-MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/34180/
+MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/35957/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://gforge.inria.fr/projects/dose/
@@ -17,7 +16,6 @@ MAKE_JOBS_SAFE=	no
 OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/ocaml.mk"
-.include "options.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} != "yes"
 CONFIGURE_ARGS+=	--with-bytecodeonly
@@ -26,9 +24,11 @@ CONFIGURE_ARGS+=	--with-bytecodeonly
 pre-configure:
 	cd ${WRKSRC} && aclocal -I m4 && autoconf
 
+.include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../devel/ocaml-extlib/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/ocamlgraph/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../misc/ocaml-cudf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dose3/PLIST b/misc/dose3/PLIST
index 134fe5bc5e0..ca4142fb6ff 100644
--- a/misc/dose3/PLIST
+++ b/misc/dose3/PLIST
@@ -1,24 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/06 11:59:17 jaapb Exp $
-bin/apt-cudf
-bin/ceve
-bin/challenged
-bin/deb-buildcheck
-bin/deb-coinstall
-bin/debcheck
-bin/distcheck
-${PLIST.ocamlgraph}bin/dominators-graph
-bin/eclipsecheck
-bin/outdated
-bin/rpmcheck
-${PLIST.ocamlgraph}bin/smallworld
-${PLIST.ocamlgraph}bin/strong-deps
+@comment $NetBSD: PLIST,v 1.3 2016/06/19 10:36:58 jaapb Exp $
 ${OCAML_SITELIB}/dose3/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/algo.a
 ${OCAML_SITELIB}/dose3/algo.cma
 ${OCAML_SITELIB}/dose3/algo.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/algo.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/algo.cmxs
-${OCAML_SITELIB}/dose3/architecture.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/common.a
 ${OCAML_SITELIB}/dose3/common.cma
 ${OCAML_SITELIB}/dose3/common.cmi
@@ -29,20 +15,11 @@ ${OCAML_SITELIB}/dose3/csw.cma
 ${OCAML_SITELIB}/dose3/csw.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/csw.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/csw.cmxs
-${OCAML_SITELIB}/dose3/cudfAdd.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/cv.a
-${OCAML_SITELIB}/dose3/cv.cma
-${OCAML_SITELIB}/dose3/cv.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/cv.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/cv.cmxs
-${OCAML_SITELIB}/dose3/debcudf.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/debian.a
 ${OCAML_SITELIB}/dose3/debian.cma
 ${OCAML_SITELIB}/dose3/debian.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/debian.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/debian.cmxs
-${OCAML_SITELIB}/dose3/depsolver.mli
-${OCAML_SITELIB}/dose3/diagnostic.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/doseparse.a
 ${OCAML_SITELIB}/dose3/doseparse.cma
 ${OCAML_SITELIB}/dose3/doseparse.cmi
@@ -53,18 +30,23 @@ ${OCAML_SITELIB}/dose3/doseparseNoRpm.cma
 ${OCAML_SITELIB}/dose3/doseparseNoRpm.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/doseparseNoRpm.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/doseparseNoRpm.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/eclipse.a
-${OCAML_SITELIB}/dose3/eclipse.cma
-${OCAML_SITELIB}/dose3/eclipse.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/eclipse.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/eclipse.cmxs
-${OCAML_SITELIB}/dose3/edosSolver.mli
-${OCAML_SITELIB}/dose3/format822_parser.mli
-${OCAML_SITELIB}/dose3/input.mli
-${OCAML_SITELIB}/dose3/packages_parser.mli
-${OCAML_SITELIB}/dose3/release.mli
-${PLIST.ocamlgraph}${OCAML_SITELIB}/dose3/strongdeps.mli
-${OCAML_SITELIB}/dose3/url.mli
-${OCAML_SITELIB}/dose3/util.mli
-${OCAML_SITELIB}/dose3/version.mli
-@pkgdir ${OCAML_SITELIB}/stublibs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/npm.a
+${OCAML_SITELIB}/dose3/npm.cma
+${OCAML_SITELIB}/dose3/npm.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/npm.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/npm.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/opam.a
+${OCAML_SITELIB}/dose3/opam.cma
+${OCAML_SITELIB}/dose3/opam.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/opam.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/opam.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/pef.a
+${OCAML_SITELIB}/dose3/pef.cma
+${OCAML_SITELIB}/dose3/pef.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/pef.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/pef.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/versioning.a
+${OCAML_SITELIB}/dose3/versioning.cma
+${OCAML_SITELIB}/dose3/versioning.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/versioning.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/versioning.cmxs
diff --git a/misc/dose3/distinfo b/misc/dose3/distinfo
index 5febf7be512..24b246c8b11 100644
--- a/misc/dose3/distinfo
+++ b/misc/dose3/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:49:34 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/06/19 10:36:58 jaapb Exp $
 
-SHA1 (dose3-3.3-beta2.tar.gz) = 8ae292162328356416dd5008db11c2bab8fbd834
-RMD160 (dose3-3.3-beta2.tar.gz) = 6b9a25539102a6ba579bf21064d6fe159842692f
-SHA512 (dose3-3.3-beta2.tar.gz) = 7540b2390f8ef49acdf4ac5c7598e25137b380f4d0b862d75a144a2e12d3f7e24633e8f0e3597f74cd48491f9fa7559dc1664692eb3a840eca26e0f077550db8
-Size (dose3-3.3-beta2.tar.gz) = 257564 bytes
-SHA1 (patch-META.in) = 13bede847fef7b94fe30ac9b7c339572e8212e8d
-SHA1 (patch-Makefile) = 4f50c506798a0749d2bd6d3ca975ecf8b107a75f
-SHA1 (patch-Makefile.config.in) = e2fe2efb61c18f099dd9ae29ef35ef8c8f943a61
-SHA1 (patch-configure.ac) = 88ecf59fd023b183f60192ab46243ce084ffaa28
+SHA1 (dose3-5.0~rc2.tar.gz) = 258ec6906e541d3d3e0b607aaaee3322dbee0221
+RMD160 (dose3-5.0~rc2.tar.gz) = e8be76f3d16ef6fa809883dcad1da743cfaa9c49
+SHA512 (dose3-5.0~rc2.tar.gz) = 594458df5437cdf155e35ddbf5ae034d626941f2b5fd28efad02149cd94417421300262e122ce502e52130ec81d6d3cee713889f8ffba6ecf945a536ea745301
+Size (dose3-5.0~rc2.tar.gz) = 297350 bytes
+SHA1 (patch-Makefile) = 1be9791f9d225d8adf81c309fd4c0aac1a6078ef
+SHA1 (patch-Makefile.config.in) = cae3219764b2f9ba75ae8bdd3d79d9e2e71c7234
+SHA1 (patch-algo_dominators.ml) = f1e5f7b4ce60b3b187cd5a9aca15a4f6c41f90b4
diff --git a/misc/dose3/options.mk b/misc/dose3/options.mk
deleted file mode 100644
index 874fc906a1b..00000000000
--- a/misc/dose3/options.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2014/11/06 11:59:17 jaapb Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dose3
-
-PKG_SUPPORTED_OPTIONS=		ocamlgraph
-PKG_SUGGESTED_OPTIONS=		ocamlgraph
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use Ocamlgraph
-###
-PLIST_VARS+=	ocamlgraph
-.if !empty(PKG_OPTIONS:Mocamlgraph)
-.include "../../devel/ocamlgraph/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ocamlgraph
-PLIST.ocamlgraph=	yes
-.else
-CONFIGURE_ARGS+=	--without-ocamlgraph
-.endif
diff --git a/misc/dose3/patches/patch-Makefile b/misc/dose3/patches/patch-Makefile
index a1a75af0b83..c2694a89955 100644
--- a/misc/dose3/patches/patch-Makefile
+++ b/misc/dose3/patches/patch-Makefile
@@ -1,14 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2014/10/27 12:01:36 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/06/19 10:36:59 jaapb Exp $
 
-Use proper location for camlp4
---- Makefile.orig	2014-10-21 11:45:17.000000000 +0000
+stublibs does not need to be created
+--- Makefile.orig	2016-06-15 10:23:22.000000000 +0000
 +++ Makefile
-@@ -41,7 +41,7 @@ itarget:
+@@ -231,7 +231,7 @@ INSTALL_STUFF = $(filter-out $(exclude_c
  
- _build/Camlp4MacroParser.cmxs:
- 	mkdir -p _build
--	ocamlopt -shared $(shell ocamlc -where)/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx -o _build/Camlp4MacroParser.cmxs
-+	ocamlopt -shared ${PREFIX}/lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx -o _build/Camlp4MacroParser.cmxs
+ installlib: META installcudf
+ 	@test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+-	@test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs
++#	@test -d $(LIBDIR)/stublibs || mkdir -p $(LIBDIR)/stublibs
+ 	@$(INSTALL) -patch-version $(VERSION) $(NAME) $(INSTALL_STUFF)
+ 	@echo "Install dose librairies to $(LIBDIR)"
  
- $(DOSELIBS)/cudf.%:
- 	$(OCAMLBUILD) $(OBFLAGS) cudf/cudf.$*
diff --git a/misc/dose3/patches/patch-Makefile.config.in b/misc/dose3/patches/patch-Makefile.config.in
index d01acce7ab7..06d25b764dd 100644
--- a/misc/dose3/patches/patch-Makefile.config.in
+++ b/misc/dose3/patches/patch-Makefile.config.in
@@ -1,29 +1,33 @@
-$NetBSD: patch-Makefile.config.in,v 1.1 2014/10/27 12:01:36 jaapb Exp $
+$NetBSD: patch-Makefile.config.in,v 1.2 2016/06/19 10:36:59 jaapb Exp $
 
 Use OCaml site-lib directory for installation
---- Makefile.config.in.orig	2014-10-21 11:45:17.000000000 +0000
+--- Makefile.config.in.orig	2016-06-15 10:23:22.000000000 +0000
 +++ Makefile.config.in
-@@ -9,21 +9,12 @@ OCAMLFIND=@OCAMLFIND@
+@@ -9,25 +9,8 @@ OCAMLFIND=@OCAMLFIND@
  
  DOSELIBS = _build/doselibs
  
--DESTDIR =
--ifeq ($(DESTDIR),)
- exec_prefix=@prefix@
--BINDIR=@bindir@
--LIBDIR=$(shell ocamlfind printconf destdir)
+-BINDIR = @prefix@@bindir@
+-# if prefix is /usr/local (default), then we use ocamlfind, 
+-# otherwise use build the destdir using the given prefix
+-ifeq (@prefix@,/usr/local)
+-  ifeq ("@OCAML_OS_TYPE@","Win32")
+-    LIBDIR=$(shell ocamlfind printconf destdir | cygpath -f - -m)
+-  else
+-    LIBDIR = $(shell ocamlfind printconf destdir)
+-  endif
+-else
+-  LIBDIR = @prefix@@libdir@/ocaml/$(shell ocamlc -version)
+-endif
+-
+-# if DESTDIR is specified, we ignore the prefix and we use the 
+-# default debian location
+-ifneq ($(DESTDIR),)
+-  BINDIR = $(DESTDIR)@bindir@
+-  LIBDIR = $(DESTDIR)@libdir@/ocaml
+-endif
 +BINDIR=${DESTDIR}@bindir@
 +LIBDIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}
  
  INSTALL=$(OCAMLFIND) install -destdir $(LIBDIR)
  UNINSTALL=$(OCAMLFIND) remove -destdir $(LIBDIR)
--else
--LIBDIR = $(DESTDIR)/$(shell ocamlc -where)
--BINDIR = $(DESTDIR)/usr/bin
--
--INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
--UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
--endif
- 
- ifeq ("@OCAML_OS_TYPE@","freebsd")
-   LDFLAGS += -fstack-protector
diff --git a/misc/dose3/patches/patch-algo_dominators.ml b/misc/dose3/patches/patch-algo_dominators.ml
new file mode 100644
index 00000000000..ecb9fe85b9e
--- /dev/null
+++ b/misc/dose3/patches/patch-algo_dominators.ml
@@ -0,0 +1,17 @@
+$NetBSD: patch-algo_dominators.ml,v 1.1 2016/06/19 10:36:59 jaapb Exp $
+
+This detection does not work correctly, so short-cut the process
+--- algo/dominators.ml.orig	2016-06-15 10:23:22.000000000 +0000
++++ algo/dominators.ml
+@@ -101,11 +101,7 @@ let dominators_tarjan graph =
+   ) graph;
+ 
+   Util.Timer.start tjntimer;
+-#if OCAMLGRAPHVERSION <= 186
+   let module Dom = Dominator.Make_graph(G) in
+-#else
+-  let module Dom = Dominator.Make(G) in
+-#endif
+   let idom = Dom.compute_all graph start_pkg in
+   let domgr = idom.Dom.dom_graph () in
+   Util.Timer.stop tjntimer ();