Update to 4.0.1, from Nicolas Thauvin.

4.0.1
	* Minor bug fixes, patch submitted by Damien Doligez

4.0.0
	* Stop supporting the autoconf build. (It might works though.)
	* Instead of autoconf, using omake and ocamlfind
	* Subpackages: no need to link codes for uninterested format.
	* Stop supporting lablgtk1
	  - Ximage2 module is now Ximage, and the older Ximage is removed
	  - OXimage2 module is now OXimage, and the older OXimage is removed

3.2.0
	* Misnamed version. It should have been 3.0.3 or something.
        * Small bug fix for image load memory allocation vulnerability

3.0.2
        * O'Caml 3.11 port.
	* Integer overflow vulnerability fix for pngread.c

3.0.1
        * Alpha channel support for png images.

3.0.0
        * new version numbering scheme
        * autoconf and makefiles cleanup
        * fix examples compilation

2.2.1
        * Now compiling with -warn-error -A

12 files changed, 263 insertions, 421 deletions

diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index e1a6bb7fb35..89e1fe689ab 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,52 +1,58 @@
-# $NetBSD: Makefile,v 1.32 2011/05/24 12:26:00 is Exp $
+# $NetBSD: Makefile,v 1.33 2011/08/07 20:36:20 wiz Exp $
 
-DISTNAME=		camlimages-2.2.0
-PKGREVISION=		12
+VERSION=		4.0.1
+PKGNAME=		camlimages-${VERSION}
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/
-EXTRACT_SUFX=		.tgz
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+MASTER_SITES=		https://bitbucket.org/camlspotter/camlimages/get/
+DISTNAME=		v${VERSION}
+DIST_SUBDIR=		${PKGNAME_NOREV}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://cristal.inria.fr/camlimages/
+HOMEPAGE=		http://gallium.inria.fr/camlimages/
 COMMENT=		Image processing library for Objective Caml
+LICENSE=		gnu-gpl-v2
 
-MAKE_JOBS_SAFE=		no
+BUILD_DEPENDS+=		omake>=0.9.8.6.0rc1:../../devel/omake
+BUILD_DEPENDS+=		ocaml-findlib>=1.2.6:../../devel/ocaml-findlib
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.0.6
+MAKE_JOBS_SAFE=		no
 
-WRKSRC=			${WRKDIR}/camlimages-2.2
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+FETCH_USING=		curl
 
-.include "../../mk/bsd.prefs.mk"
+WRKSRC=			${WRKDIR}/camlspotter-camlimages-v${VERSION}
 
-PLIST_SRC=		${PKGDIR}/PLIST
+SUBST_CLASSES+=		omf
+SUBST_STAGE.omf=	post-patch
+SUBST_FILES.omf=	OMakefile
+SUBST_SED.omf=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.omf+=		-e 's,@X11BASE@,${X11BASE},g'
+SUBST_SED.omf+=		-e 's%@LDFLAGS@%${LDFLAGS}%g'
+SUBST_SED.omf+=		-e 's,@OCAMLFIND_DESTDIR@,${DESTDIR}${PREFIX}/lib/ocaml/site-lib,g'
+SUBST_SED.omf+=		-e 's,@OCAMLFIND_LDCONF@,/dev/null,g'
+SUBST_MESSAGE.omf=	Fixing vars in OMakefile
 
-CONFIGURE_ARGS+=	--with-lablgtk=${PREFIX}/lib/ocaml/lablgtk
+INSTALLATION_DIRS=	lib/ocaml/site-lib
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+=	all
-PLIST_SRC+=	${PKGDIR}/PLIST.opt
-.endif
+do-build:
+	cd ${WRKSRC} && ${PREFIX}/bin/omake --configure --verbose
 
