update to 1.8.0

from the announcement:
The dominant theme of this release is improvements to cairo's ability
to handle text. The highlights include a new "user fonts" feature as
well as a new cairo_show_text_glyphs API which allows glyphs to be
embedded in PDF output along with their original text, (for searching,
selection, and copy-and-paste). Another major feature is a revamp of
cairo's build system making it much easier to build cairo on various
platforms.

7 files changed, 58 insertions, 133 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index ce3fec87019..3e238971d2b 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2008/08/25 15:36:18 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2008/10/16 10:55:08 drochner Exp $
 
-DISTNAME=	cairo-1.6.4
-PKGREVISION=	3
+DISTNAME=	cairo-1.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -35,7 +34,7 @@ PLIST.carbon=		yes
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.5.1
-BUILDLINK_API_DEPENDS.pixman+=	pixman>=0.10.0
+BUILDLINK_API_DEPENDS.pixman+=	pixman>=0.12.0
 
 # For snprintf() and ctime_r()
 CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 8a851ffc37f..c367ce493aa 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2008/05/14 15:26:14 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/10/16 10:55:08 drochner Exp $
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
@@ -8,6 +8,7 @@ include/cairo/cairo-ps.h
 ${PLIST.carbon}include/cairo/cairo-quartz.h
 ${PLIST.carbon}include/cairo/cairo-quartz-image.h
 include/cairo/cairo-svg.h
+include/cairo/cairo-version.h
 ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
@@ -24,10 +25,6 @@ lib/pkgconfig/cairo-svg.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc
-share/gtk-doc/html/cairo/Drawing.html
-share/gtk-doc/html/cairo/Fonts.html
-share/gtk-doc/html/cairo/Support.html
-share/gtk-doc/html/cairo/Surfaces.html
 share/gtk-doc/html/cairo/bindings-errors.html
 share/gtk-doc/html/cairo/bindings-fonts.html
 share/gtk-doc/html/cairo/bindings-memory.html
@@ -37,39 +34,45 @@ share/gtk-doc/html/cairo/bindings-patterns.html
 share/gtk-doc/html/cairo/bindings-return-values.html
 share/gtk-doc/html/cairo/bindings-streams.html
 share/gtk-doc/html/cairo/bindings-surfaces.html
-share/gtk-doc/html/cairo/cairo-Error-Handling.html
-share/gtk-doc/html/cairo/cairo-Font-Options.html
-share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html
-share/gtk-doc/html/cairo/cairo-Image-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PNG-Support.html
-share/gtk-doc/html/cairo/cairo-Paths.html
-share/gtk-doc/html/cairo/cairo-Patterns.html
-share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Quartz-Fonts.html
-share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
-share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html
-share/gtk-doc/html/cairo/cairo-Text.html
-share/gtk-doc/html/cairo/cairo-Transformations.html
-share/gtk-doc/html/cairo/cairo-Types.html
-share/gtk-doc/html/cairo/cairo-Version-Information.html
-share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
-share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
-share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
-share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
-share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html
-share/gtk-doc/html/cairo/cairo-cairo-surface-t.html
-share/gtk-doc/html/cairo/cairo-cairo-t.html
+share/gtk-doc/html/cairo/cairo-context.html
+share/gtk-doc/html/cairo/cairo-drawing.html
+share/gtk-doc/html/cairo/cairo-error-status.html
+share/gtk-doc/html/cairo/cairo-font-face.html
+share/gtk-doc/html/cairo/cairo-font-options.html
+share/gtk-doc/html/cairo/cairo-fonts.html
+share/gtk-doc/html/cairo/cairo-ft-font.html
+share/gtk-doc/html/cairo/cairo-image-surface.html
+share/gtk-doc/html/cairo/cairo-matrix.html
+share/gtk-doc/html/cairo/cairo-paths.html
+share/gtk-doc/html/cairo/cairo-pattern.html
+share/gtk-doc/html/cairo/cairo-pdf-surface.html
+share/gtk-doc/html/cairo/cairo-png-functions.html
+share/gtk-doc/html/cairo/cairo-ps-surface.html
+share/gtk-doc/html/cairo/cairo-quartz-font.html
+share/gtk-doc/html/cairo/cairo-quartz-surface.html
+share/gtk-doc/html/cairo/cairo-scaled-font.html
+share/gtk-doc/html/cairo/cairo-support.html
+share/gtk-doc/html/cairo/cairo-surface.html
+share/gtk-doc/html/cairo/cairo-surfaces.html
+share/gtk-doc/html/cairo/cairo-svg-surface.html
+share/gtk-doc/html/cairo/cairo-text.html
+share/gtk-doc/html/cairo/cairo-transformations.html
+share/gtk-doc/html/cairo/cairo-types.html
+share/gtk-doc/html/cairo/cairo-user-font.html
+share/gtk-doc/html/cairo/cairo-version-info.html
+share/gtk-doc/html/cairo/cairo-win32-font.html
+share/gtk-doc/html/cairo/cairo-win32-surface.html
+share/gtk-doc/html/cairo/cairo-xlib-surface.html
 share/gtk-doc/html/cairo/cairo.devhelp
 share/gtk-doc/html/cairo/cairo.devhelp2
 share/gtk-doc/html/cairo/home.png
