Revised package, no upstream changes. Added option for compiling in

ocamlgraph support; this is necessary for misc/ocaml-opam.

4 files changed, 30 insertions, 4 deletions

diff --git a/misc/dose3/Makefile b/misc/dose3/Makefile
index 3441f1dd0ff..aeda5af3d97 100644
--- a/misc/dose3/Makefile
+++ b/misc/dose3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/10/27 12:01:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/06 11:59:17 jaapb Exp $
 
 DISTNAME=	dose3-3.3-beta2
 PKGNAME= dose3-3.3beta2
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/34180/
 
@@ -16,6 +17,7 @@ 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
diff --git a/misc/dose3/PLIST b/misc/dose3/PLIST
index 161821e7cdb..134fe5bc5e0 100644
--- a/misc/dose3/PLIST
+++ b/misc/dose3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/27 12:01:36 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/06 11:59:17 jaapb Exp $
 bin/apt-cudf
 bin/ceve
 bin/challenged
@@ -6,9 +6,12 @@ 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
 ${OCAML_SITELIB}/dose3/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/dose3/algo.a
 ${OCAML_SITELIB}/dose3/algo.cma
@@ -60,6 +63,7 @@ ${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
diff --git a/misc/dose3/buildlink3.mk b/misc/dose3/buildlink3.mk
index 97ab7f53bd8..ea3c63523ab 100644
--- a/misc/dose3/buildlink3.mk
+++ b/misc/dose3/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/27 12:01:36 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/11/06 11:59:17 jaapb Exp $
 
 BUILDLINK_TREE+=	dose3
 
 .if !defined(DOSE3_BUILDLINK3_MK)
 DOSE3_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.dose3+=	dose3>=3.3beta2
+BUILDLINK_API_DEPENDS.dose3+=	dose3>=3.3beta2nb1
 BUILDLINK_PKGSRCDIR.dose3?=	../../misc/dose3
 
 .include "../../devel/ocaml-extlib/buildlink3.mk"
diff --git a/misc/dose3/options.mk b/misc/dose3/options.mk
new file mode 100644
index 00000000000..874fc906a1b
--- /dev/null
+++ b/misc/dose3/options.mk
@@ -0,0 +1,20 @@
+# $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