[pkgsrc/trunk]: pkgsrc/devel/pango The code which tries to disable the "atsui...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6dc0f6fc7ad6
branches:  trunk
changeset: 540927:6dc0f6fc7ad6
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Apr 11 10:26:23 2008 +0000

description:
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:

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

diffs (54 lines):

diff -r aa3d3158e9cc -r 6dc0f6fc7ad6 devel/pango/Makefile
--- a/devel/pango/Makefile      Fri Apr 11 10:11:59 2008 +0000
+++ b/devel/pango/Makefile      Fri Apr 11 10:26:23 2008 +0000
@@ -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 @@
 
 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 -r aa3d3158e9cc -r 6dc0f6fc7ad6 devel/pango/options.mk
--- a/devel/pango/options.mk    Fri Apr 11 10:11:59 2008 +0000
+++ b/devel/pango/options.mk    Fri Apr 11 10:26:23 2008 +0000
@@ -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 @@
 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 @@
 .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