diff options
author | dholland <dholland@pkgsrc.org> | 2013-06-07 17:43:40 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2013-06-07 17:43:40 +0000 |
commit | 157e78195c94e70a0280ee6c47c03efe699db2ab (patch) | |
tree | 84de62411a038d75b58bcb3b1cbcb40f7fc4635c /fonts | |
parent | 38527894c5c6b06ef0cff8fa895b948fc1a2622d (diff) | |
download | pkgsrc-157e78195c94e70a0280ee6c47c03efe699db2ab.tar.gz |
Remove special-case dependency-checking logic now handled by the
general solution I checked in in bsd.buildlink3.mk.
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/Xft2/builtin.mk | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index ec593bfa52b..69341884aa9 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,11 +1,4 @@ -# $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 +# $NetBSD: builtin.mk,v 1.20 2013/06/07 17:43:40 dholland Exp $ BUILTIN_PKG:= Xft2 @@ -53,17 +46,6 @@ MAKEVARS+= BUILTIN_PKG.Xft2 ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). ### -# -# These are dependencies of Xft2. If we need to use the pkgsrc -# versions of any of these, then also use the pkgsrc version of -# Xft2. -# -.if !empty(USE_BUILTIN.Xrender:M[nN][oO]) -USE_BUILTIN.Xft2= no -.endif -.if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) -USE_BUILTIN.Xft2= no -.endif .if !defined(USE_BUILTIN.Xft2) . if ${PREFER.Xft2} == "pkgsrc" |