Update to 1.4.1:

Changes in the package
======================
* Install compatibility symlinks for shared libraries to not break binary
  programs linked against 1.4.0.  This is just a workaround for our broken
  libtool naming scheme and should be removed when it is fixed.  Agreed
  by rh@.
* Move installation of documentation to doc/, out of doc/html.

Overview of changes between 1.4.0 and 1.4.1
===========================================
* Win32 bug fixes [Tor Lillqvist, John Ehresman]
* Thai rendering improvements including OpenType support
  [Theppitak Karoonboonyanan]
* Fix common crash in Hangul shaper [Changwoo Ryu]
* Fix various problems with language tag selection [Frederic Zhang]
* Documentation improvements [Felipe Heidrich, Doug Quale]
* Fix crash in line break code [Jeroen Zwartepoorte, Billy Biggs]
* Build fixes [J. Ali Harlow, Noah Misch]
* OpenType engine fixes [Kailash C. Chowksey, Sayamindu Dasgupta, Aamir Wali,
  Masatake YAMATO, Soheil Hassas Yeganeh]
* Indic module bug fixes [Chris Blizzard, Rajkumar S, Taneem Ahmed,
  Jungshik Shin]
* Misc bug fixes [Stanislav Brabec, Anders Carlsson, Behdad Esfahbod,
  Jody Goldberg, Theppitak, Sven Neumann, Manish Singh, Morten Welinder]

5 files changed, 60 insertions, 122 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index c76ce0c88ef..43276548598 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2004/08/06 02:09:38 minskim Exp $
+# $NetBSD: Makefile,v 1.44 2004/08/31 08:21:47 jmmv Exp $
 #
 
-DISTNAME=		pango-1.4.0
-PKGREVISION=		1
+DISTNAME=		pango-1.4.1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
@@ -31,7 +30,7 @@ PKGCONFIG_OVERRIDE+=	pangoxft.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/libdata
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--with-qt=no
 
 # Avoid an ICE in gcc2 on sparc64
@@ -39,6 +38,16 @@ 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 f704053a7c6..47d5f680ab0 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/04/01 18:15:16 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.17 2004/08/31 08:21:47 jmmv Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -30,21 +30,29 @@ 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/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/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/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/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
@@ -73,41 +81,41 @@ 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
-share/doc/html/pango/index.sgml
-share/doc/html/pango/ix01.html
-share/doc/html/pango/layout.gif
-share/doc/html/pango/left.png
-share/doc/html/pango/lowlevel.html
-share/doc/html/pango/pango-Coverage-Maps.html
-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-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
+share/doc/pango/PangoEngineLang.html
+share/doc/pango/PangoEngineShape.html
+share/doc/pango/PangoFcFont.html
+share/doc/pango/PangoFcFontMap.html
+share/doc/pango/PangoMarkupFormat.html
+share/doc/pango/home.png
+share/doc/pango/index.html
+share/doc/pango/index.sgml
+share/doc/pango/ix01.html
+share/doc/pango/layout.gif
+share/doc/pango/left.png
+share/doc/pango/lowlevel.html
+share/doc/pango/pango-Coverage-Maps.html
+share/doc/pango/pango-Engines.html
+share/doc/pango/pango-Fonts.html
+share/doc/pango/pango-FreeType-Fonts-and-Rendering.html
+share/doc/pango/pango-Glyph-Storage.html
+share/doc/pango/pango-Layout-Objects.html
+share/doc/pango/pango-Modules.html
+share/doc/pango/pango-OpenType-Font-Handling.html
+share/doc/pango/pango-Scripts.html
+share/doc/pango/pango-Tab-Stops.html
+share/doc/pango/pango-Text-Attributes.html
+share/doc/pango/pango-Text-Processing.html
+share/doc/pango/pango-Win32-Fonts-and-Rendering.html
+share/doc/pango/pango-X-Fonts-and-Rendering.html
+share/doc/pango/pango-Xft-Fonts-and-Rendering.html
+share/doc/pango/pango-querymodules.html
+share/doc/pango/pango.devhelp
+share/doc/pango/pango.html
+share/doc/pango/rendering.html
+share/doc/pango/right.png
+share/doc/pango/tools.html
+share/doc/pango/up.png
+@dirrm share/doc/pango
 @dirrm libdata/pango
 @dirrm lib/pango/1.4.0/modules
 @dirrm lib/pango/1.4.0
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 564865cc01d..158b7ad763b 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2004/08/06 02:09:38 minskim Exp $
+$NetBSD: distinfo,v 1.20 2004/08/31 08:21:47 jmmv Exp $
 
