Updated package to latest version, 0.9. Changes include:

2017-03-21  Stefano Zacchiroli  <zack@upsilon.cc>
* ALL release 0.9
* Build: remove spurious dependencies on no longer used camlp4
* Makefile: fix build issues on Windows

4 files changed, 23 insertions, 22 deletions

diff --git a/misc/ocaml-cudf/Makefile b/misc/ocaml-cudf/Makefile
index cd2c295939f..0faaa860e69 100644
--- a/misc/ocaml-cudf/Makefile
+++ b/misc/ocaml-cudf/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/12/30 11:17:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/11 10:29:58 jaapb Exp $
 
-DISTNAME=	cudf-0.8
+DISTNAME=	cudf-0.9
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	misc
-MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/34659/
+MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/36602/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://gforge.inria.fr/projects/cudf
@@ -26,5 +25,4 @@ BUILD_TARGET+=	opt
 
 .include "../../devel/ocaml-extlib/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../lang/camlp4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ocaml-cudf/buildlink3.mk b/misc/ocaml-cudf/buildlink3.mk
index ceb6f2ba050..7bde0d557c2 100644
--- a/misc/ocaml-cudf/buildlink3.mk
+++ b/misc/ocaml-cudf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/06/17 16:15:48 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:29:58 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-cudf
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-cudf
 OCAML_CUDF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cudf+=	ocaml-cudf>=0.8
+BUILDLINK_ABI_DEPENDS.ocaml-cudf+=	ocaml-cudf>=0.9
 BUILDLINK_PKGSRCDIR.ocaml-cudf?=	../../misc/ocaml-cudf
 
 .include "../../devel/ocaml-extlib/buildlink3.mk"
diff --git a/misc/ocaml-cudf/distinfo b/misc/ocaml-cudf/distinfo
index faa94031c02..8f8c1b5d0c8 100644
--- a/misc/ocaml-cudf/distinfo
+++ b/misc/ocaml-cudf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/06/17 16:15:48 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/07/11 10:29:58 jaapb Exp $
 
-SHA1 (cudf-0.8.tar.gz) = 34233ffc70e706a70637f406106ed0e7c1d8c7c0
-RMD160 (cudf-0.8.tar.gz) = 2930da6a6c7ac0ccfedd187020a51d09fdcf51e4
-SHA512 (cudf-0.8.tar.gz) = cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
-Size (cudf-0.8.tar.gz) = 55147 bytes
-SHA1 (patch-Makefile) = d313a5a0b2c6bce9f2343971b165c94067a3733c
+SHA1 (cudf-0.9.tar.gz) = 8c80ce408f835b515d737eadacd05d3fbd3a9777
+RMD160 (cudf-0.9.tar.gz) = 7dc937302f21fd31edd19e836a9fae95c97e25b0
+SHA512 (cudf-0.9.tar.gz) = 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
+Size (cudf-0.9.tar.gz) = 55124 bytes
+SHA1 (patch-Makefile) = 0ebf08d2dc4cadee01eb796613aeedae6612cecd
diff --git a/misc/ocaml-cudf/patches/patch-Makefile b/misc/ocaml-cudf/patches/patch-Makefile
index f813acd0ad4..8938060050d 100644
--- a/misc/ocaml-cudf/patches/patch-Makefile
+++ b/misc/ocaml-cudf/patches/patch-Makefile
@@ -1,24 +1,26 @@
-$NetBSD: patch-Makefile,v 1.2 2016/06/17 16:15:48 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/07/11 10:29:58 jaapb Exp $
 
 Correct installation procedure
---- Makefile.orig	2014-04-29 18:52:44.000000000 +0000
+--- Makefile.orig	2017-03-21 14:39:23.000000000 +0000
 +++ Makefile
-@@ -18,13 +18,13 @@ OCAMLBUILD = ocamlbuild
+@@ -25,14 +25,14 @@ OCAMLBUILD = ocamlbuild
  OBFLAGS =
  OCAMLFIND = ocamlfind
  
 -ifeq ($(DESTDIR),)
-+# ifeq ($(DESTDIR),)
++#ifeq ($(DESTDIR),)
  INSTALL = $(OCAMLFIND) install
  UNINSTALL = $(OCAMLFIND) remove
 -else
--INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIBDIR)
--UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)/$(OCAMLLIBDIR)
+-DESTDIR:=$(DESTDIR)/
+-INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)$(OCAMLLIBDIR)
+-UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)$(OCAMLLIBDIR)
 -endif
-+# else
-+# INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIBDIR)
-+# UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)/$(OCAMLLIBDIR)
-+# endif
++#else
++#DESTDIR:=$(DESTDIR)/
++#INSTALL = $(OCAMLFIND) install -destdir $(DESTDIR)$(OCAMLLIBDIR)
++#UNINSTALL = $(OCAMLFIND) remove -destdir $(DESTDIR)$(OCAMLLIBDIR)
++#endif
  
  DIST_DIR = $(NAME)-$(VERSION)
  DIST_TARBALL = $(DIST_DIR).tar.gz