Updated package to use ocaml.mk framework. No upstream changes.

9 files changed, 452 insertions, 458 deletions

diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile
index b36db8e30db..cc0bdaf1bbd 100644
--- a/x11/ocaml-lablgtk/Makefile
+++ b/x11/ocaml-lablgtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2016/05/22 17:42:14 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/06/25 14:33:11 jaapb Exp $
 
 DISTNAME=	lablgtk-2.18.4
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/1602/
 
@@ -15,6 +16,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-debug
 USE_TOOLS+=		gmake pkg-config
 OCAML_USE_FINDLIB=	yes
+OCAML_FINDLIB_DIRS=	lablgtk2
 
 MAKE_JOBS_SAFE=		no
 BUILD_TARGET=		world
@@ -27,7 +29,7 @@ SUPERSEDES=	lablgtk-[0-9]*
 .include "../../mk/bsd.prefs.mk"
 
 # Stub libraries for functions missing from base system.
-PLIST_VARS+=	stubs opt
+PLIST_VARS+=	stubs
 
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || \
     ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
@@ -37,10 +39,6 @@ PLIST.stubs=	yes
 
 .include "../../mk/ocaml.mk"
 
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-PLIST.opt=	yes
-.endif
-
 .include "options.mk"
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/ocaml-lablgtk/PLIST b/x11/ocaml-lablgtk/PLIST
index eb7b92c4368..c0fccb8df11 100644
--- a/x11/ocaml-lablgtk/PLIST
+++ b/x11/ocaml-lablgtk/PLIST
@@ -1,353 +1,349 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/10 08:37:49 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:33:11 jaapb Exp $
 bin/gdk_pixbuf_mlsource
 bin/lablgtk2