-SHA1 (pango-1.4.0.tar.bz2) = 10ea96cb05e0ada51e1b81f68dd1cad56cdd6a99
-Size (pango-1.4.0.tar.bz2) = 921472 bytes
+SHA1 (pango-1.4.1.tar.bz2) = ffdc4549fa5b52b4c6a9b8b8fecaa7ad3fde83a0
+Size (pango-1.4.1.tar.bz2) = 914710 bytes
 SHA1 (patch-aa) = ea2fe223d9c7da2a19f1699124a59e6081ab8e9f
 SHA1 (patch-ab) = 4f2f45c19980c32aaebe93bcd56d4ef8d2e9215b
 SHA1 (patch-ac) = e4b07d5b2e1f4f063bb6077182e91d2f56d7f927
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
deleted file mode 100644
index 680a952f769..00000000000
--- a/devel/pango/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2004/08/06 02:09:38 minskim Exp $
-
---- modules/hangul/hangul-defs.h.orig	2002-11-03 13:56:24.000000000 -0600
-+++ modules/hangul/hangul-defs.h
-@@ -48,6 +48,7 @@
- #define HTONE1 0x302E
- #define HTONE2 0x302F
- 
-+#define IS_JAMO(wc) (wc >= LBASE && wc <= TEND)
- #define IS_L(wc) (wc >= LBASE && wc <= LEND)
- #define IS_V(wc) (wc >= VFILL && wc <= VEND)
- #define IS_T(wc) (wc > TBASE && wc <= TEND)
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
deleted file mode 100644
index 8ce13ff45b1..00000000000
--- a/devel/pango/patches/patch-ac
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2004/08/06 02:09:38 minskim Exp $
-
---- modules/hangul/hangul-fc.c.orig	2003-09-23 18:11:51.000000000 -0500
-+++ modules/hangul/hangul-fc.c
-@@ -1,7 +1,7 @@
- /* Pango
-  * hangul-fc.c: Hangul shaper for FreeType based backends
-  *
-- * Copyright (C) 2002 Changwoo Ryu
-+ * Copyright (C) 2002-2004 Changwoo Ryu
-  * Author: Changwoo Ryu <cwryu@debian.org>
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -275,6 +275,21 @@ render_syllable (PangoFont *font, gunich
-     render_tone(font, tone, glyphs, n_glyphs, cluster_offset);
- }
- 
-+static void
-+render_basic (PangoFont *font, gunichar wc,
-+	      PangoGlyphString *glyphs, int *n_glyphs, int cluster_offset)
-+{
-+  int index;
-+  index = find_char (font, wc);
-+  pango_glyph_string_set_size (glyphs, *n_glyphs + 1);
-+  if (index)
-+    set_glyph (font, glyphs, *n_glyphs, cluster_offset, index);
-+  else 
-+    set_glyph (font, glyphs, *n_glyphs, cluster_offset,
-+	       get_unknown_glyph (font, wc));
-+  (*n_glyphs)++;
-+}
-+
- static void 
- hangul_engine_shape (PangoEngineShape *engine,
- 		     PangoFont        *font,
-@@ -307,13 +322,14 @@ hangul_engine_shape (PangoEngineShape *e
-       if (n_jamos)
- 	{
- 	  gunichar prev = jamos[n_jamos - 1];
--	  if ((!IS_L (prev) && IS_S (wc)) ||
-+	  if ((!IS_JAMO (wc) && !IS_S (wc) && !IS_M (wc)) ||
-+	      (!IS_L (prev) && IS_S (wc)) ||
- 	      (IS_T (prev) && IS_L (wc)) ||
- 	      (IS_V (prev) && IS_L (wc)) ||
- 	      (IS_T (prev) && IS_V (wc)) ||
--	      IS_M(prev))
-+	      IS_M (prev))
- 	    {
--	      /* Draw a syllable. */
-+	      /* Draw a syllable with these jamos. */
- 	      render_syllable (font, jamos, n_jamos, glyphs,
- 			       &n_glyphs, start - text);
- 	      n_jamos = 0;
-@@ -333,7 +349,12 @@ hangul_engine_shape (PangoEngineShape *e
- 	    jamos = g_renew (gunichar, jamos, max_jamos);
- 	}
- 
--      if (IS_S (wc))
-+      if (!IS_JAMO (wc) && !IS_S (wc) && !IS_M (wc))
-+	{
-+	  render_basic (font, wc, glyphs, &n_glyphs, start - text);
-+	  start = g_utf8_next_char (p);
-+	}
-+      else if (IS_S (wc))
- 	{
- 	  jamos[n_jamos++] = L_FROM_S (wc);
- 	  jamos[n_jamos++] = V_FROM_S (wc);