diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 06:58:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 06:58:02 +0000 |
| commit | 6ba053729abf2a4090e9d49f9fcf75a27a919827 (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /devel/zlib | |
| parent | d730f145d3301610c97c8789987869a1021f254a (diff) | |
| download | pkgsrc-6ba053729abf2a4090e9d49f9fcf75a27a919827.tar.gz | |
Support a new global variable:
BUILDLINK_PREFER_PKGSRC
This variable determines whether or not to prefer the pkgsrc
versions of software that is also present in the base system.
This variable is multi-state:
defined, or "yes" always prefer the pkgsrc versions
not defined, or "no" only use the pkgsrc versions if
needed by dependency requirements
This can also take a list of packages for which to prefer the
pkgsrc-installed software. The package names may be found by
consulting the value added to BUILDLINK_PACKAGES in the
buildlink[23].mk files for that package.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/buildlink2.mk | 10 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk index 9baa9cb6b80..e0e43e3fdfc 100644 --- a/devel/zlib/buildlink2.mk +++ b/devel/zlib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.8 2004/01/19 23:11:19 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $ .if !defined(ZLIB_BUILDLINK2_MK) ZLIB_BUILDLINK2_MK= # defined @@ -17,6 +17,14 @@ BUILDLINK_IS_BUILTIN.zlib= YES . endif .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Mzlib) +BUILDLINK_USE_BUILTIN.zlib= NO +. endif +.endif + .if defined(USE_ZLIB) BUILDLINK_USE_BUILTIN.zlib= NO .endif diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 169b3edd3ab..6106e99cc0b 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/01/26 02:39:17 grant Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -22,6 +22,14 @@ BUILDLINK_IS_BUILTIN.zlib= YES . endif .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Mzlib) +BUILDLINK_USE_BUILTIN.zlib= NO +. endif +.endif + .if defined(USE_ZLIB) BUILDLINK_USE_BUILTIN.zlib= NO .endif |