diff options
| author | cube <cube> | 2008-09-26 19:59:46 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-09-26 19:59:46 +0000 |
| commit | 61fd2f50f0cca2a8c61042937e1cdeea4dff95fc (patch) | |
| tree | 4d3bb65164934f917b611104cdf780ef18228d5a /x11 | |
| parent | b76ccfbb40c2d84ac4c4816bc82e262c93de0312 (diff) | |
| download | pkgsrc-61fd2f50f0cca2a8c61042937e1cdeea4dff95fc.tar.gz | |
Adapt to new x11.builtin.mk.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/randrproto/builtin.mk | 11 | ||||
| -rw-r--r-- | x11/renderproto/builtin.mk | 11 | ||||
| -rw-r--r-- | x11/xextproto/builtin.mk | 11 |
3 files changed, 12 insertions, 21 deletions
diff --git a/x11/randrproto/builtin.mk b/x11/randrproto/builtin.mk index 94fa8856656..3447865ac27 100644 --- a/x11/randrproto/builtin.mk +++ b/x11/randrproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2007/02/22 19:27:27 wiz Exp $ +# $NetBSD: builtin.mk,v 1.4.16.1 2008/09/26 19:59:46 cube Exp $ # TODO: builtin.mk failed to use native on XFree86 # the two headers are identical with native XFree86 @@ -76,6 +76,9 @@ MAKEVARS+= USE_BUILTIN.randrproto ### 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.randrproto?= no .if !empty(CHECK_BUILTIN.randrproto:M[nN][oO]) @@ -83,10 +86,4 @@ CHECK_BUILTIN.randrproto?= no BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.0 . endif -. if !empty(USE_BUILTIN.randrproto:M[yY][eE][sS]) -BUILDLINK_PREFIX.randrproto= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. endif - .endif # CHECK_BUILTIN.randrproto diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk index 37215f0b41a..cf8b80b4a7c 100644 --- a/x11/renderproto/builtin.mk +++ b/x11/renderproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2006/12/17 16:06:31 joerg Exp $ +# $NetBSD: builtin.mk,v 1.8.18.1 2008/09/26 19:59:46 cube Exp $ BUILTIN_PKG:= renderproto @@ -74,6 +74,9 @@ MAKEVARS+= USE_BUILTIN.renderproto ### 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.renderproto?= no .if !empty(CHECK_BUILTIN.renderproto:M[nN][oO]) @@ -81,12 +84,6 @@ CHECK_BUILTIN.renderproto?= no BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9 . endif -. if !empty(USE_BUILTIN.renderproto:M[yY][eE][sS]) -BUILDLINK_PREFIX.renderproto= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. endif - .endif # CHECK_BUILTIN.renderproto CHECK_BUILTIN.renderproto?= no diff --git a/x11/xextproto/builtin.mk b/x11/xextproto/builtin.mk index 8e8dd7e329f..f1d454ed157 100644 --- a/x11/xextproto/builtin.mk +++ b/x11/xextproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2007/02/22 19:27:28 wiz Exp $ +# $NetBSD: builtin.mk,v 1.5.16.1 2008/09/26 19:59:46 cube Exp $ BUILTIN_PKG:= xextproto @@ -58,15 +58,12 @@ MAKEVARS+= USE_BUILTIN.xextproto ### 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.xextproto?= no .if !empty(CHECK_BUILTIN.xextproto:M[nN][oO]) -. if !empty(USE_BUILTIN.xextproto:M[yY][eE][sS]) -BUILDLINK_PREFIX.xextproto= ${X11BASE} -. include "../../mk/x11.buildlink3.mk" -. include "../../mk/x11.builtin.mk" -. endif - # If we are using the builtin version, check whether it has a xextproto.pc # file or not. If the latter, generate a fake one. . if !empty(USE_BUILTIN.xextproto:M[Yy][Ee][Ss]) |