[pkgsrc/trunk]: pkgsrc Add BUILDLINK_DEPENDS.<pkg> for dependencies in a sect...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/87f92c754e7e
branches:  trunk
changeset: 469094:87f92c754e7e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 19 19:12:26 2004 +0000

description:
Add BUILDLINK_DEPENDS.<pkg> for dependencies in a section that is invoked
only if we're not using the built-in versions of the package.

diffstat:

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

diffs (116 lines):

diff -r 2a891b0c2737 -r 87f92c754e7e fonts/fontconfig/buildlink3.mk
--- a/fonts/fontconfig/buildlink3.mk    Thu Feb 19 19:03:17 2004 +0000
+++ b/fonts/fontconfig/buildlink3.mk    Thu Feb 19 19:12:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/19 18:51:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/19 19:12:26 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=     ${FONTCONFIG_BUILDLINK3_MK}+
@@ -93,6 +93,7 @@
 
 .if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[nN][oO])
 BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2
+BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.3
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=            fontconfig
 .  endif
@@ -109,10 +110,7 @@
 BUILDLINK_PREFIX.fontconfig=   ${X11BASE}
 BUILDLINK_FILES.fontconfig+=   lib/pkgconfig/fontconfig.pc
 .  endif
-
-USE_X11=                       yes
-BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.3
-
+USE_X11=       yes
 .  if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[nN][oO])
 .    include "../../devel/zlib/buildlink3.mk"
 .    include "../../graphics/freetype2/buildlink3.mk"
diff -r 2a891b0c2737 -r 87f92c754e7e x11/Xrandr-mixedcase/buildlink3.mk
--- a/x11/Xrandr-mixedcase/buildlink3.mk        Thu Feb 19 19:03:17 2004 +0000
+++ b/x11/Xrandr-mixedcase/buildlink3.mk        Thu Feb 19 19:12:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/19 18:51:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/19 19:12:26 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+
@@ -119,6 +119,7 @@
 
 .if !empty(BUILDLINK_USE_BUILTIN.Xrandr:M[nN][oO])
 BUILDLINK_DEPENDS.Xrandr+=     Xrandr>=1.0.1
+BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=            Xrandr
 .  endif
@@ -135,7 +136,6 @@
 .  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"
 .  endif
diff -r 2a891b0c2737 -r 87f92c754e7e x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Thu Feb 19 19:03:17 2004 +0000
+++ b/x11/Xrender/buildlink3.mk Thu Feb 19 19:12:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2004/02/19 18:51:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2004/02/19 19:12:26 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=        ${XRENDER_BUILDLINK3_MK}+
@@ -121,6 +121,7 @@
 
 .if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[nN][oO])
 BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8.2
+BUILDLINK_DEPENDS.render+=     render>=0.8
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=            Xrender
 .  endif
@@ -136,9 +137,6 @@
 .  endif
 USE_X11=       yes
 .  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
 .endif # XRENDER_BUILDLINK3_MK
diff -r 2a891b0c2737 -r 87f92c754e7e x11/xcursor/buildlink3.mk
--- a/x11/xcursor/buildlink3.mk Thu Feb 19 19:03:17 2004 +0000
+++ b/x11/xcursor/buildlink3.mk Thu Feb 19 19:12:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/19 18:51:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/19 19:12:26 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=        ${XCURSOR_BUILDLINK3_MK}+
@@ -82,6 +82,8 @@
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO])
+BUILDLINK_DEPENDS.xcursor+=    xcursor>=1.1.1
+BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    xcursor
 .  endif
@@ -92,15 +94,11 @@
 .endif
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xcursor+=    xcursor>=1.1.1
 .  if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS])
 BUILDLINK_PREFIX.xcursor=      ${X11BASE}
 BUILDLINK_FILES.xcursor+=      lib/pkgconfig/xcursor.pc
 .  endif
-
-USE_X11=                       yes
-BUILDLINK_DEPENDS.Xrender+=    Xrender>=0.8
-
+USE_X11=       yes
 .  if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO])
 .    if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO])
 .      include "../../x11/Xfixes/buildlink3.mk"