Update to 1.6.0. This version corresponds to GNOME 2.8.0.

Overview of changes between 1.5.2 and 1.6.0
===========================================
* Add OpenType support for Hebrew [Dov Grobgeld]
* Win32 bug and build fixes [Tor Lillqvist, Hans Breuer, John Ehresman]
* Misc bug fixes [Behdad Esfahbod, Jatin Nansi]

Overview of changes between 1.5.1 and 1.5.2
===========================================
* Support 'init' feature for Bengali [Sayamindu Dasgupta]
* Allow 32-bit property fields in OpenType code
* Optimize repeated property lookups in OpenType code
* Misc bug fixes [Behdad, Keith Sharp, Morten Welinder]

Overview of changes between 1.5.0 and 1.5.1
===========================================
* Add ellipsization support to PangoLayout
* Add pango_context_get_font_map().
* Fix metrics for the Xft backend when a transform is in effect
* Separate out backend-independent parts of pangoft2topgm for
  future rendering testbeds.
* Code cleanups (use G_DEFINE_TYPE, make PangoMatrix parameters const)
* Add a GType for PangoMatrix [Torsten Schoenfeld]
* Misc bug fixes [Morten Welinder]

4 files changed, 19 insertions, 35 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index d213f013700..d509017ad5c 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2004/08/31 11:53:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2004/09/21 16:43:52 jmmv Exp $
 #
 
-DISTNAME=		pango-1.4.1
+DISTNAME=		pango-1.6.0
 CATEGORIES=		devel
 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/}
+			${MASTER_SITE_GNOME:=sources/pango/1.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -38,16 +38,6 @@ CONFIGURE_ENV+=		F77=${FALSE}
 
 BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 
-# XXX: Set up compatibility links for pango-1.4.0; this is just a workaround
-# for our broken libtool naming, and it should be removed when our libtool
-# is fixed.
-post-install:
-.for f in pango pangoft2 pangox pangoxft
-	cd ${PREFIX}/lib && ${LN} -fs lib${f}-1.0.so.400 lib${f}-1.0.so.399
-	cd ${PREFIX}/lib && ${LN} -fs lib${f}-1.0.so.400.1 lib${f}-1.0.so.399.1
-.endfor
-.undef f
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 47d5f680ab0..d5f260e7f40 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2004/08/31 08:21:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/09/21 16:43:52 jmmv Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -20,6 +20,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/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
@@ -28,31 +29,23 @@ 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.399
-lib/libpango-1.0.so.399.1
-lib/libpango-1.0.so.400
-lib/libpango-1.0.so.400.1
+lib/libpango-1.0.so.600
+lib/libpango-1.0.so.600.0
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.la
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.399
-lib/libpangoft2-1.0.so.399.1
-lib/libpangoft2-1.0.so.400
-lib/libpangoft2-1.0.so.400.1
+lib/libpangoft2-1.0.so.600
+lib/libpangoft2-1.0.so.600.0
 lib/libpangox-1.0.a
 lib/libpangox-1.0.la
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.399
-lib/libpangox-1.0.so.399.1
-lib/libpangox-1.0.so.400
-lib/libpangox-1.0.so.400.1
+lib/libpangox-1.0.so.600
+lib/libpangox-1.0.so.600.0
 lib/libpangoxft-1.0.a
 lib/libpangoxft-1.0.la
 lib/libpangoxft-1.0.so
-lib/libpangoxft-1.0.so.399
-lib/libpangoxft-1.0.so.399.1
-lib/libpangoxft-1.0.so.400
-lib/libpangoxft-1.0.so.400.1
+lib/libpangoxft-1.0.so.600
+lib/libpangoxft-1.0.so.600.0
 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
@@ -83,6 +76,7 @@ libdata/pango/pangox.aliases
 man/man1/pango-querymodules.1
 share/doc/pango/PangoEngineLang.html
 share/doc/pango/PangoEngineShape.html
+share/doc/pango/PangoFcDecoder.html
 share/doc/pango/PangoFcFont.html
 share/doc/pango/PangoFcFontMap.html
 share/doc/pango/PangoMarkupFormat.html
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 0f626a80ba8..1a48b7ad213 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:15:16 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/09/21 16:43:52 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npango}
 BUILDLINK_PACKAGES+=	pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pango+=	pango>=1.4.0
+BUILDLINK_DEPENDS.pango+=	pango>=1.6.0
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 158b7ad763b..aa6641235bf 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2004/08/31 08:21:47 jmmv Exp $
+$NetBSD: distinfo,v 1.21 2004/09/21 16:43:52 jmmv Exp $
 
-SHA1 (pango-1.4.1.tar.bz2) = ffdc4549fa5b52b4c6a9b8b8fecaa7ad3fde83a0
-Size (pango-1.4.1.tar.bz2) = 914710 bytes
+SHA1 (pango-1.6.0.tar.bz2) = efa9e0244af847b9c193afd859517646c7cd1d7b
+Size (pango-1.6.0.tar.bz2) = 951911 bytes
 SHA1 (patch-aa) = ea2fe223d9c7da2a19f1699124a59e6081ab8e9f
 SHA1 (patch-ab) = 4f2f45c19980c32aaebe93bcd56d4ef8d2e9215b
 SHA1 (patch-ac) = e4b07d5b2e1f4f063bb6077182e91d2f56d7f927