diff options
| -rw-r--r-- | fonts/Xft2/buildlink3.mk | 8 | ||||
| -rw-r--r-- | fonts/fontconfig/buildlink3.mk | 12 | ||||
| -rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 3 | ||||
| -rw-r--r-- | x11/xcursor/buildlink3.mk | 14 |
5 files changed, 27 insertions, 14 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]) diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index b8b25a734c4..88e4d82b267 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/02/18 16:35:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/02/18 16:53:52 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -127,6 +127,8 @@ BUILDLINK_DEPENDS+= Xrandr .if !empty(XRANDR_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.Xrandr:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrandr= ${X11BASE} +BUILDLINK_USE_BUILTIN.randrext= yes +BUILDLINK_USE_BUILTIN.Xrender= yes . endif USE_X11= yes . if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[nN][oO]) diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index ff677aecef0..6636022a56d 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2004/02/18 16:35:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2004/02/18 16:53:52 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -129,6 +129,7 @@ BUILDLINK_DEPENDS+= Xrender .if !empty(XRENDER_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_PREFIX.Xrender= ${X11BASE} +BUILDLINK_USE_BUILTIN.render= yes . endif USE_X11= yes . if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[nN][oO]) diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 970f07eb7a8..bd1c42df907 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/18 16:53:52 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -92,14 +92,18 @@ BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 . if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_PREFIX.xcursor= ${X11BASE} BUILDLINK_FILES.xcursor+= lib/pkgconfig/xcursor.pc -. else -. if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) +BUILDLINK_USE_BUILTIN.Xrender= yes +. endif + +USE_X11= yes BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 + +. if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) +. if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO]) . include "../../x11/Xfixes/buildlink3.mk" -. include "../../x11/Xrender/buildlink3.mk" . endif +. include "../../x11/Xrender/buildlink3.mk" . endif -USE_X11= yes .endif # XCURSOR_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |