Update to 2.14.1, with additional patches from upstream to build with

ocaml-3.12. Set LICENSE. Add gtksourceview2 option; disable (default off)
glade option, since it currently doesn't build.

In Lablgtk-2.14.1:

2010.05.20 [Jacques]
  * update unison patch to 2.40.16 (for Quartz users)

2010.05.18 [Jacques]
  * rename gtkSignal.ml to gtkSignal.ml4 and fix depend target
  * move Glib.Utf8 code to gutf8.ml, so that it can be used in xml_lexer
    to fix a bug report by Pascal Brisset (multibyte entities of the form
    ● in glade files).

2010.04.08 [Jacques]
  * remove useless methods (discovered by ocaml 3.12)

2010.01.14 [Benjamin]
  * Apply patch from Mike Spivey to support get_visible range in Gtree
  * Fixed incorrect target labgtkspell.cmxs in Makefile

2009.10.01 [Jacques]
  * Correct wrong module name SourceViewEnums -> SourceView2Enums

In Lablgtk-2.14.0:

2009.09.25 [Jacques]
  * Ensure compilation under windows

2009.09.22 [Benjamin]
  * Restore compatibility with pre-3.11 OCaml versions

2009.09.01 [Benjamin]
  * Apply patch from Mike Spivey:
    * Access to StyleSchemeManager objects
    * Some attributes are strings and not string options.  This seems
      sensible.
    * Languages and style schemes are treated alike in creating buffers:
      both arguments are wrapped.
    * draw_spaces deals with a list of flags, not a single flag.
    * Mark categories can have priorities, icons and backgrounds
    * Some attributes of languages are accessed by methods instead of
      properties to work around a GTK bug.

2009.09.01 [Benjamin]
  * Support for GtkSourceView 2.6 in library "lablgtksourceview2"
  * Support for GtkSourceView 1.x is still available in library
    "lablgtksourceview" but it is no longer linked into the lablgtk2
    default toplevel as it is not linkable with "lablgtksourceview2".

2009.05.21 [Jacques]
  * Apply Anil Madhavapeddy patch for lablgladecc2 -hide-default

2009.05.18 [Benjamin]
  * Make and install dynamic cmxs objects when available.
  * Fix compilation bug for ml_panel.c (Richard Jones message of 2009-02-06)

2009.05.12 [Jacques]
  * Merge new tooltip support from Moutinho's branch r1365
    (sorry for 1.5y delay...)
  * Merge tree DND from Moutinho's branch r1387 (1y delay...)

2009.05.08 [Jacques]
  * Add Gdk.Windowing.platform for platform dependent applications
  * Fix bug in Clist.set_pixmap when no mask given

2009.04.20 [Jacques]
  * Print backtrace if available when exception raised in signal callback.
    Requires ocaml 3.11. (suggested by Bart Jacobs)
  * Use "val virtual obj" in generated code. Requires ocaml 3.10.

2009.03.19 [Jacques]
  * In GtkAboutDialog, change internal property from "name" to "program-name"
    if version >= 2.12. The OO interface is left unchanged, since there is
    no conflict with #misc#name anyway.

2009.02.09 [Benjamin]
  * fix linking bug for older than 2.2 Gtk with g_io_channel_read_chars

2009.01.20 [Benjamin]
  * change handling of non existent properties.
    [Not_found] is no longer raised and [Invalid_argument prop_name] is
    used instead.
    No exception is raised by unknown dynamic property setters and a GLib
    warning is emitted.
    See the comments in src/gobject.mli in the local Property module.

2009.01.13 [Benjamin]
  * fix compilation issues with Gtk 2.4

14 files changed, 326 insertions, 32 deletions

diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 97d0c849222..ed7a208106a 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/08/28 16:13:25 wiz Exp $
 #
 
-DISTNAME=	lablgtk-2.12.0
-PKGREVISION=	3
+DISTNAME=	lablgtk-2.14.1
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 COMMENT=	GTK+ 2.x bindings for Objective Caml
+# for installed files; more restrictions on applications/
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST
index 219498ecc3c..126a5436b05 100644
--- a/x11/lablgtk/PLIST
+++ b/x11/lablgtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:24:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/08/28 16:13:25 wiz Exp $
 bin/gdk_pixbuf_mlsource
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
@@ -73,6 +73,7 @@ lib/ocaml/lablgtk2/gRange.cmx
 lib/ocaml/lablgtk2/gRange.ml
 lib/ocaml/lablgtk2/gRange.mli
 lib/ocaml/lablgtk2/gSourceView.mli
