Update to 1.10.2:

Release 1.10.2 (2010-12-25 Chris Wilson <chris@chris-wilson.co.uk>)
===================================================================
The cairo community is pleased to announce the 1.10.2 release of the
cairo graphics library. This is the first update to cairo's stable 1.10
series and contains a large number of bug fixes.

While many people have contributed and have help to test the release,
2 people deserve special recognition for their efforts in tracking down
and fixing bugs, Andrea Canciani and Adrian Johnson. Thanks to their
tremendous efforts, and of all cairo contributors, it is much
appreciated.

We recommend everyone upgrade to cairo 1.10.2 and hope that everyone
will continue to have lots of fun with cairo!

-Chris

Bug fixes
---------

  Fix embedding of grayscale jpegs in PS.
  https://bugs.freedesktop.org/show_bug.cgi?id=31632

  Fix the reported path of extents containing a curve.

  Fix the compositing of unaligned boxes.

  Reset the clipper in PDF upon finish.

  Fix degenerates arcs to become a degenerate line.

  Build support for autoconf 2.67

  Fix painting of transformed patterns in PS

  Fix the EPS bounding box for PS
  https://bugs.freedesktop.org/show_bug.cgi?id=24688

  Fix the missing content for EPS
  https://bugs.freedesktop.org/show_bug.cgi?id=24688

  Fix regression upon changing page size in PS/PDF
  https://bugs.freedesktop.org/show_bug.cgi?id=24691

  Only use ActualText with PDF-1.5 documents

  Fix the bbox for type1 fallbacks.

  Reset the color after ending the context in PDF
  https://bugs.freedesktop.org/show_bug.cgi?id=31140

  Fix the advance of subsetted type1 fonts
  https://bugs.freedesktop.org/show_bug.cgi?id=31062

  Fix handling of EXTEND_NONE gradients for PDF

  Restrict in-place optimisation for a8 image masks with SOURCE

6 files changed, 8 insertions, 131 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 34121871bd4..45b921e11e1 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2010/11/28 14:06:16 obache Exp $
+# $NetBSD: Makefile,v 1.87 2010/12/26 14:58:43 wiz Exp $
 
-DISTNAME=	cairo-1.10.0
-PKGREVISION=	2
+DISTNAME=	cairo-1.10.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 9b496f7e103..4ee52c471d9 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2010/10/13 00:11:21 spz Exp $
+@comment $NetBSD: PLIST,v 1.28 2010/12/26 14:58:44 wiz Exp $
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -52,6 +52,7 @@ share/gtk-doc/html/cairo/cairo-Paths.html
 share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
 share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Regions.html
 share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
 share/gtk-doc/html/cairo/cairo-Transformations.html
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 1fab100986f..bcdc7788695 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.55 2010/10/12 19:50:34 joerg Exp $
+$NetBSD: distinfo,v 1.56 2010/12/26 14:58:44 wiz Exp $
 
-SHA1 (cairo-1.10.0.tar.gz) = efe7e47408d5188690228ccadc8523652f6bf702
-RMD160 (cairo-1.10.0.tar.gz) = fa65d4f3926308857d13f3ed0c100f89f075dc01
-Size (cairo-1.10.0.tar.gz) = 24022822 bytes
+SHA1 (cairo-1.10.2.tar.gz) = ccce5ae03f99c505db97c286a0c9a90a926d3c6e
+RMD160 (cairo-1.10.2.tar.gz) = 8c8de00120398fe2b3a60a08ff59a464b2eebf47
+Size (cairo-1.10.2.tar.gz) = 23558405 bytes
 SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165
