- Update from camlimages from 2.11 to 2.2.0

2.11
 * bug fix release

2.12
 * O'Caml 3.07 port. Added support for lablgtk2.

6 files changed, 187 insertions, 18 deletions

diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index d7a09589261..99d3b92eefc 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/12/24 17:21:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/04 22:07:24 adrianp Exp $
 
-DISTNAME=		camlimages-2.11
-PKGREVISION=		3
+DISTNAME=		camlimages-2.2.0
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 EXTRACT_SUFX=		.tgz
@@ -10,18 +9,29 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://pauillac.inria.fr/camlimages/
 COMMENT=		Image processing library for Objective Caml
 
+BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.0.6
+
+WRKSRC=                 ${WRKDIR}/camlimages-2.2
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
-PLIST_SRC=	${PKGDIR}/PLIST
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC=		${PKGDIR}/PLIST
+
+CONFIGURE_ARGS+=	--with-lablgtk=${PREFIX}/lib/ocaml/lablgtk
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
-BUILD_TARGET+=	all.opt
+BUILD_TARGET+=	all
 PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .endif
 
+.if ${OPSYS} == "Darwin"
+PLIST_SRC+=	${PKGDIR}/PLIST.Darwin
+.endif
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST
index dc064929702..5bd1a953031 100644
--- a/graphics/camlimages/PLIST
+++ b/graphics/camlimages/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/31 01:24:37 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/04 22:07:24 adrianp Exp $
 lib/ocaml/camlimages/Makefile.config
 lib/ocaml/camlimages/bitmap.cmi
 lib/ocaml/camlimages/bitmap.mli
@@ -39,8 +39,6 @@ lib/ocaml/camlimages/gif.cmi
 lib/ocaml/camlimages/gif.mli
 lib/ocaml/camlimages/graphic_image.cmi
 lib/ocaml/camlimages/graphic_image.mli
-lib/ocaml/camlimages/image.cmi
-lib/ocaml/camlimages/image.mli
 lib/ocaml/camlimages/index16.cmi
 lib/ocaml/camlimages/index16.mli
 lib/ocaml/camlimages/index8.cmi
@@ -66,7 +64,6 @@ lib/ocaml/camlimages/oColor.mli
 lib/ocaml/camlimages/oFreetype.cmi
 lib/ocaml/camlimages/oGif.cmi
 lib/ocaml/camlimages/oGraphic.cmi
-lib/ocaml/camlimages/oImage.cmi
 lib/ocaml/camlimages/oImage.mli
 lib/ocaml/camlimages/oJpeg.cmi
 lib/ocaml/camlimages/oPng.cmi
@@ -102,4 +99,160 @@ lib/ocaml/camlimages/xpm.cmi
 lib/ocaml/camlimages/xpm.mli
 lib/ocaml/camlimages/xvthumb.cmi
 lib/ocaml/camlimages/xvthumb.mli
+lib/ocaml/camlimages/bitmap.cmo
+lib/ocaml/camlimages/bitmap.cmx
+lib/ocaml/camlimages/bitmap.o
+lib/ocaml/camlimages/blend.cmo
+lib/ocaml/camlimages/blend.cmx
+lib/ocaml/camlimages/blend.o
+lib/ocaml/camlimages/bmp.cmo
+lib/ocaml/camlimages/bmp.cmx
+lib/ocaml/camlimages/bmp.o
+lib/ocaml/camlimages/camlimages.cmo
+lib/ocaml/camlimages/camlimages.cmx
+lib/ocaml/camlimages/camlimages.o
+lib/ocaml/camlimages/cmyk32.cmo
+lib/ocaml/camlimages/cmyk32.cmx
+lib/ocaml/camlimages/cmyk32.o
+lib/ocaml/camlimages/color.cmo
+lib/ocaml/camlimages/color.cmx
+lib/ocaml/camlimages/color.o
+lib/ocaml/camlimages/colorhist.cmo
+lib/ocaml/camlimages/colorhist.cmx
+lib/ocaml/camlimages/colorhist.o
+lib/ocaml/camlimages/freetype.cmo
+lib/ocaml/camlimages/freetype.cmx
+lib/ocaml/camlimages/freetype.o
+lib/ocaml/camlimages/ftintf.o
+lib/ocaml/camlimages/ftlow.cmo
+lib/ocaml/camlimages/ftlow.cmx
+lib/ocaml/camlimages/ftlow.o
+lib/ocaml/camlimages/fttext.cmo
+lib/ocaml/camlimages/fttext.cmx
+lib/ocaml/camlimages/fttext.o
+lib/ocaml/camlimages/genimage.cmo
+lib/ocaml/camlimages/genimage.cmx
+lib/ocaml/camlimages/genimage.o
+lib/ocaml/camlimages/geometry.cmo
+lib/ocaml/camlimages/geometry.cmx
+lib/ocaml/camlimages/geometry.o
+lib/ocaml/camlimages/gif.cmo
+lib/ocaml/camlimages/gif.cmx
+lib/ocaml/camlimages/gif.o
+lib/ocaml/camlimages/gifread.o
+lib/ocaml/camlimages/gifwrite.o
+lib/ocaml/camlimages/graphic_image.cmo
+lib/ocaml/camlimages/graphic_image.cmx
+lib/ocaml/camlimages/graphic_image.o
+lib/ocaml/camlimages/images.cmi
+lib/ocaml/camlimages/images.cmo
+lib/ocaml/camlimages/images.cmx
+lib/ocaml/camlimages/images.mli
+lib/ocaml/camlimages/images.o
+lib/ocaml/camlimages/index16.cmo
+lib/ocaml/camlimages/index16.cmx
+lib/ocaml/camlimages/index16.o
+lib/ocaml/camlimages/index8.cmo
+lib/ocaml/camlimages/index8.cmx
+lib/ocaml/camlimages/index8.o
+lib/ocaml/camlimages/jis_table.cmo
+lib/ocaml/camlimages/jis_table.cmx
+lib/ocaml/camlimages/jis_table.o
+lib/ocaml/camlimages/jis_unicode.cmo
+lib/ocaml/camlimages/jis_unicode.cmx
+lib/ocaml/camlimages/jis_unicode.o
+lib/ocaml/camlimages/jpeg.cmo
+lib/ocaml/camlimages/jpeg.cmx
+lib/ocaml/camlimages/jpeg.o
+lib/ocaml/camlimages/jpegread.o
+lib/ocaml/camlimages/jpegwrite.o
+lib/ocaml/camlimages/mstring.cmo
+lib/ocaml/camlimages/mstring.cmx
+lib/ocaml/camlimages/mstring.o
+lib/ocaml/camlimages/oBmp.cmo
+lib/ocaml/camlimages/oBmp.cmx
+lib/ocaml/camlimages/oBmp.o
+lib/ocaml/camlimages/oColor.cmo
+lib/ocaml/camlimages/oColor.cmx
+lib/ocaml/camlimages/oColor.o
+lib/ocaml/camlimages/oFreetype.cmo
+lib/ocaml/camlimages/oFreetype.cmx
+lib/ocaml/camlimages/oFreetype.o
+lib/ocaml/camlimages/oGif.cmo
+lib/ocaml/camlimages/oGif.cmx
+lib/ocaml/camlimages/oGif.o
+lib/ocaml/camlimages/oGraphic.cmo
+lib/ocaml/camlimages/oGraphic.cmx
+lib/ocaml/camlimages/oGraphic.o
+lib/ocaml/camlimages/oImages.cmi
+lib/ocaml/camlimages/oImages.cmo
+lib/ocaml/camlimages/oImages.cmx
+lib/ocaml/camlimages/oImages.mli
+lib/ocaml/camlimages/oImages.o
+lib/ocaml/camlimages/oJpeg.cmo
+lib/ocaml/camlimages/oJpeg.cmx
+lib/ocaml/camlimages/oJpeg.o
+lib/ocaml/camlimages/oPng.cmo
+lib/ocaml/camlimages/oPng.cmx
+lib/ocaml/camlimages/oPng.o
+lib/ocaml/camlimages/oPpm.cmo
+lib/ocaml/camlimages/oPpm.cmx
+lib/ocaml/camlimages/oPpm.o
+lib/ocaml/camlimages/oPs.cmo
+lib/ocaml/camlimages/oPs.cmx
+lib/ocaml/camlimages/oPs.o
+lib/ocaml/camlimages/oTiff.cmo
+lib/ocaml/camlimages/oTiff.cmx
+lib/ocaml/camlimages/oTiff.o
+lib/ocaml/camlimages/oXimage.cmo
+lib/ocaml/camlimages/oXimage.cmx
+lib/ocaml/camlimages/oXimage.o
+lib/ocaml/camlimages/oXpm.cmo
+lib/ocaml/camlimages/oXpm.cmx
+lib/ocaml/camlimages/oXpm.o
+lib/ocaml/camlimages/oXvthumb.cmo
+lib/ocaml/camlimages/oXvthumb.cmx
+lib/ocaml/camlimages/oXvthumb.o
+lib/ocaml/camlimages/png.cmo
+lib/ocaml/camlimages/png.cmx
+lib/ocaml/camlimages/png.o
+lib/ocaml/camlimages/pngread.o
+lib/ocaml/camlimages/pngwrite.o
+lib/ocaml/camlimages/ppm.cmo
+lib/ocaml/camlimages/ppm.cmx
+lib/ocaml/camlimages/ppm.o
+lib/ocaml/camlimages/ps.cmo
+lib/ocaml/camlimages/ps.cmx
+lib/ocaml/camlimages/ps.o
+lib/ocaml/camlimages/reduce.cmo
+lib/ocaml/camlimages/reduce.cmx
+lib/ocaml/camlimages/reduce.o
+lib/ocaml/camlimages/region.cmo
+lib/ocaml/camlimages/region.cmx
+lib/ocaml/camlimages/region.o
+lib/ocaml/camlimages/rgb24.cmo
+lib/ocaml/camlimages/rgb24.cmx
+lib/ocaml/camlimages/rgb24.o
+lib/ocaml/camlimages/rgba32.cmo
+lib/ocaml/camlimages/rgba32.cmx
+lib/ocaml/camlimages/rgba32.o
+lib/ocaml/camlimages/tiff.cmo
+lib/ocaml/camlimages/tiff.cmx
+lib/ocaml/camlimages/tiff.o
+lib/ocaml/camlimages/tiffread.o
+lib/ocaml/camlimages/tiffwrite.o
+lib/ocaml/camlimages/tmpfile.cmo
+lib/ocaml/camlimages/tmpfile.cmx
+lib/ocaml/camlimages/tmpfile.o
+lib/ocaml/camlimages/ximage.cmo
+lib/ocaml/camlimages/ximage.cmx
+lib/ocaml/camlimages/ximage.o
+lib/ocaml/camlimages/xpm.cmo
+lib/ocaml/camlimages/xpm.cmx
+lib/ocaml/camlimages/xpm.o
+lib/ocaml/camlimages/xpmread.o
+lib/ocaml/camlimages/xpmwrite.o
+lib/ocaml/camlimages/xvthumb.cmo
+lib/ocaml/camlimages/xvthumb.cmx
+lib/ocaml/camlimages/xvthumb.o
 @unexec ${RMDIR} %D/lib/ocaml/camlimages 2>/dev/null || ${TRUE}