+lib/ocaml/lablgtk2/gSourceView2.mli
 lib/ocaml/lablgtk2/gText.cmi
 lib/ocaml/lablgtk2/gText.cmx
 lib/ocaml/lablgtk2/gText.ml
@@ -194,6 +195,7 @@ lib/ocaml/lablgtk2/gtkSignal.cmi
 lib/ocaml/lablgtk2/gtkSignal.cmx
 lib/ocaml/lablgtk2/gtkSignal.ml
 lib/ocaml/lablgtk2/gtkSignal.mli
+lib/ocaml/lablgtk2/gtkSourceView2_types.mli
 lib/ocaml/lablgtk2/gtkSourceView_types.mli
 lib/ocaml/lablgtk2/gtkSpell.mli
 lib/ocaml/lablgtk2/gtkStock.cmi
@@ -202,6 +204,7 @@ lib/ocaml/lablgtk2/gtkStock.ml
 lib/ocaml/lablgtk2/gtkText.cmi
 lib/ocaml/lablgtk2/gtkText.cmx
 lib/ocaml/lablgtk2/gtkText.ml
+lib/ocaml/lablgtk2/gtkThInit.cmi
 lib/ocaml/lablgtk2/gtkThInit.cmo
 lib/ocaml/lablgtk2/gtkThInit.ml
 lib/ocaml/lablgtk2/gtkThread.cmi
@@ -217,9 +220,14 @@ lib/ocaml/lablgtk2/gtkWindow.cmi
 lib/ocaml/lablgtk2/gtkWindow.cmx
 lib/ocaml/lablgtk2/gtkWindow.ml
 lib/ocaml/lablgtk2/gtk_tags.h
+lib/ocaml/lablgtk2/gutf8.cmi
+lib/ocaml/lablgtk2/gutf8.cmx
+lib/ocaml/lablgtk2/gutf8.ml
+lib/ocaml/lablgtk2/gutf8.mli
 lib/ocaml/lablgtk2/lablgtk.a
 lib/ocaml/lablgtk2/lablgtk.cma
 lib/ocaml/lablgtk2/lablgtk.cmxa
+lib/ocaml/lablgtk2/lablgtk.cmxs
 lib/ocaml/lablgtk2/lablgtktop
 lib/ocaml/lablgtk2/liblablgtk2.a
 lib/ocaml/lablgtk2/ml_domain.h
diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview
index 19d512690a5..e3bf97beb96 100644
--- a/x11/lablgtk/PLIST.gtksourceview
+++ b/x11/lablgtk/PLIST.gtksourceview
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtksourceview,v 1.2 2008/04/12 22:43:14 jlam Exp $
+@comment $NetBSD: PLIST.gtksourceview,v 1.3 2010/08/28 16:13:25 wiz Exp $
 lib/ocaml/lablgtk2/gSourceView.cmi
 lib/ocaml/lablgtk2/gSourceView.cmx
 lib/ocaml/lablgtk2/gSourceView.ml
@@ -8,6 +8,7 @@ lib/ocaml/lablgtk2/gtkSourceView.ml
 lib/ocaml/lablgtk2/lablgtksourceview.a
 lib/ocaml/lablgtk2/lablgtksourceview.cma
 lib/ocaml/lablgtk2/lablgtksourceview.cmxa
+lib/ocaml/lablgtk2/lablgtksourceview.cmxs
 lib/ocaml/lablgtk2/liblablgtksourceview.a
 lib/ocaml/lablgtk2/sourceViewEnums.cmi
 lib/ocaml/lablgtk2/sourceViewEnums.cmx
