Updated package to its latest version, 1.0.2. Similarly, added patches

(shamelessly purloined from the Debian package) to make the package
compile with ocaml 4.02.

Changes in the new version:
- compile fix for recent lablgtk releases
- do not crash the application with an unreadable style file

13 files changed, 349 insertions, 49 deletions

diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 8fc1a1550d8..34a0ca4b36f 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2015/08/07 11:20:33 jaapb Exp $
+# $NetBSD: Makefile,v 1.72 2015/08/09 13:21:42 jaapb Exp $
 #
 
-DISTNAME=		monotone-viz-1.0.1-nolablgtk
+DISTNAME=		monotone-viz-1.0.2-nolablgtk
 PKGNAME=		${DISTNAME:S/-nolablgtk//}
-PKGREVISION=		49
 CATEGORIES=		devel scm
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/devel/monotone-viz/distinfo b/devel/monotone-viz/distinfo
index 3058554104b..785eb052ba1 100644
--- a/devel/monotone-viz/distinfo
+++ b/devel/monotone-viz/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.7 2009/02/17 19:16:29 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/08/09 13:21:42 jaapb 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
+SHA1 (monotone-viz-1.0.2-nolablgtk.tar.gz) = cebc1e9266ab69f05804cd7b7fe9ca3e4a6eb98f
+RMD160 (monotone-viz-1.0.2-nolablgtk.tar.gz) = 358057a826651bb69f7b82aaad04c2fb3ef98788
+Size (monotone-viz-1.0.2-nolablgtk.tar.gz) = 99263 bytes
+SHA1 (patch-Makefile) = c84d9c567a331e71ce2b06d01e3c2c124ac0f48b
+SHA1 (patch-app.ml) = 80e0f9459d6170989e687da9c54c576cb24f1be9
+SHA1 (patch-app.mli) = 3c2074c7f65b98c814cfacc85e30cbb9193b0e9a
+SHA1 (patch-app_types.mli) = 84916b04f1360f4fc6aa9e73be6f910ea455afed
+SHA1 (patch-query.mli) = a661d6a17f3a18eeecdcc68260dbe8bf72fa56dd
+SHA1 (patch-ui.mli) = afc7e413ba7a9eac946cad3286de6c121403f0c7
+SHA1 (patch-unidiff.mli) = a8a6666b71e0bd31bcc363906170b346a7d51ead
+SHA1 (patch-view.mli) = d994ff3d2bce5865399a7ff5ec4c556a25e98f8f
diff --git a/devel/monotone-viz/patches/patch-Makefile b/devel/monotone-viz/patches/patch-Makefile
new file mode 100644
index 00000000000..521ec6e3647
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-Makefile
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Added app_types module.
+--- Makefile.orig	2009-12-07 23:43:26.000000000 +0000
++++ Makefile
+@@ -19,7 +19,7 @@ SRC = glib/gspawn.ml glib/gspawn.mli gli
+       agraph.ml agraph.mli \
+       autocolor.ml autocolor.mli viz_style.ml viz_style.mli \
+       version.ml icon.ml ui.ml ui.mli unidiff.ml unidiff.mli \
+-      view.ml view.mli query.ml query.mli app.ml app.mli main.ml
++      view.ml view.mli query.ml query.mli app.ml app.mli app_types.mli main.ml
+ 
+ C_OBJ = glib/ocaml-gspawn.o glib/ocaml-giochannel.o \
+         glib/ocaml-misc.o glib/ocaml-gdate.o glib/ocaml-gpattern.o \
+@@ -39,7 +39,7 @@ DISTSRC = Makefile configure.ac config.m
+           basic_io_lexer.mll basic_io_lexer.mli revision.mli revision.ml \
+           components.ml automate.mli automate.ml monotone.mli monotone.ml agraph.ml agraph.mli \
+           unidiff.ml unidiff.mli gnomecanvas_hack.c view.ml view.mli \
+-          query.ml query.mli app.mli app.ml main.ml \
++          query.ml query.mli app.mli app.ml app_types.mli  main.ml \
+           glib/gspawn.ml glib/gspawn.mli glib/giochannel.ml glib/giochannel.mli \
+           glib/viz_gmisc.ml glib/gpattern.ml \
+           glib/ocaml-gspawn.c glib/ocaml-giochannel.c \
diff --git a/devel/monotone-viz/patches/patch-aa b/devel/monotone-viz/patches/patch-aa
deleted file mode 100644
index 6979e14ae38..00000000000
--- a/devel/monotone-viz/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 5d524b62f43..00000000000
--- a/devel/monotone-viz/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index ecaa5b68b67..00000000000
--- a/devel/monotone-viz/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 -> 
diff --git a/devel/monotone-viz/patches/patch-app.ml b/devel/monotone-viz/patches/patch-app.ml
new file mode 100644
index 00000000000..25383e09ce5
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-app.ml
@@ -0,0 +1,63 @@
+$NetBSD: patch-app.ml,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- app.ml.orig	2007-05-14 20:25:49.000000000 +0000
++++ app.ml
+@@ -1,56 +1,4 @@
+-class type status = 
+-  object
+-    method push           : string -> unit
+-    method pop            : unit -> unit
+-    method progress_start : string -> int -> unit
+-    method progress       : int -> unit
+-    method progress_end   : unit -> unit
+-    method with_status    : string -> (unit -> 'a) -> 'a
+-  end
+-
+-class type t =
+-    object
+-      method get_mtn : Monotone.t option
+-      method get_agraph : Agraph.t option
+-      method get_prefs : Viz_style.prefs
+-      method get_toplevel : GWindow.window
+-
+-      method set_prefs : Viz_style.prefs -> unit
+-
+-      method open_db : ?id:string -> ?branch:string -> string -> unit
+-      method close_db : unit -> unit
+-      method finalize  : unit -> unit
+-      method display_certs : string -> unit
+-      method focus_find_entry : unit -> unit
+-      method get_current_cert_value : string option 
+-      method reload : unit -> unit
+-      method zoom_in : unit -> unit
+-      method zoom_out : unit -> unit
+-      method re_layout : unit -> unit
+-      method redraw : unit -> unit
+-      method query : Viz_types.select_info -> unit
+-      method get_selected_node : string option
+-      method find : string -> unit
+-      method switch_branch : string * string -> unit
+-      method update_begin : unit
+-      method update_end : unit
+-      method center_on :string * Viz_types.c_node -> unit
+-      method center_on_by_id : string -> unit
+-      method view_popup : string * int -> unit
+-      method cert_popup : int -> unit
+-
+-      method show_open : unit -> unit
+-      method show_view : unit -> unit
+-      method show_search : unit -> unit
+-      method show_prefs : unit -> unit
+-      method show_diff : string -> string -> unit
+-
+-      method status : string -> status
+-
+-      method error_notice : string -> unit
+-    end
+-
+-
++open App_types
+ open Viz_misc
+ 
+ class ctrl w ~prefs ~manager ~status ~view : t =
diff --git a/devel/monotone-viz/patches/patch-app.mli b/devel/monotone-viz/patches/patch-app.mli
new file mode 100644
index 00000000000..2a0a83fb78f
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-app.mli
@@ -0,0 +1,60 @@
+$NetBSD: patch-app.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- app.mli.orig	2007-05-14 20:25:42.000000000 +0000
++++ app.mli
+@@ -1,53 +1,3 @@
+-class type status = 
+-  object
+-    method push           : string -> unit
+-    method pop            : unit -> unit
+-    method progress_start : string -> int -> unit
+-    method progress       : int -> unit
+-    method progress_end   : unit -> unit
+-    method with_status    : string -> (unit -> 'a) -> 'a
+-  end
+-
+-class type t =
+-    object
+-      method get_mtn : Monotone.t option
+-      method get_agraph : Agraph.t option
+-      method get_prefs : Viz_style.prefs
+-      method get_toplevel : GWindow.window
+-
+-      method set_prefs : Viz_style.prefs -> unit
+-
+-      method open_db : ?id:string -> ?branch:string -> string -> unit
+-      method close_db : unit -> unit
+-      method finalize  : unit -> unit
+-      method display_certs : string -> unit
+-      method focus_find_entry : unit -> unit
+-      method get_current_cert_value : string option 
+-      method reload : unit -> unit
+-      method zoom_in : unit -> unit
+-      method zoom_out : unit -> unit
+-      method re_layout : unit -> unit
+-      method redraw : unit -> unit
+-      method query : Viz_types.select_info -> unit
+-      method get_selected_node : string option
+-      method find : string -> unit
+-      method switch_branch : string * string -> unit
+-      method update_begin : unit
+-      method update_end : unit
+-      method center_on :string * Viz_types.c_node -> unit
+-      method center_on_by_id : string -> unit
+-      method view_popup : string * int -> unit
+-      method cert_popup : int -> unit
+-
+-      method show_open : unit -> unit
+-      method show_view : unit -> unit
+-      method show_search : unit -> unit
+-      method show_prefs : unit -> unit
+-      method show_diff : string -> string -> unit
+-
+-      method status : string -> status
+-
+-      method error_notice : string -> unit
+-    end
++open App_types
+ 
+ val make : GWindow.window -> aa:bool -> prefs:Viz_style.prefs -> t
diff --git a/devel/monotone-viz/patches/patch-app_types.mli b/devel/monotone-viz/patches/patch-app_types.mli
new file mode 100644
index 00000000000..53a6ba056c3
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-app_types.mli
@@ -0,0 +1,57 @@
+$NetBSD: patch-app_types.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- /dev/null	2015-08-09 12:54:30.000000000 +0000
++++ app_types.mli
+@@ -0,0 +1,51 @@
++class type status = 
++  object
++    method push           : string -> unit
++    method pop            : unit -> unit
++    method progress_start : string -> int -> unit
++    method progress       : int -> unit
++    method progress_end   : unit -> unit
++    method with_status    : string -> (unit -> 'a) -> 'a
++  end
++
++class type t =
++    object
++      method get_mtn : Monotone.t option
++      method get_agraph : Agraph.t option
++      method get_prefs : Viz_style.prefs
++      method get_toplevel : GWindow.window
++
++      method set_prefs : Viz_style.prefs -> unit
++
++      method open_db : ?id:string -> ?branch:string -> string -> unit
++      method close_db : unit -> unit
++      method finalize  : unit -> unit
++      method display_certs : string -> unit
++      method focus_find_entry : unit -> unit
++      method get_current_cert_value : string option 
++      method reload : unit -> unit
++      method zoom_in : unit -> unit
++      method zoom_out : unit -> unit
++      method re_layout : unit -> unit
++      method redraw : unit -> unit
++      method query : Viz_types.select_info -> unit
++      method get_selected_node : string option
++      method find : string -> unit
++      method switch_branch : string * string -> unit
++      method update_begin : unit
++      method update_end : unit
++      method center_on :string * Viz_types.c_node -> unit
++      method center_on_by_id : string -> unit
++      method view_popup : string * int -> unit
++      method cert_popup : int -> unit
++
++      method show_open : unit -> unit
++      method show_view : unit -> unit
++      method show_search : unit -> unit
++      method show_prefs : unit -> unit
++      method show_diff : string -> string -> unit
++
++      method status : string -> status
++
++      method error_notice : string -> unit
++    end
diff --git a/devel/monotone-viz/patches/patch-query.mli b/devel/monotone-viz/patches/patch-query.mli
new file mode 100644
index 00000000000..99ca435b1c4
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-query.mli
@@ -0,0 +1,12 @@
+$NetBSD: patch-query.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- query.mli.orig	2007-03-07 21:53:54.000000000 +0000
++++ query.mli
+@@ -1,5 +1,5 @@
+ type t
+-val make : #App.t -> t
++val make : #App_types.t -> t
+ 
+ val clear    : t -> unit
+ val activate : t -> unit
diff --git a/devel/monotone-viz/patches/patch-ui.mli b/devel/monotone-viz/patches/patch-ui.mli
new file mode 100644
index 00000000000..0cad45b1613
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-ui.mli
@@ -0,0 +1,52 @@
+$NetBSD: patch-ui.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- ui.mli.orig	2007-03-07 21:53:54.000000000 +0000
++++ ui.mli
+@@ -26,37 +26,37 @@ val category :
+ class status_bar :
+   packing:(GObj.widget -> unit) ->
+   string ->
+-  App.status
++  App_types.status
+ 
+ module Prefs : sig
+   val update_prefs :
+-    #App.t ->
++    #App_types.t ->
+     Viz_style.prefs -> Viz_style.prefs -> unit
+-  val show : #App.t -> unit -> unit
++  val show : #App_types.t -> unit -> unit
+ end
+ 
+ module Open : sig
+   type t
+-  val make : #App.t -> t
++  val make : #App_types.t -> t
+   val show : t -> string option
+ end
+ 
+ (*
+ module LockedDB : sig
+-  val show : #App.t -> [`FAIL | `RETRY]
++  val show : #App_types.t -> [`FAIL | `RETRY]
+ end
+ *)
+ 
+ type manager
+ val make  : unit -> manager * GObj.widget * GObj.widget
+-val setup : manager -> #App.t -> unit
++val setup : manager -> #App_types.t -> unit
+ 
+ val popup :
+-  manager -> #App.t ->
++  manager -> #App_types.t ->
+   popup_id:string -> int -> unit
+ val popup_cert : manager -> int -> unit
+-val open_db    : manager -> #App.t -> unit
+-val close_db   : manager -> #App.t -> unit
++val open_db    : manager -> #App_types.t -> unit
++val close_db   : manager -> #App_types.t -> unit
+ val clear      : manager -> unit
+ val update_begin : manager -> unit
+ 
diff --git a/devel/monotone-viz/patches/patch-unidiff.mli b/devel/monotone-viz/patches/patch-unidiff.mli
new file mode 100644
index 00000000000..04a323dfcbc
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-unidiff.mli
@@ -0,0 +1,8 @@
+$NetBSD: patch-unidiff.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- unidiff.mli.orig	2007-03-07 21:53:54.000000000 +0000
++++ unidiff.mli
+@@ -1 +1 @@
+-val show : #App.t -> string -> string -> unit
++val show : #App_types.t -> string -> string -> unit
diff --git a/devel/monotone-viz/patches/patch-view.mli b/devel/monotone-viz/patches/patch-view.mli
new file mode 100644
index 00000000000..51231c7275a
--- /dev/null
+++ b/devel/monotone-viz/patches/patch-view.mli
@@ -0,0 +1,60 @@
+$NetBSD: patch-view.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $
+
+Moved classes to separate module for ocaml 4.02.
+--- view.mli.orig	2007-03-07 21:53:54.000000000 +0000
++++ view.mli
+@@ -1,7 +1,7 @@
+ module Info_Display :
+   sig
+     type t
+-    val fetch_and_display_data : t -> #App.t -> string -> unit
++    val fetch_and_display_data : t -> #App_types.t -> string -> unit
+     val get_current_cert_value : t -> string option
+   end
+ 
+@@ -10,23 +10,23 @@ module Branch_selector :
+     type t
+     type state
+     val get_state  : t -> state
+-    val set_state  : t -> #App.t -> ?id:string -> state -> unit
+-    val set_branch : t -> #App.t -> ?id:string -> string -> unit
++    val set_state  : t -> #App_types.t -> ?id:string -> state -> unit
++    val set_branch : t -> #App_types.t -> ?id:string -> string -> unit
+     val present_dialog : t -> unit
+   end
+ 
+ module Canvas :
+   sig
+     type t
+-    val zoom : t -> #App.t -> [< `IN | `OUT ] -> unit -> unit
+-    val id_size : t -> #App.t -> int * int * int
+-    val center_on : t -> #App.t -> string * Viz_types.c_node -> unit
++    val zoom : t -> #App_types.t -> [< `IN | `OUT ] -> unit -> unit
++    val id_size : t -> #App_types.t -> int * int * int
++    val center_on : t -> #App_types.t -> string * Viz_types.c_node -> unit
+   end
+ 
+ module Find :
+   sig
+     type t
+-    val locate : t -> #App.t -> string -> unit
++    val locate : t -> #App_types.t -> string -> unit
+     val focus_find_entry : t -> unit
+   end
+ 
+@@ -42,10 +42,10 @@ val make : 
+   parent:#GWindow.window_skel ->
+   pack_find_entry:(GObj.widget -> unit) ->
+   pack_canvas:(GObj.widget -> unit) -> t
+-val setup : t -> #App.t -> unit
++val setup : t -> #App_types.t -> unit
+ 
+-val clear    : t -> #App.t -> unit
+-val close_db : t -> #App.t -> unit
+-val open_db  : t -> #App.t -> unit
+-val update   : t -> #App.t -> string option -> unit
++val clear    : t -> #App_types.t -> unit
++val close_db : t -> #App_types.t -> unit
++val open_db  : t -> #App_types.t -> unit
++val update   : t -> #App_types.t -> string option -> unit
+ val get_selected_node : t -> string option