Update to 1.10.0:

overview of changes between 1.9.1 and 1.10.0
============================================
* Update script tables, bidi tables, and Arabic joining tables for Unicode 4.1
  [Roozbeh Pournader, Behdad Esfahbod]
* Misc bug and build fixes [Sebastien Bacher, Hans Breuer, Behdad,
  J. Ali Harlow, Tor Lillqvist, Keith Packard, Vittorio Palmisano, Manish Singh]

overview of changes between 1.9.0 and 1.9.1
==========================================
* Support setting of font options and DPI on PangoContext for
  the Cairo backend.
* Adapt to recent Cairo API changes
* Win32 build improvements [Tor Lillqvist]
* Misc bug fixes [Hans Breuer, Thomas Fitzsimmons, Kazuki IWAMOTO]

Overview of changes between 1.8.x and 1.9.x
===========================================
* Add Cairo support; PangoCairoFontmap is an interface with
  implementations for Fontconfig fonts and Win32 fonts
* Extend PangoFcFontmap to allow more customization by subclasses
* Handle NULL language better for pango_context_get_metrics()
* misc optimization [Paolo Borelli, Behdad Esfahbod]
* Misc bug and build fixes [Hans Breuer, Damien Carbery,
  Keith Packard, Manish Singh]
* Doc fixes [Tim Janik]

4 files changed, 29 insertions, 14 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index d5133f3520e..9145bfb28b3 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.59 2005/08/10 20:56:16 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2005/10/02 12:16:58 jmmv Exp $
 #
 
-DISTNAME=		pango-1.8.2
+DISTNAME=		pango-1.10.0
 CATEGORIES=		devel fonts
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
-			${MASTER_SITE_GNOME:=sources/pango/1.8/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
+			${MASTER_SITE_GNOME:=sources/pango/1.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -20,10 +20,17 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 USE_LIBTOOL=		yes
 
-PKGCONFIG_OVERRIDE=	pango.pc.in
+PKGCONFIG_OVERRIDE=	pango-uninstalled.pc.in
+PKGCONFIG_OVERRIDE+=	pango.pc.in
+PKGCONFIG_OVERRIDE+=	pangocairo.pc-uninstalled.in
+PKGCONFIG_OVERRIDE+=	pangocairo.pc.in
+PKGCONFIG_OVERRIDE+=	pangoft2.pc-uninstalled.in
 PKGCONFIG_OVERRIDE+=	pangoft2.pc.in
-PKGCONFIG_OVERRIDE+=	pangox.pc.in
+PKGCONFIG_OVERRIDE+=	pangowin32.pc-uninstalled.in
 PKGCONFIG_OVERRIDE+=	pangowin32.pc.in
+PKGCONFIG_OVERRIDE+=	pangox.pc-uninstalled.in
+PKGCONFIG_OVERRIDE+=	pangox.pc.in
+PKGCONFIG_OVERRIDE+=	pangoxft.pc-uninstalled.in
 PKGCONFIG_OVERRIDE+=	pangoxft.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
@@ -35,10 +42,12 @@ CONFIGURE_ARGS+=	--with-qt=no
 CONFIGURE_ENV+=		F77=${FALSE}
 
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_DEPENDS.cairo+=	cairo>=1.0.0
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 8fa06073fce..90b9d18058c 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/07/28 11:04:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/10/02 12:16:58 jmmv Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -21,6 +21,7 @@ include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangocairo.h
 include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
@@ -29,6 +30,7 @@ include/pango-1.0/pango/pangox.h
 include/pango-1.0/pango/pangoxft-render.h
 include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.la
+lib/libpangocairo-1.0.la
 lib/libpangoft2-1.0.la
 lib/libpangox-1.0.la
 lib/libpangoxft-1.0.la
@@ -43,6 +45,7 @@ lib/pango/1.4.0/modules/pango-syriac-fc.la
 lib/pango/1.4.0/modules/pango-thai-fc.la
 lib/pango/1.4.0/modules/pango-tibetan-fc.la
 lib/pkgconfig/pango.pc
+lib/pkgconfig/pangocairo.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
 lib/pkgconfig/pangoxft.pc
@@ -62,6 +65,7 @@ share/doc/pango/ix01.html
 share/doc/pango/layout.gif
 share/doc/pango/left.png
 share/doc/pango/lowlevel.html
+share/doc/pango/pango-Cairo-Rendering.html
 share/doc/pango/pango-Coverage-Maps.html
 share/doc/pango/pango-Engines.html
 share/doc/pango/pango-Fonts.html
@@ -82,6 +86,7 @@ share/doc/pango/pango.devhelp
 share/doc/pango/pango.html
 share/doc/pango/rendering.html
 share/doc/pango/right.png
+share/doc/pango/rotated-text.png
 share/doc/pango/style.css
 share/doc/pango/tools.html
 share/doc/pango/up.png
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 5cdc3fee2e2..09f577b081b 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/10/02 12:16:58 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pango+=	pango>=1.6.0
-BUILDLINK_RECOMMENDED.pango+=	pango>=1.6.0nb1
+BUILDLINK_RECOMMENDED.pango+=	pango>=1.10.0
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 83475ace75c..5e29fed43cc 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2005/07/28 11:04:13 wiz Exp $
+$NetBSD: distinfo,v 1.28 2005/10/02 12:16:58 jmmv Exp $
 
-SHA1 (pango-1.8.2.tar.bz2) = 1ff94ba7618ea8bffbd9872ffb4856c414a0e8d8
-RMD160 (pango-1.8.2.tar.bz2) = fc44c26d6f3543ca6054c996a4edc772b888de2a
-Size (pango-1.8.2.tar.bz2) = 1021372 bytes
+SHA1 (pango-1.10.0.tar.bz2) = 09a00c228725afc281b4332d3a22f8c098f4ed80
+RMD160 (pango-1.10.0.tar.bz2) = 05b0340847bb581c186573e80838cbccdee261de
+Size (pango-1.10.0.tar.bz2) = 1186188 bytes
 SHA1 (patch-aa) = b8f8d32dd163e6fbf80cf09d1321546499302275