diff --git a/x11/lablgtk/PLIST.gtksourceview2 b/x11/lablgtk/PLIST.gtksourceview2
new file mode 100644
index 00000000000..15ca6337979
--- /dev/null
+++ b/x11/lablgtk/PLIST.gtksourceview2
@@ -0,0 +1,17 @@
+@comment $NetBSD: PLIST.gtksourceview2,v 1.1 2010/08/28 16:13:25 wiz Exp $
+lib/ocaml/lablgtk2/gSourceView2.cmi
+lib/ocaml/lablgtk2/gSourceView2.cmx
+lib/ocaml/lablgtk2/gSourceView2.ml
+lib/ocaml/lablgtk2/gtkSourceView2.cmi
+lib/ocaml/lablgtk2/gtkSourceView2.cmx
+lib/ocaml/lablgtk2/gtkSourceView2.ml
+lib/ocaml/lablgtk2/lablgtksourceview2.a
+lib/ocaml/lablgtk2/lablgtksourceview2.cma
+lib/ocaml/lablgtk2/lablgtksourceview2.cmxa
+lib/ocaml/lablgtk2/lablgtksourceview2.cmxs
+lib/ocaml/lablgtk2/liblablgtksourceview2.a
+lib/ocaml/lablgtk2/sourceView2Enums.cmi
+lib/ocaml/lablgtk2/sourceView2Enums.cmx
+lib/ocaml/lablgtk2/sourceView2Enums.ml
+lib/ocaml/lablgtk2/sourceView2_tags.h
+lib/ocaml/stublibs/dlllablgtksourceview2.so
diff --git a/x11/lablgtk/PLIST.gtkspell b/x11/lablgtk/PLIST.gtkspell
index 2bdb9c358c6..415382130b1 100644
--- a/x11/lablgtk/PLIST.gtkspell
+++ b/x11/lablgtk/PLIST.gtkspell
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST.gtkspell,v 1.1 2008/12/28 13:10:29 adrianp Exp $
+@comment $NetBSD: PLIST.gtkspell,v 1.2 2010/08/28 16:13:25 wiz Exp $
 lib/ocaml/lablgtk2/gtkSpell.cmi
 lib/ocaml/lablgtk2/gtkSpell.cmx
 lib/ocaml/lablgtk2/gtkSpell.ml
 lib/ocaml/lablgtk2/lablgtkspell.a
 lib/ocaml/lablgtk2/lablgtkspell.cma
 lib/ocaml/lablgtk2/lablgtkspell.cmxa
+lib/ocaml/lablgtk2/lablgtkspell.cmxs
 lib/ocaml/lablgtk2/liblablgtkspell.a
 ${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so
diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg
index a095d86dab6..ab236619ef2 100644
--- a/x11/lablgtk/PLIST.svg
+++ b/x11/lablgtk/PLIST.svg
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.svg,v 1.3 2009/03/05 07:13:01 wiz Exp $
+@comment $NetBSD: PLIST.svg,v 1.4 2010/08/28 16:13:25 wiz Exp $
 lib/ocaml/lablgtk2/lablrsvg.a
 lib/ocaml/lablgtk2/lablrsvg.cma
 lib/ocaml/lablgtk2/lablrsvg.cmxa
+lib/ocaml/lablgtk2/lablrsvg.cmxs
 lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/rsvg.cmi
 lib/ocaml/lablgtk2/rsvg.cmx
diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo
index 944f0cad801..0e727629327 100644
--- a/x11/lablgtk/distinfo
+++ b/x11/lablgtk/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.14 2009/07/06 22:42:24 joerg Exp $
+$NetBSD: distinfo,v 1.15 2010/08/28 16:13:25 wiz Exp $
 
-SHA1 (lablgtk-2.12.0.tar.gz) = fe3a6499bf28be21d723e379e2e9a4d7b4798baa
-RMD160 (lablgtk-2.12.0.tar.gz) = b64f17545e797d5b94e7d23ed02d6ef751485803
-Size (lablgtk-2.12.0.tar.gz) = 789731 bytes
-SHA1 (patch-aa) = 613dc2ffbc245b0593df8c500673e19ed1de1554
-SHA1 (patch-ab) = 6c4709e84ca423e92ee46c7d728750de0ea3e062
+SHA1 (lablgtk-2.14.1.tar.gz) = d0fb6185f210c6b106c250d1a85541b7da402310
+RMD160 (lablgtk-2.14.1.tar.gz) = efa0c1446d03f4deb90656586d479d2b32e110da
+Size (lablgtk-2.14.1.tar.gz) = 777615 bytes
+SHA1 (patch-aa) = 193a906174c4f48c404a6b8bf045d7b6d1fe85c3
+SHA1 (patch-ab) = 99cb8e22474fef51d2ce72ed32d8c6fd01d0e7e5
+SHA1 (patch-ac) = 045fb704c746de7485f196625eafbc0eb589d194
+SHA1 (patch-ad) = 41dbe672e0981d440e73b1f27fccd9ab5cfffdc6
+SHA1 (patch-ae) = 95bce37b63ecbfbe3d09443975a20c49839c4eb5
+SHA1 (patch-af) = 2604d83fd852f9b43838e0131d47b95374e34168
diff --git a/x11/lablgtk/options.mk b/x11/lablgtk/options.mk
index ae3a007f166..b96fc568350 100644
--- a/x11/lablgtk/options.mk
+++ b/x11/lablgtk/options.mk
@@ -1,12 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2009/09/11 14:22:07 tonio Exp $
+# $NetBSD: options.mk,v 1.7 2010/08/28 16:13:25 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lablgtk
-PKG_SUPPORTED_OPTIONS=	glade gnomecanvas gtksourceview svg gtkspell
-PKG_SUGGESTED_OPTIONS=	gnomecanvas gtksourceview svg gtkspell
+PKG_SUPPORTED_OPTIONS=	gnomecanvas gtksourceview gtksourceview2 gtkspell svg
+PKG_SUGGESTED_OPTIONS=	gnomecanvas gtksourceview gtksourceview2 gtkspell svg
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mglade)
+# Error: Unbound module Xml_lexer
 .include "../../devel/libglade/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-glade
 PLIST_SRC+=		PLIST.glade
