update to 1.2.0

changes:
New, supported backends (PDF, PostScript, and SVG)
misc API extensions
Optimizations and bug fixes

5 files changed, 48 insertions, 39 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 94f3b84a4c5..94595ce1982 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2006/07/04 15:14:49 drochner Exp $
 
-DISTNAME=	cairo-1.0.4
-PKGREVISION=	1
+DISTNAME=	cairo-1.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -12,7 +11,7 @@ COMMENT=	Vector graphics library with cross-device output support
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
-PKGCONFIG_OVERRIDE+=	cairo.pc.in
+PKGCONFIG_OVERRIDE+=	src/cairo.pc.in src/cairo-backend.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-atsui
 CONFIGURE_ARGS+=	--disable-xcb
@@ -33,7 +32,7 @@ PLIST_SUBST+=		QUARTZ="@comment "
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.5
 BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
-BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.4.4
+BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.5.1
 BUILDLINK_API_DEPENDS.libpixman+=	libpixman>=0.1.5
 
 .include "../../mk/compiler.mk"
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 6dfbf92f757..05d70327794 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,15 +1,28 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/02 08:09:43 rh Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/07/04 15:14:49 drochner Exp $
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-glitz.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 ${QUARTZ}include/cairo/cairo-quartz.h
+include/cairo/cairo-svg.h
 include/cairo/cairo-xlib-xrender.h
 include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/libcairo.la
+lib/pkgconfig/cairo-ft.pc
+lib/pkgconfig/cairo-glitz.pc
+lib/pkgconfig/cairo-pdf.pc
+lib/pkgconfig/cairo-png.pc
+lib/pkgconfig/cairo-ps.pc
+lib/pkgconfig/cairo-svg.pc
+lib/pkgconfig/cairo-xlib-xrender.pc
+lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc
+share/doc/cairo/Drawing.html
+share/doc/cairo/Fonts.html
+share/doc/cairo/Support.html
+share/doc/cairo/Surfaces.html
 share/doc/cairo/bindings-errors.html
 share/doc/cairo/bindings-fonts.html
 share/doc/cairo/bindings-memory.html
@@ -19,20 +32,16 @@ share/doc/cairo/bindings-patterns.html
 share/doc/cairo/bindings-return-values.html
 share/doc/cairo/bindings-streams.html
 share/doc/cairo/bindings-surfaces.html
-share/doc/cairo/Drawing.html
-share/doc/cairo/Fonts.html
-share/doc/cairo/Support.html
-share/doc/cairo/Surfaces.html
 share/doc/cairo/cairo-Error-handling.html
-share/doc/cairo/cairo-FreeType-Fonts.html
 share/doc/cairo/cairo-Font-Options.html
-share/doc/cairo/cairo-Glitz-Surfaces.html
+share/doc/cairo/cairo-FreeType-Fonts.html
 share/doc/cairo/cairo-Image-Surfaces.html
 share/doc/cairo/cairo-PDF-Surfaces.html
 share/doc/cairo/cairo-PNG-Support.html
 share/doc/cairo/cairo-Paths.html
 share/doc/cairo/cairo-Patterns.html
 share/doc/cairo/cairo-PostScript-Surfaces.html
+share/doc/cairo/cairo-SVG-Surfaces.html
 share/doc/cairo/cairo-Scaled-Fonts.html
 share/doc/cairo/cairo-Text.html
 share/doc/cairo/cairo-Transformations.html
@@ -46,6 +55,7 @@ share/doc/cairo/cairo-cairo-matrix-t.html
 share/doc/cairo/cairo-cairo-surface-t.html
 share/doc/cairo/cairo-cairo-t.html
 share/doc/cairo/cairo.devhelp
+share/doc/cairo/cairo.devhelp2
 share/doc/cairo/home.png
 share/doc/cairo/index.html
 share/doc/cairo/index.sgml
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 299544ace01..716f187bb61 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2006/04/02 19:59:13 wiz Exp $
+$NetBSD: distinfo,v 1.18 2006/07/04 15:14:49 drochner Exp $
 
