diff options
Diffstat (limited to 'misc/dose3')
-rw-r--r-- | misc/dose3/Makefile | 3 | ||||
-rw-r--r-- | misc/dose3/buildlink3.mk | 4 | ||||
-rw-r--r-- | misc/dose3/patches/patch-META.in | 14 | ||||
-rw-r--r-- | misc/dose3/patches/patch-configure.ac | 21 |
4 files changed, 4 insertions, 38 deletions
diff --git a/misc/dose3/Makefile b/misc/dose3/Makefile index 16215d4132e..1390b43157b 100644 --- a/misc/dose3/Makefile +++ b/misc/dose3/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2016/06/19 10:36:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.8 2016/06/20 10:39:52 jaapb Exp $ DISTNAME= dose3-5.0~rc2 PKGNAME= dose3-5.0rc2 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/35957/ diff --git a/misc/dose3/buildlink3.mk b/misc/dose3/buildlink3.mk index ea3c63523ab..b680ce78635 100644 --- a/misc/dose3/buildlink3.mk +++ b/misc/dose3/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/11/06 11:59:17 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2016/06/20 10:39:52 jaapb Exp $ BUILDLINK_TREE+= dose3 .if !defined(DOSE3_BUILDLINK3_MK) DOSE3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.dose3+= dose3>=3.3beta2nb1 +BUILDLINK_API_DEPENDS.dose3+= dose3>=5.0rc2 BUILDLINK_PKGSRCDIR.dose3?= ../../misc/dose3 .include "../../devel/ocaml-extlib/buildlink3.mk" diff --git a/misc/dose3/patches/patch-META.in b/misc/dose3/patches/patch-META.in deleted file mode 100644 index 842699a4465..00000000000 --- a/misc/dose3/patches/patch-META.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-META.in,v 1.1 2014/10/27 12:01:36 jaapb Exp $ - -Proper ocamlgraph detection ---- META.in.orig 2014-10-21 11:45:17.000000000 +0000 -+++ META.in -@@ -2,7 +2,7 @@ description = "Dose3 libraries" - version = "@PACKAGE_VERSION@" - archive(byte) = "common.cma algo.cma debian.cma eclipse.cma csw.cma" - archive(native) = "common.cmxa algo.cmxa debian.cmxa eclipse.cmxa csw.cmxa" --requires = "extlib, re.pcre, cudf, ocamlgraph, unix, @ZIP@, @BZ2@" -+requires = "extlib, re.pcre, cudf, @OCAMLGRAPH@, unix, @ZIP@, @BZ2@" - - package "common" ( - version = "@PACKAGE_VERSION@" diff --git a/misc/dose3/patches/patch-configure.ac b/misc/dose3/patches/patch-configure.ac deleted file mode 100644 index 5c94ba792c9..00000000000 --- a/misc/dose3/patches/patch-configure.ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2014/10/27 12:01:36 jaapb Exp $ - -Proper ocamlgraph detection ---- configure.ac.orig 2014-10-21 11:45:17.000000000 +0000 -+++ configure.ac -@@ -147,6 +147,7 @@ if test "$HAS_OCAMLGRAPH" = "yes" ; then - MLPACK_OCAMLGRAPH="Defaultgraphs Statistics Dominators Strongdeps Strongdeps_int Strongconflicts Strongconflicts_int" - DOC_OCAMLGRAPH="algo/Strongdeps algo/Strongconflicts algo/Strongdeps_int algo/Strongconflicts_int algo/Defaultgraphs algo/Statistics" - CONFIG_OCAMLGRAPH="-DHASOCAMLGRAPH" -+ OCAMLGRAPH=ocamlgraph - fi - - AC_ARG_WITH(curl, -@@ -286,6 +287,7 @@ AC_SUBST(MLPACK_OCAMLGRAPH) - AC_SUBST(DOC_OCAMLGRAPH) - AC_SUBST(PKG_OCAMLGRAPH) - AC_SUBST(CONFIG_OCAMLGRAPH) -+AC_SUBST(OCAMLGRAPH) - - AC_SUBST(PKG_CURL) - |