diff options
| author | wiz <wiz> | 2013-02-24 18:41:25 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-02-24 18:41:25 +0000 |
| commit | 010538bf82043731ffb88f59519e2b3d62f00475 (patch) | |
| tree | b95593883a65de4a012e5050035d9090e588861e /devel/pango | |
| parent | 2449170dcab81a5a330a8d6066528582b2daaf4d (diff) | |
| download | pkgsrc-010538bf82043731ffb88f59519e2b3d62f00475.tar.gz | |
Fix xft handling, from schmonz.
Diffstat (limited to 'devel/pango')
| -rw-r--r-- | devel/pango/Makefile | 5 | ||||
| -rw-r--r-- | devel/pango/options.mk | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 286bfc95f55..967fc789ae1 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.177 2013/02/24 15:58:16 schmonz Exp $ +# $NetBSD: Makefile,v 1.178 2013/02/24 18:41:25 wiz Exp $ DISTNAME= pango-1.32.5 PKGREVISION= 1 @@ -21,7 +21,6 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata -CONFIGURE_ARGS+= --without-xft # Carbon has been obsoleted; force turning it off #CONFIGURE_ENV+= ac_cv_header_Carbon_Carbon_h=no @@ -49,8 +48,6 @@ PLIST_VARS+= coretext .if ${OPSYS} == "Darwin" PLIST.coretext= yes -.else -BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 .endif BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 diff --git a/devel/pango/options.mk b/devel/pango/options.mk index 0c9bf74e297..d9ad7819893 100644 --- a/devel/pango/options.mk +++ b/devel/pango/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2012/02/03 22:03:34 adam Exp $ +# $NetBSD: options.mk,v 1.12 2013/02/24 18:41:25 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pango PKG_SUPPORTED_OPTIONS= x11 libthai @@ -15,6 +15,7 @@ PLIST_VARS+= x11 thai # fix for pangox.pc CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib PLIST.x11= yes +BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" @@ -22,6 +23,7 @@ BUILDLINK_DEPMETHOD.libXt?= build # only for configure .include "../../x11/libXt/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --without-xft .endif ### |