Update to 1.2.0. Depend on Xft2.

Changes:
* Improve font solection for Hangul tone marks
* Improve range definitions for basic-xft [Jungshik Shin]
* Draw unknown character boxes with X primitives for the
  X backend instead of hoping for a suitable glyph [Morten Welinder]
* For Xft/FT2, give an informative error mesage when no fonts are found.
* Support shape modules with ranges beyond the BMP [Federic Zhang]
* Use octal escapes rather than literal UTF-8 [Arnaud Charlet]
* Use g_[sf]printf where appropriate [Matthias Clasen]
* Fix the Arabic-words-broken-by-underlines problem by
  stripping out non-shape affecting attributes then adding them
  back after shaping.
* Hangul shaper fixes [Changwoo Ryu, Jungshik Shin]
* Handle compatability ideographs in basic-x shaper [Federic Zhang]
* Implement pango_ft2_font_map_set_default_substitute() [Matthias Clasen]
* Hangul module bug fixes and improvements [Changwoo Ryu, Jungshik Shin]
  - Move rendering of precomposed characters to hangul-xft shaper
  - Handle Hangul tone marks
* Add a new wrap mode for PangoLayout - PANGO_WRAP_WORD_CHAR [Alex Larsson]
* Indic module improvements [Eric Mader]
* Fixes to generic OpenType handling [Eric]
* Improve language specific charset ordering basic-x11 [James Su, Brian Yuan]
* Some merges of fixes by Werner Lemberg to the original
  FreeType OpenType code.
* Robustify and otherwise improve pango_color_parse() [Matthias Clasen]
* Some cross-compiling fixes [J. Ali Harlow]
* Merge a lot of the code between the Xft and FT2 backend,
  so that the FT2 backend gets the recent improvements to Xft.
* Add proper language tag support to the Xft/FT2 backends.
* Various effienciency fixes for the Xft/FT2 backends.
* Support for version 2 of the Xft library. [Keith Packard]
* Convert the freetype backend over to using fontconfig,
  instead of MiniXft for font cataloging.
* A port of the Indic OpenType code from ICU to Pango. [Eric Mader]
* A new hangul-xft [Changwoo Ryu]
* Various cleanups to the PangoXft and PangoFT2 public APIs.
... as well as the usual bug fixes.

7 files changed, 126 insertions, 109 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 929773071e1..b28e0e8b715 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2002/12/22 18:06:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2002/12/24 03:41:10 wiz Exp $
 #
 
