diff options
| author | minskim <minskim> | 2006-07-24 23:20:50 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2006-07-24 23:20:50 +0000 |
| commit | a92c59087a63fa0a2ffe676543cc69482a10ed98 (patch) | |
| tree | fe52c0ee9f79fcf86cc77249ccbddb9e4833e586 /devel | |
| parent | ae89e0c8e3f54f7a18239b3e3fd54b1db151085c (diff) | |
| download | pkgsrc-a92c59087a63fa0a2ffe676543cc69482a10ed98.tar.gz | |
Build the atsui module only when the x11 option is disabled, because it
causes the xlib backend of cairo to crash. Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pango/Makefile | 10 | ||||
| -rw-r--r-- | devel/pango/options.mk | 11 |
2 files changed, 12 insertions, 9 deletions
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 |