@@ -40,6 +41,14 @@ PLIST_SRC+=		PLIST.gtksourceview
 CONFIGURE_ARGS+=	--without-gtksourceview
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtksourceview2)
+.include "../../x11/gtksourceview2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gtksourceview2
+PLIST_SRC+=		PLIST.gtksourceview2
+.else
+CONFIGURE_ARGS+=	--without-gtksourceview2
+.endif
+
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-rsvg
diff --git a/x11/lablgtk/patches/patch-aa b/x11/lablgtk/patches/patch-aa
index 550d608a138..2bfd50653cf 100644
--- a/x11/lablgtk/patches/patch-aa
+++ b/x11/lablgtk/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2007/10/27 13:29:38 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2010/08/28 16:13:25 wiz Exp $
 
---- src/Makefile.orig	2007-09-25 10:56:49.000000000 +0000
+--- src/Makefile.orig	2010-05-20 07:55:54.000000000 +0000
 +++ src/Makefile
-@@ -285,9 +285,7 @@ install:
- 	cp $(CLIBS) "$(INSTALLDIR)"
- 	cd "$(INSTALLDIR)" && $(RANLIB) $(CLIBS)
- 	cp varcc$(XE) propcc$(XE) "$(INSTALLDIR)"
--	if test $(THREADS_LIB) != system || test $(HAS_DLL_SUPPORT) != yes; \
+@@ -345,9 +345,7 @@ install:
+ 	if test $(THREADS_LIB) != no; \
+ 	   then cp  $(ALLTHOBJS:.cmo=.cmi) "$(INSTALLDIR)"; \
+ 	fi
+-	if test $(THREADS_LIB) = vm || test $(HAS_DLL_SUPPORT) != yes; \
 -	   then cp lablgtktop$(XE) "$(INSTALLDIR)"; \
 -	fi
 +	cp lablgtktop$(XE) "$(INSTALLDIR)"
diff --git a/x11/lablgtk/patches/patch-ab b/x11/lablgtk/patches/patch-ab
index 638fe39e8e3..5cae7c45ddd 100644
--- a/x11/lablgtk/patches/patch-ab
+++ b/x11/lablgtk/patches/patch-ab
@@ -1,12 +1,150 @@
-$NetBSD: patch-ab,v 1.3 2009/07/06 22:42:24 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2010/08/28 16:13:25 wiz Exp $
 
