diff options
author | jlam <jlam> | 2004-01-24 03:26:45 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-24 03:26:45 +0000 |
commit | d8c00d5fab961462cd0da94e6a9beebcd7b20931 (patch) | |
tree | 4963c5656e148ab0bec2e19df9ec8ccd15d2789f /x11 | |
parent | e70d43134bb69fe026895e79b6fc99daee40e5db (diff) | |
download | pkgsrc-d8c00d5fab961462cd0da94e6a9beebcd7b20931.tar.gz |
Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files. In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/gnome-libs/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/gtk/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/tk/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/xcursor/buildlink3.mk | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index 479dcd71691..cb9294ee99e 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= Xrandr BUILDLINK_IS_BUILTIN.Xrender?= no .if !empty(XRANDR_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.Xrandr?= Xrandr>=1.0.1 +BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.1 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr BUILDLINK_PACKAGES+= Xrandr .endif # XRANDR_BUILDLINK3_MK diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk index aa0c3855514..72c3b345bb9 100644 --- a/x11/gnome-libs/buildlink3.mk +++ b/x11/gnome-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/01/22 13:53:17 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+= gnome-libs .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= gnome-libs -BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.2nb1 +BUILDLINK_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1 BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs . include "../../audio/esound/buildlink3.mk" diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index 84369d1187d..f4fd8b408af 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/01/15 20:50:15 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+ @@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= gtk .if !empty(GTK_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= gtk -BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10 +BUILDLINK_DEPENDS.gtk+= gtk+>=1.2.10 BUILDLINK_RECOMMENDED.gtk?= gtk+>=1.2.10nb6 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index 375ea138104..ab1d5f62763 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= tk .if !empty(TK_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= tk -BUILDLINK_DEPENDS.tk?= tk>=8.3.4 +BUILDLINK_DEPENDS.tk+= tk>=8.3.4 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk BUILDLINK_FILES.tk= bin/wish* diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 63658ef464f..ce3ad1e5a72 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= xcursor BUILDLINK_IS_BUILTIN.xcursor?= no .if !empty(XCURSOR_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xcursor?= xcursor>=1.1.1 +BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor BUILDLINK_PACKAGES+= xcursor .endif # XCURSOR_BUILDLINK3_MK |