diff options
| author | jlam <jlam> | 2004-02-05 07:17:14 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 07:17:14 +0000 |
| commit | b73424bff76ebe25bdbdf29bcd59d4f38e4d4310 (patch) | |
| tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /net | |
| parent | 32391ffbcd4f12fd3f21bccebcf6fbdff457ad7f (diff) | |
| download | pkgsrc-b73424bff76ebe25bdbdf29bcd59d4f38e4d4310.tar.gz | |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
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 | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk index a0e8bab3bb5..3216bad2688 100644 --- a/net/hesiod/buildlink2.mk +++ b/net/hesiod/buildlink2.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:16 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:17:15 jlam Exp $ .if !defined(HESIOD_BUILDLINK2_MK) HESIOD_BUILDLINK2_MK= # defined +.include "../../mk/bsd.prefs.mk" + BUILDLINK_DEPENDS.hesiod?= hesiod>=3.0.2 BUILDLINK_PKGSRCDIR.hesiod?= ../../net/hesiod @@ -16,11 +18,9 @@ _NEED_HESIOD= YES . endif .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mhesiod) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mhesiod) _NEED_HESIOD= YES -. endif .endif .if ${_NEED_HESIOD} == "YES" diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk index 77b79d6ffd5..cda6b050da1 100644 --- a/net/libpcap/buildlink2.mk +++ b/net/libpcap/buildlink2.mk @@ -1,8 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 07:17:14 jlam Exp $ .if !defined(LIBPCAP_BUILDLINK2_MK) LIBPCAP_BUILDLINK2_MK= # defined +.include "../../mk/bsd.prefs.mk" + BUILDLINK_DEPENDS.libpcap?= libpcap>=0.7.2 BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap @@ -12,11 +14,9 @@ _NEED_LIBPCAP= NO _NEED_LIBPCAP= YES .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibpcap) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mlibpcap) _NEED_LIBPCAP= YES -. endif .endif .if ${_NEED_LIBPCAP} == "YES" diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index 448fc969990..d45215ff886 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -20,11 +20,9 @@ BUILDLINK_IS_BUILTIN.libpcap= YES . endif .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mlibpcap) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mlibpcap) BUILDLINK_USE_BUILTIN.libpcap= NO -. endif .endif .if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) |