Update to 2.6.0:

In lablgtk2-20051027 (2.6.0):

2005.10.25 [Jacques]
  * fix GtkThread.sync (Robert Schneck-McConnell)

2005.10.17 [Jacques]
  * new recompilation approach for Windows

2005.10.03 [Olivier]
  * fix refcounting of pixbufs in GdkPixbuf

2005.09.24 [Olivier]
  * wrap gdk_cursor_new_from_pixbuf

2005.08.25 [Olivier]
  * gtk_about_dialog_set_{url,email}_hook are not methods : fix the
    external type declaration and remove from the GWindow.about_dialog class.

2005.08.18 [Olivier]
  * add special sort_column_id values in GTree to select default sort
    function or disable sorting
  * add a couple of utility functions in Glib :
      - getenv, setenv, unsetenv (2.4)
      - get_user_data_dir, etc. (2.6)
  * change the generated code of gdk-pixbuf-mlsource a bit.

In lablgtk2-20050701:
2005.06.30 [Jacques]
  * export same symbols under unix and windows

In lablgtk2-20050613:
2005.06.13 [Jacques]
  * define GText.buffer_skel and GText.view_skel

2005.06.02 [Jacques]
  * export all macro-generated functions (robertr)
  * change --rpath to -rpath (better done in ocamlmklib?)

2005.05.03 [Olivier]
  * wrap GdkPixbuf.get_file_info (2.4)
  * support serialization and deserialization of GdkPixbuf.pixbuf values
  * add a gdk-pixbuf-mlsource tool to help compiling images into programs.

2005.03.20 [Jacques]
  * add Gobject.Data.wrap to create new conversions

2005.03.07 [Olivier]
  * add GEdit.entry#xalign property (2.4)
  * make configure fail if GTK+ cannot be found

In lablgtk2-20050218:
2005.02.18 [Jacques]
  * add GObj.event_signals#scroll and other missing wevents (Hendrik Tews)

2005.02.17 [Jacques]
  * allow using vmthreads

2005.02.07 [Olivier]
  * GTree.Path.is_prev now returns bool (T. Kurt Bond)

2005.01.08 [Olivier]
  * add a use_markup optional argument to GEdit.combo_box_text.

2005.01.04 [Olivier] (2.6)
  * new stock items
  * add PangoEllipsizeMode for PangoLayout
  * new GtkLabel properties
  * new GtkProgressbar::ellipsize property
  * new GtkTreeView properties and separator rows

2005.01.02 [Olivier]
  * 2.6 improvements to GtkComboBox (separators and a couple of new
    properties)

2004.12.05 [Olivier]
  * add GtkFileChooserButton (2.6)

2004.12.04 [Jacques]
  * fix constraint in GUtil.memo

2004.12.02 [Olivier]
  * add GtkAboutDialog (2.6)

2004.12.02 [Jacques]
  * fix Michael Furr's bug reports

2004.11.24 [Olivier]
  * add GMisc.statusbar#has_resize_grip and #set_has_resize_grip
    GMisc.statusbar now inherits from GPack.box
  * add GtkIconView (2.6)

2004.11.22 [Olivier]
  * add GtkCellRendererCombo (2.6)
  * add GtkCellRendererProgress (2.6)

In lablgtk2-20041119:

2004.11.17 [Jacques]
  * fix make depend
  * cleanup lablgtk2.in

