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 | 07a9d8dfb209780130723eba289f41872654e7c3 (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /net | |
| parent | f3d1d8cfb0f2a3d26dc60f5cfbaa917b45790f02 (diff) | |
| download | pkgsrc-07a9d8dfb209780130723eba289f41872654e7c3.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 'net')
| -rw-r--r-- | net/hesiod/buildlink2.mk | 10 | ||||
| -rw-r--r-- | net/libpcap/buildlink2.mk | 10 | ||||
| -rw-r--r-- | net/libpcap/buildlink3.mk | 10 |
3 files changed, 27 insertions, 3 deletions
diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk index 15dff9b311a..c818a4f09ea 100644 --- a/net/hesiod/buildlink2.mk +++ b/net/hesiod/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:32 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $ .if !defined(HESIOD_BUILDLINK2_MK) HESIOD_BUILDLINK2_MK= # defined @@ -16,6 +16,14 @@ _NEED_HESIOD= 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:Mhesiod) +_NEED_HESIOD= YES +. endif +.endif + .if ${_NEED_HESIOD} == "YES" BUILDLINK_PACKAGES+= hesiod EVAL_PREFIX+= BUILDLINK_PREFIX.hesiod=hesiod diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk index b1e13bae93e..49fd2076de3 100644 --- a/net/libpcap/buildlink2.mk +++ b/net/libpcap/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/03/25 10:51:13 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $ .if !defined(LIBPCAP_BUILDLINK2_MK) LIBPCAP_BUILDLINK2_MK= # defined @@ -12,6 +12,14 @@ _NEED_LIBPCAP= NO _NEED_LIBPCAP= YES .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Mlibpcap) +_NEED_LIBPCAP= YES +. endif +.endif + .if ${_NEED_LIBPCAP} == "YES" BUILDLINK_PACKAGES+= libpcap EVAL_PREFIX+= BUILDLINK_PREFIX.libpcap=libpcap diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index c8cc751ce3a..95393793c68 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.libpcap= 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:Mlibpcap) +BUILDLINK_USE_BUILTIN.libpcap= NO +. endif +.endif + .if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES .endif |