-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
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/lablgtk2
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/lablgtk2
+${OCAML_SITELIB}/lablgtk2/META
+${OCAML_SITELIB}/lablgtk2/build.ml
+${OCAML_SITELIB}/lablgtk2/gAction.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gAction.cmx
+${OCAML_SITELIB}/lablgtk2/gAction.ml
+${OCAML_SITELIB}/lablgtk2/gAction.mli
+${OCAML_SITELIB}/lablgtk2/gAssistant.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gAssistant.cmx
+${OCAML_SITELIB}/lablgtk2/gAssistant.ml
+${OCAML_SITELIB}/lablgtk2/gAssistant.mli
+${OCAML_SITELIB}/lablgtk2/gBin.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gBin.cmx
+${OCAML_SITELIB}/lablgtk2/gBin.ml
+${OCAML_SITELIB}/lablgtk2/gBin.mli
+${OCAML_SITELIB}/lablgtk2/gBroken.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gBroken.cmx
+${OCAML_SITELIB}/lablgtk2/gBroken.ml
+${OCAML_SITELIB}/lablgtk2/gBroken.mli
+${OCAML_SITELIB}/lablgtk2/gButton.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gButton.cmx
+${OCAML_SITELIB}/lablgtk2/gButton.ml
+${OCAML_SITELIB}/lablgtk2/gButton.mli
+${OCAML_SITELIB}/lablgtk2/gContainer.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gContainer.cmx
+${OCAML_SITELIB}/lablgtk2/gContainer.ml
+${OCAML_SITELIB}/lablgtk2/gContainer.mli
+${OCAML_SITELIB}/lablgtk2/gData.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gData.cmx
+${OCAML_SITELIB}/lablgtk2/gData.ml
+${OCAML_SITELIB}/lablgtk2/gData.mli
+${OCAML_SITELIB}/lablgtk2/gDraw.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gDraw.cmx
+${OCAML_SITELIB}/lablgtk2/gDraw.ml
+${OCAML_SITELIB}/lablgtk2/gDraw.mli
+${OCAML_SITELIB}/lablgtk2/gEdit.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gEdit.cmx
+${OCAML_SITELIB}/lablgtk2/gEdit.ml
+${OCAML_SITELIB}/lablgtk2/gEdit.mli
+${OCAML_SITELIB}/lablgtk2/gFile.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gFile.cmx
+${OCAML_SITELIB}/lablgtk2/gFile.ml
+${OCAML_SITELIB}/lablgtk2/gFile.mli
+${OCAML_SITELIB}/lablgtk2/gList.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gList.cmx
+${OCAML_SITELIB}/lablgtk2/gList.ml
+${OCAML_SITELIB}/lablgtk2/gList.mli
+${OCAML_SITELIB}/lablgtk2/gMain.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gMain.cmx
+${OCAML_SITELIB}/lablgtk2/gMain.ml
+${OCAML_SITELIB}/lablgtk2/gMain.mli
+${OCAML_SITELIB}/lablgtk2/gMenu.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gMenu.cmx
+${OCAML_SITELIB}/lablgtk2/gMenu.ml
+${OCAML_SITELIB}/lablgtk2/gMenu.mli
+${OCAML_SITELIB}/lablgtk2/gMisc.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gMisc.cmx
+${OCAML_SITELIB}/lablgtk2/gMisc.ml
+${OCAML_SITELIB}/lablgtk2/gMisc.mli
+${OCAML_SITELIB}/lablgtk2/gObj.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gObj.cmx
+${OCAML_SITELIB}/lablgtk2/gObj.ml
+${OCAML_SITELIB}/lablgtk2/gObj.mli
+${OCAML_SITELIB}/lablgtk2/gPack.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gPack.cmx
+${OCAML_SITELIB}/lablgtk2/gPack.ml
+${OCAML_SITELIB}/lablgtk2/gPack.mli
+${OCAML_SITELIB}/lablgtk2/gPango.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gPango.cmx
+${OCAML_SITELIB}/lablgtk2/gPango.ml
+${OCAML_SITELIB}/lablgtk2/gRange.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gRange.cmx
+${OCAML_SITELIB}/lablgtk2/gRange.ml
+${OCAML_SITELIB}/lablgtk2/gRange.mli
+${OCAML_SITELIB}/lablgtk2/gSourceView.mli
+${OCAML_SITELIB}/lablgtk2/gSourceView2.mli
+${OCAML_SITELIB}/lablgtk2/gText.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gText.cmx
+${OCAML_SITELIB}/lablgtk2/gText.ml
+${OCAML_SITELIB}/lablgtk2/gText.mli
+${OCAML_SITELIB}/lablgtk2/gToolbox.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gToolbox.cmx
+${OCAML_SITELIB}/lablgtk2/gToolbox.ml
+${OCAML_SITELIB}/lablgtk2/gToolbox.mli
+${OCAML_SITELIB}/lablgtk2/gTree.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gTree.cmx
+${OCAML_SITELIB}/lablgtk2/gTree.ml
+${OCAML_SITELIB}/lablgtk2/gTree.mli
+${OCAML_SITELIB}/lablgtk2/gUtil.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gUtil.cmx
+${OCAML_SITELIB}/lablgtk2/gUtil.ml
+${OCAML_SITELIB}/lablgtk2/gUtil.mli
+${OCAML_SITELIB}/lablgtk2/gWindow.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gWindow.cmx
+${OCAML_SITELIB}/lablgtk2/gWindow.ml
+${OCAML_SITELIB}/lablgtk2/gWindow.mli
+${OCAML_SITELIB}/lablgtk2/gaux.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gaux.cmx
+${OCAML_SITELIB}/lablgtk2/gaux.ml
+${OCAML_SITELIB}/lablgtk2/gdk.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gdk.cmx
+${OCAML_SITELIB}/lablgtk2/gdk.ml
+${OCAML_SITELIB}/lablgtk2/gdk.mli
+${OCAML_SITELIB}/lablgtk2/gdkEnums.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gdkEnums.cmx
+${OCAML_SITELIB}/lablgtk2/gdkEnums.ml
+${OCAML_SITELIB}/lablgtk2/gdkEvent.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gdkEvent.cmx
+${OCAML_SITELIB}/lablgtk2/gdkEvent.ml
+${OCAML_SITELIB}/lablgtk2/gdkKeysyms.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gdkKeysyms.cmx
+${OCAML_SITELIB}/lablgtk2/gdkKeysyms.ml
+${OCAML_SITELIB}/lablgtk2/gdkPixbuf.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gdkPixbuf.cmx
+${OCAML_SITELIB}/lablgtk2/gdkPixbuf.ml
+${OCAML_SITELIB}/lablgtk2/gdkPixbuf.mli
+${OCAML_SITELIB}/lablgtk2/gdk_tags.h
+${OCAML_SITELIB}/lablgtk2/gdkpixbuf_tags.h
+${OCAML_SITELIB}/lablgtk2/gdkprivate-win32.h
+${OCAML_SITELIB}/lablgtk2/glGtk.mli
+${OCAML_SITELIB}/lablgtk2/glade.mli
+${OCAML_SITELIB}/lablgtk2/glib.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/glib.cmx
+${OCAML_SITELIB}/lablgtk2/glib.ml
+${OCAML_SITELIB}/lablgtk2/glib.mli
+${OCAML_SITELIB}/lablgtk2/glib_tags.h
+${OCAML_SITELIB}/lablgtk2/gnoCanvas.mli
+${OCAML_SITELIB}/lablgtk2/gnoDruid.mli
+${OCAML_SITELIB}/lablgtk2/gobject.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gobject.cmx
+${OCAML_SITELIB}/lablgtk2/gobject.ml
+${OCAML_SITELIB}/lablgtk2/gobject.mli
+${OCAML_SITELIB}/lablgtk2/gobject_tags.h
+${OCAML_SITELIB}/lablgtk2/gpointer.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gpointer.cmx
+${OCAML_SITELIB}/lablgtk2/gpointer.ml
+${OCAML_SITELIB}/lablgtk2/gpointer.mli
+${OCAML_SITELIB}/lablgtk2/gtk.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtk.cmx
+${OCAML_SITELIB}/lablgtk2/gtk.ml
+${OCAML_SITELIB}/lablgtk2/gtkActionProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkActionProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkActionProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkAssistant.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkAssistant.cmx
+${OCAML_SITELIB}/lablgtk2/gtkAssistant.ml
+${OCAML_SITELIB}/lablgtk2/gtkAssistantProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkAssistantProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkAssistantProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkBase.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBase.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBase.ml
+${OCAML_SITELIB}/lablgtk2/gtkBaseProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBaseProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBaseProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkBin.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBin.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBin.ml
+${OCAML_SITELIB}/lablgtk2/gtkBinProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBinProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBinProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkBroken.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBroken.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBroken.ml
+${OCAML_SITELIB}/lablgtk2/gtkBrokenProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkBrokenProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkBrokenProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkButton.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkButton.cmx
+${OCAML_SITELIB}/lablgtk2/gtkButton.ml
+${OCAML_SITELIB}/lablgtk2/gtkButtonProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkButtonProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkButtonProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkData.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkData.cmx
+${OCAML_SITELIB}/lablgtk2/gtkData.ml
+${OCAML_SITELIB}/lablgtk2/gtkEdit.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkEdit.cmx
+${OCAML_SITELIB}/lablgtk2/gtkEdit.ml
+${OCAML_SITELIB}/lablgtk2/gtkEditProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkEditProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkEditProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkEnums.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkEnums.cmx
+${OCAML_SITELIB}/lablgtk2/gtkEnums.ml
+${OCAML_SITELIB}/lablgtk2/gtkFile.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkFile.cmx
+${OCAML_SITELIB}/lablgtk2/gtkFile.ml
+${OCAML_SITELIB}/lablgtk2/gtkFileProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkFileProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkFileProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkInit.cmi
+${OCAML_SITELIB}/lablgtk2/gtkInit.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkInit.cmx
+${OCAML_SITELIB}/lablgtk2/gtkInit.ml
+${OCAML_SITELIB}/lablgtk2/gtkInit.o
+${OCAML_SITELIB}/lablgtk2/gtkList.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkList.cmx
+${OCAML_SITELIB}/lablgtk2/gtkList.ml
+${OCAML_SITELIB}/lablgtk2/gtkListProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkListProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkListProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkMain.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkMain.cmx
+${OCAML_SITELIB}/lablgtk2/gtkMain.ml
+${OCAML_SITELIB}/lablgtk2/gtkMenu.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkMenu.cmx
+${OCAML_SITELIB}/lablgtk2/gtkMenu.ml
+${OCAML_SITELIB}/lablgtk2/gtkMenuProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkMenuProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkMenuProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkMisc.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkMisc.cmx
+${OCAML_SITELIB}/lablgtk2/gtkMisc.ml
+${OCAML_SITELIB}/lablgtk2/gtkMiscProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkMiscProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkMiscProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkObject.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkObject.cmx
+${OCAML_SITELIB}/lablgtk2/gtkObject.ml
+${OCAML_SITELIB}/lablgtk2/gtkPack.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkPack.cmx
+${OCAML_SITELIB}/lablgtk2/gtkPack.ml
+${OCAML_SITELIB}/lablgtk2/gtkPackProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkPackProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkPackProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkRange.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkRange.cmx
+${OCAML_SITELIB}/lablgtk2/gtkRange.ml
+${OCAML_SITELIB}/lablgtk2/gtkRangeProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkRangeProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkRangeProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkSignal.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkSignal.cmx
+${OCAML_SITELIB}/lablgtk2/gtkSignal.ml
+${OCAML_SITELIB}/lablgtk2/gtkSignal.mli
+${OCAML_SITELIB}/lablgtk2/gtkSourceView2_types.mli
+${OCAML_SITELIB}/lablgtk2/gtkSourceView_types.mli
+${OCAML_SITELIB}/lablgtk2/gtkSpell.mli
+${OCAML_SITELIB}/lablgtk2/gtkStock.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkStock.cmx
+${OCAML_SITELIB}/lablgtk2/gtkStock.ml
+${OCAML_SITELIB}/lablgtk2/gtkText.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkText.cmx
+${OCAML_SITELIB}/lablgtk2/gtkText.ml
+${OCAML_SITELIB}/lablgtk2/gtkTextProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkTextProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkTextProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkThInit.cmi
+${OCAML_SITELIB}/lablgtk2/gtkThInit.cmo
+${OCAML_SITELIB}/lablgtk2/gtkThInit.ml
+${OCAML_SITELIB}/lablgtk2/gtkThread.cmi
+${OCAML_SITELIB}/lablgtk2/gtkThread.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkThread.cmx
+${OCAML_SITELIB}/lablgtk2/gtkThread.ml
+${OCAML_SITELIB}/lablgtk2/gtkThread.mli
+${OCAML_SITELIB}/lablgtk2/gtkThread.o
+${OCAML_SITELIB}/lablgtk2/gtkTree.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkTree.cmx
+${OCAML_SITELIB}/lablgtk2/gtkTree.ml
+${OCAML_SITELIB}/lablgtk2/gtkTreeProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkTreeProps.cmx
+${OCAML_SITELIB}/lablgtk2/gtkTreeProps.ml
+${OCAML_SITELIB}/lablgtk2/gtkWindow.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkWindow.cmx
+${OCAML_SITELIB}/lablgtk2/gtkWindow.ml
+${OCAML_SITELIB}/lablgtk2/gtk_tags.h
+${OCAML_SITELIB}/lablgtk2/gutf8.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gutf8.cmx
+${OCAML_SITELIB}/lablgtk2/gutf8.ml
+${OCAML_SITELIB}/lablgtk2/gutf8.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtk.a
+${OCAML_SITELIB}/lablgtk2/lablgtk.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtk.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtk.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgtk2.a
+${OCAML_SITELIB}/lablgtk2/ml_domain.h
+${OCAML_SITELIB}/lablgtk2/ml_gdk.h
+${OCAML_SITELIB}/lablgtk2/ml_gdkpixbuf.h
+${OCAML_SITELIB}/lablgtk2/ml_glib.h
+${OCAML_SITELIB}/lablgtk2/ml_gobject.h
+${OCAML_SITELIB}/lablgtk2/ml_gpointer.h
+${OCAML_SITELIB}/lablgtk2/ml_gtk.h
+${OCAML_SITELIB}/lablgtk2/ml_gtktext.h
+${OCAML_SITELIB}/lablgtk2/ml_gtktree.h
+${OCAML_SITELIB}/lablgtk2/ml_gvaluecaml.h
+${OCAML_SITELIB}/lablgtk2/ml_pango.h
+${OCAML_SITELIB}/lablgtk2/ogtkActionProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkActionProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkActionProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkAssistantProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkAssistantProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkAssistantProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkBaseProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkBaseProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkBaseProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkBinProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkBinProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkBinProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkBrokenProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkBrokenProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkBrokenProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkButtonProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkButtonProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkButtonProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkEditProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkEditProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkEditProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkFileProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkFileProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkFileProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkListProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkListProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkListProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkMenuProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkMenuProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkMenuProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkMiscProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkMiscProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkMiscProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkPackProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkPackProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkPackProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkRangeProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkRangeProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkRangeProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkTextProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkTextProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkTextProps.ml
+${OCAML_SITELIB}/lablgtk2/ogtkTreeProps.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/ogtkTreeProps.cmx
+${OCAML_SITELIB}/lablgtk2/ogtkTreeProps.ml
+${OCAML_SITELIB}/lablgtk2/panel.mli
+${OCAML_SITELIB}/lablgtk2/pango.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/pango.cmx
+${OCAML_SITELIB}/lablgtk2/pango.ml
+${OCAML_SITELIB}/lablgtk2/pangoEnums.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/pangoEnums.cmx
+${OCAML_SITELIB}/lablgtk2/pangoEnums.ml
+${OCAML_SITELIB}/lablgtk2/pango_tags.h
+${OCAML_SITELIB}/lablgtk2/propcc
+${OCAML_SITELIB}/lablgtk2/rsvg.mli
+${OCAML_SITELIB}/lablgtk2/varcc
+${OCAML_SITELIB}/lablgtk2/win32.h
+${OCAML_SITELIB}/lablgtk2/wrappers.h
+${OCAML_SITELIB}/lablgtk2/xml_lexer.mli
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgtk2.so
diff --git a/x11/ocaml-lablgtk/PLIST.glade b/x11/ocaml-lablgtk/PLIST.glade
index 6a7581cf2f4..0e9b6f89959 100644
--- a/x11/ocaml-lablgtk/PLIST.glade
+++ b/x11/ocaml-lablgtk/PLIST.glade
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.glade,v 1.1 2014/10/10 08:37:49 jaapb Exp $
+@comment $NetBSD: PLIST.glade,v 1.2 2016/06/25 14:33:11 jaapb Exp $
 bin/lablgladecc2