-share/gtk-doc/html/cairo/index.html
-share/gtk-doc/html/cairo/index.sgml
 share/gtk-doc/html/cairo/index-1.2.html
 share/gtk-doc/html/cairo/index-1.4.html
 share/gtk-doc/html/cairo/index-1.6.html
-share/gtk-doc/html/cairo/ix01.html
+share/gtk-doc/html/cairo/index-1.8.html
+share/gtk-doc/html/cairo/index-all.html
+share/gtk-doc/html/cairo/index.html
+share/gtk-doc/html/cairo/index.sgml
 share/gtk-doc/html/cairo/language-bindings.html
 share/gtk-doc/html/cairo/left.png
 share/gtk-doc/html/cairo/right.png
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 609eca5ba43..f7a2549ab59 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.43 2008/08/25 15:36:18 joerg Exp $
+$NetBSD: distinfo,v 1.44 2008/10/16 10:55:08 drochner Exp $
 
-SHA1 (cairo-1.6.4.tar.gz) = 9d990fe39a125ceb07221623c237cd7015855d5c
-RMD160 (cairo-1.6.4.tar.gz) = ccae736a40d985b72bda7c2f0a98a0838020658e
-Size (cairo-1.6.4.tar.gz) = 5042623 bytes
-SHA1 (patch-aa) = 92b1a9746f4f22ceb2f548eca2cfcf14481fae2a
-SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
-SHA1 (patch-ac) = 8baca078827ebc7c03eecc14c575a440239c3f03
-SHA1 (patch-ad) = 41ebd6097c2e523ae4618bb248a3d66a1b0f9b4a
+SHA1 (cairo-1.8.0.tar.gz) = 8a689ca47c24216f37bb8cabae21ff08a7f47899
+RMD160 (cairo-1.8.0.tar.gz) = 1b1079ab73813ca6782c0d4cb3623575e08ee94e
+Size (cairo-1.8.0.tar.gz) = 5662670 bytes
+SHA1 (patch-aa) = 870d57c20afbca75ab5c3ec399409de19726fd66
+SHA1 (patch-ab) = 54f0dd3e7afdf88b0ab8cf8f32ed16eed04f0797
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index f5968a1a497..94e48217726 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,33 +1,15 @@
-$NetBSD: patch-aa,v 1.12 2008/05/14 15:26:14 obache Exp $
+$NetBSD: patch-aa,v 1.13 2008/10/16 10:55:09 drochner Exp $
 
---- src/Makefile.in.orig	2008-04-11 21:33:41.000000000 +0000
+--- src/Makefile.in.orig	2008-09-26 00:57:32.000000000 +0200
 +++ src/Makefile.in
