PLIST fixes preparing ocaml 3.11.1

lablgtk is picked if available, so pull it in, it is probably more useful than labgtk1

3 files changed, 21 insertions, 4 deletions

diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 5d83bb51868..348b752d55d 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/08/26 19:57:36 sno Exp $
+# $NetBSD: Makefile,v 1.23 2009/09/06 21:10:32 tonio Exp $
 
 DISTNAME=		camlimages-2.2.0
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 EXTRACT_SUFX=		.tgz
@@ -42,6 +42,7 @@ PLIST.dll=	yes
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/lablgtk1/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST
index 83a01c7637b..f551f6077ab 100644
--- a/graphics/camlimages/PLIST
+++ b/graphics/camlimages/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:05:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/09/06 21:10:32 tonio Exp $
 lib/ocaml/camlimages/Makefile.config
 lib/ocaml/camlimages/bitmap.cmi
 lib/ocaml/camlimages/bitmap.cmo
@@ -26,6 +26,7 @@ lib/ocaml/camlimages/ci_gif.cma
 lib/ocaml/camlimages/ci_graphics.cma
 lib/ocaml/camlimages/ci_jpeg.cma
 lib/ocaml/camlimages/ci_lablgtk.cma
+lib/ocaml/camlimages/ci_lablgtk2.cma
 lib/ocaml/camlimages/ci_png.cma
 lib/ocaml/camlimages/ci_ppm.cma
 lib/ocaml/camlimages/ci_ps.cma
@@ -155,7 +156,10 @@ lib/ocaml/camlimages/oGraphic.cmi
 lib/ocaml/camlimages/oGraphic.cmo
 lib/ocaml/camlimages/oGraphic.cmx
 lib/ocaml/camlimages/oGraphic.o
+lib/ocaml/camlimages/oImage.cmi
+lib/ocaml/camlimages/oImage.cmx
 lib/ocaml/camlimages/oImage.mli
+lib/ocaml/camlimages/oImage.o
 lib/ocaml/camlimages/oImages.cmi
 lib/ocaml/camlimages/oImages.cmo
 lib/ocaml/camlimages/oImages.cmx
@@ -186,6 +190,11 @@ lib/ocaml/camlimages/oXimage.cmo
 lib/ocaml/camlimages/oXimage.cmx
 lib/ocaml/camlimages/oXimage.mli
 lib/ocaml/camlimages/oXimage.o
+lib/ocaml/camlimages/oXimage2.cmi
+lib/ocaml/camlimages/oXimage2.cmo
+lib/ocaml/camlimages/oXimage2.cmx
+lib/ocaml/camlimages/oXimage2.mli
+lib/ocaml/camlimages/oXimage2.o
 lib/ocaml/camlimages/oXpm.cmi
 lib/ocaml/camlimages/oXpm.cmo
 lib/ocaml/camlimages/oXpm.cmx
@@ -249,6 +258,11 @@ lib/ocaml/camlimages/ximage.cmo
 lib/ocaml/camlimages/ximage.cmx
 lib/ocaml/camlimages/ximage.mli
 lib/ocaml/camlimages/ximage.o
+lib/ocaml/camlimages/ximage2.cmi
+lib/ocaml/camlimages/ximage2.cmo
+lib/ocaml/camlimages/ximage2.cmx
+lib/ocaml/camlimages/ximage2.mli
+lib/ocaml/camlimages/ximage2.o
 lib/ocaml/camlimages/xpm.cmi
 lib/ocaml/camlimages/xpm.cmo
 lib/ocaml/camlimages/xpm.cmx
diff --git a/graphics/camlimages/PLIST.opt b/graphics/camlimages/PLIST.opt
index 641b77c1f1a..7c2fabe0e00 100644
--- a/graphics/camlimages/PLIST.opt
+++ b/graphics/camlimages/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.4 2009/06/14 20:05:40 joerg Exp $
+@comment $NetBSD: PLIST.opt,v 1.5 2009/09/06 21:10:32 tonio Exp $
 lib/ocaml/camlimages/ci_bmp.a
 lib/ocaml/camlimages/ci_bmp.cmxa
 lib/ocaml/camlimages/ci_core.a
@@ -13,6 +13,8 @@ lib/ocaml/camlimages/ci_jpeg.a
 lib/ocaml/camlimages/ci_jpeg.cmxa
 lib/ocaml/camlimages/ci_lablgtk.a
 lib/ocaml/camlimages/ci_lablgtk.cmxa
+lib/ocaml/camlimages/ci_lablgtk2.a
+lib/ocaml/camlimages/ci_lablgtk2.cmxa
 lib/ocaml/camlimages/ci_png.a
 lib/ocaml/camlimages/ci_png.cmxa
 lib/ocaml/camlimages/ci_ppm.a