2004.11.15 [Olivier]
  * add max-position and min-position in GPack.paned (2.4)
  * add GtkSpell interface (http://gtkspell.sf.net/)

2004.11.10 [Olivier]
  * add GPack.paned#position
  * allow multiple conditions per watch in Glib.Io.add_watch

2004.10.24 [Olivier]
  * add a .mli for GnoDruid, reorganize gnoDruid.ml a bit
  * add the single-paragraph-mode property in GtkCellRendererText

2004.10.05 [Jacques]
  * revise Timeout.add and Idle.add for compatibility
    (optional arguments must be followed by a non-labeled argument)

2004.10.02 [Jacques]
  * 2.2 compatibility fixes (G_STRFUNC only defined in 2.4)

2004.09.21 [Olivier]
  * add optional priority argument for timeouts and idle callbacks in Glib
  * get rid of the print handler in Glib.Message (it's not used by libraries)
  * get rid of the Glib.Critical exception (callbacks should never raise exceptions)
  * add Glib.Message.log and a couple other functions related to logging
  * generally prevent exceptions from escaping callbacks

2004.09.18 [Jacques]
  * revert to using `OTHER in Gobject.data_kind

2004.09.17 [Olivier]
  * more unicode fixes, add a Utf8.to_unichar_validated function

2004.09.17 [Jacques]
  * Gobject.Data.boxed parameterized by the real type, to be able to
    create tree store columns from it. Gobject.fundamental_type
    modified accordingly.

2004.09.15 [Olivier]
  * add GText.buffer#select_range

2004.09.14 [Olivier]
  * add a few unicode-related functions

2004.09.08 [Olivier]
  * add GAction.ui_manager#add_ui
  * have #get_widget and #get_action raise Not_found instead of
    Null_pointer.

2004.09.03 [Olivier]
  * in GAction.action_group, do not merge #add_action and
    #add_action_with_accel in a single method because they have
    different behaviour. Fixes a bug where stock items accelerators
    were not connected.
  * add the padding properties of GBin.alignment (2.4)

2004.08.27 [Olivier]
  * add GTree.cell_layout#reorder and GTree.cell_layout#set_cell_data_func
  * add a couple of utility functions in Glib
  * decimate ml_gtkmisc.c, add a couple of things to GtkCalendar and GtkLabel

2004.08.24 [Olivier]
  * add GWindow.message_dialog#set_markup (2.4)
  * add override of default signal handlers
    (GtkSignal.override_class_closure, GtkSignal.chain_from_overridden)

2004.08.23 [Olivier]
  * wrap some 2.4 additions in GdkPixbuf (from_file_at_size,
    save_to_buffer). Add some Ocamldoc comments.
  * add 2.4 stock items in GtkStock

2004.08.20 [Jacques]
  * fix GdkPixbuf.render_to_drawable
  * support gtk-2.0.1
  * add examples/GL/texturesurf.ml with texture from pixbuf

2004.08.19 [Olivier]
  * add 'active' property of ComboBox as a constructor parameter.
  * qualify conversion tables as 'const' (so they end up in read-only
    pages)
  * add some ocamldoc comments

2004.08.11 [Olivier]
  * have GAction.ui_manager#add_ui_from_string raise an exception in
    case of error.
  * add Glib.Markup.Error exception.
  * avoid memory leaks in Glib.Convert.
  * remove some dead code (GtkPreview).

4 files changed, 37 insertions, 9 deletions

diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 1885553399c..b451ed88c29 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2005/10/25 00:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/01 21:19:37 wiz Exp $
 #
 
-DISTNAME=	lablgtk-2.4.0
+DISTNAME=	lablgtk-2.6.0
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
+HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 COMMENT=	GTK+ 2.x bindings for Objective Caml
 
 GNU_CONFIGURE=		yes
@@ -26,6 +25,7 @@ CONFLICTS=	lablgtk-2.*
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lablgtk2/PLIST b/x11/lablgtk2/PLIST
index 92db70f473f..9a04630f4f7 100644
--- a/x11/lablgtk2/PLIST
+++ b/x11/lablgtk2/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/06 11:48:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/01 21:19:37 wiz Exp $
+bin/gdk-pixbuf-mlsource
 bin/lablgladecc2
 bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
@@ -128,6 +129,7 @@ lib/ocaml/lablgtk2/gnoCanvas.mli
 lib/ocaml/lablgtk2/gnoDruid.cmi
 lib/ocaml/lablgtk2/gnoDruid.cmx
 lib/ocaml/lablgtk2/gnoDruid.ml
+lib/ocaml/lablgtk2/gnoDruid.mli
 lib/ocaml/lablgtk2/gnomeCanvas.cmi
 lib/ocaml/lablgtk2/gnomeCanvas.cmx
 lib/ocaml/lablgtk2/gnomeCanvas.ml
@@ -201,6 +203,10 @@ lib/ocaml/lablgtk2/gtkSignal.cmi
 lib/ocaml/lablgtk2/gtkSignal.cmx
 lib/ocaml/lablgtk2/gtkSignal.ml
 lib/ocaml/lablgtk2/gtkSignal.mli
+lib/ocaml/lablgtk2/gtkSpell.cmi
+lib/ocaml/lablgtk2/gtkSpell.cmx
+lib/ocaml/lablgtk2/gtkSpell.ml
+lib/ocaml/lablgtk2/gtkSpell.mli
 lib/ocaml/lablgtk2/gtkStock.cmi
 lib/ocaml/lablgtk2/gtkStock.cmx
 lib/ocaml/lablgtk2/gtkStock.ml
@@ -234,6 +240,9 @@ lib/ocaml/lablgtk2/lablgnomeui.cmxa
 lib/ocaml/lablgtk2/lablgtk.a
 lib/ocaml/lablgtk2/lablgtk.cma
 lib/ocaml/lablgtk2/lablgtk.cmxa
+lib/ocaml/lablgtk2/lablgtkspell.a
+lib/ocaml/lablgtk2/lablgtkspell.cma
+lib/ocaml/lablgtk2/lablgtkspell.cmxa
 lib/ocaml/lablgtk2/lablgtktop
 lib/ocaml/lablgtk2/lablpanel.a
 lib/ocaml/lablgtk2/lablpanel.cma
@@ -245,6 +254,7 @@ lib/ocaml/lablgtk2/liblablglade2.a
 lib/ocaml/lablgtk2/liblablgnomecanvas.a
 lib/ocaml/lablgtk2/liblablgnomeui.a
 lib/ocaml/lablgtk2/liblablgtk2.a
+lib/ocaml/lablgtk2/liblablgtkspell.a
 lib/ocaml/lablgtk2/liblablpanel.a
 lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/ml_gdk.h
@@ -253,8 +263,12 @@ lib/ocaml/lablgtk2/ml_glib.h
 lib/ocaml/lablgtk2/ml_gobject.h
 lib/ocaml/lablgtk2/ml_gpointer.h
 lib/ocaml/lablgtk2/ml_gtk.h
+lib/ocaml/lablgtk2/ml_gtktree.h
 lib/ocaml/lablgtk2/ml_gvaluecaml.h
 lib/ocaml/lablgtk2/ml_pango.h
+lib/ocaml/lablgtk2/panel.cmi
+lib/ocaml/lablgtk2/panel.cmx
+lib/ocaml/lablgtk2/panel.ml
 lib/ocaml/lablgtk2/panel.mli
 lib/ocaml/lablgtk2/panel_tags.h
 lib/ocaml/lablgtk2/pango.cmi
diff --git a/x11/lablgtk2/distinfo b/x11/lablgtk2/distinfo
index ff40a36e6c0..3d0091feff1 100644
--- a/x11/lablgtk2/distinfo
+++ b/x11/lablgtk2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:16 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/11/01 21:19:37 wiz Exp $
 
-SHA1 (lablgtk-2.4.0.tar.gz) = 28606d4ad6f4c798b544d227c26ca3dfb2239472
-RMD160 (lablgtk-2.4.0.tar.gz) = 7d27e9e6f9ba329441085073dff4f5617c6fbfeb
-Size (lablgtk-2.4.0.tar.gz) = 637739 bytes
+SHA1 (lablgtk-2.6.0.tar.gz) = 99aecd26360c5ba8f0d17fb0cdae42ff083732ce
+RMD160 (lablgtk-2.6.0.tar.gz) = cc3bf61170f69bc43e5420bdd28e111744200384
+Size (lablgtk-2.6.0.tar.gz) = 658095 bytes
+SHA1 (patch-aa) = f4601829cd10853f1c9398a83a6400f6587b508c
diff --git a/x11/lablgtk2/patches/patch-aa b/x11/lablgtk2/patches/patch-aa
new file mode 100644
index 00000000000..f2f8682bd3a
--- /dev/null
+++ b/x11/lablgtk2/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/11/01 21:19:37 wiz Exp $
+
+--- src/Makefile.orig	2005-10-17 13:52:03.000000000 +0200
++++ src/Makefile
+@@ -220,7 +220,7 @@ build.ml: Makefile $(CONFIG) build.ml.in
+ 	    -e "s|@GTKLIBS@|$(GTKLIBS)|" < build.ml.in > $@
+ 
+ gdk-pixbuf-mlsource$(XE) : lablgtk.cma gtkInit.cmo gdk-pixbuf-mlsource.ml
+-	$(CAMLC) -o $@ $^
++	$(CAMLC) -I . -o $@ $^
+ 
+ lablgtkopt:: $(MLLIBS:.cma=.cmxa) $(INITOBJS:.cmo=.cmx)
+ ifeq ($(THREADS_LIB),system)