-@@ -81,6 +81,7 @@ host_triplet = @host@
- @CAIRO_HAS_FT_FONT_TRUE@am__append_45 = $(ft_headers)
- @CAIRO_HAS_FT_FONT_TRUE@am__append_46 = $(ft_sources)
- @CAIRO_HAS_FT_FONT_TRUE@am__append_47 = cairo-ft.pc
-+@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_48 = cairo-quartz-font.pc
- subdir = src
- DIST_COMMON = $(am__cairoinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/cairo.pc.in
-@@ -288,9 +289,9 @@ AUTOHEADER = @AUTOHEADER@
+@@ -405,8 +405,8 @@ AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CAIROPERF_LIBS = @CAIROPERF_LIBS@
 -CAIRO_CFLAGS = @CAIRO_CFLAGS@
-+CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
- CAIRO_LDADD = @CAIRO_LDADD@
 -CAIRO_LIBS = @CAIRO_LIBS@
++CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
 +CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@
  CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
  CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
- CAIRO_REQUIRES = @CAIRO_REQUIRES@
-@@ -456,7 +457,7 @@ backend_pkgconfigs = $(am__append_4) $(a
- 	$(am__append_21) $(am__append_24) $(am__append_26) \
- 	$(am__append_31) $(am__append_33) $(am__append_36) \
- 	$(am__append_38) $(am__append_41) $(am__append_44) \
--	$(am__append_47)
-+	$(am__append_47) $(am__append_48)
- cairo_base_headers = cairo.h
- cairo_base_sources = \
- 	cairo.c					\
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index dfd4ae77091..7aa2b9066a2 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.9 2008/04/21 11:29:33 tnn Exp $
+$NetBSD: patch-ab,v 1.10 2008/10/16 10:55:09 drochner Exp $
 
---- test/Makefile.in.orig	2008-04-11 23:33:42.000000000 +0200
+--- test/Makefile.in.orig	2008-09-26 00:57:34.000000000 +0200
 +++ test/Makefile.in
-@@ -59,7 +59,7 @@ host_triplet = @host@
- @CAIRO_HAS_PDF_SURFACE_TRUE@@CAIRO_HAS_PS_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_10 = fallback-resolution$(EXEEXT)
- check_PROGRAMS = imagediff$(EXEEXT) png-flatten$(EXEEXT) \
- 	$(am__EXEEXT_1) $(am__EXEEXT_2)
--@HAVE_PTHREAD_TRUE@am__append_11 = -lpthread
-+@HAVE_PTHREAD_TRUE@am__append_11 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+@@ -62,7 +62,7 @@ check_PROGRAMS = imagediff$(EXEEXT) png-
+ @CAIRO_HAS_XLIB_SURFACE_TRUE@	xlib-surface-source$(EXEEXT)
+ @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@am__append_8 = get-xrender-format$(EXEEXT)
+ @CAIRO_HAS_MULTI_PAGE_SURFACES_TRUE@am__append_9 = multi-page$(EXEEXT)
+-@HAVE_PTHREAD_TRUE@am__append_10 = -lpthread
++@HAVE_PTHREAD_TRUE@am__append_10 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ @BUILD_ANY2PPM_TRUE@am__append_11 = any2ppm
  @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_12 = pdf2png
  @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_13 = svg2png
- subdir = test
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
deleted file mode 100644
index 32d5af5b07d..00000000000
--- a/graphics/cairo/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2008/05/05 06:53:00 yyamano Exp $
-
---- src/cairo-quartz-image-surface.c.orig	2008-04-04 15:45:23.000000000 -0700
-+++ src/cairo-quartz-image-surface.c
-@@ -42,6 +42,25 @@
- 
- #include "cairo-quartz-private.h"
- 
-+/* XXX The following code is copied from cairo-quartz-surface.c to make this 
-+ * build on 10.4.x ppc. Need clean up.
-+ */
-+/* We need to work with the 10.3 SDK as well (and 10.3 machines; luckily, 10.3.9
-+ * has all the stuff we care about, just some of it isn't exported in the SDK.
-+ */
-+#ifndef kCGBitmapByteOrder32Host
-+#define USE_10_3_WORKAROUNDS
-+#define kCGBitmapAlphaInfoMask 0x1F
-+#define kCGBitmapByteOrderMask 0x7000
-+#define kCGBitmapByteOrder32Host 0
-+
-+typedef uint32_t CGBitmapInfo;
-+
-+/* public in 10.4, present in 10.3.9 */
-+CG_EXTERN void CGContextReplacePathWithStrokedPath (CGContextRef);
-+CG_EXTERN CGImageRef CGBitmapContextCreateImage (CGContextRef);
-+#endif
-+
- #define SURFACE_ERROR_NO_MEMORY (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_NO_MEMORY)))
- #define SURFACE_ERROR_INVALID_FORMAT (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_FORMAT)))
- 
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
deleted file mode 100644
index fcf66041b0e..00000000000
--- a/graphics/cairo/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/08/25 15:36:18 joerg Exp $
-
---- src/cairo-png.c.orig	2008-04-11 23:07:25.000000000 +0200
-+++ src/cairo-png.c
-@@ -119,6 +119,13 @@ png_simple_warning_callback (png_structp
- }
- 
- 
-+/* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn.
-+ * Otherwise, we will segfault if we are writing to a stream. */
-+static void
-+png_simple_output_flush_fn (png_structp png_ptr)
-+{
-+}
-+
- static cairo_status_t
- write_png (cairo_surface_t	*surface,
- 	   png_rw_ptr		write_func,
-@@ -179,7 +186,7 @@ write_png (cairo_surface_t	*surface,
- 	goto BAIL3;
- #endif
- 
--    png_set_write_fn (png, closure, write_func, NULL);
-+    png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn);
- 
-     switch (image->format) {
-     case CAIRO_FORMAT_ARGB32: