11 files changed, 294 insertions, 115 deletions

diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index c730c19a770d..9419ef5d2435 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -2,119 +2,88 @@
 # $FreeBSD$
 
 PORTNAME=	images
-PORTVERSION=	3.0.2
-PORTREVISION=	8
+PORTVERSION=	4.0.1
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ \
-		http://caml.inria.fr/distrib/bazar-ocaml/
+MASTER_SITES=	https://bitbucket.org/camlspotter/camlimages/get/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	camlimages-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	v${PORTVERSION}
+DIST_SUBDIR=	ocaml-images
 
 MAINTAINER=	michael.grunewald@laposte.net
 COMMENT=	Objective Caml image processing library
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:${PORTSDIR}/lang/ocaml-autoconf
+BUILD_DEPENDS+=	omake:${PORTSDIR}/devel/omake
 
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf
-ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing
-USE_OCAML=	yes
+USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
-USE_OCAML_WASH=	yes
+OCAMLFIND_DESTDIR=	${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
+
 OCAML_PKGDIRS=	camlimages
-USE_OCAML_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--without-lablgtk
-MAKE_JOBS_UNSAFE=	yes
+OCAML_LDLIBS=	${OCAML_SITELIBDIR}/camlimages
+
+OMAKESUBS+=	-e s@%%INCLUDESPORTS%%@${LOCALBASE}/include@
+OMAKESUBS+=	-e s@%%INCLUDESX11%%@${LOCALBASE}/include/X11@
+OMAKESUBS+=	-e s@%%INCLUDESPNG%%@${LOCALBASE}/include/libpng15@
+OMAKESUBS+=	-e s@%%LDFLAGSPORTS%%@-L${LOCALBASE}/lib@
+
+OMAKE=		omake 'PREFIX=${STAGEDIR}${PREFIX}'
+OMARGS=		--dotomake .omake --force-dotomake
+WRKSRC=		${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
+
+MAKE_JOBS_UNSAFE= yes
 
 OPTIONS_DEFINE=	PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT GTK2 DOCS
-OPTIONS_DEFAULT=	PNG JPEG TIFF XPM GIT FREETYPE GHOSTSCRIPT
+OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PNG_CONFIGURE_WITH=	png
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=	--with-png
-.else
-CONFIGURE_ARGS+=	--without-png
-.endif
+JPEG_CONFIGURE_WITH=	jpeg
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-.if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=	--with-jpeg
-.else
-CONFIGURE_ARGS+=	--without-jpeg
-.endif
+TIFF_CONFIGURE_WITH=	tiff
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS+=	--with-tiff
-.else
-CONFIGURE_ARGS+=	--without-tiff
-.endif
+XPM_CONFIGURE_WITH=	xpm
 
-.if ${PORT_OPTIONS:MXPM}
-USE_XORG=	xpm
-CONFIGURE_ARGS+=	--with-xpm
-.else
-CONFIGURE_ARGS+=	--without-xpm
-.endif
+GIF_CONFIGURE_WITH=	gif
+GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 
-.if ${PORT_OPTIONS:MGIF}
-LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
-CONFIGURE_ARGS+=	--with-gif
-.else
-CONFIGURE_ARGS+=	--without-gif
-.endif
+FREETYPE_CONFIGURE_WITH=freetype
+FREETYPE_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+
+GHOSTSCRIPT_CONFIGURE_WITH= gs
+
+GTK2_CONFIGURE_WITH=	liblgtk2
+GTK2_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+GTK2_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=		ttf:${PORTSDIR}/print/freetype
-CONFIGURE_ARGS+=	--with-freetype
-.else
-CONFIGURE_ARGS+=	--without-freetype
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MXPM}
+USE_XORG=	xpm
 .endif
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
 USE_GHOSTSCRIPT=	yes
-CONFIGURE_ARGS+=	--with-gs
-.else
-CONFIGURE_ARGS+=	--without-gs
 .endif
 
-.if ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=	--with-lablgtk2
-BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-.else
-CONFIGURE_ARGS+=	--without-lablgtk2
-.endif
+do-configure:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
+	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)
 
-GNU_CONFIGURE=	yes
-#USE_GMAKE=	yes
+do-build:
+	(cd ${WRKSRC} && ${OMAKE} ${OMARGS})
 
-#the default docsdir gets expanded to ${PREFIX}/share/doc/images
-#which isn't of much help when you are searching for the package docs
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-DOCSFILES=	CHANGES README LICENSE
+ocaml-findlib:
+	# Overriding ocaml-findlib target which does not support stage
+	# The consequence is that pkg-plist must be manually supported
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	${DOCSFILES} doc
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/doc
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc '-name "*.jpg" -o -name "*.html"')
-	@${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,g} ${DOCSDIR}/
-.endif
-	@${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages.so" >> ${TMPPLIST}
-	@${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages_core.so" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/ocaml/stublibs >/dev/null 2>&1 || ${TRUE}" >> ${TMPPLIST}
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}	
+	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} install)
 
 .include <bsd.port.mk>
