From d2b62c66fbc6fa5d43546377699557ae9780a930 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 12 Feb 2004 02:35:06 +0000
Subject: Create a new variable PREFER_NATIVE that has the opposite semantics
 as PREFER_PKGSRC.  Preferences are determined by the most specific instance
 of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If a package is
 specified in neither or in both variables, then PREFER_PKGSRC has precedence
 over PREFER_NATIVE.

---
 devel/cdk/buildlink2.mk | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'devel/cdk')

diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 458a25bc3f0..1a093544492 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
@@ -20,8 +20,18 @@ _NEED_CDK=	NO
 _NEED_CDK=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mcdk)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_CDK} == "YES"
+_NEED_CDK=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_CDK=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mcdk) && \
+    ${_BUILTIN_CDK} == "YES"
+_NEED_CDK=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mcdk)
 _NEED_CDK=	YES
 .endif
 
-- 
cgit v1.2.3