fix the build for ocaml-cairo to unlock coq

mostly from Yozo Toda

graphics/ocaml-cairo/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2020/06/09 17:34:14 chrisz Exp $
+# $OpenBSD: Makefile,v 1.7 2021/02/11 04:07:39 daniel Exp $
 
 COMMENT =	binding to cairo, a 2D vector graphics library
 CATEGORIES =	graphics
 
 GH_ACCOUNT =	Chris00
 GH_PROJECT =	ocaml-cairo
-GH_TAGNAME =	0.6.1
-REVISION =	2
+GH_TAGNAME =	0.6.2
 
 # LGPL 3.0
 PERMIT_PACKAGE = Yes
@@ -14,7 +13,8 @@ PERMIT_PACKAGE = Yes
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 c m z
+WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += z
 
 MODULES =	lang/ocaml
 

graphics/ocaml-cairo/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ocaml-cairo-0.6.1.tar.gz) = LUSStisx5xSnqY/PVLmKRq5fZDDrx/FiBWipooSYrRE=
-SIZE (ocaml-cairo-0.6.1.tar.gz) = 109786
+SHA256 (ocaml-cairo-0.6.2.tar.gz) = LASXjuL2RRFj9AsLxOM0zadWXIU36fUo+DUYS0L7QS4=
+SIZE (ocaml-cairo-0.6.2.tar.gz) = 109948

graphics/ocaml-cairo/patches/patch-cairo2_opam

@@ -0,0 +1,16 @@
+$OpenBSD: patch-cairo2_opam,v 1.1 2021/02/11 04:07:39 daniel Exp $
+
+we're not on dune 2.x yet
+
+Index: cairo2.opam
+--- cairo2.opam.orig
++++ cairo2.opam
+@@ -18,7 +18,7 @@ depends: [
+   "ocaml" {>= "4.02"}
+   "base-bigarray"
+   "dune"
+-  "dune-configurator"
++  "dune.configurator"
+   "conf-cairo"
+ ]
+ depopts: [

graphics/ocaml-cairo/patches/patch-config_dune

@@ -0,0 +1,13 @@
+$OpenBSD: patch-config_dune,v 1.1 2021/02/11 04:07:39 daniel Exp $
+
+we're not on dune 2.x yet
+
+Index: config/dune
+--- config/dune.orig
++++ config/dune
+@@ -2,4 +2,4 @@
+ (executable
+  (name      discover)
+  (modules   discover)
+- (libraries dune-configurator str))
++ (libraries dune.configurator str))