update to 1.28.0

this switches to the gnome-2.30 branch

5 files changed, 9 insertions, 53 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 732011efd6d..7d6453ee124 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2010/03/27 15:59:33 taca Exp $
+# $NetBSD: Makefile,v 1.142 2010/05/31 17:57:37 drochner Exp $
 
-DISTNAME=		pango-1.26.2
-PKGREVISION=		2
+DISTNAME=		pango-1.28.0
 CATEGORIES=		devel fonts
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pango/1.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pango/1.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 711a6d41782..87226512685 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2009/10/21 15:42:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.49 2010/05/31 17:57:37 drochner Exp $
 bin/pango-querymodules
 bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
@@ -80,6 +80,7 @@ share/gtk-doc/html/pango/index-1.20.html
 share/gtk-doc/html/pango/index-1.22.html
 share/gtk-doc/html/pango/index-1.24.html
 share/gtk-doc/html/pango/index-1.26.html
+share/gtk-doc/html/pango/index-1.28.html
 share/gtk-doc/html/pango/index-1.4.html
 share/gtk-doc/html/pango/index-1.6.html
 share/gtk-doc/html/pango/index-1.8.html
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 541e197ba59..1a2e4c746a1 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.83 2010/03/27 15:59:33 taca Exp $
+$NetBSD: distinfo,v 1.84 2010/05/31 17:57:37 drochner Exp $
 
-SHA1 (pango-1.26.2.tar.bz2) = 051b6f7b5f98a4c8083ef6a5178cb5255a992b98
-RMD160 (pango-1.26.2.tar.bz2) = 6613bddf643d5c912e6656d84c6671aa6ce88a9d
-Size (pango-1.26.2.tar.bz2) = 1536011 bytes
+SHA1 (pango-1.28.0.tar.bz2) = b77fd452a59e4e11ee8b97193344c945250d5d37
+RMD160 (pango-1.28.0.tar.bz2) = f5fb75ad47f20569081e95441d226f1570725ad9
+Size (pango-1.28.0.tar.bz2) = 1500538 bytes
 SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59
 SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8
-SHA1 (patch-ae) = 9eb458be84f6dfce27fb469d45cc78e34acd9c36
-SHA1 (patch-am) = dc7387b4da24356a56ab8d07ef0462b6f4b3b209
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
deleted file mode 100644
index 42c3aa8c2ef..00000000000
--- a/devel/pango/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2010/02/21 23:51:26 tron Exp $
-
-Avoid high CPU usage under Mac OS X caused by questionable C++ code.
-
-Please look here for details:
-https://bugzilla.gnome.org/show_bug.cgi?id=593240
-
---- pango/opentype/hb-open-type-private.hh.orig	2009-11-26 00:44:17.000000000 +0000
-+++ pango/opentype/hb-open-type-private.hh	2010-02-21 23:41:06.000000000 +0000
-@@ -61,7 +61,7 @@
- /* Null objects */
- 
- /* Global nul-content Null pool.  Enlarge as necessary. */
--static const char NullPool[32] = "";
-+static const void *NullPool[32];
- 
- /* Generic template for nul-content sizeof-sized Null objects. */
- template <typename Type>
diff --git a/devel/pango/patches/patch-am b/devel/pango/patches/patch-am
deleted file mode 100644
index dd03db1b9e0..00000000000
--- a/devel/pango/patches/patch-am
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/03/27 15:59:34 taca Exp $
-
-Fix for CVE-2010-0421.
-
---- pango/opentype/hb-ot-layout.cc.orig	2009-11-26 00:44:17.000000000 +0000
-+++ pango/opentype/hb-ot-layout.cc
-@@ -44,6 +44,8 @@ _hb_ot_layout_init (hb_face_t *face)
- {
-   hb_ot_layout_t *layout = &face->ot_layout;
- 
-+  memset (layout, 0, sizeof (*layout));
-+
-   layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF));
-   layout->gdef = &Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
- 
-@@ -293,7 +295,7 @@ hb_ot_layout_build_glyph_classes (hb_fac
-     return;
- 
-   if (layout->new_gdef.len == 0) {
--    layout->new_gdef.klasses = (unsigned char *) calloc (num_total_glyphs, sizeof (unsigned char));
-+    layout->new_gdef.klasses = (unsigned char *) calloc (count, sizeof (unsigned char));
-     layout->new_gdef.len = count;
-   }
-