diff options
| author | cube <cube@pkgsrc.org> | 2008-10-06 12:58:11 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2008-10-06 12:58:11 +0000 |
| commit | 6635d9bb1ca9574ed959e8e6d8a373fc0ea58208 (patch) | |
| tree | 980d2df599c7d04c5770e1bb800cb915052da9cb /mk/x11.builtin.mk | |
| parent | e0c7c455188b44f01929d724c528766480e88fdc (diff) | |
| download | pkgsrc-6635d9bb1ca9574ed959e8e6d8a373fc0ea58208.tar.gz | |
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 (limited to 'mk/x11.builtin.mk')
| -rw-r--r-- | mk/x11.builtin.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/x11.builtin.mk b/mk/x11.builtin.mk index 1337eb0a21c..5930ad4024c 100644 --- a/mk/x11.builtin.mk +++ b/mk/x11.builtin.mk @@ -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). |