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.

---
 converters/libiconv/buildlink2.mk | 24 +++++++++++++++++++-----
 converters/libiconv/buildlink3.mk | 16 +++++++++++++---
 2 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'converters/libiconv')

diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index ccb964c9021..7872c81b97d 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
@@ -29,18 +29,32 @@ _BLNK_LIBICONV_FOUND=	NO
 .endfor
 
 .if ${_BUILTIN_ICONV} == "YES"
-_NEED_ICONV=		NO
+_NEED_ICONV=	NO
 .else
-_NEED_ICONV=		YES
+_NEED_ICONV=	YES
 .endif
 
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_ICONV} == "YES"
+_NEED_ICONV=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_ICONV=	YES
+.endif
+.if !empty(PREFER_NATIVE:Miconv) && \
+    ${_BUILTIN_ICONV} == "YES"
+_NEED_ICONV=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Miconv)
+_NEED_ICONV=	YES
+.endif
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
     !empty(PREFER_PKGSRC:Miconv)
-_NEED_ICONV=		YES
+_NEED_ICONV=	YES
 .endif
 
 .if defined(USE_GNU_ICONV)
-_NEED_ICONV=		YES
+_NEED_ICONV=	YES
 .endif
 
 .if ${_NEED_ICONV} == "YES"
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index f72f13a3d36..d53caccf703 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -36,8 +36,18 @@ BUILDLINK_USE_BUILTIN.iconv=	YES
 BUILDLINK_USE_BUILTIN.iconv=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Miconv)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.iconv=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.iconv=	NO
+.endif
+.if !empty(PREFER_NATIVE:Miconv) && \
+    !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.iconv=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Miconv)
 BUILDLINK_USE_BUILTIN.iconv=	NO
 .endif
 
-- 
cgit v1.2.3