[pkgsrc/trunk]: pkgsrc/devel/pango After "atsui" support was removed from "ca...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78d63d7be321
branches:  trunk
changeset: 541426:78d63d7be321
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Apr 22 12:15:38 2008 +0000

description:
After "atsui" support was removed from "cairo" it is no longer available
in "pango", too. Fix package list (for Mac OS X) and bump package revision.

diffstat:

 devel/pango/Makefile   |  8 ++------
 devel/pango/PLIST      |  4 +---
 devel/pango/options.mk |  5 +----
 3 files changed, 4 insertions(+), 13 deletions(-)

diffs (68 lines):

diff -r 0ce6a99f633b -r 78d63d7be321 devel/pango/Makefile
--- a/devel/pango/Makefile      Tue Apr 22 11:31:18 2008 +0000
+++ b/devel/pango/Makefile      Tue Apr 22 12:15:38 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.111 2008/04/13 13:00:55 tnn Exp $
+# $NetBSD: Makefile,v 1.112 2008/04/22 12:15:38 tron Exp $
 
 DISTNAME=              pango-1.20.2
+PKGREVISION=           1
 CATEGORIES=            devel fonts
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pango/1.20/}
 EXTRACT_SUFX=          .tar.bz2
@@ -38,11 +39,6 @@
 
 CHECK_FILES_SKIP+=     ${PREFIX}/libdata/pango/pango.modules
 
-PLIST_VARS+=           carbon
-.if exists(/System/Library/Frameworks/Carbon.framework)
-PLIST.carbon=          yes
-.endif
-
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.14.0
diff -r 0ce6a99f633b -r 78d63d7be321 devel/pango/PLIST
--- a/devel/pango/PLIST Tue Apr 22 11:31:18 2008 +0000
+++ b/devel/pango/PLIST Tue Apr 22 12:15:38 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2008/04/12 22:43:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.39 2008/04/22 12:15:38 tron Exp $
 bin/pango-querymodules
 ${PLIST.x11}bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
@@ -26,7 +26,6 @@
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
-${PLIST.carbon}include/pango-1.0/pango/pangoatsui.h
 include/pango-1.0/pango/pangocairo.h
 include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
@@ -42,7 +41,6 @@
 ${PLIST.x11}lib/libpangoxft-1.0.la
 lib/pango/1.6.0/modules/pango-arabic-fc.la
 lib/pango/1.6.0/modules/pango-arabic-lang.la
-${PLIST.carbon}lib/pango/1.6.0/modules/pango-basic-atsui.la
 lib/pango/1.6.0/modules/pango-basic-fc.la
 ${PLIST.x11}lib/pango/1.6.0/modules/pango-basic-x.la
 lib/pango/1.6.0/modules/pango-hangul-fc.la
diff -r 0ce6a99f633b -r 78d63d7be321 devel/pango/options.mk
--- a/devel/pango/options.mk    Tue Apr 22 11:31:18 2008 +0000
+++ b/devel/pango/options.mk    Tue Apr 22 12:15:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/22 12:15:38 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS= x11
@@ -12,9 +12,6 @@
 ### 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
 # fix for pangox.pc
 CONFIGURE_ENV+=                X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib
 PLIST.x11=             yes