Fri Sep 26 19:58:13 2008 UTC ()
Add a check for CHECK_BUILTIN.<BUILTIN_PKG>, set BUILDLINK_PREFIX in
we're using the built-in version and include x11.buildlink3.mk.  This is
the way x11.builtin.mk is currently used by all its consumer.  This will
factor a bit of code out of the existing builtin.mk files and will make it
a lot easier to use by other builtim.mk files.


(cube)
diff -r1.2 -r1.2.20.1 pkgsrc/mk/x11.builtin.mk
cvs diff -r1.2 -r1.2.20.1 pkgsrc/mk/x11.builtin.mk (expand / switch to unified diff)

--- pkgsrc/mk/x11.builtin.mk 2006/10/26 17:08:08 1.2
+++ pkgsrc/mk/x11.builtin.mk 2008/09/26 19:58:13 1.2.20.1
@@ -1,8 +1,19 @@ @@ -1,8 +1,19 @@
1# $NetBSD: x11.builtin.mk,v 1.2 2006/10/26 17:08:08 rillig Exp $ 1# $NetBSD: x11.builtin.mk,v 1.2.20.1 2008/09/26 19:58:13 cube Exp $
2# 2#
3# x11.builtin.mk will include the builtin.mk file from the appropriate 3# x11.builtin.mk will include the builtin.mk file from the appropriate
4# X11 distribution. 4# X11 distribution.
5# 5#
 6# BUILTIN_PKG and USE_BUILTIN.<BUILTIN_PKG> must be defined by the caller
6 7
7.include "../../mk/x11.version.mk" 8CHECK_BUILTIN.${BUILTIN_PKG}?= no
8.include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk" 9.if !empty(CHECK_BUILTIN.${BUILTIN_PKG}:M[Nn][Oo])
 10. if !empty(USE_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
 11
 12BUILDLINK_PREFIX.${BUILTIN_PKG}= ${X11BASE}
 13
 14. include "../../mk/x11.buildlink3.mk"
 15. include "../../mk/x11.version.mk"
 16. include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
 17
 18. endif
 19.endif