From 4006dd8d3c16be15e01d264394098f7a0798db4c Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 5 Feb 2004 07:06:15 +0000 Subject: Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its value outside of buildlink-related files. --- net/hesiod/buildlink2.mk | 9 ++++----- net/libpcap/buildlink2.mk | 9 ++++----- net/libpcap/buildlink3.mk | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) (limited to 'net') diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk index c818a4f09ea..a0e8bab3bb5 100644 --- a/net/hesiod/buildlink2.mk +++ b/net/hesiod/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:16 jlam Exp $ .if !defined(HESIOD_BUILDLINK2_MK) HESIOD_BUILDLINK2_MK= # defined @@ -16,10 +16,9 @@ _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) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mhesiod) _NEED_HESIOD= YES . endif .endif diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk index 49fd2076de3..77b79d6ffd5 100644 --- a/net/libpcap/buildlink2.mk +++ b/net/libpcap/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:06:15 jlam Exp $ .if !defined(LIBPCAP_BUILDLINK2_MK) LIBPCAP_BUILDLINK2_MK= # defined @@ -12,10 +12,9 @@ _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) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mlibpcap) _NEED_LIBPCAP= YES . endif .endif diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index 95393793c68..448fc969990 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -20,10 +20,9 @@ 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) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mlibpcap) BUILDLINK_USE_BUILTIN.libpcap= NO . endif .endif -- cgit v1.2.3