diff options
| author | tron <tron> | 2008-04-11 10:26:23 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-04-11 10:26:23 +0000 |
| commit | 36cbd2bd3ca28c909b487dbd29b5b7b1a5b0cf7d (patch) | |
| tree | 8b106f319cc5ed33acc65f515a1fe6cc0e3a405a /devel | |
| parent | b557de873aa9c1cfa4a6adab81a1aae863bd6f83 (diff) | |
| download | pkgsrc-36cbd2bd3ca28c909b487dbd29b5b7b1a5b0cf7d.tar.gz | |
The code which tries to disable the "atsui" backend under Mac OS X if
the package is compiled with X11 support doesn't work anymore. Don't try
to disable it because it doesn't seem to break the X11 backend anymore
(tested with XChat). Bump package revision because of package list changes
under Mac OS X.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pango/Makefile | 9 | ||||
| -rw-r--r-- | devel/pango/options.mk | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile index bd8eafd732b..aee9c97fe60 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.108 2008/04/10 12:14:43 drochner Exp $ +# $NetBSD: Makefile,v 1.109 2008/04/11 10:26:23 tron Exp $ DISTNAME= pango-1.20.1 +PKGREVISION= 1 CATEGORIES= devel fonts MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.20/} EXTRACT_SUFX= .tar.bz2 @@ -38,6 +39,12 @@ CONFIGURE_ENV+= F77=${FALSE:Q} CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules +.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.14.0 diff --git a/devel/pango/options.mk b/devel/pango/options.mk index 3163c7d35d6..fa3906579bb 100644 --- a/devel/pango/options.mk +++ b/devel/pango/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/01/03 22:25:22 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/11 10:26:23 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pango PKG_SUPPORTED_OPTIONS= x11 @@ -15,8 +15,7 @@ PKG_SUGGESTED_OPTIONS= x11 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_SUBST+= CARBON="@comment " -PLIST_SUBST+= X11="" +PLIST_SUBST+= X11= .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" @@ -25,9 +24,4 @@ BUILDLINK_DEPMETHOD.libXt?= build # only for configure .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 |