Update to 1.8.1:

pOverview of changes between 1.8.0 and 1.8.1
===========================================
* Fix several problems with conjuct formation in Sinhala [Harshula]
* Fix problems that were causing fonts to be missized and
  not print in GtkHTML [Ross Burton]
* Fix compilation with old fontconfig [Vincent Noel] and
  old FreeType [Andrew P. Lentvorski, Jr]
* Work around problem with glyphs in monospace fonts being truncated
  by Xft [Billy Biggs]
* Misc bug fixes [Damon Chaplin, Matthias Clasen, Kees Cook, Nick Lamb,
  Adam Sampson,Manish Singh, Morten Welinder]
* Misc build fixes [Sebastien Bacher, Matthias Clasen, Tor Lillquist]
* Doc improvements [Torsten Schoenfeld, Billy Biggs, Morten Welinder]

5 files changed, 11 insertions, 28 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index ea56d0a2c9d..53543487b04 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2004/12/26 22:03:08 rh Exp $
+# $NetBSD: Makefile,v 1.51 2005/03/05 13:49:36 wiz Exp $
 #
 
-DISTNAME=		pango-1.8.0
+DISTNAME=		pango-1.8.1
 CATEGORIES=		devel fonts
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index e40b982060f..29d180cc194 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2004/12/24 10:03:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.21 2005/03/05 13:49:36 wiz Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -81,7 +81,6 @@ share/doc/pango/pango.devhelp
 share/doc/pango/pango.html
 share/doc/pango/rendering.html
 share/doc/pango/right.png
-share/doc/pango/style.css
 share/doc/pango/tools.html
 share/doc/pango/up.png
 @dirrm share/doc/pango
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 5a6d5ba00d2..3229a026801 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.25 2005/02/23 22:24:30 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/03/05 13:49:36 wiz Exp $
 
-SHA1 (pango-1.8.0.tar.bz2) = 186cb01215ca92da6ae76b84069a33b4c493822e
-RMD160 (pango-1.8.0.tar.bz2) = 9dcd4294c1216feebf253037e1db8e0b86befea0
-Size (pango-1.8.0.tar.bz2) = 979183 bytes
-SHA1 (patch-aa) = ea2fe223d9c7da2a19f1699124a59e6081ab8e9f
-SHA1 (patch-ab) = 75970a50b8a3c08891b0307e4a0b6377ea14eafc
+SHA1 (pango-1.8.1.tar.bz2) = 46d6992cd5782a3ca7623f0d91f31b6bdffb0346
+RMD160 (pango-1.8.1.tar.bz2) = a65832954fa495fdb1f72076f15d61116ebd91ed
+Size (pango-1.8.1.tar.bz2) = 996389 bytes
+SHA1 (patch-aa) = 1058468d520a80789bc2bfeed581237ed8cb0d0a
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index fd970c93267..da72859d1be 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2004/05/09 13:16:02 grant Exp $
+$NetBSD: patch-aa,v 1.10 2005/03/05 13:49:36 wiz Exp $
 
---- pango/opentype/Makefile.in.orig	2004-03-17 05:11:11.000000000 +1100
+--- pango/opentype/Makefile.in.orig	2005-03-04 21:08:23.000000000 +0100
 +++ pango/opentype/Makefile.in
-@@ -277,7 +277,8 @@ ottest_SOURCES = \
+@@ -280,7 +280,8 @@ ottest_SOURCES = \
  
  ottest_LDADD = \
  	libpango-ot.la	\
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
deleted file mode 100644
index b24b65de3b9..00000000000
--- a/devel/pango/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2004/12/28 10:48:09 minskim Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=161568
-
---- pango/pangofc-fontmap.c.orig	2004-12-15 20:50:49.000000000 -0600
-+++ pango/pangofc-fontmap.c
-@@ -535,7 +535,7 @@ pango_fc_convert_weight_to_fc (PangoWeig
-   if (pango_weight < (PANGO_WEIGHT_LIGHT + PANGO_WEIGHT_NORMAL) / 2)
-     return FC_WEIGHT_LIGHT;
-   else if (pango_weight < (500 /* PANGO_WEIGHT_MEDIUM */ + PANGO_WEIGHT_SEMIBOLD) / 2)
--    return FC_WEIGHT_NORMAL;
-+    return FC_WEIGHT_MEDIUM;
-   else if (pango_weight < (PANGO_WEIGHT_SEMIBOLD + PANGO_WEIGHT_BOLD) / 2)
-     return FC_WEIGHT_DEMIBOLD;
-   else if (pango_weight < (PANGO_WEIGHT_BOLD + PANGO_WEIGHT_ULTRABOLD) / 2)