diff --git a/graphics/camlimages/PLIST.Darwin b/graphics/camlimages/PLIST.Darwin
new file mode 100644
index 00000000000..0bce84d77ad
--- /dev/null
+++ b/graphics/camlimages/PLIST.Darwin
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2005/02/04 22:07:24 adrianp Exp $
+lib/ocaml/camlimages/dllci_jpeg.so
+lib/ocaml/camlimages/dllci_tiff.so
+lib/ocaml/camlimages/dllci_gif.so
+lib/ocaml/camlimages/dllci_png.so
+lib/ocaml/camlimages/dllci_xpm.so
+lib/ocaml/camlimages/dllci_freetype.so
+@unexec ${RMDIR} %D/lib/ocaml/camlimages 2>/dev/null || ${TRUE}
diff --git a/graphics/camlimages/PLIST.opt b/graphics/camlimages/PLIST.opt
index 9d1b3243d36..4ccb7ee328d 100644
--- a/graphics/camlimages/PLIST.opt
+++ b/graphics/camlimages/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2003/08/31 01:24:41 jtb Exp $
+@comment $NetBSD: PLIST.opt,v 1.2 2005/02/04 22:07:24 adrianp Exp $
 lib/ocaml/camlimages/ci_core.a
 lib/ocaml/camlimages/ci_core.cmxa
 lib/ocaml/camlimages/ci_ppm.a
@@ -25,4 +25,4 @@ lib/ocaml/camlimages/ci_freetype.a
 lib/ocaml/camlimages/ci_freetype.cmxa
 lib/ocaml/camlimages/ci_lablgtk.a
 lib/ocaml/camlimages/ci_lablgtk.cmxa
-@dirrm lib/ocaml/camlimages
+@unexec ${RMDIR} %D/lib/ocaml/camlimages 2>/dev/null || ${TRUE}
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index 7571e15e18d..67261328ceb 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/05 03:32:05 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/02/04 22:07:24 adrianp Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CAMLIMAGES_BUILDLINK3_MK:=	${CAMLIMAGES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncamlimages}
 BUILDLINK_PACKAGES+=	camlimages
 
 .if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.camlimages+=	camlimages>=2.11
+BUILDLINK_DEPENDS.camlimages+=	camlimages>=2.2.0
 BUILDLINK_PKGSRCDIR.camlimages?=	../../graphics/camlimages
 .endif	# CAMLIMAGES_BUILDLINK3_MK
 
diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo
index 2c95a786ee1..783366483d3 100644
--- a/graphics/camlimages/distinfo
+++ b/graphics/camlimages/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/07/10 22:57:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/02/04 22:07:24 adrianp Exp $
 
-SHA1 (camlimages-2.11.tgz) = 487fa871e3cf81864979bbbddb9abf86f4c9fbab
-Size (camlimages-2.11.tgz) = 1354100 bytes
-SHA1 (patch-aa) = 89889b3af5bd314bdef5328ea9880a315f879240
-SHA1 (patch-ab) = f428a79006c92a4b77166733233f7608559f405d
+SHA1 (camlimages-2.2.0.tgz) = bc0062739be5ca9236f28145f17f840bf3f295ee
+Size (camlimages-2.2.0.tgz) = 1385525 bytes