-SHA1 (patch-ab) = 25875f1d578335a952d9ec83cf95f01de0efe5df
-SHA1 (patch-ac) = 76f29729c2b0ed3b1dc98960e1d9c9061a1b1440
-SHA1 (patch-ad) = 5cd279612743e42a1ac2d5487cf273681b3f6f3e
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
deleted file mode 100644
index e8eb7949345..00000000000
--- a/graphics/cairo/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2010/10/12 19:50:35 joerg Exp $
-
-Fix unportable test construct.
-LD_PRELOAD is supported on DragonFly.
-
---- configure.orig	2010-09-06 16:16:46.000000000 +0000
-+++ configure
-@@ -21447,7 +21447,7 @@ xlib_xcb_NONPKGCONFIG_LIBS="$ac_env_xlib
- xlib_xcb_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS_value"
- 
- 
--  if test "x$use_xcb" == "xyes" -a "x$use_xlib" == "xyes"; then
-+  if test "x$use_xcb" = "xyes" -a "x$use_xlib" = "xyes"; then
-     xlib_xcb_REQUIRES="x11-xcb"
- 
- pkg_failed=no
-@@ -21797,7 +21797,7 @@ xcb_shm_NONPKGCONFIG_LIBS="$ac_env_xcb_s
- xcb_shm_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xcb_shm_NONPKGCONFIG_EXTRA_LIBS_value"
- 
- 
--  if test "x$use_xcb" == "xyes"; then
-+  if test "x$use_xcb" = "xyes"; then
-       xcb_shm_REQUIRES="xcb-shm"
- 
- pkg_failed=no
-@@ -25203,7 +25203,7 @@ drm_xr_NONPKGCONFIG_LIBS="$ac_env_drm_xr
- drm_xr_NONPKGCONFIG_EXTRA_LIBS="$ac_env_drm_xr_NONPKGCONFIG_EXTRA_LIBS_value"
- 
- 
--  if test "x$use_drm" == "xyes"; then
-+  if test "x$use_drm" = "xyes"; then
-       drm_xr_REQUIRES="xorg-server >= 1.6 xproto xextproto >= 7.0.99.1 renderproto x11"
- 
- pkg_failed=no
-@@ -25845,7 +25845,7 @@ xcb_drm_NONPKGCONFIG_LIBS="$ac_env_xcb_d
- xcb_drm_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xcb_drm_NONPKGCONFIG_EXTRA_LIBS_value"
- 
- 
--  if test "x$use_xcb" == "xyes" -a "x$use_drm" == "xyes"; then
-+  if test "x$use_xcb" = "xyes" -a "x$use_drm" = "xyes"; then
-       xcb_drm_REQUIRES="xcb-dri2"
- 
- pkg_failed=no
-@@ -33603,7 +33603,7 @@ _ACEOF
- 
- 
- case $host in
--*-linux*|*-*bsd*|*-solaris*|*-*-darwin*)
-+*-linux*|*-*bsd*|*-solaris*|*-*-darwin*|*-dragonfly*)
- 	have_ld_preload="yes"
- 	;;
- *)
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
deleted file mode 100644
index 27118d7e7a0..00000000000
--- a/graphics/cairo/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.15 2010/09/15 18:35:38 wiz Exp $
-
-Enumerations shouldn't end with a comma.
-https://bugs.freedesktop.org/show_bug.cgi?id=30115
-
---- src/cairo.h.orig	2010-09-06 12:11:22.000000000 +0000
-+++ src/cairo.h
-@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
-     CAIRO_DEVICE_TYPE_SCRIPT,
-     CAIRO_DEVICE_TYPE_XCB,
-     CAIRO_DEVICE_TYPE_XLIB,
--    CAIRO_DEVICE_TYPE_XML,
-+    CAIRO_DEVICE_TYPE_XML
- } cairo_device_type_t;
- 
- cairo_public cairo_device_type_t
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
deleted file mode 100644
index 7492dd47c14..00000000000
--- a/graphics/cairo/patches/patch-ad
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2010/10/12 19:50:35 joerg Exp $
-
-Fix unportable test construct.
-LD_PRELOAD is supported on DragonFly.
-
---- configure.ac.orig	2010-09-06 12:11:22.000000000 +0000
-+++ configure.ac
-@@ -99,7 +99,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xcb, XCB, n
- ])
- 
- CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XCB, no, [
--  if test "x$use_xcb" == "xyes" -a "x$use_xlib" == "xyes"; then
-+  if test "x$use_xcb" = "xyes" -a "x$use_xlib" = "xyes"; then
-     xlib_xcb_REQUIRES="x11-xcb"
-     PKG_CHECK_MODULES(xlib_xcb, $xlib_xcb_REQUIRES, ,
- 		      [use_xlib_xcb="no (requires $xlib_xcb_REQUIRES http://xcb.freedesktop.org)"])
-@@ -110,7 +110,7 @@ CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XC
- AM_CONDITIONAL(BUILD_XLIB_XCB, test "x$use_xlib_xcb" = "xyes")
- 
- CAIRO_ENABLE_FUNCTIONS(xcb_shm, XCB/SHM, auto, [
--  if test "x$use_xcb" == "xyes"; then
-+  if test "x$use_xcb" = "xyes"; then
-       xcb_shm_REQUIRES="xcb-shm"
-       PKG_CHECK_MODULES(xcb_shm, $xcb_shm_REQUIRES, ,
- 			[AC_MSG_RESULT(no)
-@@ -232,7 +232,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(drm, DRM, n
- ])
- 
- CAIRO_ENABLE_FUNCTIONS(drm_xr, DRM Xr (DDX), no, [
--  if test "x$use_drm" == "xyes"; then
-+  if test "x$use_drm" = "xyes"; then
-       drm_xr_REQUIRES="xorg-server >= 1.6 xproto xextproto >= 7.0.99.1 renderproto x11"
-       PKG_CHECK_MODULES(drm_xr, $drm_xr_REQUIRES, ,
- 			[AC_MSG_RESULT(no)
-@@ -262,7 +262,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Ga
- ])
- 
- CAIRO_ENABLE_FUNCTIONS(xcb_drm, XCB/DRM, no, [
--  if test "x$use_xcb" == "xyes" -a "x$use_drm" == "xyes"; then
-+  if test "x$use_xcb" = "xyes" -a "x$use_drm" = "xyes"; then
-       xcb_drm_REQUIRES="xcb-dri2"
-       PKG_CHECK_MODULES(xcb_drm, $xcb_drm_REQUIRES, ,
- 			[AC_MSG_RESULT(no)
-@@ -708,7 +708,7 @@ dnl The tracing utility requires LD_PREL
- dnl that are known to work.
- 
- case $host in
--*-linux*|*-*bsd*|*-solaris*|*-*-darwin*)
-+*-linux*|*-*bsd*|*-solaris*|*-*-darwin*|*-dragonfly*)
- 	have_ld_preload="yes"
- 	;;
- *)