-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
+${OCAML_SITELIB}/lablgtk2/glade.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/glade.cmx
+${OCAML_SITELIB}/lablgtk2/glade.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablglade.a
+${OCAML_SITELIB}/lablgtk2/lablglade.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablglade.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablglade.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablglade2.a
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablglade2.so
diff --git a/x11/ocaml-lablgtk/PLIST.gnome b/x11/ocaml-lablgtk/PLIST.gnome
index 2b6c71e07c0..977d2c2122e 100644
--- a/x11/ocaml-lablgtk/PLIST.gnome
+++ b/x11/ocaml-lablgtk/PLIST.gnome
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST.gnome,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.gnome,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${OCAML_SITELIB}/lablgtk2/gnoDruid.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnoDruid.cmx
+${OCAML_SITELIB}/lablgtk2/gnoDruid.ml
+${OCAML_SITELIB}/lablgtk2/gnomeDruid.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnomeDruid.cmx
+${OCAML_SITELIB}/lablgtk2/gnomeDruid.ml
+${OCAML_SITELIB}/lablgtk2/gnomeui_tags.h
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.a
+${OCAML_SITELIB}/lablgtk2/lablgnomeui.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomeui.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgnomeui.a
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgnomeui.so
diff --git a/x11/ocaml-lablgtk/PLIST.gnomecanvas b/x11/ocaml-lablgtk/PLIST.gnomecanvas
index 5a977780e8e..74fc6ab6885 100644
--- a/x11/ocaml-lablgtk/PLIST.gnomecanvas
+++ b/x11/ocaml-lablgtk/PLIST.gnomecanvas
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${OCAML_SITELIB}/lablgtk2/gnoCanvas.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnoCanvas.cmx
+${OCAML_SITELIB}/lablgtk2/gnoCanvas.ml
+${OCAML_SITELIB}/lablgtk2/gnomeCanvas.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gnomeCanvas.cmx
+${OCAML_SITELIB}/lablgtk2/gnomeCanvas.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.a
+${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgnomecanvas.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.a
+${OCAML_SITELIB}/lablgtk2/lablpanel.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablpanel.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgnomecanvas.a
+${OCAML_SITELIB}/lablgtk2/liblablpanel.a
+${OCAML_SITELIB}/lablgtk2/panel.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/panel.cmx
+${OCAML_SITELIB}/lablgtk2/panel.ml
+${OCAML_SITELIB}/lablgtk2/panel_tags.h
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgnomecanvas.so
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablpanel.so
diff --git a/x11/ocaml-lablgtk/PLIST.gtksourceview b/x11/ocaml-lablgtk/PLIST.gtksourceview
index 46c8349da09..5d8b29e55e8 100644
--- a/x11/ocaml-lablgtk/PLIST.gtksourceview
+++ b/x11/ocaml-lablgtk/PLIST.gtksourceview
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST.gtksourceview,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.gtksourceview,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${OCAML_SITELIB}/lablgtk2/gSourceView.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gSourceView.cmx
+${OCAML_SITELIB}/lablgtk2/gSourceView.ml
+${OCAML_SITELIB}/lablgtk2/gtkSourceView.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkSourceView.cmx
+${OCAML_SITELIB}/lablgtk2/gtkSourceView.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.a
+${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgtksourceview.a
+${OCAML_SITELIB}/lablgtk2/sourceViewEnums.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/sourceViewEnums.cmx
+${OCAML_SITELIB}/lablgtk2/sourceViewEnums.ml
+${OCAML_SITELIB}/lablgtk2/sourceView_tags.h
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgtksourceview.so
diff --git a/x11/ocaml-lablgtk/PLIST.gtksourceview2 b/x11/ocaml-lablgtk/PLIST.gtksourceview2
index 5e3a663ca55..0b3184486ad 100644
--- a/x11/ocaml-lablgtk/PLIST.gtksourceview2
+++ b/x11/ocaml-lablgtk/PLIST.gtksourceview2
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST.gtksourceview2,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.gtksourceview2,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${OCAML_SITELIB}/lablgtk2/gSourceView2.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gSourceView2.cmx
+${OCAML_SITELIB}/lablgtk2/gSourceView2.ml
+${OCAML_SITELIB}/lablgtk2/gtkSourceView2.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkSourceView2.cmx
+${OCAML_SITELIB}/lablgtk2/gtkSourceView2.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview2.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview2.cma
+${OCAML_SITELIB}/lablgtk2/lablgtksourceview2.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtksourceview2.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgtksourceview2.a
+${OCAML_SITELIB}/lablgtk2/sourceView2Enums.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/sourceView2Enums.cmx
+${OCAML_SITELIB}/lablgtk2/sourceView2Enums.ml
+${OCAML_SITELIB}/lablgtk2/sourceView2_tags.h
+${OCAML_SITELIB}/lablgtk2/dlllablgtksourceview2.so
diff --git a/x11/ocaml-lablgtk/PLIST.gtkspell b/x11/ocaml-lablgtk/PLIST.gtkspell
index 7dc723fd89e..55729fc652c 100644
--- a/x11/ocaml-lablgtk/PLIST.gtkspell
+++ b/x11/ocaml-lablgtk/PLIST.gtkspell
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST.gtkspell,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.gtkspell,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${OCAML_SITELIB}/lablgtk2/gtkSpell.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/gtkSpell.cmx
+${OCAML_SITELIB}/lablgtk2/gtkSpell.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtkspell.a
+${OCAML_SITELIB}/lablgtk2/lablgtkspell.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtkspell.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablgtkspell.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablgtkspell.a
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablgtkspell.so
diff --git a/x11/ocaml-lablgtk/PLIST.svg b/x11/ocaml-lablgtk/PLIST.svg
index 7600bc1ca7b..3b254b02b7c 100644
--- a/x11/ocaml-lablgtk/PLIST.svg
+++ b/x11/ocaml-lablgtk/PLIST.svg
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST.svg,v 1.1 2014/10/10 08:37:49 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
+@comment $NetBSD: PLIST.svg,v 1.2 2016/06/25 14:33:11 jaapb Exp $
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablrsvg.a
+${OCAML_SITELIB}/lablgtk2/lablrsvg.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablrsvg.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/lablrsvg.cmxs
+${OCAML_SITELIB}/lablgtk2/liblablrsvg.a
+${OCAML_SITELIB}/lablgtk2/rsvg.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk2/rsvg.cmx
+${OCAML_SITELIB}/lablgtk2/rsvg.ml
+${PLIST.stubs}${OCAML_SITELIB}/lablgtk2/dlllablrsvg.so