Attachment 59821 Details for Bug 89965 – patch-ocaml-images

patch-ocaml-images

patch-ocaml-images (text/plain), 4.59 KB, created by Marwan Burelle on 2005-12-05 09:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marwan Burelle

Created: 2005-12-05 09:10:06 UTC

Size: 4.59 KB

patch

obsolete

>diff -ruN ocaml-images.orig/Makefile ocaml-images/Makefile
>--- ocaml-images.orig/Makefile	Mon Dec  5 10:03:09 2005
>+++ ocaml-images/Makefile	Mon Dec  5 10:08:08 2005
>@@ -7,34 +7,37 @@
> #
> 
> PORTNAME=	images
>-PORTVERSION=	2.11
>-PORTREVISION=	0
>+PORTVERSION=	2.2
>+PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
> PKGNAMEPREFIX=	ocaml-
> DISTNAME=	camlimages-${PORTVERSION}
> EXTRACT_SUFX=	.tgz
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	marwan.burelle@lri.fr
> COMMENT=	Objective Caml image processing library
> 
>-USE_GHOSTSCRIPT=	yes
>-
> BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
>-		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>+		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
>+		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
> RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
>-		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
>+		lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
>+		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
> LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
> 		png.5:${PORTSDIR}/graphics/png \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		tiff.4:${PORTSDIR}/graphics/tiff
> 
>+USE_GHOSTSCRIPT=	yes
> USE_XPM=	yes
> USE_FREETYPE=	yes
>-GNU_CONFIGURE=	yes
>+HAS_CONFIGURE=	yes
> CONFIGURE_ENV=	\
> 	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
>-	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>+	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
>+	LDFLAGS="${LDFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include"
>+CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include --includedir=${X11BASE}/include
> USE_GMAKE=	yes
> 
> PKGDEINSTALL=	${PKGINSTALL}
>diff -ruN ocaml-images.orig/distinfo ocaml-images/distinfo
>--- ocaml-images.orig/distinfo	Mon Dec  5 10:03:09 2005
>+++ ocaml-images/distinfo	Mon Dec  5 09:03:12 2005
>@@ -1,3 +1,3 @@
>-MD5 (camlimages-2.11.tgz) = f04f0d1a78aa38a6841dc3d71e249449
>-SHA256 (camlimages-2.11.tgz) = 884f8c9eaa153da5f38fb050cecb1fbae9065e441f7f6efcea82ac4a29fd3dc5
>-SIZE (camlimages-2.11.tgz) = 1354100
>+MD5 (camlimages-2.2.tgz) = d933eb58c7983f70b1a000fa01893aa4
>+SHA256 (camlimages-2.2.tgz) = 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
>+SIZE (camlimages-2.2.tgz) = 1385525
>diff -ruN ocaml-images.orig/files/patch-Makefile.config.in ocaml-images/files/patch-Makefile.config.in
>--- ocaml-images.orig/files/patch-Makefile.config.in	Mon Dec  5 10:03:09 2005
>+++ ocaml-images/files/patch-Makefile.config.in	Thu Jan  1 01:00:00 1970
>@@ -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 -ruN ocaml-images.orig/files/patch-Makefile.shared ocaml-images/files/patch-Makefile.shared
>--- ocaml-images.orig/files/patch-Makefile.shared	Mon Dec  5 10:03:09 2005
>+++ ocaml-images/files/patch-Makefile.shared	Thu Jan  1 01:00:00 1970
>@@ -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 -ruN ocaml-images.orig/files/patch-freetype2:ftintf.c ocaml-images/files/patch-freetype2:ftintf.c
>--- ocaml-images.orig/files/patch-freetype2:ftintf.c	Mon Dec  5 10:03:09 2005
>+++ ocaml-images/files/patch-freetype2:ftintf.c	Thu Jan  1 01:00:00 1970
>@@ -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 -ruN ocaml-images.orig/files/patch-tiff::tiffread.c ocaml-images/files/patch-tiff::tiffread.c
>--- ocaml-images.orig/files/patch-tiff::tiffread.c	Thu Jan  1 01:00:00 1970
>+++ ocaml-images/files/patch-tiff::tiffread.c	Mon Dec  5 09:26:31 2005
>@@ -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 )

Actions: View

Attachments on bug 89965: 59821