Add a somewhat odd workaround to stop Mac OS X's toolchain (at least

Xcode 3.2.1) from breaking "pango" under Mac OS X. Bump package
revision because the package would previously build but not work.

[No, I have no idea why adding a random fprintf() in that loop avoids
 the problem. But it is the only trick I have found so far.]

4 files changed, 49 insertions, 16 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 0e2a0edc069..9d978d4fc19 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2009/11/20 11:56:08 drochner Exp $
+# $NetBSD: Makefile,v 1.137 2009/11/23 17:18:52 tron Exp $
 
 DISTNAME=		pango-1.26.1
+PKGREVISION=		1
 CATEGORIES=		devel fonts
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pango/1.26/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 2458eefb0f9..18c81f46643 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2009/11/22 19:14:41 sno Exp $
+$NetBSD: distinfo,v 1.79 2009/11/23 17:18:52 tron Exp $
 
 SHA1 (pango-1.26.1.tar.bz2) = d4891a34a46ddc9a6e37bcdf0fef4cbab7391b7b
 RMD160 (pango-1.26.1.tar.bz2) = cc9e3bd5d4cdfcb9c2298b75c4b02fee31816184
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59
 SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8
 SHA1 (patch-ac) = 04da33d33698f7c1e7776e7c050d4fb7043ff0a3
 SHA1 (patch-ad) = 96b82ee6685eed69e324f3d1d7139a2762ae1a30
+SHA1 (patch-ae) = 2ebb8a0886a745fbfb0106dece91c5c990982ef8
diff --git a/devel/pango/hacks.mk b/devel/pango/hacks.mk
deleted file mode 100644
index 2ce71eeb15c..00000000000
--- a/devel/pango/hacks.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2009/10/22 19:54:03 tron Exp $
-
-.if !defined(PANGO_HACKS_MK)
-PANGO_HACKS_MK=	# defined
-
-# Avoid high CPU usage caused by code generaton problems in Apple's G++.
-# Please look here for details:
-# https://bugzilla.gnome.org/show_bug.cgi?id=593240
-
-.  if ${OPSYS} == "Darwin"
-PKG_HACKS+=	darwin-pango-code-gen-bug
-CFLAGS=		-pipe -O0 -g
-.  endif
-.endif
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
new file mode 100644
index 00000000000..08c5644fe35
--- /dev/null
+++ b/devel/pango/patches/patch-ae
@@ -0,0 +1,45 @@
+$NetBSD: patch-ae,v 1.4 2009/11/23 17:18:52 tron Exp $
+
+Avoid high CPU usage caused by code generaton problems in Apple's toolchain.
+
+Please look here for details:
+https://bugzilla.gnome.org/show_bug.cgi?id=593240
+
+--- pango/pango-ot-info.c.orig	2009-11-17 16:35:44.000000000 +0000
++++ pango/pango-ot-info.c	2009-11-23 13:55:29.000000000 +0000
+@@ -536,13 +536,22 @@
+ {
+   unsigned int i;
+ 
++#if defined(__APPLE__) && defined(__GNUC__)
++  (void)fflush(stdout);
++#endif
++
+   for (i = 0; i < ruleset->rules->len; i++)
+     {
+-      PangoOTRule *rule = &g_array_index (ruleset->rules, PangoOTRule, i);
++      PangoOTRule *rule;
+       hb_mask_t mask;
+       unsigned int lookup_count, j;
+       unsigned int lookup_indexes[1000];
+ 
++#if defined(__APPLE__) && defined(__GNUC__)
++      (void)fprintf(stdout, "%d", i);
++#endif
++
++      rule = &g_array_index (ruleset->rules, const PangoOTRule, i);
+       if (rule->table_type != PANGO_OT_TABLE_GSUB)
+ 	continue;
+ 
+@@ -561,6 +570,11 @@
+ 					lookup_indexes[j],
+ 					rule->property_bit);
+     }
++
++#if defined(__APPLE__) && defined(__GNUC__)
++  (void)fpurge(stdout);
++#endif
++
+ }
+ 
+ void