From a92c59087a63fa0a2ffe676543cc69482a10ed98 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Mon, 24 Jul 2006 23:20:50 +0000
Subject: Build the atsui module only when the x11 option is disabled, because
 it causes the xlib backend of cairo to crash.  Bump PKGREVISION.

---
 devel/pango/Makefile   | 10 ++--------
 devel/pango/options.mk | 11 ++++++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'devel')

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 4dd74dc0b2a..dc9844e6c94 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2006/07/24 18:09:43 minskim Exp $
+# $NetBSD: Makefile,v 1.81 2006/07/24 23:20:50 minskim Exp $
 
 DISTNAME=		pango-1.12.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel fonts
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
@@ -40,12 +40,6 @@ CONFIGURE_ARGS+=	--with-qt=no
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
 
-.if exists(/System/Library/Frameworks/Carbon.framework)
-PLIST_SUBST+=		CARBON=
-.else
-PLIST_SUBST+=		CARBON="@comment "
-.endif
-
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.10.0
diff --git a/devel/pango/options.mk b/devel/pango/options.mk
index 2a39ac793af..f505795dc25 100644
--- a/devel/pango/options.mk
+++ b/devel/pango/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/07/23 04:59:34 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2006/07/24 23:20:50 minskim Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS=	x11
@@ -10,6 +10,10 @@ PKG_SUGGESTED_OPTIONS=	x11
 ### X11 support
 ###
 .if !empty(PKG_OPTIONS:Mx11)
+# Force not to build the atsui module, because it causes the xlib backend
+# of cairo to crash.
+CONFIGURE_ENV+=	ac_cv_lib_cairo_cairo_atsui_font_face_create_for_atsu_font_id=no
+PLIST_SUBST+=		CARBON="@comment "
 PLIST_SUBST+=		X11=""
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../fonts/Xft2/buildlink3.mk"
@@ -18,4 +22,9 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUBST+=		X11="@comment "
+.if exists(/System/Library/Frameworks/Carbon.framework)
+PLIST_SUBST+=		CARBON=
+.else
+PLIST_SUBST+=		CARBON="@comment "
+.endif
 .endif
-- 
cgit v1.2.3