diff options
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/builtin.mk | 10 | ||||
| -rw-r--r-- | fonts/fontconfig/builtin.mk | 8 | ||||
| -rw-r--r-- | fonts/libfontenc/builtin.mk | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index ac3dba3bf8e..bc4c26f8794 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.16 2008/01/05 17:24:12 tron Exp $ +# $NetBSD: builtin.mk,v 1.16.8.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= Xft2 @@ -86,6 +86,9 @@ MAKEVARS+= USE_BUILTIN.Xft2 ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.Xft2?= no .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO]) @@ -93,9 +96,4 @@ CHECK_BUILTIN.Xft2?= no BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2 . endif -. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) -BUILDLINK_PREFIX.Xft2= ${X11BASE} -BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc -. endif - .endif # CHECK_BUILTIN.Xft2 diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk index d046f36709a..a7d24fcf302 100644 --- a/fonts/fontconfig/builtin.mk +++ b/fonts/fontconfig/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $ +# $NetBSD: builtin.mk,v 1.9.22.1 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= fontconfig @@ -85,6 +85,9 @@ MAKEVARS+= USE_BUILTIN.fontconfig ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### + +.include "../../mk/x11.builtin.mk" + CHECK_BUILTIN.fontconfig?= no .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO]) @@ -94,9 +97,6 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . endif . if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) -BUILDLINK_PREFIX.fontconfig= ${X11BASE} -BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc - USE_BUILTIN.expat= yes USE_BUILTIN.freetype2= yes USE_BUILTIN.zlib= yes diff --git a/fonts/libfontenc/builtin.mk b/fonts/libfontenc/builtin.mk index f14230c083f..91ba21f56b9 100644 --- a/fonts/libfontenc/builtin.mk +++ b/fonts/libfontenc/builtin.mk @@ -1,6 +1,7 @@ -# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/18 17:33:27 cube Exp $ +# $NetBSD: builtin.mk,v 1.1.2.2 2008/09/26 21:15:18 cube Exp $ BUILTIN_PKG:= libfontenc PKGCONFIG_FILE.libfontenc= ${X11BASE}/lib/pkgconfig/fontenc.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" |