[pkgsrc/trunk]: pkgsrc/mk Add a workaround for X11_TYPE modular so that x11.b...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f5acb582510
branches:  trunk
changeset: 547983:4f5acb582510
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Oct 06 12:58:11 2008 +0000

description:
Add a workaround for X11_TYPE modular so that x11.bl3.mk is not included.
Ideally, X11_TYPE modular would set up such packages so that
PREFER.<BUILTIN_PKG> is set to "pkgsrc", but it's a more complex change.

Reported by Adam Hoka.

diffstat:

 mk/x11.builtin.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 8df71208077d -r 4f5acb582510 mk/x11.builtin.mk
--- a/mk/x11.builtin.mk Mon Oct 06 12:54:43 2008 +0000
+++ b/mk/x11.builtin.mk Mon Oct 06 12:58:11 2008 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: x11.builtin.mk,v 1.3 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: x11.builtin.mk,v 1.4 2008/10/06 12:58:11 cube Exp $
 #
 # x11.builtin.mk will include the builtin.mk file from the appropriate
 # X11 distribution.
 #
 # BUILTIN_PKG and USE_BUILTIN.<BUILTIN_PKG> must be defined by the caller
 
+.if ${X11_TYPE} == "modular"
+USE_BUILTIN.${BUILTIN_PKG}=    no
+.endif
+
 # XXX make(1) idiosyncrasy
 # 'CHECK_BUILTIN.${BUILTIN_PKG}?= no' will overwrite the value on older
 # version of make (in NetBSD's base system, prior to 20080331).