From bf6e059da4895ab456eb5a60bfc41a648bc78a2b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 18 Feb 2004 16:35:27 +0000
Subject: Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
 environment overrides all other settings.

---
 converters/libiconv/buildlink3.mk | 40 ++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'converters/libiconv')

diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index d53caccf703..100ea810a8c 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -30,33 +30,35 @@ BUILDLINK_IS_BUILTIN.iconv=	NO
 .  endif
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.iconv=	YES
-.else
-BUILDLINK_USE_BUILTIN.iconv=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.iconv)
+.  if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.iconv=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.iconv=	NO
-.endif
-.if !empty(PREFER_NATIVE:Miconv) && \
-    !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+.  endif
+
+.  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:Miconv)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.iconv=	NO
-.endif
-
-.if defined(USE_GNU_ICONV)
+.  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
+.  endif
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.iconv=	YES
+.  if defined(USE_GNU_ICONV)
+BUILDLINK_USE_BUILTIN.iconv=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
-- 
cgit v1.2.3