-SHA1 (cairo-1.0.4.tar.gz) = 89e72202e5b51a8914fce60f52f7c51ecdea982a
-RMD160 (cairo-1.0.4.tar.gz) = 40403971bcb6ed9cd4379e8e13a52f515db886cb
-Size (cairo-1.0.4.tar.gz) = 1475777 bytes
-SHA1 (patch-aa) = 1148fea31496343606663c4455eb589ad66cacb6
-SHA1 (patch-ab) = 08155b91ceacea1e358ac7a41119d0d9370c9b5e
+SHA1 (cairo-1.2.0.tar.gz) = c5da7f89cdd3782102357f99a47f516d11661e92
+RMD160 (cairo-1.2.0.tar.gz) = 9dd76e43e881dfd3f20a81fc0f946e302ed7993c
+Size (cairo-1.2.0.tar.gz) = 2659930 bytes
+SHA1 (patch-aa) = 7d4b4fa8f685a64bbd703d2ee8ae5f6ad28d196d
+SHA1 (patch-ab) = d408881c714686a3481f66dcb069c763359313a6
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index 589d55a51a7..4bdba46ef33 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.6 2005/12/06 23:14:11 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2006/07/04 15:14:49 drochner Exp $
 
---- src/Makefile.in.orig	2005-08-24 18:28:42.000000000 +0200
+--- src/Makefile.in.orig	2006-07-01 03:25:10.000000000 +0200
 +++ src/Makefile.in
-@@ -145,7 +145,7 @@ AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
+@@ -230,7 +230,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
+ CAIRO_CAN_TEST_PDF_SURFACE_TRUE = @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@
+ CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@
+ CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@
 -CAIRO_CFLAGS = @CAIRO_CFLAGS@
 +CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
  CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@
  CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@
- CAIRO_HAS_FT_FONT_FALSE = @CAIRO_HAS_FT_FONT_FALSE@
-@@ -168,7 +168,7 @@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS
- CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@
- CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@
+ CAIRO_HAS_BEOS_SURFACE_FALSE = @CAIRO_HAS_BEOS_SURFACE_FALSE@
+@@ -265,7 +265,7 @@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HA
  CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
+ CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
+ CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
 -CAIRO_LIBS = @CAIRO_LIBS@
 +CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ CAIRO_REQUIRES = @CAIRO_REQUIRES@
  CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
  CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
- CAIRO_VERSION_MINOR = @CAIRO_VERSION_MINOR@
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index 7751a6b5712..f895636aac6 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2005/10/06 18:46:59 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2006/07/04 15:14:49 drochner Exp $
 
---- test/Makefile.in.orig	2005-10-04 02:48:31.000000000 +0200
+--- test/Makefile.in.orig	2006-07-01 03:25:14.000000000 +0200
 +++ test/Makefile.in
-@@ -43,7 +43,7 @@ host_triplet = @host@
- @CAIRO_HAS_PS_SURFACE_TRUE@am__append_4 = ps-surface
- @CAIRO_HAS_XLIB_SURFACE_TRUE@am__append_5 = xlib-surface
- check_PROGRAMS = $(am__EXEEXT_6)
--@HAVE_PTHREAD_TRUE@am__append_6 = -lpthread
-+@HAVE_PTHREAD_TRUE@am__append_6 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- noinst_PROGRAMS = imagediff$(EXEEXT)
+@@ -57,7 +57,7 @@ check_PROGRAMS = $(am__EXEEXT_9) imagedi
+ @CAIRO_CAN_TEST_GLITZ_EGL_SURFACE_TRUE@am__append_12 = $(GLITZ_EGL_LIBS)
+ @CAIRO_CAN_TEST_GLITZ_GLX_SURFACE_TRUE@am__append_13 = $(GLITZ_GLX_LIBS)
+ @CAIRO_CAN_TEST_GLITZ_WGL_SURFACE_TRUE@am__append_14 = $(GLITZ_WGL_LIBS)
+-@HAVE_PTHREAD_TRUE@am__append_15 = -lpthread
++@HAVE_PTHREAD_TRUE@am__append_15 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_16 = pdf2png
+ @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_17 = svg2png
  subdir = test
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in