Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	15 Sep 2007 20:09:40 -0000	1.15
+++ Makefile	30 Nov 2007 21:33:49 -0000
@@ -2,13 +2,13 @@
 
 COMMENT=		vector graphics library
 
-DISTNAME=		cairo-1.4.10
-SHARED_LIBS +=  cairo                7.0      # .13.5
+DISTNAME=		cairo-1.4.12
+SHARED_LIBS=		cairo   7.1
 CATEGORIES=		graphics
 
 HOMEPAGE=		http://cairographics.org/introduction
 
-MAINTAINER=		Eric Faurot <eric.faurot@gmail.com>
+MAINTAINER=		Eric Faurot <eric@openbsd.org>
 
 WANTLIB=		X11.>=10 Xau Xdmcp expat Xrender freetype fontconfig m z
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	24 Jul 2007 17:47:07 -0000	1.8
+++ distinfo	30 Nov 2007 21:33:49 -0000
@@ -1,5 +1,5 @@
-MD5 (cairo-1.4.10.tar.gz) = VZil5QCtki43sVne5y/Jkw==
-RMD160 (cairo-1.4.10.tar.gz) = zhywJdR+w5VXfk9Mb+UJK+heDL4=
-SHA1 (cairo-1.4.10.tar.gz) = g3EJfjBlDsgXskaUNnEQE5YnQD4=
-SHA256 (cairo-1.4.10.tar.gz) = WU54pmBEiYwyHjeNR/r0O2ZbI7pjiDTSeH40S6E+UTI=
-SIZE (cairo-1.4.10.tar.gz) = 3216689
+MD5 (cairo-1.4.12.tar.gz) = jlDCwNVjiOTulBlsDHp5BA==
+RMD160 (cairo-1.4.12.tar.gz) = XtZdWHLAVh8zkuYAB4mNk2DYPQo=
+SHA1 (cairo-1.4.12.tar.gz) = RdUlfloMFSS8wlZgqWssedASrT8=
+SHA256 (cairo-1.4.12.tar.gz) = oaHkzOyNqYAUHZA62+g1NUgbT9qWpHlFZDjT37x2fV0=
+SIZE (cairo-1.4.12.tar.gz) = 3276610
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/cairo/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- patches/patch-configure	24 Jul 2007 17:47:07 -0000	1.6
+++ patches/patch-configure	30 Nov 2007 21:33:49 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.6 2007/07/24 17:47:07 steven Exp $
---- configure.orig	Wed Jun 27 23:06:23 2007
-+++ configure	Sun Jul  8 12:20:08 2007
-@@ -25885,7 +25885,7 @@ else
+--- configure.orig	Tue Nov 27 07:31:49 2007
++++ configure	Fri Nov 30 22:14:14 2007
+@@ -26153,7 +26153,7 @@ else
  
    if test "x$png_REQUIRES" = x; then
      # libpng13 is GnuWin32's libpng-1.2.8 :-(
@@ -10,7 +10,7 @@
        if $PKG_CONFIG --exists $l ; then
          png_REQUIRES=$l
          use_png=yes
-@@ -29738,7 +29738,7 @@ fi
+@@ -30010,7 +30010,7 @@ fi
  
  case `$PKG_CONFIG --version` in
  0.?|0.?.?|0.1[0-7]|0.1[0-7].?) PKGCONFIG_REQUIRES="Requires"; ;;
Index: patches/patch-src_cairo-xlib-surface_c
===================================================================
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo-xlib-surface_c,v
retrieving revision 1.6
diff -u -r1.6 patch-src_cairo-xlib-surface_c
--- patches/patch-src_cairo-xlib-surface_c	24 Jul 2007 17:47:07 -0000	1.6
+++ patches/patch-src_cairo-xlib-surface_c	30 Nov 2007 21:33:49 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_cairo-xlib-surface_c,v 1.6 2007/07/24 17:47:07 steven Exp $
---- src/cairo-xlib-surface.c.orig	Wed Jun 27 20:05:33 2007
-+++ src/cairo-xlib-surface.c	Sun Jul  8 12:20:08 2007
+--- src/cairo-xlib-surface.c.orig	Tue Nov 27 07:20:12 2007
++++ src/cairo-xlib-surface.c	Fri Nov 30 22:14:14 2007
 @@ -494,6 +494,255 @@ _swap_ximage_to_native (XImage *ximage)
      }
  }
@@ -504,7 +504,7 @@
      ximage.bits_per_pixel = bpp;
      ximage.red_mask = red;
      ximage.green_mask = green;
-@@ -1945,6 +2394,7 @@ _cairo_xlib_surface_create_internal (Display		       *
+@@ -1946,6 +2395,7 @@ _cairo_xlib_surface_create_internal (Display		       *
  				     int			height,
  				     int			depth)
  {
@@ -512,7 +512,7 @@
      cairo_xlib_surface_t *surface;
      cairo_xlib_screen_info_t *screen_info;
  
-@@ -2042,7 +2492,38 @@ _cairo_xlib_surface_create_internal (Display		       *
+@@ -2043,7 +2493,38 @@ _cairo_xlib_surface_create_internal (Display		       *
      surface->have_clip_rects = FALSE;
      surface->clip_rects = surface->embedded_clip_rects;
      surface->num_clip_rects = 0;