diff --git a/graphics/ocaml-images/distinfo b/graphics/ocaml-images/distinfo
index 76616630cf37..292653df98ca 100644
--- a/graphics/ocaml-images/distinfo
+++ b/graphics/ocaml-images/distinfo
@@ -1,4 +1,2 @@
-SHA256 (ocaml-autoconf-1.0.tar.gz) = 67e85520f65c033c86e99e5438e51657e777579034570527c1b2c62096ecb004
-SIZE (ocaml-autoconf-1.0.tar.gz) = 11337
-SHA256 (camlimages-3.0.2.tgz) = db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
-SIZE (camlimages-3.0.2.tgz) = 1429138
+SHA256 (ocaml-images/v4.0.1.tar.gz) = b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4
+SIZE (ocaml-images/v4.0.1.tar.gz) = 2190274
diff --git a/graphics/ocaml-images/files/patch-OMakefile b/graphics/ocaml-images/files/patch-OMakefile
new file mode 100644
index 000000000000..469d16c417d5
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-OMakefile
@@ -0,0 +1,20 @@
+--- OMakefile.orig	2012-11-07 22:03:19.000000000 +0100
++++ OMakefile	2012-11-07 22:04:26.000000000 +0100
+@@ -22,13 +22,13 @@
+ 
+ # Specify non standard include directories
+ INCLUDES[]=
+-  /usr/include/X11
+-  /usr/local/include
++  %%INCLUDESPORTS%%
++  %%INCLUDESX11%%
++  %%INCLUDESPNG%%
+ 
+ # Specify non standard library directories
+ LDFLAGS[]+= 
+-# for example, 
+-# LDFLAGS[]+= -L/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
++  %%LDFLAGSPORTS%%
+ 
+ # Specify directories where X's rgb.txt can be found
+ PATH_RGB_TXT[]=
diff --git a/graphics/ocaml-images/files/patch-configure.ac b/graphics/ocaml-images/files/patch-configure.ac
deleted file mode 100644
index a3e65e951247..000000000000
--- a/graphics/ocaml-images/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2010-03-26 01:15:49.000000000 -0700
-+++ configure.ac	2010-03-26 01:15:52.000000000 -0700
-@@ -5,7 +5,6 @@
- 
- # Check ocaml
- AC_PROG_OCAML([3.08])
--AC_PROG_OCAML_TOOL(OCAMLMKLIB, ocamlmklib)
- AC_SUBST(OCAMLLIB)
- 
- # Check versions to build
diff --git a/graphics/ocaml-images/files/patch-src_OMakefile b/graphics/ocaml-images/files/patch-src_OMakefile
new file mode 100644
index 000000000000..c6d85cfd4037
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_OMakefile
@@ -0,0 +1,15 @@
+--- src/OMakefile.orig	2012-11-07 22:43:27.000000000 +0100
++++ src/OMakefile	2012-11-07 22:44:22.000000000 +0100
+@@ -262,10 +262,10 @@
+       $(glob i, *.so)
+ 
+ INSTALL()=
+-  value $(OCAMLFIND) install $(LIBRARY_PREFIX) $(INSTALL_TARGETS)
++  value $(OCAMLFIND) install -ldconf ignore -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX) $(INSTALL_TARGETS)
+ 
+ UNINSTALL()=
+-  value $(OCAMLFIND) remove $(LIBRARY_PREFIX)
++  value $(OCAMLFIND) remove -ldconf ignore -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX)
+ 
+ install: all
+   $(INSTALL)
diff --git a/graphics/ocaml-images/files/patch-src_gifread.c b/graphics/ocaml-images/files/patch-src_gifread.c
new file mode 100644
index 000000000000..360520019081
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_gifread.c
@@ -0,0 +1,10 @@
+--- src/gifread.c.orig	2012-11-07 22:33:55.000000000 +0100
++++ src/gifread.c	2012-11-07 22:34:04.000000000 +0100
+@@ -200,7 +200,6 @@
+ 
+   if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) 
+       == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("DGifGetLine");
+   }
+   CAMLreturn(buf);
diff --git a/graphics/ocaml-images/files/patch-src_gifwrite.c b/graphics/ocaml-images/files/patch-src_gifwrite.c
index 301d3821631f..15c2acb36171 100644
--- a/graphics/ocaml-images/files/patch-src_gifwrite.c
+++ b/graphics/ocaml-images/files/patch-src_gifwrite.c
@@ -1,5 +1,5 @@
---- ./src/gifwrite.c.orig	2010-04-09 03:01:01.000000000 -0700
-+++ ./src/gifwrite.c	2010-04-09 03:01:08.000000000 -0700
+--- src/gifwrite.c.orig	2011-06-22 20:04:32.000000000 +0200
++++ src/gifwrite.c	2012-11-07 22:32:25.000000000 +0100
 @@ -25,7 +25,7 @@
  
  #include <gif_lib.h>
@@ -9,3 +9,11 @@
  {
    CAMLparam1(list);
    CAMLlocal1(l);
+@@ -133,7 +133,6 @@
+ 
+   if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width) 
+        == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("EGifPutLine");
+   }
+   CAMLreturn(Val_unit);
diff --git a/graphics/ocaml-images/files/patch-src_jpegread.c b/graphics/ocaml-images/files/patch-src_jpegread.c
new file mode 100644
index 000000000000..4369ab05fd9d
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_jpegread.c
@@ -0,0 +1,11 @@
+--- src/jpegread.c.orig	2011-06-22 20:04:32.000000000 +0200
++++ src/jpegread.c
+@@ -417,7 +417,7 @@
+     jpeg_read_scanlines( cinfop, row, 1 );
+     row[0] += scanline_bytes;
+   }
+-  CAMLreturn0;
++  CAMLreturn(0);
+ }
+ 
+ value close_jpeg_file_for_read( jpegh )
diff --git a/graphics/ocaml-images/files/patch-src_tiffread.c b/graphics/ocaml-images/files/patch-src_tiffread.c
index 86b46390bb7a..73b684a3408e 100644
--- a/graphics/ocaml-images/files/patch-src_tiffread.c
+++ b/graphics/ocaml-images/files/patch-src_tiffread.c
@@ -1,11 +1,12 @@
---- src/tiffread.c.orig	2009-10-26 13:42:03.000000000 +0100
-+++ src/tiffread.c	2010-08-28 10:47:42.000000000 +0200
-@@ -20,15 +20,21 @@
- #include <caml/alloc.h>
- #include <caml/memory.h>
- #include <caml/fail.h>
-+#include "oversized.h"
+--- src/tiffread.c.orig	2011-06-22 20:04:32.000000000 +0200
++++ src/tiffread.c
+@@ -23,14 +23,22 @@
  
+ #include "oversized.h"
+ 
++/* Avoid redefinitions */
++#undef int16
++#undef uint16
  /* These are defined in caml/config.h */
  #define int16 int16tiff
  #define uint16 uint16tiff
@@ -22,9 +23,9 @@
  extern value *imglib_error;
  
  value open_tiff_file_for_read( name )
-@@ -64,6 +70,10 @@
-     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
-     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
+@@ -70,6 +78,10 @@
+       failwith_oversized("tiff");
+     }
  
 +    if (oversized (imagewidth, imagelength)) {
 +	failwith_oversized("tiff");
diff --git a/graphics/ocaml-images/files/patch-src_tiffwrite.c b/graphics/ocaml-images/files/patch-src_tiffwrite.c
index 3462835c81de..2e50b0b217b6 100644
--- a/graphics/ocaml-images/files/patch-src_tiffwrite.c
+++ b/graphics/ocaml-images/files/patch-src_tiffwrite.c
@@ -1,6 +1,14 @@
---- src/tiffwrite.c.orig	2009-10-26 13:42:03.000000000 +0100
-+++ src/tiffwrite.c	2010-08-28 10:46:35.000000000 +0200
-@@ -25,6 +25,8 @@
+--- src/tiffwrite.c.orig	2011-06-22 20:04:32.000000000 +0200
++++ src/tiffwrite.c
+@@ -20,11 +20,16 @@
+ #include <caml/memory.h>
+ #include <caml/fail.h>
+ 
++/* Avoid redefinitions */
++#undef int16
++#undef uint16
+ /* These are defined in caml/config.h */
+ #define int16 int16tiff
  #define uint16 uint16tiff
  #define int32 int32tiff
  #define uint32 uint32tiff
@@ -9,7 +17,7 @@
  
  #include <tiffio.h>
  
-@@ -32,6 +34,8 @@
+@@ -32,6 +37,8 @@
  #undef uint16
  #undef int32
  #undef uint32
diff --git a/graphics/ocaml-images/pkg-plist b/graphics/ocaml-images/pkg-plist
new file mode 100644
index 000000000000..2232a825d32c
--- /dev/null
+++ b/graphics/ocaml-images/pkg-plist
@@ -0,0 +1,149 @@
+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
+%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.a
+%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cma
+%%GIF%%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
+%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.a
+%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cma
+%%GTK2%%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
+%%GTK2%%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
+%%GTK2%%lib/ocaml/site-lib/camlimages/oXimage.cmi
+lib/ocaml/site-lib/camlimages/oXimage.mli
+%%GTK2%%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
+%%GTK2%%lib/ocaml/site-lib/camlimages/ximage.cmi
+lib/ocaml/site-lib/camlimages/ximage.mli
+%%GTK2%%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
+@dirrm lib/ocaml/site-lib/camlimages
+@dirrmtry lib/ocaml/site-lib
+@dirrmtry lib/ocaml