diff options
| author | jlam <jlam> | 2004-02-19 18:51:01 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-19 18:51:01 +0000 |
| commit | 71ec9c937d3c3c965a84325fda059a2b9a7f25f8 (patch) | |
| tree | 2a215fb740385ad8bf9e506fdd8f337ef447923f /fonts | |
| parent | 7b6509a8fba99e41a36c7f0499e39a31c6f41cb4 (diff) | |
| download | pkgsrc-71ec9c937d3c3c965a84325fda059a2b9a7f25f8.tar.gz | |
Move the settings, which force the use of builtin versions of dependencies
if the builtin version of the package is being used, into a global
location so that they're always executed.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/buildlink3.mk | 13 | ||||
| -rw-r--r-- | fonts/fontconfig/buildlink3.mk | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 1152cc85e32..1835b6dc8a7 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:53:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/19 18:51:01 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -124,12 +124,15 @@ BUILDLINK_DEPENDS+= Xft2 . endif .endif -.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 +.if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= yes BUILDLINK_USE_BUILTIN.Xrender= yes +.endif + +.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 . 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 b3c9194bec0..a46b3db1225 100644 --- a/fonts/fontconfig/buildlink3.mk +++ b/fonts/fontconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/18 16:53:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/19 18:51:01 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ @@ -98,13 +98,16 @@ BUILDLINK_DEPENDS+= fontconfig . endif .endif -.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 +.if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= yes BUILDLINK_USE_BUILTIN.freetype2= yes BUILDLINK_USE_BUILTIN.expat= yes +.endif + +.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 . endif USE_X11= yes |