upgrade to 2.11

7 files changed, 37 insertions, 154 deletions

diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 881205e932d0..3760f66e75a3 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	images
-PORTVERSION=	2.10
-PORTREVISION=	2
+PORTVERSION=	2.11
+PORTREVISION=	0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	camlimages-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -24,10 +24,10 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
-LIB_DEPENDS=	ungif:${PORTSDIR}/graphics/libungif \
-		png:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
+		png.5:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_XPM=	yes
 USE_FREETYPE=	yes
@@ -37,6 +37,8 @@ CONFIGURE_ENV=	\
 	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_GMAKE=	yes
 
+PKGDEINSTALL=	${PKGINSTALL}
+
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO_MSG} ""
@@ -45,4 +47,9 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
+post-install:
+	@${FIND} ${PREFIX}/lib/ocaml/camlimages -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/ocaml/camlimages" >> ${TMPPLIST}
+
 .include <bsd.port.mk>
diff --git a/graphics/ocaml-images/distinfo b/graphics/ocaml-images/distinfo
index 5ba865224f8e..d2dde654d41c 100644
--- a/graphics/ocaml-images/distinfo
+++ b/graphics/ocaml-images/distinfo
@@ -1,2 +1,2 @@
-MD5 (camlimages-2.10.tgz) = 3cb0a28d6b4c55d59164d22407386ee1
-SIZE (camlimages-2.10.tgz) = 1258377
+MD5 (camlimages-2.11.tgz) = f04f0d1a78aa38a6841dc3d71e249449
+SIZE (camlimages-2.11.tgz) = 1354100
diff --git a/graphics/ocaml-images/files/patch-freetype2:ftintf.c b/graphics/ocaml-images/files/patch-freetype2:ftintf.c
new file mode 100644
index 000000000000..a2e018734fc6
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-freetype2:ftintf.c
@@ -0,0 +1,12 @@
+--- 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-tiffread.c b/graphics/ocaml-images/files/patch-tiffread.c
deleted file mode 100644
index 7e6bd85ff622..000000000000
--- a/graphics/ocaml-images/files/patch-tiffread.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- tiff/tiffread.c.orig	Sat Feb  8 00:49:46 2003
-+++ tiff/tiffread.c	Sat Feb  8 00:50:10 2003
-@@ -37,15 +37,7 @@
- typedef	char int8;
- #endif
- 
--#ifdef uint8
- typedef	unsigned char uint8;
--#endif
--#ifdef int16
--typedef	short int16;
--#endif
--#ifdef uint16
--typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
--#endif
- 
- #include <tiffio.h>
- 
diff --git a/graphics/ocaml-images/files/patch-tiffwrite.c b/graphics/ocaml-images/files/patch-tiffwrite.c
deleted file mode 100644
index c48bf1c16a5d..000000000000
--- a/graphics/ocaml-images/files/patch-tiffwrite.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- tiff/tiffwrite.c.orig	Sat Feb  8 00:50:32 2003
-+++ tiff/tiffwrite.c	Sat Feb  8 00:50:51 2003
-@@ -34,15 +34,7 @@
- #else
- typedef	char int8;
- #endif
--#ifdef uint8
- typedef	unsigned char uint8;
--#endif
--#ifdef int16
--typedef	short int16;
--#endif
--#ifdef uint16
--typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
--#endif
- 
- #include <tiffio.h>
- 
diff --git a/graphics/ocaml-images/pkg-install b/graphics/ocaml-images/pkg-install
new file mode 100644
index 000000000000..c64374940d0b
--- /dev/null
+++ b/graphics/ocaml-images/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+  echo "${PKG_PREFIX}/lib/ocaml/camlimages" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
+elif [ "$2" = "DEINSTALL" ]; then
+  mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
+  grep -v camlimages ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
+  rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
+fi
diff --git a/graphics/ocaml-images/pkg-plist b/graphics/ocaml-images/pkg-plist
deleted file mode 100644
index 29d7967eed20..000000000000
--- a/graphics/ocaml-images/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-lib/ocaml/camlimages/Makefile.config
-lib/ocaml/camlimages/bitmap.cmi
-lib/ocaml/camlimages/bitmap.mli
-lib/ocaml/camlimages/blend.cmi
-lib/ocaml/camlimages/blend.mli
-lib/ocaml/camlimages/bmp.cmi
-lib/ocaml/camlimages/bmp.mli
-lib/ocaml/camlimages/camlimages.cmi
-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_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.mli
-lib/ocaml/camlimages/color.cmi
-lib/ocaml/camlimages/color.mli
-lib/ocaml/camlimages/colorhist.cmi
-lib/ocaml/camlimages/dllci_freetype.so
-lib/ocaml/camlimages/dllci_gif.so
-lib/ocaml/camlimages/dllci_jpeg.so
-lib/ocaml/camlimages/dllci_png.so
-lib/ocaml/camlimages/dllci_tiff.so
-lib/ocaml/camlimages/dllci_xpm.so
-lib/ocaml/camlimages/freetype.cmi
-lib/ocaml/camlimages/freetype.mli
-lib/ocaml/camlimages/ftlow.cmi
-lib/ocaml/camlimages/ftlow.mli
-lib/ocaml/camlimages/fttext.cmi
-lib/ocaml/camlimages/fttext.mli
-lib/ocaml/camlimages/genimage.cmi
-lib/ocaml/camlimages/genimage.mli
-lib/ocaml/camlimages/geometry.cmi
-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
-lib/ocaml/camlimages/index8.mli
-lib/ocaml/camlimages/info.cmi
-lib/ocaml/camlimages/info.mli
-lib/ocaml/camlimages/jis_table.cmi
-lib/ocaml/camlimages/jis_unicode.cmi
-lib/ocaml/camlimages/jis_unicode.mli
-lib/ocaml/camlimages/jpeg.cmi
-lib/ocaml/camlimages/jpeg.mli
-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.mli
-lib/ocaml/camlimages/oBmp.cmi
-lib/ocaml/camlimages/oColor.cmi
-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
-lib/ocaml/camlimages/oPpm.cmi
-lib/ocaml/camlimages/oPs.cmi
-lib/ocaml/camlimages/oTiff.cmi
-lib/ocaml/camlimages/oXimage.cmi
-lib/ocaml/camlimages/oXimage.mli
-lib/ocaml/camlimages/oXpm.cmi
-lib/ocaml/camlimages/oXvthumb.cmi
-lib/ocaml/camlimages/oXvthumb.mli
-lib/ocaml/camlimages/png.cmi
-lib/ocaml/camlimages/png.mli
-lib/ocaml/camlimages/ppm.cmi
-lib/ocaml/camlimages/ppm.mli
-lib/ocaml/camlimages/ps.cmi
-lib/ocaml/camlimages/ps.mli
-lib/ocaml/camlimages/reduce.cmi
-lib/ocaml/camlimages/reduce.mli
-lib/ocaml/camlimages/region.cmi
-lib/ocaml/camlimages/region.mli
-lib/ocaml/camlimages/rgb24.cmi
-lib/ocaml/camlimages/rgb24.mli
-lib/ocaml/camlimages/rgba32.cmi
-lib/ocaml/camlimages/rgba32.mli
-lib/ocaml/camlimages/tiff.cmi
-lib/ocaml/camlimages/tiff.mli
-lib/ocaml/camlimages/tmpfile.cmi
-lib/ocaml/camlimages/tmpfile.mli
-lib/ocaml/camlimages/ximage.cmi
-lib/ocaml/camlimages/ximage.mli
-lib/ocaml/camlimages/xpm.cmi
-lib/ocaml/camlimages/xpm.mli
-lib/ocaml/camlimages/xvthumb.cmi
-lib/ocaml/camlimages/xvthumb.mli
-@dirrm lib/ocaml/camlimages