- Update version to 2.2 (newer than actual 2.11), also solve build problems

  appears with OCaml 3.09
- Pass maintainership to submitter

PR:		ports/89965
Submitted by:	Marwan Burelle <burelle@lri.fr>

4 files changed, 14 insertions, 42 deletions

diff --git a/graphics/ocaml-images/files/patch-Makefile.config.in b/graphics/ocaml-images/files/patch-Makefile.config.in
deleted file mode 100644
index a284a7a4da77..000000000000
--- a/graphics/ocaml-images/files/patch-Makefile.config.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.config.in.orig	Tue Apr  9 18:59:59 2002
-+++ Makefile.config.in	Sat Feb  8 00:53:29 2003
-@@ -24,12 +24,12 @@
- SUPPORT_PS=@SUPPORT_PS@
- SUPPORT_LABLGTK=@SUPPORT_LABLGTK@
- 
--LIBGIF=@LIBGIF@
-+LIBGIF=-L${LOCALBASE}/lib @LIBGIF@
- LIBBMP=@LIBBMP@
--LIBJPEG=@LIBJPEG@
--LIBTIFF=@LIBTIFF@
-+LIBJPEG=-L${LOCALBASE}/lib @LIBJPEG@
-+LIBTIFF=-L${LOCALBASE}/lib @LIBTIFF@
- LIBFREETYPE=@LIBFREETYPE@
--LIBPNG=@LIBPNG@
-+LIBPNG=-L${LOCALBASE}/lib @LIBPNG@
- LIBXVTHUMB=@LIBXVTHUMB@
- LIBXPM=@LIBXPM@
- LIBPPM=@LIBPPM@
diff --git a/graphics/ocaml-images/files/patch-Makefile.shared b/graphics/ocaml-images/files/patch-Makefile.shared
deleted file mode 100644
index 3587429ded47..000000000000
--- a/graphics/ocaml-images/files/patch-Makefile.shared
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.shared.orig	Sat Feb  8 00:59:46 2003
-+++ Makefile.shared	Sat Feb  8 01:00:00 2003
-@@ -62,7 +62,7 @@
- 	$(CAMLYACC) $<
- 
- .c.o: ../config.h
--	$(CAMLC) -ccopt "-I.. $(CFLAGS) -I/usr/local/include" -c $< 
-+	$(CAMLC) -ccopt "-I.. $(CFLAGS) -I/usr/X11R6/include -I/usr/local/include" -c $< 
- 
- depend: .depend
- 
diff --git a/graphics/ocaml-images/files/patch-freetype2:ftintf.c b/graphics/ocaml-images/files/patch-freetype2:ftintf.c
deleted file mode 100644
index a2e018734fc6..000000000000
--- a/graphics/ocaml-images/files/patch-freetype2:ftintf.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- freetype2/ftintf.c.orig	Wed Mar 24 10:51:28 2004
-+++ freetype2/ftintf.c	Wed Mar 24 10:51:56 2004
-@@ -20,7 +20,8 @@
- 
- #if (HAVE_FREETYPE && HAVE_FREETYPE2)
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- value init_FreeType()
- {
diff --git a/graphics/ocaml-images/files/patch-tiff::tiffread.c b/graphics/ocaml-images/files/patch-tiff::tiffread.c
new file mode 100644
index 000000000000..983c73533296
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-tiff::tiffread.c
@@ -0,0 +1,14 @@
+--- tiff/tiffread.c.orig	Tue Sep 21 23:56:44 2004
++++ tiff/tiffread.c	Mon Dec  5 09:25:43 2005
+@@ -28,11 +28,6 @@
+ 
+ #include <tiffio.h>
+ 
+-#undef int16
+-#undef uint16
+-#undef int32
+-#undef uint32
+-
+ extern value *imglib_error;
+ 
+ value open_tiff_file_for_read( name )