[pkgsrc/trunk]: pkgsrc Create a new variable PREFER_NATIVE that has the oppos...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79f82944dc7e
branches:  trunk
changeset: 468272:79f82944dc7e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 12 02:35:06 2004 +0000

description:
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.

diffstat:

 archivers/bzip2/buildlink2.mk     |  23 +++++++++++++++++++----
 archivers/bzip2/buildlink3.mk     |  16 +++++++++++++---
 converters/libiconv/buildlink2.mk |  24 +++++++++++++++++++-----
 converters/libiconv/buildlink3.mk |  16 +++++++++++++---
 devel/binutils/buildlink2.mk      |  16 +++++++++++++---
 devel/binutils/buildlink3.mk      |  16 +++++++++++++---
 devel/cdk/buildlink2.mk           |  16 +++++++++++++---
 devel/gettext-lib/buildlink2.mk   |  16 +++++++++++++---
 devel/gettext-lib/buildlink3.mk   |  16 +++++++++++++---
 devel/libevent/buildlink2.mk      |  20 +++++++++++++++-----
 devel/ncurses/buildlink2.mk       |  22 ++++++++++++++++------
 devel/ncurses/buildlink3.mk       |  16 +++++++++++++---
 devel/readline/buildlink2.mk      |  16 +++++++++++++---
 devel/readline/buildlink3.mk      |  16 +++++++++++++---
 devel/zlib/buildlink2.mk          |  16 +++++++++++++---
 devel/zlib/buildlink3.mk          |  16 +++++++++++++---
 graphics/MesaLib/buildlink3.mk    |  16 +++++++++++++---
 graphics/freetype2/buildlink2.mk  |  18 ++++++++++++++----
 graphics/freetype2/buildlink3.mk  |  16 +++++++++++++---
 graphics/glu/buildlink3.mk        |  16 +++++++++++++---
 mail/libmilter/buildlink2.mk      |  16 +++++++++++++---
 mk/bsd.pkg.defaults.mk            |  17 +++++++++++------
 net/hesiod/buildlink2.mk          |  16 +++++++++++++---
 net/libpcap/buildlink2.mk         |  16 +++++++++++++---
 net/libpcap/buildlink3.mk         |  16 +++++++++++++---
 security/PAM/buildlink2.mk        |  16 +++++++++++++---
 security/PAM/buildlink3.mk        |  16 +++++++++++++---
 security/heimdal/buildlink3.mk    |  16 +++++++++++++---
 security/openssl/buildlink2.mk    |  16 +++++++++++++---
 security/openssl/buildlink3.mk    |  16 +++++++++++++---
 x11/Xrender/buildlink2.mk         |  16 +++++++++++++---
 x11/Xrender/buildlink3.mk         |  16 +++++++++++++---
 32 files changed, 432 insertions(+), 108 deletions(-)

diffs (truncated from 1015 to 300 lines):

diff -r d3c3882bee68 -r 79f82944dc7e archivers/bzip2/buildlink2.mk
--- a/archivers/bzip2/buildlink2.mk     Thu Feb 12 02:32:49 2004 +0000
+++ b/archivers/bzip2/buildlink2.mk     Thu Feb 12 02:35:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(BZIP2_BUILDLINK2_MK)
 BZIP2_BUILDLINK2_MK=   # defined
@@ -28,13 +28,28 @@
 .endfor
 
 .if ${_BUILTIN_BZIP2} == "0"
-_NEED_BZIP2=           YES
+_NEED_BZIP2=   YES
 .else
-_NEED_BZIP2=           NO
+_NEED_BZIP2=   NO
+.endif
+
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_BZIP2} != 0
+_NEED_BZIP=    NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_BZIP=    YES
+.endif
+.if !empty(PREFER_NATIVE:Mbzip2) && \
+    ${_BUILTIN_BZIP2} != 0
+_NEED_BZIP=    NO
+.endif
+.if !empty(PREFER_PKGSRC:Mbzip2)
+_NEED_BZIP=    YES
 .endif
 
 .if defined(USE_BZIP2)
-_NEED_BZIP2=           YES
+_NEED_BZIP2=   YES
 .endif
 
 .if ${_NEED_BZIP2} == "YES"
diff -r d3c3882bee68 -r 79f82944dc7e archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Thu Feb 12 02:32:49 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Thu Feb 12 02:35:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
@@ -44,8 +44,18 @@
 BUILDLINK_USE_BUILTIN.bzip2=   NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mbzip2)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.bzip2=   YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.bzip2=   NO
+.endif
+.if !empty(PREFER_NATIVE:Mbzip2) && \
+    !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.bzip2=   YES
+.endif
+.if !empty(PREFER_PKGSRC:Mbzip2)
 BUILDLINK_USE_BUILTIN.bzip2=   NO
 .endif
 
diff -r d3c3882bee68 -r 79f82944dc7e converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Thu Feb 12 02:32:49 2004 +0000
+++ b/converters/libiconv/buildlink2.mk Thu Feb 12 02:35:06 2004 +0000
@@ -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 @@
 .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 -r d3c3882bee68 -r 79f82944dc7e converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Thu Feb 12 02:32:49 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Thu Feb 12 02:35:06 2004 +0000
@@ -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=   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
 
diff -r d3c3882bee68 -r 79f82944dc7e devel/binutils/buildlink2.mk
--- a/devel/binutils/buildlink2.mk      Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/binutils/buildlink2.mk      Thu Feb 12 02:35:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=        # defined
@@ -31,8 +31,18 @@
 _NEED_BINUTILS=                YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_BINUTILS} == "YES"
+_NEED_BINUTILS=                NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_BINUTILS=                YES
+.endif
+.if !empty(PREFER_NATIVE:Mbinutils) && \
+    ${_BUILTIN_BINUTILS} == "YES"
+_NEED_BINUTILS=                NO
+.endif
+.if !empty(PREFER_PKGSRC:Mbinutils)
 _NEED_BINUTILS=                YES
 .endif
 
diff -r d3c3882bee68 -r 79f82944dc7e devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Thu Feb 12 02:35:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
@@ -43,8 +43,18 @@
 BUILDLINK_USE_BUILTIN.binutils=        NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=        YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=        NO
+.endif
+.if !empty(PREFER_NATIVE:Mbinutils) && \
+    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=        YES
+.endif
+.if !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=        NO
 .endif
 
diff -r d3c3882bee68 -r 79f82944dc7e devel/cdk/buildlink2.mk
--- a/devel/cdk/buildlink2.mk   Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/cdk/buildlink2.mk   Thu Feb 12 02:35:06 2004 +0000
@@ -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=     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
 
diff -r d3c3882bee68 -r 79f82944dc7e devel/gettext-lib/buildlink2.mk
--- a/devel/gettext-lib/buildlink2.mk   Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/gettext-lib/buildlink2.mk   Thu Feb 12 02:35:06 2004 +0000
@@ -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=     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 -r d3c3882bee68 -r 79f82944dc7e devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Thu Feb 12 02:35:06 2004 +0000
@@ -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= 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
 
diff -r d3c3882bee68 -r 79f82944dc7e devel/libevent/buildlink2.mk
--- a/devel/libevent/buildlink2.mk      Thu Feb 12 02:32:49 2004 +0000
+++ b/devel/libevent/buildlink2.mk      Thu Feb 12 02:35:06 2004 +0000