Fix to instal cairo-quartz-font.pc.

(and while here, enable quartz-image)

Then atsui support for pango again.

Bump pkgrevision.

4 files changed, 30 insertions, 8 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 5ab19011b69..2d0c87c796d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2008/04/28 15:09:16 tnn Exp $
+# $NetBSD: Makefile,v 1.64 2008/05/14 15:26:14 obache Exp $
 
 DISTNAME=	cairo-1.6.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -25,6 +25,8 @@ CONFIGURE_ARGS+=	--enable-ps
 PLIST_VARS+=		carbon
 .if exists(/System/Library/Frameworks/Carbon.framework)
 CONFIGURE_ARGS+=	--enable-quartz
+CONFIGURE_ARGS+=	--enable-quartz-font
+CONFIGURE_ARGS+=	--enable-quartz-image
 PLIST.carbon=		yes
 .endif
 
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index c6d5e6f59a7..8a851ffc37f 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/04/22 10:23:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/05/14 15:26:14 obache Exp $
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
@@ -6,6 +6,7 @@ include/cairo/cairo-glitz.h
 include/cairo/cairo-pdf.h
 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
 ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
@@ -16,6 +17,8 @@ lib/pkgconfig/cairo-glitz.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
+${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc
+${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc
 ${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc
 lib/pkgconfig/cairo-svg.pc
 ${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 3287ca43fe5..9e0763bed04 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2008/05/05 06:53:00 yyamano Exp $
+$NetBSD: distinfo,v 1.42 2008/05/14 15:26:14 obache 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) = a6e95dc17dd316236dd7197f5e743c733e57587d
+SHA1 (patch-aa) = 92b1a9746f4f22ceb2f548eca2cfcf14481fae2a
 SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
 SHA1 (patch-ac) = 8baca078827ebc7c03eecc14c575a440239c3f03
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index 82855799afd..f5968a1a497 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.11 2008/04/21 11:29:33 tnn Exp $
+$NetBSD: patch-aa,v 1.12 2008/05/14 15:26:14 obache Exp $
 
---- src/Makefile.in.orig	2008-04-11 23:33:41.000000000 +0200
+--- src/Makefile.in.orig	2008-04-11 21:33:41.000000000 +0000
 +++ src/Makefile.in
-@@ -288,9 +288,9 @@ AUTOHEADER = @AUTOHEADER@
+@@ -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@
  AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CAIROPERF_LIBS = @CAIROPERF_LIBS@
@@ -14,3 +22,12 @@ $NetBSD: patch-aa,v 1.11 2008/04/21 11:29:33 tnn Exp $
  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					\