[pkgsrc/trunk]: pkgsrc Don't include other buildlink3.mk files if we're just ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40549a44cf02
branches:  trunk
changeset: 468850:40549a44cf02
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Feb 17 09:13:33 2004 +0000

description:
Don't include other buildlink3.mk files if we're just checking whether the
software is built-in.

diffstat:

 fonts/fontconfig/buildlink3.mk     |  10 ++++++----
 x11/Xrandr-mixedcase/buildlink3.mk |   8 +++++---
 x11/Xrender/buildlink3.mk          |   8 +++++---
 x11/xcursor/buildlink3.mk          |   8 +++++---
 4 files changed, 21 insertions(+), 13 deletions(-)

diffs (94 lines):

diff -r 8889250e1512 -r 40549a44cf02 fonts/fontconfig/buildlink3.mk
--- a/fonts/fontconfig/buildlink3.mk    Tue Feb 17 08:59:44 2004 +0000
+++ b/fonts/fontconfig/buildlink3.mk    Tue Feb 17 09:13:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 22:47:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 09:13:33 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=     ${FONTCONFIG_BUILDLINK3_MK}+
@@ -103,9 +103,11 @@
 USE_X11=       yes
 BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.3
 
-.  include "../../devel/zlib/buildlink3.mk"
-.  include "../../graphics/freetype2/buildlink3.mk"
-.  include "../../textproc/expat/buildlink3.mk"
+.  if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[nN][oO])
+.    include "../../devel/zlib/buildlink3.mk"
+.    include "../../graphics/freetype2/buildlink3.mk"
+.    include "../../textproc/expat/buildlink3.mk"
+.  endif
 .endif # FONTCONFIG_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 8889250e1512 -r 40549a44cf02 x11/Xrandr-mixedcase/buildlink3.mk
--- a/x11/Xrandr-mixedcase/buildlink3.mk        Tue Feb 17 08:59:44 2004 +0000
+++ b/x11/Xrandr-mixedcase/buildlink3.mk        Tue Feb 17 09:13:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 22:45:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 09:13:33 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+
@@ -127,9 +127,11 @@
 BUILDLINK_PREFIX.Xrandr=       ${X11BASE}
 .  endif
 USE_X11=       yes
+.  if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[nN][oO])
 BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
-.  include "../../x11/randrext/buildlink3.mk"
-.  include "../../x11/Xrender/buildlink3.mk"
+.    include "../../x11/randrext/buildlink3.mk"
+.    include "../../x11/Xrender/buildlink3.mk"
+.  endif
 .endif # XRANDR_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 8889250e1512 -r 40549a44cf02 x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Tue Feb 17 08:59:44 2004 +0000
+++ b/x11/Xrender/buildlink3.mk Tue Feb 17 09:13:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2004/02/16 21:04:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2004/02/17 09:13:33 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=        ${XRENDER_BUILDLINK3_MK}+
@@ -129,10 +129,12 @@
 BUILDLINK_PREFIX.Xrender=      ${X11BASE}
 .  endif
 USE_X11=       yes
-.  if !empty(BUILDLINK_DEPENDS.Xrender:MXrender>=0.8*)
+.  if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[nN][oO])
+.    if !empty(BUILDLINK_DEPENDS.Xrender:MXrender>=0.8*)
 BUILDLINK_DEPENDS.render+=     render>=0.8
+.    endif
+.    include "../../x11/render/buildlink3.mk"
 .  endif
-.  include "../../x11/render/buildlink3.mk"
 .endif # XRENDER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 8889250e1512 -r 40549a44cf02 x11/xcursor/buildlink3.mk
--- a/x11/xcursor/buildlink3.mk Tue Feb 17 08:59:44 2004 +0000
+++ b/x11/xcursor/buildlink3.mk Tue Feb 17 09:13:33 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/16 23:16:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/02/17 09:13:33 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=        ${XCURSOR_BUILDLINK3_MK}+
@@ -90,9 +90,11 @@
 .  if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
 BUILDLINK_PREFIX.xcursor=      ${X11BASE}
 .  else
+.    if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO])
 BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
-.    include "../../x11/Xfixes/buildlink3.mk"
-.    include "../../x11/Xrender/buildlink3.mk"
+.      include "../../x11/Xfixes/buildlink3.mk"
+.      include "../../x11/Xrender/buildlink3.mk"
+.    endif
 .  endif
 USE_X11=       yes
 .endif # XCURSOR_BUILDLINK3_MK