Update to 1.4.0:

This is a stable release providing new functionality as compared
to Pango-1.2, while maintaining source and binary compatibility.
Notable improvements in Pango since version 1.2:

* Support for characters beyond the basic-multilingual
  plane of Unicode and updates of character properties to
  match Unicode-4.0.

* The same modules are now used for the Xft and fontconfig
  backends, reducing code duplication, and making it easier
  to create new backends independent of Pango that use
  fontconfig and FreeType.

* A better font and shaper selection algorithm is now used
  that takes script information into account.

* Bidirectional base direction can now be automatically
  determined from the text instead of explicitly set by
  the application.

* Improvements to OpenType handling, especially for the GPOS
  table. GPOS features are now enabled for Arabic.

5 files changed, 65 insertions, 92 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index c697bfa1aa5..2222d9a5261 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2004/02/27 14:30:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2004/04/01 18:15:16 jmmv Exp $
 #
 
-DISTNAME=		pango-1.2.5
-PKGREVISION=		1
+DISTNAME=		pango-1.4.0
 CATEGORIES=		devel
-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/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
+			${MASTER_SITE_GNOME:=sources/pango/1.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -37,6 +36,7 @@ BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index da54ee19817..f704053a7c6 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/01/22 13:39:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/04/01 18:15:16 jmmv Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -11,110 +11,72 @@ 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
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-modules.h
 include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-script.h
 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/pangofc-font.h
+include/pango-1.0/pango/pangofc-fontmap.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.200
-lib/libpango-1.0.so.200.5
+lib/libpango-1.0.so.399
+lib/libpango-1.0.so.399.1
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.la
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.200
-lib/libpangoft2-1.0.so.200.5
+lib/libpangoft2-1.0.so.399
+lib/libpangoft2-1.0.so.399.1
 lib/libpangox-1.0.a
 lib/libpangox-1.0.la
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.200
-lib/libpangox-1.0.so.200.5
+lib/libpangox-1.0.so.399
+lib/libpangox-1.0.so.399.1
 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.5
-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-hangul-xft.a
-lib/pango/1.2.0/modules/pango-hangul-xft.la
-lib/pango/1.2.0/modules/pango-hangul-xft.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-indic-ft2.a
-lib/pango/1.2.0/modules/pango-indic-ft2.la
-lib/pango/1.2.0/modules/pango-indic-ft2.so
-lib/pango/1.2.0/modules/pango-indic-xft.a
-lib/pango/1.2.0/modules/pango-indic-xft.la
-lib/pango/1.2.0/modules/pango-indic-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-ft2.a
-lib/pango/1.2.0/modules/pango-thai-ft2.la
-lib/pango/1.2.0/modules/pango-thai-ft2.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/libpangoxft-1.0.so.399
+lib/libpangoxft-1.0.so.399.1
+lib/pango/1.4.0/modules/pango-arabic-fc.a
+lib/pango/1.4.0/modules/pango-arabic-fc.la
+lib/pango/1.4.0/modules/pango-arabic-fc.so
+lib/pango/1.4.0/modules/pango-basic-fc.a
+lib/pango/1.4.0/modules/pango-basic-fc.la
+lib/pango/1.4.0/modules/pango-basic-fc.so
+lib/pango/1.4.0/modules/pango-basic-x.a
+lib/pango/1.4.0/modules/pango-basic-x.la
+lib/pango/1.4.0/modules/pango-basic-x.so
+lib/pango/1.4.0/modules/pango-hangul-fc.a
+lib/pango/1.4.0/modules/pango-hangul-fc.la
+lib/pango/1.4.0/modules/pango-hangul-fc.so
+lib/pango/1.4.0/modules/pango-hebrew-fc.a
+lib/pango/1.4.0/modules/pango-hebrew-fc.la
+lib/pango/1.4.0/modules/pango-hebrew-fc.so
+lib/pango/1.4.0/modules/pango-indic-fc.a
+lib/pango/1.4.0/modules/pango-indic-fc.la
+lib/pango/1.4.0/modules/pango-indic-fc.so
+lib/pango/1.4.0/modules/pango-thai-fc.a
+lib/pango/1.4.0/modules/pango-thai-fc.la
+lib/pango/1.4.0/modules/pango-thai-fc.so
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
 lib/pkgconfig/pangoxft.pc
 libdata/pango/pango.modules
 libdata/pango/pangox.aliases
+man/man1/pango-querymodules.1
+share/doc/html/pango/PangoEngineLang.html
+share/doc/html/pango/PangoEngineShape.html
+share/doc/html/pango/PangoFcFont.html
+share/doc/html/pango/PangoFcFontMap.html
 share/doc/html/pango/PangoMarkupFormat.html
 share/doc/html/pango/home.png
 share/doc/html/pango/index.html
@@ -128,25 +90,27 @@ share/doc/html/pango/pango-Engines.html
 share/doc/html/pango/pango-Fonts.html
 share/doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
 share/doc/html/pango/pango-Glyph-Storage.html
-share/doc/html/pango/pango-Indic-Engine-Support.html
 share/doc/html/pango/pango-Layout-Objects.html
 share/doc/html/pango/pango-Modules.html
 share/doc/html/pango/pango-OpenType-Font-Handling.html
+share/doc/html/pango/pango-Scripts.html
 share/doc/html/pango/pango-Tab-Stops.html
 share/doc/html/pango/pango-Text-Attributes.html
 share/doc/html/pango/pango-Text-Processing.html
 share/doc/html/pango/pango-Win32-Fonts-and-Rendering.html
 share/doc/html/pango/pango-X-Fonts-and-Rendering.html
 share/doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+share/doc/html/pango/pango-querymodules.html
 share/doc/html/pango/pango.devhelp
 share/doc/html/pango/pango.html
 share/doc/html/pango/rendering.html
 share/doc/html/pango/right.png
+share/doc/html/pango/tools.html
 share/doc/html/pango/up.png
 @dirrm share/doc/html/pango
 @dirrm libdata/pango
-@dirrm lib/pango/1.2.0/modules
-@dirrm lib/pango/1.2.0
+@dirrm lib/pango/1.4.0/modules
+@dirrm lib/pango/1.4.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 ef7389631fc..287bb07579d 100644
--- a/devel/pango/buildlink2.mk
+++ b/devel/pango/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/19 17:54:06 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/04/01 18:15:16 jmmv Exp $
 
 .if !defined(PANGO_BUILDLINK2_MK)
 PANGO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		pango
-BUILDLINK_DEPENDS.pango?=	pango>=1.2.3nb1
+BUILDLINK_DEPENDS.pango?=	pango>=1.4.0
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
@@ -13,7 +13,12 @@ BUILDLINK_FILES.pango=	include/pango-1.0/*/*
 BUILDLINK_FILES.pango+=	include/pango-1.0/*
 BUILDLINK_FILES.pango+=	lib/libpango*-1.0.*
 
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/fontconfig/buildlink2.mk"
 .include "../../fonts/Xft2/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../x11/Xrender/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	pango-buildlink
 
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 0e8b377e4c0..0f626a80ba8 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:15:16 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -11,11 +11,15 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npango}
 BUILDLINK_PACKAGES+=	pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pango+=	pango>=1.2.5nb1
+BUILDLINK_DEPENDS.pango+=	pango>=1.4.0
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index d0fd8281a4d..0261617ee84 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/02/06 22:54:00 wiz Exp $
+$NetBSD: distinfo,v 1.17 2004/04/01 18:15:16 jmmv Exp $
 
-SHA1 (pango-1.2.5.tar.bz2) = a4e351635895e5d53b49d3db71ac6f54cecaae89
-Size (pango-1.2.5.tar.bz2) = 865495 bytes
+SHA1 (pango-1.4.0.tar.bz2) = 10ea96cb05e0ada51e1b81f68dd1cad56cdd6a99
+Size (pango-1.4.0.tar.bz2) = 921472 bytes