[pkgsrc/trunk]: pkgsrc/devel/pango Don't build the "atsui" backend under Mac ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3d5b49c6c0f
branches:  trunk
changeset: 546033:b3d5b49c6c0f
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Aug 19 18:10:22 2008 +0000

description:
Don't build the "atsui" backend under Mac OS X when we are building with
X11 support. It also doesn't work properly in the non-X11 case (at least
with XChat) but is essential for a non-X11 GTK+ 2.*.

Bump the package revision because of this change.

diffstat:

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

diffs (46 lines):

diff -r af8e3e9c7084 -r b3d5b49c6c0f devel/pango/Makefile
--- a/devel/pango/Makefile      Tue Aug 19 17:52:20 2008 +0000
+++ b/devel/pango/Makefile      Tue Aug 19 18:10:22 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2008/07/14 03:56:28 tnn Exp $
+# $NetBSD: Makefile,v 1.116 2008/08/19 18:10:22 tron Exp $
 
 DISTNAME=              pango-1.20.5
+PKGREVISION=           1
 CATEGORIES=            devel fonts
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pango/1.20/}
 EXTRACT_SUFX=          .tar.bz2
@@ -39,9 +40,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"
 
diff -r af8e3e9c7084 -r b3d5b49c6c0f devel/pango/options.mk
--- a/devel/pango/options.mk    Tue Aug 19 17:52:20 2008 +0000
+++ b/devel/pango/options.mk    Tue Aug 19 18:10:22 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/04/22 12:15:38 tron Exp $
+# $NetBSD: options.mk,v 1.8 2008/08/19 18:10:22 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS= x11
@@ -20,6 +20,14 @@
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=    build # only for configure
 .include "../../x11/libXt/buildlink3.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=        ac_cv_header_Carbon_Carbon_h=no
+.endif
 .else
 CONFIGURE_ARGS+=       --without-x
+
+.if ${OPSYS} == "Darwin"
+PLIST.carbon=  yes
 .endif
+.endif