-DISTNAME=		pango-1.0.5
-PKGREVISION=		1
+DISTNAME=		pango-1.2.0
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
-			${MASTER_SITE_GNOME:=sources/pango/1.0/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
+			${MASTER_SITE_GNOME:=sources/pango/1.2/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.pango.org
@@ -16,6 +15,7 @@ USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
+TEST_TARGET=		check
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -32,23 +32,9 @@ CONF_FILES+=		${EGDIR}/pangox.aliases ${PKG_SYSCONFDIR}/pangox.aliases
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-# directory appeared in XFree86 4.*
-# if it is there, we are using XFree86 4.* and will
-# install some additional files
-.if exists(${X11BASE}/lib/X11/locale/common)
-PLIST_SRC=		${PKGDIR}/PLIST.xf4 ${PKGDIR}/PLIST
-.else
-PLIST_SRC=		${PKGDIR}/PLIST
-.endif
-
-test: build
-	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/check.log
-
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index c7218fd3171..f91b1cd2651 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/12/22 18:06:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/12/24 03:41:11 wiz Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -9,6 +9,7 @@ include/pango-1.0/pango/pango-enum-types.h
 include/pango-1.0/pango/pango-font.h
 include/pango-1.0/pango/pango-fontmap.h
 include/pango-1.0/pango/pango-fontset.h
+include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
 include/pango-1.0/pango/pango-indic.h
 include/pango-1.0/pango/pango-item.h
@@ -21,97 +22,126 @@ include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
 include/pango-1.0/pango/pangoft2.h
 include/pango-1.0/pango/pangox.h
+include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.la
 lib/libpango-1.0.so
-lib/libpango-1.0.so.0
-lib/libpango-1.0.so.0.5
+lib/libpango-1.0.so.200
+lib/libpango-1.0.so.200.0
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.la
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.0
-lib/libpangoft2-1.0.so.0.5
+lib/libpangoft2-1.0.so.200
+lib/libpangoft2-1.0.so.200.0
 lib/libpangox-1.0.a
 lib/libpangox-1.0.la
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.0
-lib/libpangox-1.0.so.0.5
-lib/pango/1.0.0/modules/pango-arabic-ft2.a
-lib/pango/1.0.0/modules/pango-arabic-ft2.la
-lib/pango/1.0.0/modules/pango-arabic-ft2.so
-lib/pango/1.0.0/modules/pango-arabic-x.a
-lib/pango/1.0.0/modules/pango-arabic-x.la
-lib/pango/1.0.0/modules/pango-arabic-x.so
-lib/pango/1.0.0/modules/pango-basic-ft2.a
-lib/pango/1.0.0/modules/pango-basic-ft2.la
-lib/pango/1.0.0/modules/pango-basic-ft2.so
-lib/pango/1.0.0/modules/pango-basic-x.a
-lib/pango/1.0.0/modules/pango-basic-x.la
-lib/pango/1.0.0/modules/pango-basic-x.so
-lib/pango/1.0.0/modules/pango-bengali-x.a
-lib/pango/1.0.0/modules/pango-bengali-x.la
-lib/pango/1.0.0/modules/pango-bengali-x.so
-lib/pango/1.0.0/modules/pango-devanagari-x.a
-lib/pango/1.0.0/modules/pango-devanagari-x.la
-lib/pango/1.0.0/modules/pango-devanagari-x.so
-lib/pango/1.0.0/modules/pango-gujarati-x.a
-lib/pango/1.0.0/modules/pango-gujarati-x.la
-lib/pango/1.0.0/modules/pango-gujarati-x.so
-lib/pango/1.0.0/modules/pango-gurmukhi-x.a
-lib/pango/1.0.0/modules/pango-gurmukhi-x.la
-lib/pango/1.0.0/modules/pango-gurmukhi-x.so
-lib/pango/1.0.0/modules/pango-hangul-x.a
-lib/pango/1.0.0/modules/pango-hangul-x.la
-lib/pango/1.0.0/modules/pango-hangul-x.so
-lib/pango/1.0.0/modules/pango-hebrew-ft2.a
-lib/pango/1.0.0/modules/pango-hebrew-ft2.la
-lib/pango/1.0.0/modules/pango-hebrew-ft2.so
-lib/pango/1.0.0/modules/pango-hebrew-x.a
-lib/pango/1.0.0/modules/pango-hebrew-x.la
-lib/pango/1.0.0/modules/pango-hebrew-x.so
-lib/pango/1.0.0/modules/pango-myanmar-x.a
-lib/pango/1.0.0/modules/pango-myanmar-x.la
-lib/pango/1.0.0/modules/pango-myanmar-x.so
-lib/pango/1.0.0/modules/pango-tamil-x.a
-lib/pango/1.0.0/modules/pango-tamil-x.la
-lib/pango/1.0.0/modules/pango-tamil-x.so
-lib/pango/1.0.0/modules/pango-thai-x.a
-lib/pango/1.0.0/modules/pango-thai-x.la
-lib/pango/1.0.0/modules/pango-thai-x.so
+lib/libpangox-1.0.so.200
+lib/libpangox-1.0.so.200.0
+lib/libpangoxft-1.0.a
+lib/libpangoxft-1.0.la
+lib/libpangoxft-1.0.so
+lib/libpangoxft-1.0.so.200
+lib/libpangoxft-1.0.so.200.0
+lib/pango/${PKGVERSION}/modules/pango-hangul-xft.a
+lib/pango/${PKGVERSION}/modules/pango-hangul-xft.la
+lib/pango/${PKGVERSION}/modules/pango-hangul-xft.so
+lib/pango/${PKGVERSION}/modules/pango-indic-xft.a
+lib/pango/${PKGVERSION}/modules/pango-indic-xft.la
+lib/pango/${PKGVERSION}/modules/pango-indic-xft.so
+lib/pango/1.2.0/modules/pango-arabic-ft2.a
+lib/pango/1.2.0/modules/pango-arabic-ft2.la
+lib/pango/1.2.0/modules/pango-arabic-ft2.so
+lib/pango/1.2.0/modules/pango-arabic-x.a
+lib/pango/1.2.0/modules/pango-arabic-x.la
+lib/pango/1.2.0/modules/pango-arabic-x.so
+lib/pango/1.2.0/modules/pango-arabic-xft.a
+lib/pango/1.2.0/modules/pango-arabic-xft.la
+lib/pango/1.2.0/modules/pango-arabic-xft.so
+lib/pango/1.2.0/modules/pango-basic-ft2.a
+lib/pango/1.2.0/modules/pango-basic-ft2.la
+lib/pango/1.2.0/modules/pango-basic-ft2.so
+lib/pango/1.2.0/modules/pango-basic-x.a
+lib/pango/1.2.0/modules/pango-basic-x.la
+lib/pango/1.2.0/modules/pango-basic-x.so
+lib/pango/1.2.0/modules/pango-basic-xft.a
+lib/pango/1.2.0/modules/pango-basic-xft.la
+lib/pango/1.2.0/modules/pango-basic-xft.so
+lib/pango/1.2.0/modules/pango-bengali-x.a
+lib/pango/1.2.0/modules/pango-bengali-x.la
+lib/pango/1.2.0/modules/pango-bengali-x.so
+lib/pango/1.2.0/modules/pango-devanagari-x.a
+lib/pango/1.2.0/modules/pango-devanagari-x.la
+lib/pango/1.2.0/modules/pango-devanagari-x.so
+lib/pango/1.2.0/modules/pango-gujarati-x.a
+lib/pango/1.2.0/modules/pango-gujarati-x.la
+lib/pango/1.2.0/modules/pango-gujarati-x.so
+lib/pango/1.2.0/modules/pango-gurmukhi-x.a
+lib/pango/1.2.0/modules/pango-gurmukhi-x.la
+lib/pango/1.2.0/modules/pango-gurmukhi-x.so
+lib/pango/1.2.0/modules/pango-hangul-x.a
+lib/pango/1.2.0/modules/pango-hangul-x.la
+lib/pango/1.2.0/modules/pango-hangul-x.so
+lib/pango/1.2.0/modules/pango-hebrew-ft2.a
+lib/pango/1.2.0/modules/pango-hebrew-ft2.la
+lib/pango/1.2.0/modules/pango-hebrew-ft2.so
+lib/pango/1.2.0/modules/pango-hebrew-x.a
+lib/pango/1.2.0/modules/pango-hebrew-x.la
+lib/pango/1.2.0/modules/pango-hebrew-x.so
+lib/pango/1.2.0/modules/pango-hebrew-xft.a
+lib/pango/1.2.0/modules/pango-hebrew-xft.la
+lib/pango/1.2.0/modules/pango-hebrew-xft.so
+lib/pango/1.2.0/modules/pango-myanmar-x.a
+lib/pango/1.2.0/modules/pango-myanmar-x.la
+lib/pango/1.2.0/modules/pango-myanmar-x.so
+lib/pango/1.2.0/modules/pango-tamil-x.a
+lib/pango/1.2.0/modules/pango-tamil-x.la
+lib/pango/1.2.0/modules/pango-tamil-x.so
+lib/pango/1.2.0/modules/pango-thai-x.a
+lib/pango/1.2.0/modules/pango-thai-x.la
+lib/pango/1.2.0/modules/pango-thai-x.so
+lib/pango/1.2.0/modules/pango-thai-xft.a
+lib/pango/1.2.0/modules/pango-thai-xft.la
+lib/pango/1.2.0/modules/pango-thai-xft.so
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
+lib/pkgconfig/pangoxft.pc
 share/examples/pango/pango.modules
 share/examples/pango/pangox.aliases
+share/gtk-doc/html/pango/PangoMarkupFormat.html
+share/gtk-doc/html/pango/home.png
 share/gtk-doc/html/pango/index.html
 share/gtk-doc/html/pango/index.sgml
 share/gtk-doc/html/pango/layout.gif
+share/gtk-doc/html/pango/left.png
 share/gtk-doc/html/pango/lowlevel.html
-share/gtk-doc/html/pango/pango-coverage-maps.html
-share/gtk-doc/html/pango/pango-engines.html
-share/gtk-doc/html/pango/pango-fonts.html
-share/gtk-doc/html/pango/pango-freetype-fonts-and-rendering.html
-share/gtk-doc/html/pango/pango-glyph-storage.html
-share/gtk-doc/html/pango/pango-indic-engine-support.html
-share/gtk-doc/html/pango/pango-layout-objects.html
-share/gtk-doc/html/pango/pango-modules.html
-share/gtk-doc/html/pango/pango-opentype-font-handling.html
-share/gtk-doc/html/pango/pango-tab-stops.html
-share/gtk-doc/html/pango/pango-text-attributes.html
-share/gtk-doc/html/pango/pango-text-processing.html
-share/gtk-doc/html/pango/pango-win32-fonts-and-rendering.html
-share/gtk-doc/html/pango/pango-x-fonts.html
-share/gtk-doc/html/pango/pango-x-rendering.html
-share/gtk-doc/html/pango/pango-xft-fonts-and-rendering.html
+share/gtk-doc/html/pango/pango-Coverage-Maps.html
+share/gtk-doc/html/pango/pango-Engines.html
+share/gtk-doc/html/pango/pango-Fonts.html
+share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-Glyph-Storage.html
+share/gtk-doc/html/pango/pango-Indic-Engine-Support.html
+share/gtk-doc/html/pango/pango-Layout-Objects.html
+share/gtk-doc/html/pango/pango-Modules.html
+share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+share/gtk-doc/html/pango/pango-Tab-Stops.html
+share/gtk-doc/html/pango/pango-Text-Attributes.html
+share/gtk-doc/html/pango/pango-Text-Processing.html
+share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango.devhelp
 share/gtk-doc/html/pango/pango.html
-share/gtk-doc/html/pango/pangomarkupformat.html
 share/gtk-doc/html/pango/rendering.html
+share/gtk-doc/html/pango/right.png
+share/gtk-doc/html/pango/up.png
 @dirrm share/gtk-doc/html/pango
 @unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}
 @dirrm share/examples/pango
-@dirrm lib/pango/1.0.0/modules
-@dirrm lib/pango/1.0.0
+@dirrm lib/pango/1.2.0/modules
+@dirrm lib/pango/1.2.0
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
index db1aa7e627f..70a4def405f 100644
--- a/devel/pango/buildlink2.mk
+++ b/devel/pango/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:40 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 03:41:11 wiz Exp $
 
 .if !defined(PANGO_BUILDLINK2_MK)
 PANGO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		pango
-BUILDLINK_DEPENDS.pango?=	pango>=1.0.4nb1
+BUILDLINK_DEPENDS.pango?=	pango>=1.2.0
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
@@ -14,6 +14,7 @@ BUILDLINK_FILES.pango+=	include/pango-1.0/*
 BUILDLINK_FILES.pango+=	lib/libpango*-1.0.*
 
 .include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	pango-buildlink
 
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 84fb7c6dd57..0d77e914d6c 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2002/12/22 18:06:21 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2002/12/24 03:41:11 wiz Exp $
 
-SHA1 (pango-1.0.5.tar.gz) = cf33b4a956d0de77956aa09b9004b530e4d6df54
-Size (pango-1.0.5.tar.gz) = 1203673 bytes
-SHA1 (patch-aa) = e2bb58559359e785ea7113b4883617a7ac020f9f
-SHA1 (patch-ab) = d8e8e4161b06c431bd9f93b449e375ee5e89e56e
+SHA1 (pango-1.2.0.tar.gz) = 0d707f4a04c7d754e3ba24c796968e10be187cc9
+Size (pango-1.2.0.tar.gz) = 1204741 bytes
+SHA1 (patch-aa) = 78aa475af65b792a8ad2c06b3d516bb51cebe07e
+SHA1 (patch-ab) = bf2448c3ee0f96d2fec8b99eed4545ad52e8499c
 SHA1 (patch-ac) = d6043c232e34d13a0bb5be42a6936da0088273fb
-SHA1 (patch-ad) = bdfcb429ecb194bcd8595ce09b051c73a9202e40
+SHA1 (patch-ad) = 3f4e4c7832e540285f65689ed9424fbf70ce9811
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index 59555ce4c51..cf42bd3acbe 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2002/12/22 18:06:21 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2002/12/24 03:41:11 wiz Exp $
 
---- examples/Makefile.in.orig	Sun Oct 13 18:50:53 2002
+--- examples/Makefile.in.orig	Fri Dec 20 18:23:05 2002
 +++ examples/Makefile.in
-@@ -116,7 +116,7 @@ XFT_LIBS = @XFT_LIBS@
- YACC = @YACC@
+@@ -118,7 +118,7 @@ XFT_CFLAGS = @XFT_CFLAGS@
+ XFT_LIBS = @XFT_LIBS@
  ms_librarian = @ms_librarian@
  
 -aliasdir = $(sysconfdir)/pango
 +aliasdir = $(datadir)/examples/@PACKAGE@
  
- INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FREETYPE_CFLAGS)
- 
+ INCLUDES = \
+ 	-DG_DISABLE_DEPRECATED		\
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
index f033052406e..ac70cdc8efb 100644
--- a/devel/pango/patches/patch-ab
+++ b/devel/pango/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2002/12/22 18:06:22 jmmv Exp $
+$NetBSD: patch-ab,v 1.7 2002/12/24 03:41:12 wiz Exp $
 
---- modules/Makefile.in.orig	Sun Dec 22 11:55:17 2002
+--- modules/Makefile.in.orig	Fri Dec 20 18:23:01 2002
 +++ modules/Makefile.in
 @@ -23,7 +23,7 @@ bindir = @bindir@
  sbindir = @sbindir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2002/12/22 18:06:22 jmmv Exp $
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
-@@ -337,12 +337,12 @@ maintainer-clean-generic clean mostlycle
+@@ -339,12 +339,12 @@ maintainer-clean-generic clean mostlycle
  
  install-data-local:
  	@if $(RUN_QUERY_IMMODULES_TEST) ; then 				\
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
index 4aa4f9ce673..00fda733d3e 100644
--- a/devel/pango/patches/patch-ad
+++ b/devel/pango/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2002/12/22 18:06:22 jmmv Exp $
+$NetBSD: patch-ad,v 1.5 2002/12/24 03:41:12 wiz Exp $
 
---- pango/pangox-fontmap.c.orig	Mon Mar 25 21:22:52 2002
+--- pango/pangox-fontmap.c.orig	Tue Oct 15 00:50:47 2002
 +++ pango/pangox-fontmap.c
-@@ -874,7 +874,7 @@ pango_x_font_map_read_aliases (PangoXFon
+@@ -912,7 +912,7 @@ pango_x_font_map_read_aliases (PangoXFon
    int n;
  
    if (!files_str)