diff options
| author | tron <tron@pkgsrc.org> | 2008-08-19 18:10:22 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-08-19 18:10:22 +0000 |
| commit | 98d037b9d88267188b2e7061e5718ecac2378064 (patch) | |
| tree | 09a072273263ed2f6dbbb3737b163a337596345b | |
| parent | 1a7aeb8ecfbec5266a4afecd64cd5300c10ae396 (diff) | |
| download | pkgsrc-98d037b9d88267188b2e7061e5718ecac2378064.tar.gz | |
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.
| -rw-r--r-- | devel/pango/Makefile | 6 | ||||
| -rw-r--r-- | devel/pango/options.mk | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 2b63606ea43..63014995c2b 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -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 @@ CONFIGURE_ENV+= F77=${FALSE:Q} 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 --git a/devel/pango/options.mk b/devel/pango/options.mk index 558f09386f3..52b97d973da 100644 --- a/devel/pango/options.mk +++ b/devel/pango/options.mk @@ -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 @@ PLIST.x11= yes .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 |