diff options
| author | jlam <jlam> | 2004-02-18 16:53:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-18 16:53:52 +0000 |
| commit | a7e7a0979a263c1cd5b7673fb625f49f7c305911 (patch) | |
| tree | 46f8161673c836a64f48aee8c58566f5162ba305 /x11 | |
| parent | ff939e0dc77366add1742d37d4ed3fb8f9a9aba1 (diff) | |
| download | pkgsrc-a7e7a0979a263c1cd5b7673fb625f49f7c305911.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 'x11')
| -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 |
3 files changed, 14 insertions, 7 deletions
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/+$//} |