Updated to version 2.16.0. Changed maintainer from pkgsrc-users@ to myself.

Added PLIST_VAR in order to install native code files only on appropriate
architectures.

This closes PR pkg/46922 (submitted before I became a developer).

Changes from 2.14.2 to 2.16.0:

2012.08.23 [Jacques]
  * update Windows port, compiles fine on mingw with
    ./configure --disable-gtktest
  * lablgtk2 script does not load extra libraries by default
    (use flag -all to load all extensions)

2012.08.17 [Jacques]
  * generate correct lablgtk2 script for findlib.
  * add old-uninstall target.
  * support threaded toplevel with Quartz backend, using gtkThTop.ml
    (runs the toplevel loop in another thread)
  * remove GtkThInit from META (not portable)
  * avoid busy waiting by using g_main_context_set_poll_func to
    make polling non-blocking.
    busy waiting is still needed for VM threads, and can be activated
    by setting the environment variable LABLGTK_BUSY_WAIT.

2012.08.16 [Jacques]
  * update applications/browser for OCaml 4.00
  * update applications/camlirc to use GText instead of GBroken.text

2012.07.26 [Pierre-Marie]
  * improvements to GtkSourceView2.
  * add cast and assignation functions to GText.nocopy_iter.
  * add Gtk 2.10 missing key modifiers.

2012.07.24 [Jacques]
  * can still install using old-install.

2012.06.19 [Adrien]
  * add a high-level API to create keyboard shortcuts.

2012.06.12 [Adrien]
  * add several #as_foo methods: entry, notebook, range
  * new signals for notebook: select_page, reorder_tab,
    change_current_page, move_focus_out, page_{added,removed,reordered}
  * add gtk_container_child_{set,get}_property
  * add gtk_notebook_{set,get}_tab_reorderable
  * add gtk_signal_new which can be used to create custom keyboard shortcuts
  * add g_signal_list and g_signal_query
  * add functions to connect to notify::foo signals which indicate when an
    object property changes
  * add foo#connect#notify_bar methods to add callbacks on changes of
    the "bar" property of the object "foo".

2012.04.11 [Maxence]
  * use findlib to install (see README for the list of installed packages)

2012.06.05 [Jacques]
  * merge GtkSourceView2 additions by Pierre-Marie Pedrot

2012.03.07 [Jacques]
  * add Make_Val_option to wrappers.h

2011.07.20 [Jacques]
  * add gtk_accelerator_name/get_label (for Pierre Boutillier)
  * add gtk_accel_map_foreach/change_entry (ibid)
  * add gdk_window_clear_area (for DDR)
  * make gtk_tree_view_get_visible_range version dependent (Thomas Ripoche)

12 files changed, 480 insertions, 390 deletions

diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index e19a212c175..f053c0025d9 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.63 2012/09/07 19:17:48 adam Exp $
+# $NetBSD: Makefile,v 1.64 2012/09/09 18:45:44 jaapb Exp $
 #
 
-DISTNAME=	lablgtk-2.14.2
-PKGREVISION=	20
+DISTNAME=	lablgtk-2.16.0
 CATEGORIES=	x11
-MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/979/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
+MAINTAINER=	jaapb@NetBSD.org
+HOMEPAGE=	http://lablgtk.forge.ocamlcore.org/
 COMMENT=	GTK+ 2.x bindings for Objective Caml
 # for installed files; more restrictions on applications/
 LICENSE=	gnu-lgpl-v2
@@ -29,7 +28,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 # Stub libraries for functions missing from base system.
-PLIST_VARS+=	stubs
+PLIST_VARS+=	stubs opt
 
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || \
     ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
@@ -37,14 +36,15 @@ PLIST_VARS+=	stubs
 PLIST.stubs=	yes
 .endif
 
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+PLIST.opt=      yes
+.endif
+
 .include "options.mk"
 
 INSTALLATION_DIRS+=	lib/ocaml/site-lib
 
-post-install:
-	cd ${DESTDIR}${PREFIX}/lib/ocaml/site-lib && ${LN} -s ../lablgtk2
-	${INSTALL_DATA} ${WRKSRC}/META ${DESTDIR}${PREFIX}/lib/ocaml/lablgtk2
-
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST
index df04b93f198..0ca1fd54536 100644
--- a/x11/lablgtk/PLIST
+++ b/x11/lablgtk/PLIST
@@ -1,262 +1,351 @@
-@comment $NetBSD: PLIST,v 1.14 2012/06/16 03:15:31 dholland Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/09/09 18:45:44 jaapb Exp $
 bin/gdk_pixbuf_mlsource
 bin/lablgtk2
-lib/ocaml/lablgtk2/META
-lib/ocaml/lablgtk2/gAction.cmi
-lib/ocaml/lablgtk2/gAction.cmx
-lib/ocaml/lablgtk2/gAction.ml
-lib/ocaml/lablgtk2/gAction.mli
-lib/ocaml/lablgtk2/gAssistant.cmi
-lib/ocaml/lablgtk2/gAssistant.cmx
-lib/ocaml/lablgtk2/gAssistant.ml
-lib/ocaml/lablgtk2/gAssistant.mli
-lib/ocaml/lablgtk2/gBin.cmi
-lib/ocaml/lablgtk2/gBin.cmx
-lib/ocaml/lablgtk2/gBin.ml
-lib/ocaml/lablgtk2/gBin.mli
-lib/ocaml/lablgtk2/gBroken.cmi
-lib/ocaml/lablgtk2/gBroken.cmx
-lib/ocaml/lablgtk2/gBroken.ml
-lib/ocaml/lablgtk2/gBroken.mli
-lib/ocaml/lablgtk2/gButton.cmi
-lib/ocaml/lablgtk2/gButton.cmx
-lib/ocaml/lablgtk2/gButton.ml
-lib/ocaml/lablgtk2/gButton.mli
-lib/ocaml/lablgtk2/gContainer.cmi
-lib/ocaml/lablgtk2/gContainer.cmx
-lib/ocaml/lablgtk2/gContainer.ml
-lib/ocaml/lablgtk2/gContainer.mli
-lib/ocaml/lablgtk2/gData.cmi
-lib/ocaml/lablgtk2/gData.cmx
-lib/ocaml/lablgtk2/gData.ml
-lib/ocaml/lablgtk2/gData.mli
-lib/ocaml/lablgtk2/gDraw.cmi
-lib/ocaml/lablgtk2/gDraw.cmx
-lib/ocaml/lablgtk2/gDraw.ml
-lib/ocaml/lablgtk2/gDraw.mli
-lib/ocaml/lablgtk2/gEdit.cmi
-lib/ocaml/lablgtk2/gEdit.cmx
-lib/ocaml/lablgtk2/gEdit.ml
-lib/ocaml/lablgtk2/gEdit.mli
-lib/ocaml/lablgtk2/gFile.cmi
-lib/ocaml/lablgtk2/gFile.cmx
-lib/ocaml/lablgtk2/gFile.ml
-lib/ocaml/lablgtk2/gFile.mli
-lib/ocaml/lablgtk2/gList.cmi
-lib/ocaml/lablgtk2/gList.cmx
-lib/ocaml/lablgtk2/gList.ml
-lib/ocaml/lablgtk2/gList.mli
-lib/ocaml/lablgtk2/gMain.cmi
-lib/ocaml/lablgtk2/gMain.cmx
-lib/ocaml/lablgtk2/gMain.ml
-lib/ocaml/lablgtk2/gMain.mli
-lib/ocaml/lablgtk2/gMenu.cmi
-lib/ocaml/lablgtk2/gMenu.cmx
-lib/ocaml/lablgtk2/gMenu.ml
-lib/ocaml/lablgtk2/gMenu.mli
-lib/ocaml/lablgtk2/gMisc.cmi
-lib/ocaml/lablgtk2/gMisc.cmx
-lib/ocaml/lablgtk2/gMisc.ml
-lib/ocaml/lablgtk2/gMisc.mli
-lib/ocaml/lablgtk2/gObj.cmi
-lib/ocaml/lablgtk2/gObj.cmx
-lib/ocaml/lablgtk2/gObj.ml
-lib/ocaml/lablgtk2/gObj.mli
-lib/ocaml/lablgtk2/gPack.cmi
-lib/ocaml/lablgtk2/gPack.cmx
-lib/ocaml/lablgtk2/gPack.ml
-lib/ocaml/lablgtk2/gPack.mli
-lib/ocaml/lablgtk2/gPango.cmi
-lib/ocaml/lablgtk2/gPango.cmx
-lib/ocaml/lablgtk2/gPango.ml
-lib/ocaml/lablgtk2/gRange.cmi
-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
-lib/ocaml/lablgtk2/gText.mli
-lib/ocaml/lablgtk2/gToolbox.cmi
-lib/ocaml/lablgtk2/gToolbox.cmx
-lib/ocaml/lablgtk2/gToolbox.ml
-lib/ocaml/lablgtk2/gToolbox.mli
-lib/ocaml/lablgtk2/gTree.cmi
-lib/ocaml/lablgtk2/gTree.cmx
-lib/ocaml/lablgtk2/gTree.ml
-lib/ocaml/lablgtk2/gTree.mli
-lib/ocaml/lablgtk2/gUtil.cmi
-lib/ocaml/lablgtk2/gUtil.cmx
-lib/ocaml/lablgtk2/gUtil.ml
-lib/ocaml/lablgtk2/gUtil.mli
-lib/ocaml/lablgtk2/gWindow.cmi
-lib/ocaml/lablgtk2/gWindow.cmx
-lib/ocaml/lablgtk2/gWindow.ml
-lib/ocaml/lablgtk2/gWindow.mli
-lib/ocaml/lablgtk2/gaux.cmi
-lib/ocaml/lablgtk2/gaux.cmx
-lib/ocaml/lablgtk2/gaux.ml
-lib/ocaml/lablgtk2/gdk.cmi
-lib/ocaml/lablgtk2/gdk.cmx
-lib/ocaml/lablgtk2/gdk.ml
-lib/ocaml/lablgtk2/gdk.mli
-lib/ocaml/lablgtk2/gdkEnums.cmi
-lib/ocaml/lablgtk2/gdkEnums.cmx
-lib/ocaml/lablgtk2/gdkEnums.ml
-lib/ocaml/lablgtk2/gdkEvent.cmi
-lib/ocaml/lablgtk2/gdkEvent.cmx
-lib/ocaml/lablgtk2/gdkEvent.ml
-lib/ocaml/lablgtk2/gdkKeysyms.cmi
-lib/ocaml/lablgtk2/gdkKeysyms.cmx
-lib/ocaml/lablgtk2/gdkKeysyms.ml
-lib/ocaml/lablgtk2/gdkPixbuf.cmi
-lib/ocaml/lablgtk2/gdkPixbuf.cmx
-lib/ocaml/lablgtk2/gdkPixbuf.ml
-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
-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
-lib/ocaml/lablgtk2/gnoDruid.mli
-lib/ocaml/lablgtk2/gobject.cmi
-lib/ocaml/lablgtk2/gobject.cmx
-lib/ocaml/lablgtk2/gobject.ml
-lib/ocaml/lablgtk2/gobject.mli
-lib/ocaml/lablgtk2/gobject_tags.h
-lib/ocaml/lablgtk2/gpointer.cmi
-lib/ocaml/lablgtk2/gpointer.cmx
-lib/ocaml/lablgtk2/gpointer.ml
-lib/ocaml/lablgtk2/gpointer.mli
-lib/ocaml/lablgtk2/gtk.cmi
-lib/ocaml/lablgtk2/gtk.cmx
-lib/ocaml/lablgtk2/gtk.ml
-lib/ocaml/lablgtk2/gtkAssistant.cmi
-lib/ocaml/lablgtk2/gtkAssistant.cmx
-lib/ocaml/lablgtk2/gtkAssistant.ml
-lib/ocaml/lablgtk2/gtkBase.cmi
-lib/ocaml/lablgtk2/gtkBase.cmx
-lib/ocaml/lablgtk2/gtkBase.ml
-lib/ocaml/lablgtk2/gtkBin.cmi
-lib/ocaml/lablgtk2/gtkBin.cmx
-lib/ocaml/lablgtk2/gtkBin.ml
-lib/ocaml/lablgtk2/gtkBroken.cmi
-lib/ocaml/lablgtk2/gtkBroken.cmx
-lib/ocaml/lablgtk2/gtkBroken.ml
-lib/ocaml/lablgtk2/gtkButton.cmi
-lib/ocaml/lablgtk2/gtkButton.cmx
-lib/ocaml/lablgtk2/gtkButton.ml
-lib/ocaml/lablgtk2/gtkData.cmi
-lib/ocaml/lablgtk2/gtkData.cmx
-lib/ocaml/lablgtk2/gtkData.ml
-lib/ocaml/lablgtk2/gtkEdit.cmi
-lib/ocaml/lablgtk2/gtkEdit.cmx
-lib/ocaml/lablgtk2/gtkEdit.ml
-lib/ocaml/lablgtk2/gtkEnums.cmi
-lib/ocaml/lablgtk2/gtkEnums.cmx
-lib/ocaml/lablgtk2/gtkEnums.ml
-lib/ocaml/lablgtk2/gtkFile.cmi
-lib/ocaml/lablgtk2/gtkFile.cmx
-lib/ocaml/lablgtk2/gtkFile.ml
-lib/ocaml/lablgtk2/gtkInit.cmi
-lib/ocaml/lablgtk2/gtkInit.cmo
-lib/ocaml/lablgtk2/gtkInit.cmx
-lib/ocaml/lablgtk2/gtkInit.ml
-lib/ocaml/lablgtk2/gtkInit.o
-lib/ocaml/lablgtk2/gtkList.cmi
-lib/ocaml/lablgtk2/gtkList.cmx
-lib/ocaml/lablgtk2/gtkList.ml
-lib/ocaml/lablgtk2/gtkMain.cmi
-lib/ocaml/lablgtk2/gtkMain.cmx
-lib/ocaml/lablgtk2/gtkMain.ml
-lib/ocaml/lablgtk2/gtkMenu.cmi
-lib/ocaml/lablgtk2/gtkMenu.cmx
-lib/ocaml/lablgtk2/gtkMenu.ml
-lib/ocaml/lablgtk2/gtkMisc.cmi
-lib/ocaml/lablgtk2/gtkMisc.cmx
-lib/ocaml/lablgtk2/gtkMisc.ml
-lib/ocaml/lablgtk2/gtkObject.cmi
-lib/ocaml/lablgtk2/gtkObject.cmx
-lib/ocaml/lablgtk2/gtkObject.ml
-lib/ocaml/lablgtk2/gtkPack.cmi
-lib/ocaml/lablgtk2/gtkPack.cmx
-lib/ocaml/lablgtk2/gtkPack.ml
-lib/ocaml/lablgtk2/gtkRange.cmi
-lib/ocaml/lablgtk2/gtkRange.cmx
-lib/ocaml/lablgtk2/gtkRange.ml
-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
-lib/ocaml/lablgtk2/gtkStock.cmx
-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
-lib/ocaml/lablgtk2/gtkThread.cmo
-lib/ocaml/lablgtk2/gtkThread.cmx
-lib/ocaml/lablgtk2/gtkThread.ml
-lib/ocaml/lablgtk2/gtkThread.mli
-lib/ocaml/lablgtk2/gtkThread.o
-lib/ocaml/lablgtk2/gtkTree.cmi
-lib/ocaml/lablgtk2/gtkTree.cmx
-lib/ocaml/lablgtk2/gtkTree.ml
-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
-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_gtktext.h
-lib/ocaml/lablgtk2/ml_gtktree.h
-lib/ocaml/lablgtk2/ml_gvaluecaml.h
-lib/ocaml/lablgtk2/ml_pango.h
-lib/ocaml/lablgtk2/panel.mli
-lib/ocaml/lablgtk2/pango.cmi
-lib/ocaml/lablgtk2/pango.cmx
-lib/ocaml/lablgtk2/pango.ml
-lib/ocaml/lablgtk2/pangoEnums.cmi
-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
-lib/ocaml/lablgtk2/varcc
-lib/ocaml/lablgtk2/win32.h
-lib/ocaml/lablgtk2/wrappers.h
-lib/ocaml/lablgtk2/xml_lexer.mli
-lib/ocaml/site-lib/lablgtk2
-${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so
+lib/ocaml/site-lib/lablgtk2/META
+lib/ocaml/site-lib/lablgtk2/build.ml
+lib/ocaml/site-lib/lablgtk2/gAction.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gAction.cmx
+lib/ocaml/site-lib/lablgtk2/gAction.ml
+lib/ocaml/site-lib/lablgtk2/gAction.mli
+lib/ocaml/site-lib/lablgtk2/gAssistant.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gAssistant.cmx
+lib/ocaml/site-lib/lablgtk2/gAssistant.ml
+lib/ocaml/site-lib/lablgtk2/gAssistant.mli
+lib/ocaml/site-lib/lablgtk2/gBin.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gBin.cmx
+lib/ocaml/site-lib/lablgtk2/gBin.ml
+lib/ocaml/site-lib/lablgtk2/gBin.mli
+lib/ocaml/site-lib/lablgtk2/gBroken.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gBroken.cmx
+lib/ocaml/site-lib/lablgtk2/gBroken.ml
+lib/ocaml/site-lib/lablgtk2/gBroken.mli
+lib/ocaml/site-lib/lablgtk2/gButton.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gButton.cmx
+lib/ocaml/site-lib/lablgtk2/gButton.ml
+lib/ocaml/site-lib/lablgtk2/gButton.mli
+lib/ocaml/site-lib/lablgtk2/gContainer.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gContainer.cmx
+lib/ocaml/site-lib/lablgtk2/gContainer.ml
+lib/ocaml/site-lib/lablgtk2/gContainer.mli
+lib/ocaml/site-lib/lablgtk2/gData.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gData.cmx
+lib/ocaml/site-lib/lablgtk2/gData.ml
+lib/ocaml/site-lib/lablgtk2/gData.mli
+lib/ocaml/site-lib/lablgtk2/gDraw.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gDraw.cmx
+lib/ocaml/site-lib/lablgtk2/gDraw.ml
+lib/ocaml/site-lib/lablgtk2/gDraw.mli
+lib/ocaml/site-lib/lablgtk2/gEdit.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gEdit.cmx
+lib/ocaml/site-lib/lablgtk2/gEdit.ml
+lib/ocaml/site-lib/lablgtk2/gEdit.mli
+lib/ocaml/site-lib/lablgtk2/gFile.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gFile.cmx
+lib/ocaml/site-lib/lablgtk2/gFile.ml
+lib/ocaml/site-lib/lablgtk2/gFile.mli
+lib/ocaml/site-lib/lablgtk2/gList.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gList.cmx
+lib/ocaml/site-lib/lablgtk2/gList.ml
+lib/ocaml/site-lib/lablgtk2/gList.mli
+lib/ocaml/site-lib/lablgtk2/gMain.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gMain.cmx
+lib/ocaml/site-lib/lablgtk2/gMain.ml
+lib/ocaml/site-lib/lablgtk2/gMain.mli
+lib/ocaml/site-lib/lablgtk2/gMenu.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gMenu.cmx
+lib/ocaml/site-lib/lablgtk2/gMenu.ml
+lib/ocaml/site-lib/lablgtk2/gMenu.mli
+lib/ocaml/site-lib/lablgtk2/gMisc.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gMisc.cmx
+lib/ocaml/site-lib/lablgtk2/gMisc.ml
+lib/ocaml/site-lib/lablgtk2/gMisc.mli
+lib/ocaml/site-lib/lablgtk2/gObj.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gObj.cmx
+lib/ocaml/site-lib/lablgtk2/gObj.ml
+lib/ocaml/site-lib/lablgtk2/gObj.mli
+lib/ocaml/site-lib/lablgtk2/gPack.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gPack.cmx
+lib/ocaml/site-lib/lablgtk2/gPack.ml
+lib/ocaml/site-lib/lablgtk2/gPack.mli
+lib/ocaml/site-lib/lablgtk2/gPango.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gPango.cmx
+lib/ocaml/site-lib/lablgtk2/gPango.ml
+lib/ocaml/site-lib/lablgtk2/gRange.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gRange.cmx
+lib/ocaml/site-lib/lablgtk2/gRange.ml
+lib/ocaml/site-lib/lablgtk2/gRange.mli
+lib/ocaml/site-lib/lablgtk2/gSourceView.mli
+lib/ocaml/site-lib/lablgtk2/gSourceView2.mli
+lib/ocaml/site-lib/lablgtk2/gText.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gText.cmx
+lib/ocaml/site-lib/lablgtk2/gText.ml
+lib/ocaml/site-lib/lablgtk2/gText.mli
+lib/ocaml/site-lib/lablgtk2/gToolbox.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gToolbox.cmx
+lib/ocaml/site-lib/lablgtk2/gToolbox.ml
+lib/ocaml/site-lib/lablgtk2/gToolbox.mli
+lib/ocaml/site-lib/lablgtk2/gTree.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gTree.cmx
+lib/ocaml/site-lib/lablgtk2/gTree.ml
+lib/ocaml/site-lib/lablgtk2/gTree.mli
+lib/ocaml/site-lib/lablgtk2/gUtil.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gUtil.cmx
+lib/ocaml/site-lib/lablgtk2/gUtil.ml
+lib/ocaml/site-lib/lablgtk2/gUtil.mli
+lib/ocaml/site-lib/lablgtk2/gWindow.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gWindow.cmx
+lib/ocaml/site-lib/lablgtk2/gWindow.ml
+lib/ocaml/site-lib/lablgtk2/gWindow.mli
+lib/ocaml/site-lib/lablgtk2/gaux.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gaux.cmx
+lib/ocaml/site-lib/lablgtk2/gaux.ml
+lib/ocaml/site-lib/lablgtk2/gdk.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gdk.cmx
+lib/ocaml/site-lib/lablgtk2/gdk.ml
+lib/ocaml/site-lib/lablgtk2/gdk.mli
+lib/ocaml/site-lib/lablgtk2/gdkEnums.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gdkEnums.cmx
+lib/ocaml/site-lib/lablgtk2/gdkEnums.ml
+lib/ocaml/site-lib/lablgtk2/gdkEvent.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gdkEvent.cmx
+lib/ocaml/site-lib/lablgtk2/gdkEvent.ml
+lib/ocaml/site-lib/lablgtk2/gdkKeysyms.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gdkKeysyms.cmx
+lib/ocaml/site-lib/lablgtk2/gdkKeysyms.ml
+lib/ocaml/site-lib/lablgtk2/gdkPixbuf.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gdkPixbuf.cmx
+lib/ocaml/site-lib/lablgtk2/gdkPixbuf.ml
+lib/ocaml/site-lib/lablgtk2/gdkPixbuf.mli
+lib/ocaml/site-lib/lablgtk2/gdk_tags.h
+lib/ocaml/site-lib/lablgtk2/gdkpixbuf_tags.h
+lib/ocaml/site-lib/lablgtk2/gdkprivate-win32.h
+lib/ocaml/site-lib/lablgtk2/glGtk.mli
+lib/ocaml/site-lib/lablgtk2/glade.mli
+lib/ocaml/site-lib/lablgtk2/glib.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/glib.cmx
+lib/ocaml/site-lib/lablgtk2/glib.ml
+lib/ocaml/site-lib/lablgtk2/glib.mli
+lib/ocaml/site-lib/lablgtk2/glib_tags.h
+lib/ocaml/site-lib/lablgtk2/gnoCanvas.mli
+lib/ocaml/site-lib/lablgtk2/gnoDruid.mli
+lib/ocaml/site-lib/lablgtk2/gobject.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gobject.cmx
+lib/ocaml/site-lib/lablgtk2/gobject.ml
+lib/ocaml/site-lib/lablgtk2/gobject.mli
+lib/ocaml/site-lib/lablgtk2/gobject_tags.h
+lib/ocaml/site-lib/lablgtk2/gpointer.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gpointer.cmx
+lib/ocaml/site-lib/lablgtk2/gpointer.ml
+lib/ocaml/site-lib/lablgtk2/gpointer.mli
+lib/ocaml/site-lib/lablgtk2/gtk.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtk.cmx
+lib/ocaml/site-lib/lablgtk2/gtk.ml
+lib/ocaml/site-lib/lablgtk2/gtkActionProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkActionProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkActionProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkAssistant.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkAssistant.cmx
+lib/ocaml/site-lib/lablgtk2/gtkAssistant.ml
+lib/ocaml/site-lib/lablgtk2/gtkAssistantProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkAssistantProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkAssistantProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkBase.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBase.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBase.ml
+lib/ocaml/site-lib/lablgtk2/gtkBaseProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBaseProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBaseProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkBin.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBin.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBin.ml
+lib/ocaml/site-lib/lablgtk2/gtkBinProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBinProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBinProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkBroken.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBroken.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBroken.ml
+lib/ocaml/site-lib/lablgtk2/gtkBrokenProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkBrokenProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkBrokenProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkButton.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkButton.cmx
+lib/ocaml/site-lib/lablgtk2/gtkButton.ml
+lib/ocaml/site-lib/lablgtk2/gtkButtonProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkButtonProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkButtonProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkData.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkData.cmx
+lib/ocaml/site-lib/lablgtk2/gtkData.ml
+lib/ocaml/site-lib/lablgtk2/gtkEdit.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkEdit.cmx
+lib/ocaml/site-lib/lablgtk2/gtkEdit.ml
+lib/ocaml/site-lib/lablgtk2/gtkEditProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkEditProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkEditProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkEnums.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkEnums.cmx
+lib/ocaml/site-lib/lablgtk2/gtkEnums.ml
+lib/ocaml/site-lib/lablgtk2/gtkFile.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkFile.cmx
+lib/ocaml/site-lib/lablgtk2/gtkFile.ml
+lib/ocaml/site-lib/lablgtk2/gtkFileProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkFileProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkFileProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkInit.cmi
+lib/ocaml/site-lib/lablgtk2/gtkInit.cmo
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkInit.cmx
+lib/ocaml/site-lib/lablgtk2/gtkInit.ml
+lib/ocaml/site-lib/lablgtk2/gtkInit.o
+lib/ocaml/site-lib/lablgtk2/gtkList.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkList.cmx
+lib/ocaml/site-lib/lablgtk2/gtkList.ml
+lib/ocaml/site-lib/lablgtk2/gtkListProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkListProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkListProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkMain.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkMain.cmx
+lib/ocaml/site-lib/lablgtk2/gtkMain.ml
+lib/ocaml/site-lib/lablgtk2/gtkMenu.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkMenu.cmx
+lib/ocaml/site-lib/lablgtk2/gtkMenu.ml
+lib/ocaml/site-lib/lablgtk2/gtkMenuProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkMenuProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkMenuProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkMisc.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkMisc.cmx
+lib/ocaml/site-lib/lablgtk2/gtkMisc.ml
+lib/ocaml/site-lib/lablgtk2/gtkMiscProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkMiscProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkMiscProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkObject.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkObject.cmx
+lib/ocaml/site-lib/lablgtk2/gtkObject.ml
+lib/ocaml/site-lib/lablgtk2/gtkPack.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkPack.cmx
+lib/ocaml/site-lib/lablgtk2/gtkPack.ml
+lib/ocaml/site-lib/lablgtk2/gtkPackProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkPackProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkPackProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkRange.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkRange.cmx
+lib/ocaml/site-lib/lablgtk2/gtkRange.ml
+lib/ocaml/site-lib/lablgtk2/gtkRangeProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkRangeProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkRangeProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkSignal.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkSignal.cmx
+lib/ocaml/site-lib/lablgtk2/gtkSignal.ml
+lib/ocaml/site-lib/lablgtk2/gtkSignal.mli
+lib/ocaml/site-lib/lablgtk2/gtkSourceView2_types.mli
+lib/ocaml/site-lib/lablgtk2/gtkSourceView_types.mli
+lib/ocaml/site-lib/lablgtk2/gtkSpell.mli
+lib/ocaml/site-lib/lablgtk2/gtkStock.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkStock.cmx
+lib/ocaml/site-lib/lablgtk2/gtkStock.ml
+lib/ocaml/site-lib/lablgtk2/gtkText.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkText.cmx
+lib/ocaml/site-lib/lablgtk2/gtkText.ml
+lib/ocaml/site-lib/lablgtk2/gtkTextProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkTextProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkTextProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkThInit.cmi
+lib/ocaml/site-lib/lablgtk2/gtkThInit.cmo
+lib/ocaml/site-lib/lablgtk2/gtkThInit.ml
+lib/ocaml/site-lib/lablgtk2/gtkThread.cmi
+lib/ocaml/site-lib/lablgtk2/gtkThread.cmo
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkThread.cmx
+lib/ocaml/site-lib/lablgtk2/gtkThread.ml
+lib/ocaml/site-lib/lablgtk2/gtkThread.mli
+lib/ocaml/site-lib/lablgtk2/gtkThread.o
+lib/ocaml/site-lib/lablgtk2/gtkTree.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkTree.cmx
+lib/ocaml/site-lib/lablgtk2/gtkTree.ml
+lib/ocaml/site-lib/lablgtk2/gtkTreeProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkTreeProps.cmx
+lib/ocaml/site-lib/lablgtk2/gtkTreeProps.ml
+lib/ocaml/site-lib/lablgtk2/gtkWindow.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkWindow.cmx
+lib/ocaml/site-lib/lablgtk2/gtkWindow.ml
+lib/ocaml/site-lib/lablgtk2/gtk_tags.h
+lib/ocaml/site-lib/lablgtk2/gutf8.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gutf8.cmx
+lib/ocaml/site-lib/lablgtk2/gutf8.ml
+lib/ocaml/site-lib/lablgtk2/gutf8.mli
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtk.a
+lib/ocaml/site-lib/lablgtk2/lablgtk.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtk.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtk.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgtk2.a
+lib/ocaml/site-lib/lablgtk2/ml_domain.h
+lib/ocaml/site-lib/lablgtk2/ml_gdk.h
+lib/ocaml/site-lib/lablgtk2/ml_gdkpixbuf.h
+lib/ocaml/site-lib/lablgtk2/ml_glib.h
+lib/ocaml/site-lib/lablgtk2/ml_gobject.h
+lib/ocaml/site-lib/lablgtk2/ml_gpointer.h
+lib/ocaml/site-lib/lablgtk2/ml_gtk.h
+lib/ocaml/site-lib/lablgtk2/ml_gtktext.h
+lib/ocaml/site-lib/lablgtk2/ml_gtktree.h
+lib/ocaml/site-lib/lablgtk2/ml_gvaluecaml.h
+lib/ocaml/site-lib/lablgtk2/ml_pango.h
+lib/ocaml/site-lib/lablgtk2/ogtkActionProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkActionProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkActionProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkAssistantProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkAssistantProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkAssistantProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkBaseProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkBaseProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkBaseProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkBinProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkBinProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkBinProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkBrokenProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkBrokenProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkBrokenProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkButtonProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkButtonProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkButtonProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkEditProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkEditProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkEditProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkFileProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkFileProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkFileProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkListProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkListProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkListProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkMenuProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkMenuProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkMenuProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkMiscProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkMiscProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkMiscProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkPackProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkPackProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkPackProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkRangeProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkRangeProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkRangeProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkTextProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkTextProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkTextProps.ml
+lib/ocaml/site-lib/lablgtk2/ogtkTreeProps.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/ogtkTreeProps.cmx
+lib/ocaml/site-lib/lablgtk2/ogtkTreeProps.ml
+lib/ocaml/site-lib/lablgtk2/panel.mli
+lib/ocaml/site-lib/lablgtk2/pango.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/pango.cmx
+lib/ocaml/site-lib/lablgtk2/pango.ml
+lib/ocaml/site-lib/lablgtk2/pangoEnums.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/pangoEnums.cmx
+lib/ocaml/site-lib/lablgtk2/pangoEnums.ml
+lib/ocaml/site-lib/lablgtk2/pango_tags.h
+lib/ocaml/site-lib/lablgtk2/propcc
+lib/ocaml/site-lib/lablgtk2/rsvg.mli
+lib/ocaml/site-lib/lablgtk2/varcc
+lib/ocaml/site-lib/lablgtk2/win32.h
+lib/ocaml/site-lib/lablgtk2/wrappers.h
+lib/ocaml/site-lib/lablgtk2/xml_lexer.mli
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgtk2.so
 @comment in ocaml: lib/ocaml/stublibs
 @comment in ocaml: lib/ocaml
diff --git a/x11/lablgtk/PLIST.glade b/x11/lablgtk/PLIST.glade
index 42f547c8863..6fd3c2978fc 100644
--- a/x11/lablgtk/PLIST.glade
+++ b/x11/lablgtk/PLIST.glade
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.glade,v 1.3 2010/09/25 11:18:28 obache Exp $
+@comment $NetBSD: PLIST.glade,v 1.4 2012/09/09 18:45:45 jaapb Exp $
 bin/lablgladecc2
-lib/ocaml/lablgtk2/glade.cmi
-lib/ocaml/lablgtk2/glade.cmx
-lib/ocaml/lablgtk2/glade.ml
-lib/ocaml/lablgtk2/lablglade.a
-lib/ocaml/lablgtk2/lablglade.cma
-lib/ocaml/lablgtk2/lablglade.cmxa
-lib/ocaml/lablgtk2/lablglade.cmxs
-lib/ocaml/lablgtk2/liblablglade2.a
-${PLIST.stubs}lib/ocaml/stublibs/dlllablglade2.so
+lib/ocaml/site-lib/lablgtk2/glade.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/glade.cmx
+lib/ocaml/site-lib/lablgtk2/glade.ml
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablglade.a
+lib/ocaml/site-lib/lablgtk2/lablglade.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablglade.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablglade.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablglade2.a
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablglade2.so
diff --git a/x11/lablgtk/PLIST.gnome b/x11/lablgtk/PLIST.gnome
index a64a6706319..07f8eea7505 100644
--- a/x11/lablgtk/PLIST.gnome
+++ b/x11/lablgtk/PLIST.gnome
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST.gnome,v 1.3 2010/09/25 11:18:28 obache Exp $
-lib/ocaml/lablgtk2/gnoDruid.cmi
-lib/ocaml/lablgtk2/gnoDruid.cmx
-lib/ocaml/lablgtk2/gnoDruid.ml
-lib/ocaml/lablgtk2/gnomeDruid.cmi
-lib/ocaml/lablgtk2/gnomeDruid.cmx
-lib/ocaml/lablgtk2/gnomeDruid.ml
-lib/ocaml/lablgtk2/gnomeui_tags.h
-lib/ocaml/lablgtk2/lablgnomeui.a
-lib/ocaml/lablgtk2/lablgnomeui.cma
-lib/ocaml/lablgtk2/lablgnomeui.cmxa
-lib/ocaml/lablgtk2/lablgnomeui.cmxs
-lib/ocaml/lablgtk2/liblablgnomeui.a
-${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so
+@comment $NetBSD: PLIST.gnome,v 1.4 2012/09/09 18:45:45 jaapb Exp $
+lib/ocaml/site-lib/lablgtk2/gnoDruid.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gnoDruid.cmx
+lib/ocaml/site-lib/lablgtk2/gnoDruid.ml
+lib/ocaml/site-lib/lablgtk2/gnomeDruid.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gnomeDruid.cmx
+lib/ocaml/site-lib/lablgtk2/gnomeDruid.ml
+lib/ocaml/site-lib/lablgtk2/gnomeui_tags.h
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomeui.a
+lib/ocaml/site-lib/lablgtk2/lablgnomeui.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomeui.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomeui.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgnomeui.a
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgnomeui.so
diff --git a/x11/lablgtk/PLIST.gnomecanvas b/x11/lablgtk/PLIST.gnomecanvas
index 1fdc057ed14..5436ed55067 100644
--- a/x11/lablgtk/PLIST.gnomecanvas
+++ b/x11/lablgtk/PLIST.gnomecanvas
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST.gnomecanvas,v 1.3 2010/09/25 11:18:28 obache Exp $
-lib/ocaml/lablgtk2/gnoCanvas.cmi
-lib/ocaml/lablgtk2/gnoCanvas.cmx
-lib/ocaml/lablgtk2/gnoCanvas.ml
-lib/ocaml/lablgtk2/gnomeCanvas.cmi
-lib/ocaml/lablgtk2/gnomeCanvas.cmx
-lib/ocaml/lablgtk2/gnomeCanvas.ml
-lib/ocaml/lablgtk2/lablgnomecanvas.a
-lib/ocaml/lablgtk2/lablgnomecanvas.cma
-lib/ocaml/lablgtk2/lablgnomecanvas.cmxa
-lib/ocaml/lablgtk2/lablgnomecanvas.cmxs
-lib/ocaml/lablgtk2/lablpanel.a
-lib/ocaml/lablgtk2/lablpanel.cma
-lib/ocaml/lablgtk2/lablpanel.cmxa
-lib/ocaml/lablgtk2/lablpanel.cmxs
-lib/ocaml/lablgtk2/liblablgnomecanvas.a
-lib/ocaml/lablgtk2/liblablpanel.a
-lib/ocaml/lablgtk2/panel.cmi
-lib/ocaml/lablgtk2/panel.cmx
-lib/ocaml/lablgtk2/panel.ml
-lib/ocaml/lablgtk2/panel_tags.h
-${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomecanvas.so
-${PLIST.stubs}lib/ocaml/stublibs/dlllablpanel.so
+@comment $NetBSD: PLIST.gnomecanvas,v 1.4 2012/09/09 18:45:45 jaapb Exp $
+lib/ocaml/site-lib/lablgtk2/gnoCanvas.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gnoCanvas.cmx
+lib/ocaml/site-lib/lablgtk2/gnoCanvas.ml
+lib/ocaml/site-lib/lablgtk2/gnomeCanvas.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gnomeCanvas.cmx
+lib/ocaml/site-lib/lablgtk2/gnomeCanvas.ml
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomecanvas.a
+lib/ocaml/site-lib/lablgtk2/lablgnomecanvas.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomecanvas.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgnomecanvas.cmxs
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablpanel.a
+lib/ocaml/site-lib/lablgtk2/lablpanel.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablpanel.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablpanel.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgnomecanvas.a
+lib/ocaml/site-lib/lablgtk2/liblablpanel.a
+lib/ocaml/site-lib/lablgtk2/panel.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/panel.cmx
+lib/ocaml/site-lib/lablgtk2/panel.ml
+lib/ocaml/site-lib/lablgtk2/panel_tags.h
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgnomecanvas.so
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablpanel.so
diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview
index e3bf97beb96..33623ff8d33 100644
--- a/x11/lablgtk/PLIST.gtksourceview
+++ b/x11/lablgtk/PLIST.gtksourceview
@@ -1,17 +1,17 @@
-@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
-lib/ocaml/lablgtk2/gtkSourceView.cmi
-lib/ocaml/lablgtk2/gtkSourceView.cmx
-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
-lib/ocaml/lablgtk2/sourceViewEnums.ml
-lib/ocaml/lablgtk2/sourceView_tags.h
-${PLIST.stubs}lib/ocaml/stublibs/dlllablgtksourceview.so
+@comment $NetBSD: PLIST.gtksourceview,v 1.4 2012/09/09 18:45:45 jaapb Exp $
+lib/ocaml/site-lib/lablgtk2/gSourceView.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gSourceView.cmx
+lib/ocaml/site-lib/lablgtk2/gSourceView.ml
+lib/ocaml/site-lib/lablgtk2/gtkSourceView.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkSourceView.cmx
+lib/ocaml/site-lib/lablgtk2/gtkSourceView.ml
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview.a
+lib/ocaml/site-lib/lablgtk2/lablgtksourceview.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgtksourceview.a
+lib/ocaml/site-lib/lablgtk2/sourceViewEnums.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/sourceViewEnums.cmx
+lib/ocaml/site-lib/lablgtk2/sourceViewEnums.ml
+lib/ocaml/site-lib/lablgtk2/sourceView_tags.h
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgtksourceview.so
diff --git a/x11/lablgtk/PLIST.gtksourceview2 b/x11/lablgtk/PLIST.gtksourceview2
index 15ca6337979..b032f6bc9f4 100644
--- a/x11/lablgtk/PLIST.gtksourceview2
+++ b/x11/lablgtk/PLIST.gtksourceview2
@@ -1,17 +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
+@comment $NetBSD: PLIST.gtksourceview2,v 1.2 2012/09/09 18:45:45 jaapb Exp $
+lib/ocaml/site-lib/lablgtk2/gSourceView2.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gSourceView2.cmx
+lib/ocaml/site-lib/lablgtk2/gSourceView2.ml
+lib/ocaml/site-lib/lablgtk2/gtkSourceView2.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkSourceView2.cmx
+lib/ocaml/site-lib/lablgtk2/gtkSourceView2.ml
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview2.a
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview2.cma
+lib/ocaml/site-lib/lablgtk2/lablgtksourceview2.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtksourceview2.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgtksourceview2.a
+lib/ocaml/site-lib/lablgtk2/sourceView2Enums.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/sourceView2Enums.cmx
+lib/ocaml/site-lib/lablgtk2/sourceView2Enums.ml
+lib/ocaml/site-lib/lablgtk2/sourceView2_tags.h
+lib/ocaml/site-lib/lablgtk2/dlllablgtksourceview2.so
diff --git a/x11/lablgtk/PLIST.gtkspell b/x11/lablgtk/PLIST.gtkspell
index 415382130b1..406735de5f7 100644
--- a/x11/lablgtk/PLIST.gtkspell
+++ b/x11/lablgtk/PLIST.gtkspell
@@ -1,10 +1,10 @@
-@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
+@comment $NetBSD: PLIST.gtkspell,v 1.3 2012/09/09 18:45:45 jaapb Exp $
+lib/ocaml/site-lib/lablgtk2/gtkSpell.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/gtkSpell.cmx
+lib/ocaml/site-lib/lablgtk2/gtkSpell.ml
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtkspell.a
+lib/ocaml/site-lib/lablgtk2/lablgtkspell.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtkspell.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablgtkspell.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablgtkspell.a
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgtkspell.so
diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg
index ab236619ef2..4ec2f6d8548 100644
--- a/x11/lablgtk/PLIST.svg
+++ b/x11/lablgtk/PLIST.svg
@@ -1,10 +1,10 @@
-@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
-lib/ocaml/lablgtk2/rsvg.ml
-${PLIST.stubs}lib/ocaml/stublibs/dlllablrsvg.so
+@comment $NetBSD: PLIST.svg,v 1.5 2012/09/09 18:45:45 jaapb Exp $
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablrsvg.a
+lib/ocaml/site-lib/lablgtk2/lablrsvg.cma
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablrsvg.cmxa
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/lablrsvg.cmxs
+lib/ocaml/site-lib/lablgtk2/liblablrsvg.a
+lib/ocaml/site-lib/lablgtk2/rsvg.cmi
+${PLIST.opt}lib/ocaml/site-lib/lablgtk2/rsvg.cmx
+lib/ocaml/site-lib/lablgtk2/rsvg.ml
+${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablrsvg.so
diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo
index 295a8ce088a..79c82f0448d 100644
--- a/x11/lablgtk/distinfo
+++ b/x11/lablgtk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2010/09/19 15:33:10 wiz Exp $
+$NetBSD: distinfo,v 1.17 2012/09/09 18:45:45 jaapb Exp $
 
-SHA1 (lablgtk-2.14.2.tar.gz) = fd184418ccbc542825748ca63fba75138d2ea561
-RMD160 (lablgtk-2.14.2.tar.gz) = aa463705398eb60712187ef6a252849fb59cbff2
-Size (lablgtk-2.14.2.tar.gz) = 779803 bytes
-SHA1 (patch-aa) = 193a906174c4f48c404a6b8bf045d7b6d1fe85c3
+SHA1 (lablgtk-2.16.0.tar.gz) = 3dec411a410fbb38d6e2e5a43a4ebfb2e407e7e6
+RMD160 (lablgtk-2.16.0.tar.gz) = 47d89ce62e02dc4143f340e92adfdde6bbdef89a
+Size (lablgtk-2.16.0.tar.gz) = 787217 bytes
+SHA1 (patch-src_Makefile) = fad55d7546b948b006a8c3ad9f5381ac647cfb53
diff --git a/x11/lablgtk/patches/patch-aa b/x11/lablgtk/patches/patch-aa
deleted file mode 100644
index 2bfd50653cf..00000000000
--- a/x11/lablgtk/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2010/08/28 16:13:25 wiz Exp $
-
---- src/Makefile.orig	2010-05-20 07:55:54.000000000 +0000
-+++ src/Makefile
-@@ -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)"
- 	cp -p *.h "$(INSTALLDIR)"
- 	@if test -f lablgtk.cmxa; then $(MAKE) installopt; fi
- 	@if test -f dlllablgtk2$(XS); then $(MAKE) installdll; fi
diff --git a/x11/lablgtk/patches/patch-src_Makefile b/x11/lablgtk/patches/patch-src_Makefile
new file mode 100644
index 00000000000..ed8ba8fec64
--- /dev/null
+++ b/x11/lablgtk/patches/patch-src_Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile,v 1.1 2012/09/09 18:45:45 jaapb Exp $
+
+Support DESTDIR when installing
+--- src/Makefile.orig	2012-08-23 10:37:48.000000000 +0000
++++ src/Makefile
+@@ -391,7 +391,9 @@ old-uninstall:
+ # Install using ocamlfind
+ findlib-install:
+ 	mkdir -p "$(BINDIR)"
+-	ocamlfind install lablgtk2 ../META \
++	ocamlfind install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \
++    -ldconf /var/null lablgtk2 \
++    ../META \
+     build.ml \
+     $(CLIBS) \
+     $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \