summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-18 16:53:52 +0000
committerjlam <jlam@pkgsrc.org>2004-02-18 16:53:52 +0000
commitd51a733eebcd4f2472a6d3d194abbd613d7241d3 (patch)
tree46f8161673c836a64f48aee8c58566f5162ba305 /fonts
parentbf6e059da4895ab456eb5a60bfc41a648bc78a2b (diff)
downloadpkgsrc-d51a733eebcd4f2472a6d3d194abbd613d7241d3.tar.gz
If we're using the built-in version of the software, then we must also
be using built-in versions of any other software pulled in via buildlink3.mk files.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/Xft2/buildlink3.mk8
-rw-r--r--fonts/fontconfig/buildlink3.mk12
2 files changed, 13 insertions, 7 deletions
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 3b72cb9dad6..1152cc85e32 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/18 16:35:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:53:52 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+
@@ -126,8 +126,10 @@ BUILDLINK_DEPENDS+= Xft2
.if !empty(XFT2_BUILDLINK3_MK:M+)
. if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xft2= ${X11BASE}
-BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc
+BUILDLINK_PREFIX.Xft2= ${X11BASE}
+BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc
+BUILDLINK_USE_BUILTIN.fontconfig= yes
+BUILDLINK_USE_BUILTIN.Xrender= yes
. endif
USE_X11= yes
. if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[nN][oO])
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index f1042c82f02..b3c9194bec0 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/18 16:53:52 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+
@@ -100,10 +100,14 @@ BUILDLINK_DEPENDS+= fontconfig
.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
. if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS])
-BUILDLINK_PREFIX.fontconfig= ${X11BASE}
-BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc
+BUILDLINK_PREFIX.fontconfig= ${X11BASE}
+BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc
+BUILDLINK_USE_BUILTIN.zlib= yes
+BUILDLINK_USE_BUILTIN.freetype2= yes
+BUILDLINK_USE_BUILTIN.expat= yes
. endif
-USE_X11= yes
+
+USE_X11= yes
BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
. if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[nN][oO])