Add cairo at 1.5.14, and bump PORTEPOCH. We will be downgrading cairo

in ports, and test cairo 1.6 with GNOME 2.24.

ahze: I have also removed patch-src_cairo-xlib-display.c.  If Firefox 3 still
needs this, please add it back.

Discussed with:	ahze


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10841 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 151 insertions, 0 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
new file mode 100644
index 000000000..22c43f766
--- /dev/null
+++ b/graphics/cairo/Makefile
@@ -0,0 +1,69 @@
+# New ports collection makefile for:	cairo
+# Date created:		2004-10-06
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD: ports/graphics/cairo/Makefile,v 1.34 2008/03/24 03:49:44 marcus Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.69 2008/03/21 04:04:14 ahze Exp $
+#
+
+PORTNAME=	cairo
+PORTVERSION=	1.5.14
+PORTREVISION?=	0
+PORTEPOCH?=	1
+CATEGORIES=	graphics
+#MASTER_SITES=	http://cairographics.org/releases/
+MASTER_SITES=	http://cairographics.org/snapshots/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Vector graphics library with cross-device output support
+
+.if !defined(REFERENCE_PORT)
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+		png.5:${PORTSDIR}/graphics/png \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		pixman-1.10:${PORTSDIR}/x11/pixman
+
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
+		--enable-pdf \
+		--enable-ps
+USE_GNOME=	gnometarget gnomehack ltverhack referencehack
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
+		LDFLAGS="${PTHREAD_LIBS}"
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--disable-xlib
+PLIST_SUB+=	X11="@comment "
+.else
+USE_XORG+=	xrender
+PLIST_SUB+=	X11=""
+.endif
+
+OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GLITZ)
+LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
+CONFIGURE_ARGS+=	--enable-glitz
+PLIST_SUB+=	GLITZ=""
+.else
+CONFIGURE_ARGS+=	--disable-glitz
+PLIST_SUB+=	GLITZ="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/test/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
+		${WRKSRC}/src/*.pc.in
+	@${REINPLACE_CMD} -e 's|src test doc|src doc|; \
+		s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.post.mk>
+
+.endif
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
new file mode 100644
index 000000000..890b70458
--- /dev/null
+++ b/graphics/cairo/distinfo
@@ -0,0 +1,3 @@
+MD5 (cairo-1.5.14.tar.gz) = 9b5d250937375e53435cb5613416c030
+SHA256 (cairo-1.5.14.tar.gz) = fbca8a292b83cbf184835be0e6007c194d7bab3ce4ee2bced8ea7bf07a7e151b
+SIZE (cairo-1.5.14.tar.gz) = 4877446
diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c
new file mode 100644
index 000000000..8cd60665f
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo-ft-font.c
@@ -0,0 +1,28 @@
+--- src/cairo-ft-font.c.orig	Tue Aug 16 14:46:46 2005
++++ src/cairo-ft-font.c	Tue Aug 16 14:46:59 2005
+@@ -44,6 +44,11 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ 
++#include <sys/types.h>
++#include <stdlib.h>
++#include <time.h>
++#include <unistd.h>
++
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_
+     key->id = id;
+ 
+     /* 1607 is just an arbitrary prime. */
+-    hash = _cairo_hash_string (filename);
++    if (filename != NULL) {
++        hash = _cairo_hash_string (filename);
++    } else {
++	srandom(time(NULL) * getpid());
++	hash = random();
++    }
+     hash += ((unsigned long) id) * 1607;
+ 	
+     key->base.hash_entry.hash = hash;
diff --git a/graphics/cairo/files/patch-src_cairoint.h b/graphics/cairo/files/patch-src_cairoint.h
new file mode 100644
index 000000000..a9b3ce480
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairoint.h
@@ -0,0 +1,14 @@
+--- src/cairoint.h.orig	Sun Oct 15 18:02:35 2006
++++ src/cairoint.h	Sun Oct 15 18:10:11 2006
+@@ -50,6 +50,11 @@
+ #include "config.h"
+ #endif
+ 
++#ifndef INT16_MAX
++#define INT16_MAX 0x7fff
++#define INT16_MIN (-0x7fff-1)
++#endif
++
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/graphics/cairo/pkg-descr b/graphics/cairo/pkg-descr
new file mode 100644
index 000000000..4fd137a19
--- /dev/null
+++ b/graphics/cairo/pkg-descr
@@ -0,0 +1,13 @@
+Cairo is a vector graphics library with cross-device output
+support. Currently supported output targets include the X Window
+System and in-memory image buffers. PostScript and PDF file output is
+planned. Cairo is designed to produce identical output on all output
+media while taking advantage of display hardware acceleration when
+available (eg. through the X Render Extension).
+
+Cairo provides a stateful user-level API with capabilities similar to
+the PDF 1.4 imaging model. Cairo provides operations including stroking 
+and filling Bezier cubic splines, transforming and compositing translucent
+images, and antialiased text rendering.
+
+WWW:	http://www.cairographics.org
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
new file mode 100644
index 000000000..c81b6e936
--- /dev/null
+++ b/graphics/cairo/pkg-plist
@@ -0,0 +1,24 @@
+include/cairo/cairo-deprecated.h
+include/cairo/cairo-features.h
+include/cairo/cairo-ft.h
+%%GLITZ%%include/cairo/cairo-glitz.h
+include/cairo/cairo-pdf.h
+include/cairo/cairo-ps.h
+include/cairo/cairo-svg.h
+%%X11%%include/cairo/cairo-xlib-xrender.h
+%%X11%%include/cairo/cairo-xlib.h
+include/cairo/cairo.h
+lib/libcairo.a
+lib/libcairo.la
+lib/libcairo.so
+lib/libcairo.so.2
+libdata/pkgconfig/cairo.pc
+libdata/pkgconfig/cairo-ft.pc
+%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc
+libdata/pkgconfig/cairo-pdf.pc
+libdata/pkgconfig/cairo-png.pc
+libdata/pkgconfig/cairo-ps.pc
+libdata/pkgconfig/cairo-svg.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
+@dirrm include/cairo