---- src/ml_panel.c.orig	2010-05-31 16:31:03.000000000 +0200
-+++ src/ml_panel.c
-@@ -23,6 +23,7 @@
- #include <string.h>
+From
+http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
+for building against ocaml-3.12.*.
+
+--- src/gAction.mli.orig	2008-08-03 14:43:59.000000000 +0000
++++ src/gAction.mli
+@@ -20,6 +20,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++
++open Gobject
++
+ (** Action-based menus and toolbars *)
+ 
+ (** {3 GtkAction} *)
+@@ -27,9 +30,9 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action_signals :
+-  ([> Gtk.action ] as 'b) Gobject.obj ->
++  ([> Gtk.action ] as 'b) obj ->
+   object ('a)
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     val after : bool
+     method after : < after : 'a; .. > as 'a
+     method activate : callback:(unit -> unit) -> GtkSignal.id
+@@ -38,10 +41,10 @@ class action_signals :
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action_skel :
+-  ([> Gtk.action ] as 'a) Gobject.obj ->
++  ([> Gtk.action ] as 'a) obj ->
+   object
+-    val obj : 'a Gobject.obj
+-    method as_action : Gtk.action Gobject.obj
++    val obj : 'a obj
++    method as_action : Gtk.action obj
+ 
+     (** Properties *)
+ 
+@@ -88,10 +91,10 @@ class action_skel :
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action :
+-  ([> Gtk.action ] as 'a) Gobject.obj ->
++  ([> Gtk.action ] as 'a) obj ->
+   object
+     inherit action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method connect : action_signals
+   end
+ 
+@@ -103,20 +106,20 @@ val action : name:string -> unit -> acti
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action_signals :
+-  ([> Gtk.toggle_action ] as 'b) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'b) obj ->
+   object
+     inherit action_signals
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method toggled : callback:(unit -> unit) -> GtkSignal.id
+   end
  
- #include <libgnomeui/gnome-client.h>
-+#include <libgnomeui/gnome-ui-init.h>
- #include <panel-applet.h>
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action_skel :
+-  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'a) obj ->
+   object
+     inherit action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method draw_as_radio : bool
+     method get_active : bool
+     method set_active : bool -> unit
+@@ -127,9 +130,10 @@ class toggle_action_skel :
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action :
+-  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'a) obj ->
+   object
+     inherit toggle_action_skel
++    val obj : 'a obj
+     method connect : toggle_action_signals
+   end
  
- #include <caml/mlvalues.h>
+@@ -140,10 +144,10 @@ val toggle_action : name:string -> unit 
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkRadioAction *)
+ class radio_action_signals :
+-  ([> Gtk.radio_action] as 'b) Gobject.obj ->
++  ([> Gtk.radio_action] as 'b) obj ->
+   object
+     inherit toggle_action_signals
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method changed :
+       callback:(int -> unit) -> GtkSignal.id
+   end
+@@ -151,12 +155,12 @@ class radio_action_signals :
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkRadioAction *)
+ class radio_action :
+-  ([> Gtk.radio_action] as 'a) Gobject.obj ->
++  ([> Gtk.radio_action] as 'a) obj ->
+   object
+     inherit toggle_action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method connect : radio_action_signals
+-    method as_radio_action : Gtk.radio_action Gobject.obj
++    method as_radio_action : Gtk.radio_action obj
+     method get_current_value : int
+     method set_group : Gtk.radio_action Gtk.group -> unit
+     method set_value : int -> unit
+@@ -172,10 +176,10 @@ val radio_action : ?group:radio_action -
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkActionGroup *)
+ class action_group_signals :
+-  ([> Gtk.action_group ] as 'b) Gobject.obj ->
++  ([> Gtk.action_group ] as 'b) obj ->
+   object ('a)
+     val after : bool
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method after : 'a
+     method connect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
+     method disconnect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
+@@ -186,10 +190,10 @@ class action_group_signals :
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkActionGroup *)
+ class action_group :
+-  ([> Gtk.action_group ] as 'a) Gobject.obj ->
++  ([> Gtk.action_group ] as 'a) obj ->
+   object
+-    val obj : 'a Gobject.obj
+-    method as_group : Gtk.action_group Gobject.obj
++    val obj : 'a obj
++    method as_group : Gtk.action_group obj
+     method connect : action_group_signals
+     method sensitive : bool
+     method set_sensitive : bool -> unit
diff --git a/x11/lablgtk/patches/patch-ac b/x11/lablgtk/patches/patch-ac
new file mode 100644
index 00000000000..e2660296368
--- /dev/null
+++ b/x11/lablgtk/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2010/08/28 16:13:25 wiz Exp $
+
+From
+http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
+for building against ocaml-3.12.*.
+
+--- src/gButton.mli.orig	2008-08-03 14:43:59.000000000 +0000
++++ src/gButton.mli
+@@ -357,9 +357,10 @@ end
+ (** @gtkdoc gtk GtkToolItem 
+     @since GTK 2.4 *)
+ class tool_item : 
+-  [> Gtk.tool_item] obj ->
++  ([> Gtk.tool_item] as 'a) obj ->
+   object
+     inherit tool_item_skel
++    val obj : 'a obj
+     method connect : GContainer.container_signals
+   end
+ 
+@@ -423,9 +424,10 @@ class tool_button_skel :
+ (** @gtkdoc gtk GtkToolButton
+     @since GTK 2.4 *)
+ class tool_button : 
+-  [> Gtk.tool_button] obj ->
++  ([> Gtk.tool_button] as 'a) obj ->
+   object
+     inherit tool_button_skel
++    val obj : 'a obj
+     method connect : tool_button_signals
+   end
+ 
diff --git a/x11/lablgtk/patches/patch-ad b/x11/lablgtk/patches/patch-ad
new file mode 100644
index 00000000000..ec7e28a597f
--- /dev/null
+++ b/x11/lablgtk/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2010/08/28 16:13:25 wiz Exp $
+
+From
+http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
+for building against ocaml-3.12.*.
+
+--- src/gWindow.ml.orig	2010-04-08 08:48:52.000000000 +0000
++++ src/gWindow.ml
+@@ -171,7 +171,7 @@ class ['a] dialog_ext obj = object (self
+ end
+ 
+ class ['a] dialog obj = object (self)
+-  inherit ['a] dialog_ext obj
++  inherit ['a] dialog_ext (obj :> Gtk.dialog obj)
+   method connect : 'a dialog_signals = new dialog_signals obj (self#decode)
+ end
+ 
+@@ -193,7 +193,7 @@ let dialog ?(no_separator=false) =
+ type any_response = [GtkEnums.response | `OTHER of int]
+ 
+ class dialog_any obj = object (self)
+-  inherit [any_response] dialog_base obj
++  inherit [any_response] dialog_base (obj :> Gtk.dialog obj)
+   method private encode = function
+       `OTHER n -> n
+     | #GtkEnums.response as v -> Dialog.std_response v
diff --git a/x11/lablgtk/patches/patch-ae b/x11/lablgtk/patches/patch-ae
new file mode 100644
index 00000000000..c60240f38c3
--- /dev/null
+++ b/x11/lablgtk/patches/patch-ae
@@ -0,0 +1,36 @@
+$NetBSD: patch-ae,v 1.1 2010/08/28 16:13:25 wiz Exp $
+
+From
+http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
+for building against ocaml-3.12.*.
+
+--- src/gWindow.mli.orig	2009-03-19 14:41:16.000000000 +0000
++++ src/gWindow.mli
+@@ -191,9 +191,10 @@ class ['a] dialog_skel : ([>Gtk.dialog] 
+ 
+ (** Create popup windows
+    @gtkdoc gtk GtkDialog *)
+-class ['a] dialog_ext : [> Gtk.dialog] obj ->
++class ['a] dialog_ext : ([> Gtk.dialog] as 'b) obj ->
+   object
+     inherit ['a] dialog_skel
++    val obj : 'b obj
+     method add_button : string -> 'a -> unit
+     method add_button_stock : GtkStock.id -> 'a -> unit
+   end
+@@ -203,6 +204,7 @@ class ['a] dialog_ext : [> Gtk.dialog] o
+ class ['a] dialog : [> Gtk.dialog] obj ->
+   object
+     inherit ['a] dialog_ext
++    val obj : Gtk.dialog obj
+     method connect : 'a dialog_signals
+   end
+ 
+@@ -236,7 +238,6 @@ val dialog :
+ type any_response = [GtkEnums.response | `OTHER of int]
+ class dialog_any : [> Gtk.dialog] obj -> [any_response] dialog
+ 
+-
+ (** {3 GtkMessageDialog} *)
+ 
+ type 'a buttons
diff --git a/x11/lablgtk/patches/patch-af b/x11/lablgtk/patches/patch-af
new file mode 100644
index 00000000000..c14ff7c68e3
--- /dev/null
+++ b/x11/lablgtk/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2010/08/28 16:13:25 wiz Exp $
+
+From
+http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
+for building against ocaml-3.12.*.
+
+--- src/gnoCanvas.mli.orig	2007-06-20 07:40:34.000000000 +0000
++++ src/gnoCanvas.mli
+@@ -180,9 +180,10 @@ and canvas : GnomeCanvas.canvas Gtk.obj 
+   end
+ 
+ (** @gtkdoc libgnomecanvas GnomeCanvasItem *)
+-class ['p] item : [> GnomeCanvas.item] Gtk.obj -> 
++class ['p] item : ([> GnomeCanvas.item] as 'a) Gtk.obj -> 
+   object
+     inherit base_item
++    val obj : 'a Gtk.obj
+     constraint 'p = [< items_properties]
+     method set : 'p list -> unit
+   end