diff options
| author | tron <tron> | 2013-06-05 07:15:08 +0000 |
|---|---|---|
| committer | tron <tron> | 2013-06-05 07:15:08 +0000 |
| commit | b6e506acf073131e43676265c119b277b690aabb (patch) | |
| tree | 3740e423348d6d1aa32475c963f51b9f3037d3bb /fonts | |
| parent | d9c68003c543f872f72c475e3203f7fb77294cc2 (diff) | |
| download | pkgsrc-b6e506acf073131e43676265c119b277b690aabb.tar.gz | |
Make sure that we perform builtin detection for "fontconfig" and
"Xrender" first. This avoids using the builtin "Xft2" if the builtin
"fontconfig" is reject.
This fixes another regression caused by the "pango" upgrade and the fix
for PKG pkg/47882.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/builtin.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index c6a49e18321..ec593bfa52b 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,11 @@ -# $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:12 joerg Exp $ +# $NetBSD: builtin.mk,v 1.19 2013/06/05 07:15:08 tron Exp $ + +.if !defined(USE_BUILTIN.fontconfig) +.include "../../fonts/fontconfig/builtin.mk" +.endif +.if !defined(USE_BUILTIN.Xrender) +.include "../../x11/Xrender/builtin.mk" +.endif BUILTIN_PKG:= Xft2 @@ -51,10 +58,10 @@ MAKEVARS+= BUILTIN_PKG.Xft2 # versions of any of these, then also use the pkgsrc version of # Xft2. # -.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO]) +.if !empty(USE_BUILTIN.Xrender:M[nN][oO]) USE_BUILTIN.Xft2= no .endif -.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO]) +.if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) USE_BUILTIN.Xft2= no .endif |