Update to 2.6.0

3 files changed, 205 insertions, 164 deletions

diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index d425b769dfc2..c2fc56fb268c 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	lablgtk2
-PORTVERSION=	2.4.0
-PORTREVISION=	4
+PORTVERSION=	2.6.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/ \
@@ -24,6 +23,14 @@ RUN_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 
+OPTIONS=	GLADE "With glade support" OFF \
+		GNOMECANVAS "With gnomecanvas support" OFF \
+		GNOMEPANEL "With gnomepanel support" OFF \
+		GNOMEUI "With gnomeui support" OFF \
+		GTKSPELL "With gtkspell support" OFF \
+		GTKTL "With gtkglarea support" ON \
+		RSVG "With rsvg support" OFF
+
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/${PORTNAME}
 
@@ -32,9 +39,15 @@ ALL_TARGET=	all opt
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libdir=${PREFIX}/lib/ocaml
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	\
+		COPYING \
+		README
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/lablgl) && exists(${X11BASE}/libdata/pkgconfig/gtkgl-2.0.pc)
+.if (exists(${LOCALBASE}/bin/lablgl) && exists(${X11BASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL)
 CONFIGURE_ARGS+=	--with-gl
 BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
@@ -46,7 +59,7 @@ CONFIGURE_ARGS+=	--without-gl
 PLIST_SUB+=	GL="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/libglade-2.0.pc)
+.if (exists(${X11BASE}/libdata/pkgconfig/libglade-2.0.pc)) || defined(WITH_GLADE)
 CONFIGURE_ARGS+=	--with-glade
 USE_GNOME+=	libglade2
 WITH_GLADE=	yes
@@ -56,7 +69,7 @@ CONFIGURE_ARGS+=	--without-glade
 PLIST_SUB+=	GLADE="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
+.if (exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)) || defined(WITH_GNOMEUI)
 CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=	libgnomeui
 WITH_GNOMEUI=	yes
@@ -66,7 +79,7 @@ CONFIGURE_ARGS+=	--without-gnomeui
 PLIST_SUB+=	GNOMEUI="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)
+.if (exists(${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc)) || defined(WITH_GNOMECANVAS)
 CONFIGURE_ARGS+=	--with-gnomecanvas
 USE_GNOME+=	libgnomecanvas
 PLIST_SUB+=	GNOMECANVAS=""
@@ -76,7 +89,7 @@ CONFIGURE_ARGS+=	--without-gnomecanvas
 PLIST_SUB+=	GNOMECANVAS="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc)
+.if (exists(${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc)) || defined(WITH_RSVG)
 CONFIGURE_ARGS+=	--with-rsvg
 USE_GNOME+=	librsvg2
 WITH_RSVG=	yes
@@ -86,7 +99,7 @@ CONFIGURE_ARGS+=	--without-rsvg
 PLIST_SUB+=	RSVG="@comment "
 .endif
 
-.if exists(${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)
+.if (exists(${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc)) || defined(WITH_GNOMEPANEL)
 CONFIGURE_ARGS+=	--with-panel
 USE_GNOME+=	gnomepanel
 WITH_PANEL=	yes
@@ -96,6 +109,17 @@ CONFIGURE_ARGS+=	--without-panel
 PLIST_SUB+=	PANEL="@comment "
 .endif
 
+.if (exists(${X11BASE}/libdata/pkgconfig/gtkspell-2.0.pc)) || defined(WITH_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+
+CONFIGURE_ARGS+=	--with-gtkspell
+PLIST_SUB+=	GTKSPELL=""
+WITH_GTKSPELL=	yes
+.else
+CONFIGURE_ARGS+=	--without-gtkspell
+PLIST_SUB+=	GTKSPELL="@comment "
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/x11-toolkits/ocaml-lablgtk2/distinfo b/x11-toolkits/ocaml-lablgtk2/distinfo
index 829aa9dd5826..095ee8c3bbde 100644
--- a/x11-toolkits/ocaml-lablgtk2/distinfo
+++ b/x11-toolkits/ocaml-lablgtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (lablgtk-2.4.0.tar.gz) = faa7b28c3ad97a1a76d983d24f26f567
-SHA256 (lablgtk-2.4.0.tar.gz) = e4763b4b92edf342093729d11525a976c6ce705c63733a51bc488fbb468993dd
-SIZE (lablgtk-2.4.0.tar.gz) = 637739
+MD5 (lablgtk-2.6.0.tar.gz) = 47319aacbbb761323bdfab67513829df
+SHA256 (lablgtk-2.6.0.tar.gz) = 3694bc1e288ce0903af6c96a2790d2340ba38fa51b18090062ede75137d97876
+SIZE (lablgtk-2.6.0.tar.gz) = 658095
diff --git a/x11-toolkits/ocaml-lablgtk2/pkg-plist b/x11-toolkits/ocaml-lablgtk2/pkg-plist
index 426a1fe06c95..320e6e630d33 100644
--- a/x11-toolkits/ocaml-lablgtk2/pkg-plist
+++ b/x11-toolkits/ocaml-lablgtk2/pkg-plist
@@ -1,5 +1,6 @@
-bin/lablgtk2
+bin/gdk-pixbuf-mlsource
 %%GLADE%%bin/lablgladecc2
+bin/lablgtk2
 lib/ocaml/lablgtk2/gAction.cmi
 lib/ocaml/lablgtk2/gAction.cmx
 lib/ocaml/lablgtk2/gAction.ml
@@ -110,14 +111,34 @@ lib/ocaml/lablgtk2/gdkPixbuf.mli
 lib/ocaml/lablgtk2/gdk_tags.h
 lib/ocaml/lablgtk2/gdkpixbuf_tags.h
 lib/ocaml/lablgtk2/gdkprivate-win32.h
-lib/ocaml/lablgtk2/glGtk.mli
-lib/ocaml/lablgtk2/glade.mli
+%%GL%%lib/ocaml/lablgtk2/glGtk.cmi
+%%GL%%lib/ocaml/lablgtk2/glGtk.cmx
+%%GL%%lib/ocaml/lablgtk2/glGtk.ml
+%%GL%%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/glib.cmi
 lib/ocaml/lablgtk2/glib.cmx
 lib/ocaml/lablgtk2/glib.ml
 lib/ocaml/lablgtk2/glib.mli
 lib/ocaml/lablgtk2/glib_tags.h
-lib/ocaml/lablgtk2/gnoCanvas.mli
+%%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
+%%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/gnomeui_tags.h
 lib/ocaml/lablgtk2/gobject.cmi
 lib/ocaml/lablgtk2/gobject.cmx
 lib/ocaml/lablgtk2/gobject.ml
@@ -184,6 +205,10 @@ lib/ocaml/lablgtk2/gtkSignal.cmi
 lib/ocaml/lablgtk2/gtkSignal.cmx
 lib/ocaml/lablgtk2/gtkSignal.ml
 lib/ocaml/lablgtk2/gtkSignal.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/gtkStock.cmi
 lib/ocaml/lablgtk2/gtkStock.cmx
 lib/ocaml/lablgtk2/gtkStock.ml
@@ -205,19 +230,53 @@ 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
+%%GLADE%%lib/ocaml/lablgtk2/lablglade.a
+%%GLADE%%lib/ocaml/lablgtk2/lablglade.cma
+%%GLADE%%lib/ocaml/lablgtk2/lablglade.cmxa
+%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.a
+%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.cma
+%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.cmxa
+%%GNOMEUI%%lib/ocaml/lablgtk2/lablgnomeui.a
+%%GNOMEUI%%lib/ocaml/lablgtk2/lablgnomeui.cma
+%%GNOMEUI%%lib/ocaml/lablgtk2/lablgnomeui.cmxa
 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
+%%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.a
+%%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.cma
+%%GTKSPELL%%lib/ocaml/lablgtk2/lablgtkspell.cmxa
+%%PANEL%%%%PANEL%%lib/ocaml/lablgtk2/lablpanel.a
+%%PANEL%%lib/ocaml/lablgtk2/lablpanel.cma
+%%PANEL%%lib/ocaml/lablgtk2/lablpanel.cmxa
+%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.a
+%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.cma
+%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.cmxa
+%%GLADE%%lib/ocaml/lablgtk2/liblablglade2.a
+%%GNOMECANVAS%%lib/ocaml/lablgtk2/liblablgnomecanvas.a
+%%GNOMEUI%%lib/ocaml/lablgtk2/liblablgnomeui.a
 lib/ocaml/lablgtk2/liblablgtk2.a
+lib/ocaml/lablgtk2/liblablgtkgl2.a
+%%GTKSPELL%%lib/ocaml/lablgtk2/liblablgtkspell.a
+%%PANEL%%lib/ocaml/lablgtk2/liblablpanel.a
+%%RSVG%%lib/ocaml/lablgtk2/liblablrsvg.a
 lib/ocaml/lablgtk2/ml_gdk.h
 lib/ocaml/lablgtk2/ml_gdkpixbuf.h
 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.mli
+%%PANEL%%lib/ocaml/lablgtk2/panel.cmi
+%%PANEL%%lib/ocaml/lablgtk2/panel.cmx
+%%PANEL%%lib/ocaml/lablgtk2/panel.ml
+%%PANEL%%lib/ocaml/lablgtk2/panel.mli
+%%PANEL%%lib/ocaml/lablgtk2/panel_tags.h
 lib/ocaml/lablgtk2/pango.cmi
 lib/ocaml/lablgtk2/pango.cmx
 lib/ocaml/lablgtk2/pango.ml
@@ -226,160 +285,118 @@ lib/ocaml/lablgtk2/pangoEnums.cmx
 lib/ocaml/lablgtk2/pangoEnums.ml
 lib/ocaml/lablgtk2/pango_tags.h
 lib/ocaml/lablgtk2/propcc
-lib/ocaml/lablgtk2/rsvg.mli
+%%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/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
-%%GL%%lib/ocaml/lablgtk2/glGtk.cmi
-%%GL%%lib/ocaml/lablgtk2/glGtk.cmx
-%%GL%%lib/ocaml/lablgtk2/glGtk.ml
-%%GL%%lib/ocaml/lablgtk2/gtkgl_tags.h
-%%GL%%lib/ocaml/lablgtk2/lablgtkgl.a
-%%GL%%lib/ocaml/lablgtk2/lablgtkgl.cma
-%%GL%%lib/ocaml/lablgtk2/lablgtkgl.cmxa
-%%GL%%lib/ocaml/lablgtk2/liblablgtkgl2.a
-%%GLADE%%lib/ocaml/lablgtk2/glade.cmi
-%%GLADE%%lib/ocaml/lablgtk2/glade.cmx
-%%GLADE%%lib/ocaml/lablgtk2/glade.ml
-%%GLADE%%lib/ocaml/lablgtk2/lablglade.a
-%%GLADE%%lib/ocaml/lablgtk2/lablglade.cma
-%%GLADE%%lib/ocaml/lablgtk2/lablglade.cmxa
-%%GLADE%%lib/ocaml/lablgtk2/liblablglade2.a
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.cmi
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.cmx
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnoCanvas.ml
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.cmi
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.cmx
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/gnomeCanvas.ml
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.a
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.cma
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/lablgnomecanvas.cmxa
-%%GNOMECANVAS%%lib/ocaml/lablgtk2/liblablgnomecanvas.a
-%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.cmi
-%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.cmx
-%%GNOMEUI%%lib/ocaml/lablgtk2/gnoDruid.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/lablgnomeui.a
-%%GNOMEUI%%lib/ocaml/lablgtk2/lablgnomeui.cma
-%%GNOMEUI%%lib/ocaml/lablgtk2/lablgnomeui.cmxa
-%%GNOMEUI%%lib/ocaml/lablgtk2/liblablgnomeui.a
-%%PANEL%%lib/ocaml/lablgtk2/lablpanel.a
-%%PANEL%%lib/ocaml/lablgtk2/lablpanel.cma
-%%PANEL%%lib/ocaml/lablgtk2/lablpanel.cmxa
-%%PANEL%%lib/ocaml/lablgtk2/liblablpanel.a
-%%PANEL%%lib/ocaml/lablgtk2/panel_tags.h
-%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.a
-%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.cma
-%%RSVG%%lib/ocaml/lablgtk2/lablrsvg.cmxa
-%%RSVG%%lib/ocaml/lablgtk2/liblablrsvg.a
-%%RSVG%%lib/ocaml/lablgtk2/rsvg.cmi
-%%RSVG%%lib/ocaml/lablgtk2/rsvg.cmx
-%%RSVG%%lib/ocaml/lablgtk2/rsvg.ml
-@dirrm lib/ocaml/lablgtk2
-lib/ocaml/stublibs/dlllablgtk2.so
-%%GL%%lib/ocaml/stublibs/dlllablgtkgl2.so
 %%GLADE%%lib/ocaml/stublibs/dlllablglade2.so
 %%GNOMECANVAS%%lib/ocaml/stublibs/dlllablgnomecanvas.so
 %%GNOMEUI%%lib/ocaml/stublibs/dlllablgnomeui.so
+lib/ocaml/stublibs/dlllablgtk2.so
+lib/ocaml/stublibs/dlllablgtkgl2.so
+%%GTKSPELL%%lib/ocaml/stublibs/dlllablgtkspell.so
 %%PANEL%%lib/ocaml/stublibs/dlllablpanel.so
 %%RSVG%%lib/ocaml/stublibs/dlllablrsvg.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/action.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/buttons.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/calc.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/calendar.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/clist.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/combo.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/combobox.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/csview.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/dcalendar.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/drawing.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/druid.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/editor.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/editor2.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/entry.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/entrycompletion.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/events.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/events2.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/expander.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/fifteen.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/filechooser.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/fixed_editor.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/fixpoint.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/giotest.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/hello.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/image.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/image256x256.rgb
-%%PORTDOCS%%%%EXAMPLESDIR%%/kaimono.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/label.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/lissajous.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/nihongo.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/notebook.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/pixview.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/pousse.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/progressbar.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/radiobuttons.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/rpn.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/scrolledwin.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/socket.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/test.xpm
-%%PORTDOCS%%%%EXAMPLESDIR%%/testdnd.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/testgtk.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/tictactoe.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/timer.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/toolbar.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/tree.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/tree_model.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/tree_store.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/tron.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/floppybuddy.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/gtk-logo-rgb.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/test.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/test_text.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/text-demo.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/unicode_table.ml
-%%PORTDOCS%%%%EXAMPLESDIR%%/text/unicode_viewer.ml
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/text
-%%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/tutorial-2.ml
-%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-3.ml
-%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-4.ml
-%%GL%%%%PORTDOCS%%%%EXAMPLESDIR%%/GL/tutorial-5.ml
-%%GL%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/GL
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/glade_demo.ml
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/gladecalc.ml
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/project1.glade
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/project1.gladep
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/project2.glade
-%%GLADE%%%%PORTDOCS%%%%EXAMPLESDIR%%/glade/project2.gladep
-%%GLADE%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/glade
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-arrowhead.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-curve.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-features.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-fifteen.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-primitives.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/canvas-richtext.ml
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/flower.png
-%%GNOMECANVAS%%%%PORTDOCS%%%%EXAMPLESDIR%%/canvas/toroid.png
-%%GNOMECANVAS%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/canvas
-%%PANEL%%%%PORTDOCS%%%%EXAMPLESDIR%%/panel/README
-%%PANEL%%%%PORTDOCS%%%%EXAMPLESDIR%%/panel/applet.ml
-%%PANEL%%%%PORTDOCS%%%%EXAMPLESDIR%%/panel/lablgtk_applet.server
-%%PANEL%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/panel
-%%RSVG%%%%PORTDOCS%%%%EXAMPLESDIR%%/rsvg/floppy.svg
-%%RSVG%%%%PORTDOCS%%%%EXAMPLESDIR%%/rsvg/test_rsvg.ml
-%%RSVG%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/rsvg
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm share/doc/ocaml
+%%EXAMPLESDIR%%/GL/gears.ml
+%%EXAMPLESDIR%%/GL/morph3d.ml
+%%EXAMPLESDIR%%/GL/planet.ml
+%%EXAMPLESDIR%%/GL/scene.ml
+%%EXAMPLESDIR%%/GL/simple.ml
+%%EXAMPLESDIR%%/GL/texturesurf.ml
+%%EXAMPLESDIR%%/GL/tutorial-2.ml
+%%EXAMPLESDIR%%/GL/tutorial-3.ml
+%%EXAMPLESDIR%%/GL/tutorial-4.ml
+%%EXAMPLESDIR%%/GL/tutorial-5.ml
+%%EXAMPLESDIR%%/action.ml
+%%EXAMPLESDIR%%/buttons.ml
+%%EXAMPLESDIR%%/calc.ml
+%%EXAMPLESDIR%%/calendar.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-arrowhead.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-curve.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-features.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-fifteen.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-primitives.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/canvas-richtext.ml
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/flower.png
+%%GNOMECANVAS%%%%EXAMPLESDIR%%/canvas/toroid.png
+%%EXAMPLESDIR%%/clist.ml
+%%EXAMPLESDIR%%/combo.ml
+%%EXAMPLESDIR%%/combobox.ml
+%%EXAMPLESDIR%%/counter.ml
+%%EXAMPLESDIR%%/csview.ml
+%%EXAMPLESDIR%%/dcalendar.ml
+%%EXAMPLESDIR%%/drawing.ml
+%%EXAMPLESDIR%%/druid.ml
+%%EXAMPLESDIR%%/editor.ml
+%%EXAMPLESDIR%%/editor2.ml
+%%EXAMPLESDIR%%/entry.ml
+%%EXAMPLESDIR%%/entrycompletion.ml
+%%EXAMPLESDIR%%/events.ml
+%%EXAMPLESDIR%%/events2.ml
+%%EXAMPLESDIR%%/expander.ml
+%%EXAMPLESDIR%%/fifteen.ml
+%%EXAMPLESDIR%%/filechooser.ml
+%%EXAMPLESDIR%%/fixed_editor.ml
+%%EXAMPLESDIR%%/fixpoint.ml
+%%EXAMPLESDIR%%/giotest.ml
+%%GLADE%%%%EXAMPLESDIR%%/glade/glade_demo.ml
+%%GLADE%%%%EXAMPLESDIR%%/glade/gladecalc.ml
+%%GLADE%%%%EXAMPLESDIR%%/glade/project1.glade
+%%GLADE%%%%EXAMPLESDIR%%/glade/project1.gladep
+%%GLADE%%%%EXAMPLESDIR%%/glade/project2.glade
+%%GLADE%%%%EXAMPLESDIR%%/glade/project2.gladep
+%%EXAMPLESDIR%%/hello.ml
+%%EXAMPLESDIR%%/iconview.ml
+%%EXAMPLESDIR%%/image.ml
+%%EXAMPLESDIR%%/image256x256.rgb
+%%EXAMPLESDIR%%/kaimono.ml
+%%EXAMPLESDIR%%/label.ml
+%%EXAMPLESDIR%%/lissajous.ml
+%%EXAMPLESDIR%%/nihongo.ml
+%%EXAMPLESDIR%%/notebook.ml
+%%PANEL%%%%EXAMPLESDIR%%/panel/README
+%%PANEL%%%%EXAMPLESDIR%%/panel/applet.ml
+%%PANEL%%%%EXAMPLESDIR%%/panel/lablgtk_applet.server
+%%EXAMPLESDIR%%/pixview.ml
+%%EXAMPLESDIR%%/pousse.ml
+%%EXAMPLESDIR%%/progressbar.ml
+%%EXAMPLESDIR%%/radiobuttons.ml
+%%EXAMPLESDIR%%/rpn.ml
+%%RSVG%%%%EXAMPLESDIR%%/rsvg/floppy.svg
+%%RSVG%%%%EXAMPLESDIR%%/rsvg/test_rsvg.ml
+%%EXAMPLESDIR%%/scrolledwin.ml
+%%EXAMPLESDIR%%/signal_override.ml
+%%EXAMPLESDIR%%/socket.ml
+%%EXAMPLESDIR%%/spell.ml
+%%EXAMPLESDIR%%/test.xpm
+%%EXAMPLESDIR%%/testdnd.ml
+%%EXAMPLESDIR%%/testgtk.ml
+%%EXAMPLESDIR%%/text/Makefile
+%%EXAMPLESDIR%%/text/floppybuddy.gif
+%%EXAMPLESDIR%%/text/gtk-logo-rgb.gif
+%%EXAMPLESDIR%%/text/test.txt
+%%EXAMPLESDIR%%/text/test_text.ml
+%%EXAMPLESDIR%%/text/text-demo.ml
+%%EXAMPLESDIR%%/text/unicode_table.ml
+%%EXAMPLESDIR%%/text/unicode_viewer.ml
+%%EXAMPLESDIR%%/timer.ml
+%%EXAMPLESDIR%%/toolbar.ml
+%%EXAMPLESDIR%%/tree.ml
+%%EXAMPLESDIR%%/tree_model.ml
+%%EXAMPLESDIR%%/tree_store.ml
+%%EXAMPLESDIR%%/tron.ml
+@dirrm %%EXAMPLESDIR%%/text
+%%RSVG%%@dirrm %%EXAMPLESDIR%%/rsvg
+%%PANEL%%@dirrm %%EXAMPLESDIR%%/panel
+%%GLADE%%@dirrm %%EXAMPLESDIR%%/glade
+%%GNOMECANVAS%%@dirrm %%EXAMPLESDIR%%/canvas
+@dirrm %%EXAMPLESDIR%%/GL
+@dirrm %%EXAMPLESDIR%%
+@unexec rmdir %D/share/examples/ocaml 2>/dev/null || true
+@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true
+@dirrm lib/ocaml/lablgtk2
+@unexec rmdir %D/lib/ocaml 2>/dev/null || true