-PLIST_VARS+=	dll
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
-    ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD"
-PLIST.dll=	yes
-.endif
+do-install:
+	cd ${WRKSRC} && OCAMLFIND_DESTDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib \
+		OCAMLFIND_LDCONF=/dev/null ${PREFIX}/bin/omake install
 
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.11.0
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/nspr/buildlink3.mk"
+.include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk1/buildlink3.mk"
+.include "../../print/ghostscript/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/ocaml-graphics/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST
index f551f6077ab..e90fe04237a 100644
--- a/graphics/camlimages/PLIST
+++ b/graphics/camlimages/PLIST
@@ -1,277 +1,147 @@
-@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
-lib/ocaml/camlimages/bitmap.cmx
-lib/ocaml/camlimages/bitmap.mli
-lib/ocaml/camlimages/bitmap.o
-lib/ocaml/camlimages/blend.cmi
-lib/ocaml/camlimages/blend.cmo
-lib/ocaml/camlimages/blend.cmx
-lib/ocaml/camlimages/blend.mli
-lib/ocaml/camlimages/blend.o
-lib/ocaml/camlimages/bmp.cmi
-lib/ocaml/camlimages/bmp.cmo
-lib/ocaml/camlimages/bmp.cmx
-lib/ocaml/camlimages/bmp.mli
-lib/ocaml/camlimages/bmp.o
-lib/ocaml/camlimages/camlimages.cmi
-lib/ocaml/camlimages/camlimages.cmo
-lib/ocaml/camlimages/camlimages.cmx
-lib/ocaml/camlimages/camlimages.o
-lib/ocaml/camlimages/ci_bmp.cma
-lib/ocaml/camlimages/ci_core.cma
-lib/ocaml/camlimages/ci_freetype.cma
-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
-lib/ocaml/camlimages/ci_tiff.cma
-lib/ocaml/camlimages/ci_xpm.cma
-lib/ocaml/camlimages/ci_xvthumb.cma
-lib/ocaml/camlimages/cmyk32.cmi
-lib/ocaml/camlimages/cmyk32.cmo
-lib/ocaml/camlimages/cmyk32.cmx
-lib/ocaml/camlimages/cmyk32.mli
-lib/ocaml/camlimages/cmyk32.o
-lib/ocaml/camlimages/color.cmi
-lib/ocaml/camlimages/color.cmo
-lib/ocaml/camlimages/color.cmx
-lib/ocaml/camlimages/color.mli
-lib/ocaml/camlimages/color.o
-lib/ocaml/camlimages/colorhist.cmi
-lib/ocaml/camlimages/colorhist.cmo
-lib/ocaml/camlimages/colorhist.cmx
-lib/ocaml/camlimages/colorhist.o
-lib/ocaml/camlimages/config.h
-${PLIST.dll}lib/ocaml/camlimages/dllci_freetype.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_gif.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_jpeg.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_png.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_tiff.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_xpm.so
-lib/ocaml/camlimages/freetype.cmi
-lib/ocaml/camlimages/freetype.cmo
-lib/ocaml/camlimages/freetype.cmx
-lib/ocaml/camlimages/freetype.mli
-lib/ocaml/camlimages/freetype.o
-lib/ocaml/camlimages/ftintf.o
-lib/ocaml/camlimages/ftlow.cmi
-lib/ocaml/camlimages/ftlow.cmo
-lib/ocaml/camlimages/ftlow.cmx
-lib/ocaml/camlimages/ftlow.mli
-lib/ocaml/camlimages/ftlow.o
-lib/ocaml/camlimages/fttext.cmi
-lib/ocaml/camlimages/fttext.cmo
-lib/ocaml/camlimages/fttext.cmx
-lib/ocaml/camlimages/fttext.mli
-lib/ocaml/camlimages/fttext.o
-lib/ocaml/camlimages/genimage.cmi
-lib/ocaml/camlimages/genimage.cmo
-lib/ocaml/camlimages/genimage.cmx
-lib/ocaml/camlimages/genimage.mli
-lib/ocaml/camlimages/genimage.o
-lib/ocaml/camlimages/geometry.cmi
-lib/ocaml/camlimages/geometry.cmo
-lib/ocaml/camlimages/geometry.cmx
-lib/ocaml/camlimages/geometry.o
-lib/ocaml/camlimages/gif.cmi
-lib/ocaml/camlimages/gif.cmo
-lib/ocaml/camlimages/gif.cmx
-lib/ocaml/camlimages/gif.mli
-lib/ocaml/camlimages/gif.o
-lib/ocaml/camlimages/gifread.o
-lib/ocaml/camlimages/gifwrite.o
-lib/ocaml/camlimages/graphic_image.cmi
-lib/ocaml/camlimages/graphic_image.cmo
-lib/ocaml/camlimages/graphic_image.cmx
-lib/ocaml/camlimages/graphic_image.mli
-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.cmi
-lib/ocaml/camlimages/index16.cmo
-lib/ocaml/camlimages/index16.cmx
-lib/ocaml/camlimages/index16.mli
-lib/ocaml/camlimages/index16.o
-lib/ocaml/camlimages/index8.cmi
-lib/ocaml/camlimages/index8.cmo
-lib/ocaml/camlimages/index8.cmx
-lib/ocaml/camlimages/index8.mli
-lib/ocaml/camlimages/index8.o
-lib/ocaml/camlimages/info.cmi
-lib/ocaml/camlimages/info.mli
-lib/ocaml/camlimages/jis_table.cmi
-lib/ocaml/camlimages/jis_table.cmo
-lib/ocaml/camlimages/jis_table.cmx
-lib/ocaml/camlimages/jis_table.o
-lib/ocaml/camlimages/jis_unicode.cmi
-lib/ocaml/camlimages/jis_unicode.cmo
-lib/ocaml/camlimages/jis_unicode.cmx
-lib/ocaml/camlimages/jis_unicode.mli
-lib/ocaml/camlimages/jis_unicode.o
-lib/ocaml/camlimages/jpeg.cmi
-lib/ocaml/camlimages/jpeg.cmo
-lib/ocaml/camlimages/jpeg.cmx
-lib/ocaml/camlimages/jpeg.mli
-lib/ocaml/camlimages/jpeg.o
-lib/ocaml/camlimages/jpegread.o
-lib/ocaml/camlimages/jpegwrite.o
-lib/ocaml/camlimages/libci_freetype.a
-lib/ocaml/camlimages/libci_gif.a
-lib/ocaml/camlimages/libci_jpeg.a
-lib/ocaml/camlimages/libci_png.a
-lib/ocaml/camlimages/libci_tiff.a
-lib/ocaml/camlimages/libci_xpm.a
-lib/ocaml/camlimages/mstring.cmi
-lib/ocaml/camlimages/mstring.cmo
-lib/ocaml/camlimages/mstring.cmx
-lib/ocaml/camlimages/mstring.mli
-lib/ocaml/camlimages/mstring.o
-lib/ocaml/camlimages/oBmp.cmi
-lib/ocaml/camlimages/oBmp.cmo
-lib/ocaml/camlimages/oBmp.cmx
-lib/ocaml/camlimages/oBmp.o
-lib/ocaml/camlimages/oColor.cmi
-lib/ocaml/camlimages/oColor.cmo
-lib/ocaml/camlimages/oColor.cmx
-lib/ocaml/camlimages/oColor.mli
-lib/ocaml/camlimages/oColor.o
-lib/ocaml/camlimages/oFreetype.cmi
-lib/ocaml/camlimages/oFreetype.cmo
-lib/ocaml/camlimages/oFreetype.cmx
-lib/ocaml/camlimages/oFreetype.o
-lib/ocaml/camlimages/oGif.cmi
-lib/ocaml/camlimages/oGif.cmo
-lib/ocaml/camlimages/oGif.cmx
-lib/ocaml/camlimages/oGif.o
-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
-lib/ocaml/camlimages/oImages.mli
-lib/ocaml/camlimages/oImages.o
-lib/ocaml/camlimages/oJpeg.cmi
-lib/ocaml/camlimages/oJpeg.cmo
-lib/ocaml/camlimages/oJpeg.cmx
-lib/ocaml/camlimages/oJpeg.o
-lib/ocaml/camlimages/oPng.cmi
-lib/ocaml/camlimages/oPng.cmo
-lib/ocaml/camlimages/oPng.cmx
-lib/ocaml/camlimages/oPng.o
-lib/ocaml/camlimages/oPpm.cmi
-lib/ocaml/camlimages/oPpm.cmo
-lib/ocaml/camlimages/oPpm.cmx
-lib/ocaml/camlimages/oPpm.o
-lib/ocaml/camlimages/oPs.cmi
-lib/ocaml/camlimages/oPs.cmo
-lib/ocaml/camlimages/oPs.cmx
-lib/ocaml/camlimages/oPs.o
-lib/ocaml/camlimages/oTiff.cmi
-lib/ocaml/camlimages/oTiff.cmo
-lib/ocaml/camlimages/oTiff.cmx
-lib/ocaml/camlimages/oTiff.o
-lib/ocaml/camlimages/oXimage.cmi
-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
-lib/ocaml/camlimages/oXpm.o
-lib/ocaml/camlimages/oXvthumb.cmi
-lib/ocaml/camlimages/oXvthumb.cmo
-lib/ocaml/camlimages/oXvthumb.cmx
-lib/ocaml/camlimages/oXvthumb.mli
-lib/ocaml/camlimages/oXvthumb.o
-lib/ocaml/camlimages/png.cmi
-lib/ocaml/camlimages/png.cmo
-lib/ocaml/camlimages/png.cmx
-lib/ocaml/camlimages/png.mli
-lib/ocaml/camlimages/png.o
-lib/ocaml/camlimages/pngread.o
-lib/ocaml/camlimages/pngwrite.o
-lib/ocaml/camlimages/ppm.cmi
-lib/ocaml/camlimages/ppm.cmo
-lib/ocaml/camlimages/ppm.cmx
-lib/ocaml/camlimages/ppm.mli
-lib/ocaml/camlimages/ppm.o
-lib/ocaml/camlimages/ps.cmi
-lib/ocaml/camlimages/ps.cmo
-lib/ocaml/camlimages/ps.cmx
-lib/ocaml/camlimages/ps.mli
-lib/ocaml/camlimages/ps.o
-lib/ocaml/camlimages/reduce.cmi
-lib/ocaml/camlimages/reduce.cmo
-lib/ocaml/camlimages/reduce.cmx
-lib/ocaml/camlimages/reduce.mli
-lib/ocaml/camlimages/reduce.o
-lib/ocaml/camlimages/region.cmi
-lib/ocaml/camlimages/region.cmo
-lib/ocaml/camlimages/region.cmx
-lib/ocaml/camlimages/region.mli
-lib/ocaml/camlimages/region.o
-lib/ocaml/camlimages/rgb24.cmi
-lib/ocaml/camlimages/rgb24.cmo
-lib/ocaml/camlimages/rgb24.cmx
-lib/ocaml/camlimages/rgb24.mli
-lib/ocaml/camlimages/rgb24.o
-lib/ocaml/camlimages/rgba32.cmi
-lib/ocaml/camlimages/rgba32.cmo
-lib/ocaml/camlimages/rgba32.cmx
-lib/ocaml/camlimages/rgba32.mli
-lib/ocaml/camlimages/rgba32.o
-lib/ocaml/camlimages/tiff.cmi
-lib/ocaml/camlimages/tiff.cmo
-lib/ocaml/camlimages/tiff.cmx
-lib/ocaml/camlimages/tiff.mli
-lib/ocaml/camlimages/tiff.o
-lib/ocaml/camlimages/tiffread.o
-lib/ocaml/camlimages/tiffwrite.o
-lib/ocaml/camlimages/tmpfile.cmi
-lib/ocaml/camlimages/tmpfile.cmo
-lib/ocaml/camlimages/tmpfile.cmx
-lib/ocaml/camlimages/tmpfile.mli
-lib/ocaml/camlimages/tmpfile.o
-lib/ocaml/camlimages/ximage.cmi
-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
-lib/ocaml/camlimages/xpm.mli
-lib/ocaml/camlimages/xpm.o
-lib/ocaml/camlimages/xpmread.o
-lib/ocaml/camlimages/xpmwrite.o
-lib/ocaml/camlimages/xvthumb.cmi
-lib/ocaml/camlimages/xvthumb.cmo
-lib/ocaml/camlimages/xvthumb.cmx
-lib/ocaml/camlimages/xvthumb.mli
-lib/ocaml/camlimages/xvthumb.o
+@comment $NetBSD: PLIST,v 1.8 2011/08/07 20:36:20 wiz Exp $
+lib/ocaml/site-lib/camlimages/META
+lib/ocaml/site-lib/camlimages/bitmap.cmi
+lib/ocaml/site-lib/camlimages/bitmap.mli
+lib/ocaml/site-lib/camlimages/blend.cmi
+lib/ocaml/site-lib/camlimages/blend.mli
+lib/ocaml/site-lib/camlimages/bmp.cmi
+lib/ocaml/site-lib/camlimages/bmp.mli
+lib/ocaml/site-lib/camlimages/camlimages.cmi
+lib/ocaml/site-lib/camlimages/camlimages_all.a
+lib/ocaml/site-lib/camlimages/camlimages_all.cma
+lib/ocaml/site-lib/camlimages/camlimages_all.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_core.a
+lib/ocaml/site-lib/camlimages/camlimages_core.cma
+lib/ocaml/site-lib/camlimages/camlimages_core.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_freetype.a
+lib/ocaml/site-lib/camlimages/camlimages_freetype.cma
+lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_gif.a
+lib/ocaml/site-lib/camlimages/camlimages_gif.cma
+lib/ocaml/site-lib/camlimages/camlimages_gif.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_graphics.a
+lib/ocaml/site-lib/camlimages/camlimages_graphics.cma
+lib/ocaml/site-lib/camlimages/camlimages_graphics.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.a
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.cma
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.a
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cma
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_png.a
+lib/ocaml/site-lib/camlimages/camlimages_png.cma
+lib/ocaml/site-lib/camlimages/camlimages_png.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_ps.a
+lib/ocaml/site-lib/camlimages/camlimages_ps.cma
+lib/ocaml/site-lib/camlimages/camlimages_ps.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_supported.a
+lib/ocaml/site-lib/camlimages/camlimages_supported.cma
+lib/ocaml/site-lib/camlimages/camlimages_supported.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_tiff.a
+lib/ocaml/site-lib/camlimages/camlimages_tiff.cma
+lib/ocaml/site-lib/camlimages/camlimages_tiff.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_xpm.a
+lib/ocaml/site-lib/camlimages/camlimages_xpm.cma
+lib/ocaml/site-lib/camlimages/camlimages_xpm.cmxa
+lib/ocaml/site-lib/camlimages/cmyk32.cmi
+lib/ocaml/site-lib/camlimages/cmyk32.mli
+lib/ocaml/site-lib/camlimages/color.cmi
+lib/ocaml/site-lib/camlimages/color.mli
+lib/ocaml/site-lib/camlimages/colorhist.cmi
+lib/ocaml/site-lib/camlimages/colorhist.mli
+lib/ocaml/site-lib/camlimages/dllcamlimages_all.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_freetype.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_gif.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_jpeg.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_png.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_supported.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_tiff.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_xpm.so
+lib/ocaml/site-lib/camlimages/freetype.cmi
+lib/ocaml/site-lib/camlimages/freetype.mli
+lib/ocaml/site-lib/camlimages/ftlow.cmi
+lib/ocaml/site-lib/camlimages/ftlow.mli
+lib/ocaml/site-lib/camlimages/fttext.cmi
+lib/ocaml/site-lib/camlimages/fttext.mli
+lib/ocaml/site-lib/camlimages/genimage.cmi
+lib/ocaml/site-lib/camlimages/genimage.mli
+lib/ocaml/site-lib/camlimages/geometry.cmi
+lib/ocaml/site-lib/camlimages/geometry.mli
+lib/ocaml/site-lib/camlimages/gif.cmi
+lib/ocaml/site-lib/camlimages/gif.mli
+lib/ocaml/site-lib/camlimages/graphic_image.cmi
+lib/ocaml/site-lib/camlimages/graphic_image.mli
+lib/ocaml/site-lib/camlimages/image_intf.cmi
+lib/ocaml/site-lib/camlimages/image_intf.mli
+lib/ocaml/site-lib/camlimages/imagegdk.cmi
+lib/ocaml/site-lib/camlimages/imagegdk.mli
+lib/ocaml/site-lib/camlimages/images.cmi
+lib/ocaml/site-lib/camlimages/images.mli
+lib/ocaml/site-lib/camlimages/index16.cmi
+lib/ocaml/site-lib/camlimages/index16.mli
+lib/ocaml/site-lib/camlimages/index8.cmi
+lib/ocaml/site-lib/camlimages/index8.mli
+lib/ocaml/site-lib/camlimages/info.cmi
+lib/ocaml/site-lib/camlimages/info.mli
+lib/ocaml/site-lib/camlimages/jis_table.cmi
+lib/ocaml/site-lib/camlimages/jis_unicode.cmi
+lib/ocaml/site-lib/camlimages/jis_unicode.mli
+lib/ocaml/site-lib/camlimages/jpeg.cmi
+lib/ocaml/site-lib/camlimages/jpeg.mli
+lib/ocaml/site-lib/camlimages/libcamlimages_all.a
+lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a
+lib/ocaml/site-lib/camlimages/libcamlimages_gif.a
+lib/ocaml/site-lib/camlimages/libcamlimages_jpeg.a
+lib/ocaml/site-lib/camlimages/libcamlimages_png.a
+lib/ocaml/site-lib/camlimages/libcamlimages_supported.a
+lib/ocaml/site-lib/camlimages/libcamlimages_tiff.a
+lib/ocaml/site-lib/camlimages/libcamlimages_xpm.a
+lib/ocaml/site-lib/camlimages/mstring.cmi
+lib/ocaml/site-lib/camlimages/mstring.mli
+lib/ocaml/site-lib/camlimages/oBmp.cmi
+lib/ocaml/site-lib/camlimages/oColor.cmi
+lib/ocaml/site-lib/camlimages/oColor.mli
+lib/ocaml/site-lib/camlimages/oFreetype.cmi
+lib/ocaml/site-lib/camlimages/oGif.cmi
+lib/ocaml/site-lib/camlimages/oGraphic.cmi
+lib/ocaml/site-lib/camlimages/oImages.cmi
+lib/ocaml/site-lib/camlimages/oImages.mli
+lib/ocaml/site-lib/camlimages/oJpeg.cmi
+lib/ocaml/site-lib/camlimages/oJpeg.mli
+lib/ocaml/site-lib/camlimages/oPng.cmi
+lib/ocaml/site-lib/camlimages/oPng.mli
+lib/ocaml/site-lib/camlimages/oPpm.cmi
+lib/ocaml/site-lib/camlimages/oPs.cmi
+lib/ocaml/site-lib/camlimages/oTiff.cmi
+lib/ocaml/site-lib/camlimages/oXimage.cmi
+lib/ocaml/site-lib/camlimages/oXimage.mli
+lib/ocaml/site-lib/camlimages/oXimage2.cmi
+lib/ocaml/site-lib/camlimages/oXpm.cmi
+lib/ocaml/site-lib/camlimages/oXvthumb.cmi
+lib/ocaml/site-lib/camlimages/oXvthumb.mli
+lib/ocaml/site-lib/camlimages/png.cmi
+lib/ocaml/site-lib/camlimages/png.mli
+lib/ocaml/site-lib/camlimages/ppm.cmi
+lib/ocaml/site-lib/camlimages/ppm.mli
+lib/ocaml/site-lib/camlimages/ps.cmi
+lib/ocaml/site-lib/camlimages/ps.mli
+lib/ocaml/site-lib/camlimages/reduce.cmi
+lib/ocaml/site-lib/camlimages/reduce.mli
+lib/ocaml/site-lib/camlimages/region.cmi
+lib/ocaml/site-lib/camlimages/region.mli
+lib/ocaml/site-lib/camlimages/rgb24.cmi
+lib/ocaml/site-lib/camlimages/rgb24.mli
+lib/ocaml/site-lib/camlimages/rgba32.cmi
+lib/ocaml/site-lib/camlimages/rgba32.mli
+lib/ocaml/site-lib/camlimages/tiff.cmi
+lib/ocaml/site-lib/camlimages/tiff.mli
+lib/ocaml/site-lib/camlimages/tmpfile.cmi
+lib/ocaml/site-lib/camlimages/tmpfile.mli
+lib/ocaml/site-lib/camlimages/units.cmi
+lib/ocaml/site-lib/camlimages/ximage.cmi
+lib/ocaml/site-lib/camlimages/ximage.mli
+lib/ocaml/site-lib/camlimages/ximage2.cmi
+lib/ocaml/site-lib/camlimages/xpm.cmi
+lib/ocaml/site-lib/camlimages/xpm.mli
+lib/ocaml/site-lib/camlimages/xvthumb.cmi
+lib/ocaml/site-lib/camlimages/xvthumb.mli
diff --git a/graphics/camlimages/PLIST.opt b/graphics/camlimages/PLIST.opt
deleted file mode 100644
index 7c2fabe0e00..00000000000
--- a/graphics/camlimages/PLIST.opt
+++ /dev/null
@@ -1,29 +0,0 @@
-@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
-lib/ocaml/camlimages/ci_core.cmxa
-lib/ocaml/camlimages/ci_freetype.a
-lib/ocaml/camlimages/ci_freetype.cmxa
-lib/ocaml/camlimages/ci_gif.a
-lib/ocaml/camlimages/ci_gif.cmxa
-lib/ocaml/camlimages/ci_graphics.a
-lib/ocaml/camlimages/ci_graphics.cmxa
-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
-lib/ocaml/camlimages/ci_ppm.cmxa
-lib/ocaml/camlimages/ci_ps.a
-lib/ocaml/camlimages/ci_ps.cmxa
-lib/ocaml/camlimages/ci_tiff.a
-lib/ocaml/camlimages/ci_tiff.cmxa
-lib/ocaml/camlimages/ci_xpm.a
-lib/ocaml/camlimages/ci_xpm.cmxa
-lib/ocaml/camlimages/ci_xvthumb.a
-lib/ocaml/camlimages/ci_xvthumb.cmxa
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index 366c7c69d33..1c9a6d5a74f 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2011/08/07 20:36:20 wiz Exp $
 
 BUILDLINK_TREE+=	camlimages
 
 .if !defined(CAMLIMAGES_BUILDLINK3_MK)
 CAMLIMAGES_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.camlimages+=	camlimages>=2.2.0
-BUILDLINK_ABI_DEPENDS.camlimages?=	camlimages>=2.2.0nb1
+BUILDLINK_API_DEPENDS.camlimages+=	camlimages>=4.0.1
+BUILDLINK_ABI_DEPENDS.camlimages?=	camlimages>=4.0.1
 BUILDLINK_PKGSRCDIR.camlimages?=	../../graphics/camlimages
 .endif # CAMLIMAGES_BUILDLINK3_MK
 
diff --git a/graphics/camlimages/distinfo b/graphics/camlimages/distinfo
index cf7e48f6021..0406d2cc1bb 100644
--- a/graphics/camlimages/distinfo
+++ b/graphics/camlimages/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2011/05/24 12:26:00 is Exp $
+$NetBSD: distinfo,v 1.8 2011/08/07 20:36:20 wiz Exp $
 
-SHA1 (camlimages-2.2.0.tgz) = bc0062739be5ca9236f28145f17f840bf3f295ee
-RMD160 (camlimages-2.2.0.tgz) = 0f108ef3da565aeb0ab10d00e45819399af36d8c
-Size (camlimages-2.2.0.tgz) = 1385525 bytes
-SHA1 (patch-aa) = 8f1818e6b1a782066acb2ad6399514aa61e0e1f8
-SHA1 (patch-ac) = 3c2de383d335b03599be81a9ac32382493b726b1
-SHA1 (patch-ad) = 543280151e06269dd82d256bc9e53645a9186b5f
-SHA1 (patch-png_pngread.c) = b4d696e75c728be9a766424b41afbe5bb9446685
-SHA1 (patch-png_pngwrite.c) = 6894fc49bc0e752df550331c77c859362650c626
+SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 4c1eee28f02749f53ed8345b448ce11375ce6dce
+RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b
+Size (camlimages-4.0.1/v4.0.1.tar.gz) = 2190252 bytes
+SHA1 (patch-OMakefile) = de4f35f576b4a5a6de477b0f50cc6e5d4cfbe24c
+SHA1 (patch-src_pngread.c) = 00d753b8570b5ff9ffa71e6e62328496b03f9654
+SHA1 (patch-src_pngwrite.c) = 4df4f69851769e0eefc2249a30ac8dd53aa8d755
+SHA1 (patch-src_tiffread.c) = 319411cb6454ce276f540e260e4054054a60c700
diff --git a/graphics/camlimages/patches/patch-OMakefile b/graphics/camlimages/patches/patch-OMakefile
new file mode 100644
index 00000000000..5654a1c247e
--- /dev/null
+++ b/graphics/camlimages/patches/patch-OMakefile
@@ -0,0 +1,39 @@
+$NetBSD: patch-OMakefile,v 1.1 2011/08/07 20:36:20 wiz Exp $
+
+--- OMakefile.orig	2011-06-22 18:04:32.000000000 +0000
++++ OMakefile	2011-08-06 17:23:47.000000000 +0000
+@@ -25,8 +25,10 @@
+   /usr/include/X11
+   /usr/local/include
+ 
++INCLUDES[]+= @PREFIX@/include
++
+ # Specify non standard library directories
+-LDFLAGS[]+= 
++LDFLAGS[]+= @LDFLAGS@
+ # for example, 
+ # LDFLAGS[]+= -L/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
+ 
+@@ -35,6 +37,8 @@
+   /etc/X11
+   /usr/share/X11
+ 
++PATH_RGB_TXT[]+= @X11BASE@/lib/X11
++
+ BYTE_ENABLED=1
+ NATIVE_ENABLED=1
+ 
+@@ -122,11 +126,11 @@
+     export
+ 
+   HAVE_Z = $(Check_header_library z, zlib.h, zlibVersion)
+-  HAVE_PNG = $(Check_header_library png, png.h, png_create_read_struct)
++  HAVE_PNG = $(Check_header_library png15, png.h, png_create_read_struct)
+   SUPPORT_PNG = $(and $(HAVE_Z) $(HAVE_PNG))
+   LDFLAGS_png=
+   if $(SUPPORT_PNG)
+-    LDFLAGS_png=-lpng -lz
++    LDFLAGS_png=-lpng15 -lz
+     SUPPORTED_FORMATS+=png
+     export
+ 
diff --git a/graphics/camlimages/patches/patch-aa b/graphics/camlimages/patches/patch-aa
deleted file mode 100644
index 934263fcc80..00000000000
--- a/graphics/camlimages/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/02/03 11:29:54 joerg Exp $
-
---- tiff/tiffread.c.orig	2006-02-03 11:24:33.000000000 +0000
-+++ tiff/tiffread.c
-@@ -33,6 +33,9 @@
- #undef int32
- #undef uint32
- 
-+#define uint16 uint16_t
-+#define uint32 uint32_t
-+
- extern value *imglib_error;
- 
- value open_tiff_file_for_read( name )
diff --git a/graphics/camlimages/patches/patch-ac b/graphics/camlimages/patches/patch-ac
deleted file mode 100644
index 331eb3de495..00000000000
--- a/graphics/camlimages/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/05/24 12:26:00 is Exp $
-
---- Makefile.orig	2004-10-02 15:49:05.000000000 +0000
-+++ Makefile
-@@ -92,15 +92,15 @@ top:
- installopt: install
- 
- install: all
--	mkdir -p $(LIBDIR)
--	if test -w $(CAMLDIR)/ld.conf \
--        && test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
--	    echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	if test -w $(DESTDIR)$(CAMLDIR)/ld.conf \
-+        && test `grep -s -c '^$(LIBDIR)$$' $(DESTDIR)$(CAMLDIR)/ld.conf` = 0; then \
-+	    echo $(LIBDIR) >> $(DESTDIR)$(CAMLDIR)/ld.conf; \
- 	fi
- 	for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
--	$(CP) Makefile.config $(LIBDIR)
--	$(CP) config.h $(LIBDIR)
--	$(RANLIB) $(LIBDIR)/*.a
-+	$(CP) Makefile.config $(DESTDIR)$(LIBDIR)
-+	$(CP) config.h $(DESTDIR)$(LIBDIR)
-+	$(RANLIB) $(DESTDIR)$(LIBDIR)/*.a
- 
- depend:
- 	for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
diff --git a/graphics/camlimages/patches/patch-ad b/graphics/camlimages/patches/patch-ad
deleted file mode 100644
index 3404b91d66e..00000000000
--- a/graphics/camlimages/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2011/05/24 12:26:00 is Exp $
-
---- Makefile.shared.orig	2004-10-02 14:20:09.000000000 +0000
-+++ Makefile.shared
-@@ -45,8 +45,8 @@ clean::
- 	rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~
- 
- install:: all
--	- mkdir -p $(LIBDIR)
--	- cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR)
-+	- mkdir -p $(DESTDIR)$(LIBDIR)
-+	- cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(DESTDIR)$(LIBDIR)
- 
- #######
- 
diff --git a/graphics/camlimages/patches/patch-png_pngread.c b/graphics/camlimages/patches/patch-src_pngread.c
index a3899920127..8cdf0cec398 100644
--- a/graphics/camlimages/patches/patch-png_pngread.c
+++ b/graphics/camlimages/patches/patch-src_pngread.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-png_pngread.c,v 1.1 2011/02/19 10:54:37 wiz Exp $
+$NetBSD: patch-src_pngread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $
 
 Fix build with png-1.5.
 
---- png/pngread.c.orig	2002-03-26 13:15:10.000000000 +0000
-+++ png/pngread.c
-@@ -70,7 +70,7 @@ value read_png_file_as_rgb24( name )
+--- src/pngread.c.orig	2011-01-25 14:10:44.000000000 +0000
++++ src/pngread.c	2011-04-17 13:35:40.000000000 +0000
+@@ -69,7 +69,7 @@
    }
  
    /* error handling */
@@ -13,16 +13,16 @@ Fix build with png-1.5.
      /* Free all of the memory associated with the png_ptr and info_ptr */
      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
      fclose(fp);
-@@ -126,7 +126,7 @@ value read_png_file_as_rgb24( name )
-     }
-   
+@@ -134,7 +134,7 @@
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
      /* Later, we can return something */
 -    if (setjmp(png_ptr->jmpbuf)) {
 +    if (setjmp(png_jmpbuf(png_ptr))) {
        /* Free all of the memory associated with the png_ptr and info_ptr */
        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
        fclose(fp);
-@@ -224,7 +224,7 @@ value read_png_file( name )
+@@ -243,7 +243,7 @@
    }
  
    /* error handling */
@@ -31,9 +31,9 @@ Fix build with png-1.5.
      /* Free all of the memory associated with the png_ptr and info_ptr */
      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
      fclose(fp);
-@@ -328,7 +328,7 @@ fprintf(stderr, "pngread.c: rgb image\n"
-     }
-   
+@@ -302,7 +302,7 @@
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
      /* Later, we can return something */
 -    if (setjmp(png_ptr->jmpbuf)) {
 +    if (setjmp(png_jmpbuf(png_ptr))) {
diff --git a/graphics/camlimages/patches/patch-png_pngwrite.c b/graphics/camlimages/patches/patch-src_pngwrite.c
index cd21647fc6b..fd100caec56 100644
--- a/graphics/camlimages/patches/patch-png_pngwrite.c
+++ b/graphics/camlimages/patches/patch-src_pngwrite.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-png_pngwrite.c,v 1.1 2011/02/19 10:54:37 wiz Exp $
+$NetBSD: patch-src_pngwrite.c,v 1.1 2011/08/07 20:36:20 wiz Exp $
 
 Fix build with png-1.5.
 
---- png/pngwrite.c.orig	2004-03-04 17:10:00.000000000 +0000
-+++ png/pngwrite.c
-@@ -57,7 +57,7 @@ value write_png_file_rgb24( name, buffer
+--- src/pngwrite.c.orig	2011-01-25 14:10:44.000000000 +0000
++++ src/pngwrite.c	2011-04-17 13:36:21.000000000 +0000
+@@ -62,7 +62,7 @@
    }
  
    /* error handling */
@@ -13,7 +13,7 @@ Fix build with png-1.5.
      /* Free all of the memory associated with the png_ptr and info_ptr */
      png_destroy_write_struct(&png_ptr, &info_ptr);
      fclose(fp);
-@@ -166,7 +166,7 @@ value write_png_file_index( name, buffer
+@@ -171,7 +171,7 @@
    }
  
    /* error handling */
diff --git a/graphics/camlimages/patches/patch-src_tiffread.c b/graphics/camlimages/patches/patch-src_tiffread.c
new file mode 100644
index 00000000000..54d0f6f1c6f
--- /dev/null
+++ b/graphics/camlimages/patches/patch-src_tiffread.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_tiffread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $
+
+--- src/tiffread.c.orig	2011-01-25 14:10:44.000000000 +0000
++++ src/tiffread.c	2011-04-17 13:37:39.000000000 +0000
+@@ -28,6 +28,8 @@
+ #define uint16 uint16tiff
+ #define int32 int32tiff
+ #define uint32 uint32tiff
++#define uint16 uint16_t
++#define uint32 uint32_t
+ 
+ #include <tiffio.h>
+