3 files changed, 52 insertions, 46 deletions

diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 5686ae6981d6..8dad9be86682 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	lablgtk2
-PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTVERSION=	2.12.0
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \
 		http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \
@@ -22,8 +22,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_OCAML=	yes
 
-BROKEN=		does not build with GNOME 2.26
-
 OPTIONS=	GLADE "With glade support" ON \
 		GNOMECANVAS "With gnomecanvas support" ON \
 		GNOMEPANEL "With gnomepanel support" ON \
@@ -44,7 +42,7 @@ PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
 .include <bsd.port.pre.mk>
 
-.if (exists(${LOCALBASE}/bin/lablgl) && exists(${LOCALBASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
+.if (exists(${LOCALBASE}/bin/lablgl) && exists(${LOCALBASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || !defined(WITHOUT_GTKTL)
 CONFIGURE_ARGS+=	--with-gl
 BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
@@ -56,7 +54,7 @@ CONFIGURE_ARGS+=	--without-gl
 PLIST_SUB+=	GL="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc)) || !defined(WITHOUT_GLADE)
 CONFIGURE_ARGS+=	--with-glade
 USE_GNOME+=	libglade2
 WITH_GLADE=	yes
@@ -66,7 +64,7 @@ CONFIGURE_ARGS+=	--without-glade
 PLIST_SUB+=	GLADE="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || !defined(WITHOUT_GNOMEUI)
 CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=	libgnomeui
 WITH_GNOMEUI=	yes
@@ -76,7 +74,7 @@ CONFIGURE_ARGS+=	--without-gnomeui
 PLIST_SUB+=	GNOMEUI="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || !defined(WITHOUT_GNOMECANVAS)
 CONFIGURE_ARGS+=	--with-gnomecanvas
 USE_GNOME+=	libgnomecanvas
 PLIST_SUB+=	GNOMECANVAS=""
@@ -86,7 +84,7 @@ CONFIGURE_ARGS+=	--without-gnomecanvas
 PLIST_SUB+=	GNOMECANVAS="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc)) || !defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--with-rsvg
 USE_GNOME+=	librsvg2
 WITH_RSVG=	yes
@@ -96,7 +94,7 @@ CONFIGURE_ARGS+=	--without-rsvg
 PLIST_SUB+=	RSVG="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || !defined(WITHOUT_GNOMEPANEL)
 CONFIGURE_ARGS+=	--with-panel
 USE_GNOME+=	gnomepanel
 WITH_PANEL=	yes
@@ -106,7 +104,7 @@ CONFIGURE_ARGS+=	--without-panel
 PLIST_SUB+=	PANEL="@comment "
 .endif
 
-.if (exists(${LOCALBASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
+.if (exists(${LOCALBASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || !defined(WITHOUT_GTKSPELL)
 LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 
 CONFIGURE_ARGS+=	--with-gtkspell
diff --git a/x11-toolkits/ocaml-lablgtk2/distinfo b/x11-toolkits/ocaml-lablgtk2/distinfo
index 5be18e4bc3fb..d97126cb1654 100644
--- a/x11-toolkits/ocaml-lablgtk2/distinfo
+++ b/x11-toolkits/ocaml-lablgtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (lablgtk-2.10.1.tar.gz) = bd7073ca05e684e5d5a3d553371fd6e5
-SHA256 (lablgtk-2.10.1.tar.gz) = e80c1db579cec89072fdaed755a179e26849c5eec51b2aa5627edda6173da886
-SIZE (lablgtk-2.10.1.tar.gz) = 768508
+MD5 (lablgtk-2.12.0.tar.gz) = 0e253128afee3cdc6e9b43c34b35984d
+SHA256 (lablgtk-2.12.0.tar.gz) = b3e3341adb0aa5d66dc91e9d5e6a1053a00a42f990fee61cf8f9639cc9cbd4cd
+SIZE (lablgtk-2.12.0.tar.gz) = 789731
diff --git a/x11-toolkits/ocaml-lablgtk2/pkg-plist b/x11-toolkits/ocaml-lablgtk2/pkg-plist
index a9068f3129e7..ac8526a6dbd0 100644
--- a/x11-toolkits/ocaml-lablgtk2/pkg-plist
+++ b/x11-toolkits/ocaml-lablgtk2/pkg-plist
@@ -1,4 +1,4 @@
-bin/gdk-pixbuf-mlsource
+bin/gdk_pixbuf_mlsource
 %%GLADE%%bin/lablgladecc2
 bin/lablgtk2
 lib/ocaml/lablgtk2/META
@@ -120,11 +120,11 @@ lib/ocaml/lablgtk2/gdkprivate-win32.h
 %%GL%%lib/ocaml/lablgtk2/glGtk.cmi
 %%GL%%lib/ocaml/lablgtk2/glGtk.cmx
 %%GL%%lib/ocaml/lablgtk2/glGtk.ml
-%%GL%%lib/ocaml/lablgtk2/glGtk.mli
+lib/ocaml/lablgtk2/glGtk.mli
 %%GLADE%%lib/ocaml/lablgtk2/glade.cmi
 %%GLADE%%lib/ocaml/lablgtk2/glade.cmx
 %%GLADE%%lib/ocaml/lablgtk2/glade.ml
-%%GLADE%%lib/ocaml/lablgtk2/glade.mli
+lib/ocaml/lablgtk2/glade.mli
 lib/ocaml/lablgtk2/glib.cmi
 lib/ocaml/lablgtk2/glib.cmx
 lib/ocaml/lablgtk2/glib.ml
@@ -133,18 +133,18 @@ lib/ocaml/lablgtk2/glib_tags.h
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.cmi
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.cmx
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.ml
-%%GNOMECANVAS%%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/gnoCanvas.mli
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.cmi
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.cmx
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.ml
-lib/ocaml/lablgtk2/gnomeDruid.cmi
-lib/ocaml/lablgtk2/gnomeDruid.cmx
-lib/ocaml/lablgtk2/gnomeDruid.ml
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnomeDruid.cmi
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnomeDruid.cmx
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnomeDruid.ml
 %%GNOMEUI%%lib/ocaml/lablgtk2/gnomeui_tags.h
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.cmi
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.cmx
+%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.ml
+lib/ocaml/lablgtk2/gnoDruid.mli
 lib/ocaml/lablgtk2/gobject.cmi
 lib/ocaml/lablgtk2/gobject.cmx
 lib/ocaml/lablgtk2/gobject.ml
@@ -218,7 +218,7 @@ lib/ocaml/lablgtk2/gtkSourceView_types.mli
 %%GTKSPELL%%lib/ocaml/lablgtk2/gtkSpell.cmi
 %%GTKSPELL%%lib/ocaml/lablgtk2/gtkSpell.cmx
 %%GTKSPELL%%lib/ocaml/lablgtk2/gtkSpell.ml
-%%GTKSPELL%%lib/ocaml/lablgtk2/gtkSpell.mli
+lib/ocaml/lablgtk2/gtkSpell.mli
 lib/ocaml/lablgtk2/gtkStock.cmi
 lib/ocaml/lablgtk2/gtkStock.cmx
 lib/ocaml/lablgtk2/gtkStock.ml
@@ -240,7 +240,7 @@ lib/ocaml/lablgtk2/gtkWindow.cmi
 lib/ocaml/lablgtk2/gtkWindow.cmx
 lib/ocaml/lablgtk2/gtkWindow.ml
 lib/ocaml/lablgtk2/gtk_tags.h
-lib/ocaml/lablgtk2/gtkgl_tags.h
+%%GL%%lib/ocaml/lablgtk2/gtkgl_tags.h
 %%GLADE%%lib/ocaml/lablgtk2/lablglade.a
 %%GLADE%%lib/ocaml/lablgtk2/lablglade.cma
 %%GLADE%%lib/ocaml/lablgtk2/lablglade.cmxa
@@ -253,9 +253,9 @@ lib/ocaml/lablgtk2/gtkgl_tags.h
 lib/ocaml/lablgtk2/lablgtk.a
 lib/ocaml/lablgtk2/lablgtk.cma
 lib/ocaml/lablgtk2/lablgtk.cmxa
-lib/ocaml/lablgtk2/lablgtkgl.a
-lib/ocaml/lablgtk2/lablgtkgl.cma
-lib/ocaml/lablgtk2/lablgtkgl.cmxa
+%%GL%%lib/ocaml/lablgtk2/lablgtkgl.a
+%%GL%%lib/ocaml/lablgtk2/lablgtkgl.cma
+%%GL%%lib/ocaml/lablgtk2/lablgtkgl.cmxa
 %%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.a
 %%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.cma
 %%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.cmxa
@@ -269,7 +269,7 @@ lib/ocaml/lablgtk2/lablgtkgl.cmxa
 %%GNOMECANVAS%%lib/ocaml/lablgtk2/liblablgnomecanvas.a
 %%GNOMEUI%%lib/ocaml/lablgtk2/liblablgnomeui.a
 lib/ocaml/lablgtk2/liblablgtk2.a
-lib/ocaml/lablgtk2/liblablgtkgl2.a
+%%GL%%lib/ocaml/lablgtk2/liblablgtkgl2.a
 %%GTKSPELL%%lib/ocaml/lablgtk2/liblablgtkspell.a
 %%PANEL%%lib/ocaml/lablgtk2/liblablpanel.a
 %%RSVG%%lib/ocaml/lablgtk2/liblablrsvg.a
@@ -287,7 +287,7 @@ lib/ocaml/lablgtk2/ml_pango.h
 %%PANEL%%lib/ocaml/lablgtk2/panel.cmi
 %%PANEL%%lib/ocaml/lablgtk2/panel.cmx
 %%PANEL%%lib/ocaml/lablgtk2/panel.ml
-%%PANEL%%lib/ocaml/lablgtk2/panel.mli
+lib/ocaml/lablgtk2/panel.mli
 %%PANEL%%lib/ocaml/lablgtk2/panel_tags.h
 lib/ocaml/lablgtk2/pango.cmi
 lib/ocaml/lablgtk2/pango.cmx
@@ -300,7 +300,7 @@ lib/ocaml/lablgtk2/propcc
 %%RSVG%%lib/ocaml/lablgtk2/rsvg.cmi
 %%RSVG%%lib/ocaml/lablgtk2/rsvg.cmx
 %%RSVG%%lib/ocaml/lablgtk2/rsvg.ml
-%%RSVG%%lib/ocaml/lablgtk2/rsvg.mli
+lib/ocaml/lablgtk2/rsvg.mli
 lib/ocaml/lablgtk2/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
@@ -309,22 +309,24 @@ lib/ocaml/lablgtk2/xml_lexer.mli
 %%GNOMECANVAS%%lib/ocaml/stublibs/dlllablgnomecanvas.so
 %%GNOMEUI%%lib/ocaml/stublibs/dlllablgnomeui.so
 lib/ocaml/stublibs/dlllablgtk2.so
-lib/ocaml/stublibs/dlllablgtkgl2.so
+%%GL%%lib/ocaml/stublibs/dlllablgtkgl2.so
 %%GTKSPELL%%lib/ocaml/stublibs/dlllablgtkspell.so
 %%PANEL%%lib/ocaml/stublibs/dlllablpanel.so
 %%RSVG%%lib/ocaml/stublibs/dlllablrsvg.so
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/aargb.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/gears.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/morph3d.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/planet.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/scene.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/simple.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/texturesurf.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-2.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-3.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-4.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-5.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/aargb.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/gears.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/morph3d.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/planet.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/scene.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/simple.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/simple_th.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/texturesurf.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-2.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-3.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-4.ml
+%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-5.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/about.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/accel_tree.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/action.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/assistant.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/assistant_tutorial.ml
@@ -346,6 +348,8 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/combobox.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/counter.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/csview.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom_tree.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom_tree_generic.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/dcalendar.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/drawing.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/druid.ml
@@ -353,6 +357,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/editor2.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/entry.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/entrycompletion.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/eventbox.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/events.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/events2.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/expander.ml
@@ -360,6 +365,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/filechooser.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/fixed_editor.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/fixpoint.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/gioredirect.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/giotest.ml
 %%PORTDOCS%%%%GLADE%%%%EXAMPLESDIR%%/glade/glade_demo.ml
 %%PORTDOCS%%%%GLADE%%%%EXAMPLESDIR%%/glade/gladecalc.ml
@@ -392,6 +398,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/slide_show.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/socket.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/spell.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/spin.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/test.xpm
 %%PORTDOCS%%%%EXAMPLESDIR%%/testdnd.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/testgtk.ml
@@ -405,6 +412,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/text/unicode_viewer.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/timer.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/toolbar.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/tooltip.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/tree.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/tree_model.ml
 %%PORTDOCS%%%%EXAMPLESDIR%%/tree_store.ml
@@ -414,7 +422,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%PORTDOCS%%%%PANEL%%@dirrm %%EXAMPLESDIR%%/panel
 %%PORTDOCS%%%%GLADE%%@dirrm %%EXAMPLESDIR%%/glade
 %%PORTDOCS%%%%GNOMECANVAS%%@dirrm %%EXAMPLESDIR%%/canvas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/GL
+%%GL%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/GL
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrmtry share/examples/ocaml
 %%PORTDOCS%%%%DOCSDIR%%/COPYING