From 904fb99528f41da42271c33b5e2c2fb70a5898a8 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
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/gettext-lib/buildlink2.mk | 16 +++++++++++++---
 devel/gettext-lib/buildlink3.mk | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'devel/gettext-lib')

diff --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index 07592619993..bcbe65a48ea 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.29 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.30 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK=	# defined
@@ -47,8 +47,18 @@ _NEED_GNU_GETTEXT=	NO
 _NEED_GNU_GETTEXT=	YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_GETTEXT} == "YES"
+_NEED_GNU_GETTEXT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_GNU_GETTEXT=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mgettext) && \
+    ${_BUILTIN_GETTEXT} == "YES"
+_NEED_GNU_GETTEXT=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mgettext)
 _NEED_GNU_GETTEXT=	YES
 .endif
 
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 9ed24b3d317..2016856b231 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -56,8 +56,18 @@ BUILDLINK_USE_BUILTIN.gettext=	YES
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mgettext) && \
+    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.gettext=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mgettext)
 BUILDLINK_USE_BUILTIN.gettext=	NO
 .endif
 
-- 
cgit v1.2.3