diff options
author | jlam <jlam> | 2004-01-24 03:26:45 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-01-24 03:26:45 +0000 |
commit | 440980b1a0312d6e257bdcd9701be6cda7245363 (patch) | |
tree | 4963c5656e148ab0bec2e19df9ec8ccd15d2789f /www | |
parent | b55df09dd3f22e24a0d60d25cfe2b25d641e6335 (diff) | |
download | pkgsrc-440980b1a0312d6e257bdcd9701be6cda7245363.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 'www')
-rw-r--r-- | www/apache/buildlink3.mk | 4 | ||||
-rw-r--r-- | www/cgilib/buildlink3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk index 1fab0099213..c981842490f 100644 --- a/www/apache/buildlink3.mk +++ b/www/apache/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}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= apache .if !empty(APACHE_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= apache -BUILDLINK_DEPENDS.apache?= apache{,6}-1.3.* +BUILDLINK_DEPENDS.apache+= apache{,6}-1.3.* BUILDLINK_PKGSRCDIR.apache?= ../../lang/apache . if defined(APACHE_MODULE) BUILDLINK_DEPMETHOD.apache+= full diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk index 7e1ab69dbee..a9876805d81 100644 --- a/www/cgilib/buildlink3.mk +++ b/www/cgilib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/01/23 11:53:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:48 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CGILIB_BUILDLINK3_MK:= ${CGILIB_BUILDLINK3_MK}+ @@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= cgilib .if !empty(CGILIB_BUILDLINK3_MK:M+) BUILDLINK_PACKAGES+= cgilib -BUILDLINK_DEPENDS.cgilib?= cgilib>=0.5nb1 +BUILDLINK_DEPENDS.cgilib+= cgilib>=0.5nb1 BUILDLINK_PKGSRCDIR.cgilib?= ../../www/cgilib .endif # CGILIB_BUILDLINK3_MK |