summaryrefslogtreecommitdiff
path: root/x11/renderproto
diff options
context:
space:
mode:
authorcube <cube>2008-10-05 21:36:32 +0000
committercube <cube>2008-10-05 21:36:32 +0000
commit2c8f273533926f8b1e1655584dcb2080f2e79048 (patch)
tree7e3acb4e1cfd62c69446a0e9e96faf8cfb567d76 /x11/renderproto
parent65393655c330983dfd10414dd9fbf359b7d9ebd8 (diff)
downloadpkgsrc-2c8f273533926f8b1e1655584dcb2080f2e79048.tar.gz
Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current. Thanks a lot to all who helped, especially Matthias Scheler who did repeated tests on Mac OS X and older versions of NetBSD to make sure the support for those platforms wouldn't be broken (or at least, not fatally, as I would still expect a few hiccups here and there, because there is only so much one can test in such limited time). On the infrastructure side, this branch brings pkgconfig-builtin.mk, in order to write very easily new builtin.mk files. It can actually handle more than just pkgconfig files, but it will provide a version if it finds such a file. x11.builtin.mk has also been made more useful and now all existing (and future!) native-X11-related builtin.mk files should include it.
Diffstat (limited to 'x11/renderproto')
-rw-r--r--x11/renderproto/builtin.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/x11/renderproto/builtin.mk b/x11/renderproto/builtin.mk
index 37215f0b41a..091418363ec 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.9 2008/10/05 21:36:34 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