3 files changed, 39 insertions, 5 deletions
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index f73a2ab46b2e..0ea7596b0629 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	images
 PORTVERSION=	3.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ \
diff --git a/graphics/ocaml-images/files/patch-src_tiffread.c b/graphics/ocaml-images/files/patch-src_tiffread.c
index e0aa834ff296..86b46390bb7a 100644
--- a/graphics/ocaml-images/files/patch-src_tiffread.c
+++ b/graphics/ocaml-images/files/patch-src_tiffread.c
@@ -1,6 +1,6 @@
---- src/tiffread.c.orig	2010-03-26 01:20:08.000000000 -0700
-+++ src/tiffread.c	2010-03-26 01:20:46.000000000 -0700
-@@ -20,6 +20,7 @@
+--- 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>
@@ -8,7 +8,21 @@
  
  /* These are defined in caml/config.h */
  #define int16 int16tiff
-@@ -64,6 +65,10 @@
+ #define uint16 uint16tiff
+ #define int32 int32tiff
+ #define uint32 uint32tiff
++#define int64 int64tiff
++#define uint64 uint64tiff
+ 
+ #include <tiffio.h>
+ 
++#undef int64
++#undef uint64
++
+ 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);
  
diff --git a/graphics/ocaml-images/files/patch-src_tiffwrite.c b/graphics/ocaml-images/files/patch-src_tiffwrite.c
new file mode 100644
index 000000000000..3462835c81de
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_tiffwrite.c
@@ -0,0 +1,20 @@
+--- 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 @@
+ #define uint16 uint16tiff
+ #define int32 int32tiff
+ #define uint32 uint32tiff
++#define int64 int64tiff
++#define uint64 uint64tiff
+ 
+ #include <tiffio.h>
+ 
+@@ -32,6 +34,8 @@
+ #undef uint16
+ #undef int32
+ #undef uint32
++#undef int64
++#undef uint64
+ 
+ extern value *imglib_error;
+