diff options
| author | dholland <dholland> | 2013-06-07 17:43:40 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-06-07 17:43:40 +0000 |
| commit | b6d220342aefdbed0e87c83fc21563ac9ee1cc2b (patch) | |
| tree | 84de62411a038d75b58bcb3b1cbcb40f7fc4635c /x11 | |
| parent | 5f59cc14e58204954e1e34af01ead71139cc3179 (diff) | |
| download | pkgsrc-b6d220342aefdbed0e87c83fc21563ac9ee1cc2b.tar.gz | |
Remove special-case dependency-checking logic now handled by the
general solution I checked in in bsd.buildlink3.mk.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXft/builtin.mk | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/x11/libXft/builtin.mk b/x11/libXft/builtin.mk index a5674fe5f16..af4262fd52a 100644 --- a/x11/libXft/builtin.mk +++ b/x11/libXft/builtin.mk @@ -1,11 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2013/06/05 12:12:07 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.2 2013/06/07 17:43:40 dholland Exp $ BUILTIN_PKG:= libXft @@ -53,17 +46,6 @@ MAKEVARS+= BUILTIN_PKG.libXft ### 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 libXft. If we need to use the pkgsrc -# versions of any of these, then also use the pkgsrc version of -# libXft. -# -.if !empty(USE_BUILTIN.Xrender:M[nN][oO]) -USE_BUILTIN.libXft= no -.endif -.if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) -USE_BUILTIN.libXft= no -.endif .if !defined(USE_BUILTIN.libXft) . if ${PREFER.libXft} == "pkgsrc" |