Fix build with newer lablgtk. With help from dholland.

4 files changed, 43 insertions, 1 deletions

diff --git a/devel/monotone-viz/distinfo b/devel/monotone-viz/distinfo
index 1a084a0efd6..3058554104b 100644
--- a/devel/monotone-viz/distinfo
+++ b/devel/monotone-viz/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/05/07 04:15:56 bjs Exp $
+$NetBSD: distinfo,v 1.7 2009/02/17 19:16:29 joerg Exp $
 
 SHA1 (monotone-viz-1.0.1-nolablgtk.tar.gz) = 68bce1e401fe7f0212152969ea1268026e1dcc7c
 RMD160 (monotone-viz-1.0.1-nolablgtk.tar.gz) = 21e0a5d946d1b73cb05322a00d2cd236d5d2b42f
 Size (monotone-viz-1.0.1-nolablgtk.tar.gz) = 97972 bytes
+SHA1 (patch-aa) = 5fca1fa18cc247c3f8c62469b1f79dffc7fcf9bc
+SHA1 (patch-ab) = c765bd1bb0e11d5a16e08f72ab1d64c8198a7db3
+SHA1 (patch-ac) = 84d4281fdf0bd5b7f6e173c55b4deb219c9bf6d9
diff --git a/devel/monotone-viz/patches/patch-aa b/devel/monotone-viz/patches/patch-aa
new file mode 100644
index 00000000000..6979e14ae38
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.7 2009/02/17 19:16:29 joerg Exp $
+
+--- glib/ocaml-giochannel.c.orig	2009-02-17 19:40:17.000000000 +0100
++++ glib/ocaml-giochannel.c
+@@ -134,7 +134,7 @@ check_substring (value s, gsize off, gsi
+ #endif
+ 
+ CAMLprim value
+-ml_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
++my_ml_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
+ {
+   CAMLparam1(s);
+   GError *err = NULL;
diff --git a/devel/monotone-viz/patches/patch-ab b/devel/monotone-viz/patches/patch-ab
new file mode 100644
index 00000000000..5d524b62f43
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2009/02/17 19:16:29 joerg Exp $
+
+--- glib/giochannel.ml.orig	2009-02-17 19:39:55.000000000 +0100
++++ glib/giochannel.ml
+@@ -24,7 +24,7 @@ external new_file : string -> string -> 
+ 
+ external read_chars : t -> ?off:int -> ?len:int -> string -> 
+   [ `NORMAL of int | `AGAIN | `EOF]
+-  = "ml_g_io_channel_read_chars"
++  = "my_ml_g_io_channel_read_chars"
+ external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> 
+   [ `NORMAL of int | `AGAIN]
+   = "ml_g_io_channel_write_chars"
diff --git a/devel/monotone-viz/patches/patch-ac b/devel/monotone-viz/patches/patch-ac
new file mode 100644
index 00000000000..ecaa5b68b67
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/02/17 19:16:29 joerg Exp $
+
+--- glib/giochannel.mli.orig	2009-02-17 19:44:51.000000000 +0100
++++ glib/giochannel.mli
+@@ -20,7 +20,7 @@ external new_file : string -> string -> 
+ 
+ external read_chars : t -> ?off:int -> ?len:int -> string -> 
+   [ `NORMAL of int | `AGAIN | `EOF]
+-  = "ml_g_io_channel_read_chars"
++  = "my_ml_g_io_channel_read_chars"
+ (** @raise Error .
+     @raise Glib.Convert.Error .*)
+ external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string ->