[pkgsrc/trunk]: pkgsrc Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg>...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg>...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:35:05 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/787ec6d1b251
branches:  trunk
changeset: 469004:787ec6d1b251
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 18 16:35:27 2004 +0000

description:
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.

diffstat:

 archivers/bzip2/buildlink3.mk      |  44 +++++++++++++++++---------------
 converters/libiconv/buildlink3.mk  |  44 +++++++++++++++++---------------
 devel/binutils/buildlink3.mk       |  44 +++++++++++++++++---------------
 devel/gettext-lib/buildlink3.mk    |  44 +++++++++++++++++---------------
 devel/ncurses/buildlink3.mk        |  48 +++++++++++++++++++-----------------
 devel/readline/buildlink3.mk       |  50 +++++++++++++++++++------------------
 devel/zlib/buildlink3.mk           |  44 +++++++++++++++++---------------
 fonts/Xft2/buildlink3.mk           |  38 +++++++++++++++-------------
 fonts/fontconfig/buildlink3.mk     |  38 +++++++++++++++-------------
 graphics/MesaLib/buildlink3.mk     |  38 +++++++++++++++-------------
 graphics/freetype2/buildlink3.mk   |  38 +++++++++++++++-------------
 graphics/glu/buildlink3.mk         |  38 +++++++++++++++-------------
 net/libpcap/buildlink3.mk          |  38 +++++++++++++++-------------
 security/PAM/buildlink3.mk         |  38 +++++++++++++++-------------
 security/heimdal/buildlink3.mk     |  38 +++++++++++++++-------------
 security/openssl/buildlink3.mk     |  38 +++++++++++++++-------------
 textproc/expat/buildlink3.mk       |  38 +++++++++++++++-------------
 x11/Xrandr-mixedcase/buildlink3.mk |  38 +++++++++++++++-------------
 x11/Xrender/buildlink3.mk          |  38 +++++++++++++++-------------
 x11/randrext/buildlink3.mk         |  38 +++++++++++++++-------------
 x11/render/buildlink3.mk           |  38 +++++++++++++++-------------
 x11/xcursor/buildlink3.mk          |  38 +++++++++++++++-------------
 22 files changed, 466 insertions(+), 422 deletions(-)

diffs (truncated from 1337 to 300 lines):

diff -r 5636914f3c43 -r 787ec6d1b251 archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Wed Feb 18 16:04:50 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Wed Feb 18 16:35:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
@@ -38,33 +38,35 @@
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.bzip2=   YES
-.else
-BUILDLINK_USE_BUILTIN.bzip2=   NO
-.endif
-
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_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])
+
+.if !defined(BUILDLINK_USE_BUILTIN.bzip2)
+.  if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.bzip2=   YES
-.endif
-.if !empty(PREFER_PKGSRC:Mbzip2)
+.  else
 BUILDLINK_USE_BUILTIN.bzip2=   NO
-.endif
+.  endif
 
-.if defined(USE_BZIP2)
+.  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
+.  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
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.bzip2=   YES
+.  if defined(USE_BZIP2)
+BUILDLINK_USE_BUILTIN.bzip2=   NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO])
diff -r 5636914f3c43 -r 787ec6d1b251 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Wed Feb 18 16:04:50 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Wed Feb 18 16:35:27 2004 +0000
@@ -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 @@
 .  endif
 .endif
 
-.if !empty(BUILDLINK_IS_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 !empty(BUILDLINK_CHECK_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])
+
+.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:Miconv)
+.  else
 BUILDLINK_USE_BUILTIN.iconv=   NO
-.endif
+.  endif
 
-.if defined(USE_GNU_ICONV)
+.  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
+.  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
 
-.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])
diff -r 5636914f3c43 -r 787ec6d1b251 devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Wed Feb 18 16:04:50 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Wed Feb 18 16:35:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
@@ -37,33 +37,35 @@
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.binutils=        YES
-.else
-BUILDLINK_USE_BUILTIN.binutils=        NO
-.endif
-
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_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])
+
+.if !defined(BUILDLINK_USE_BUILTIN.binutils)
+.  if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.binutils=        YES
-.endif
-.if !empty(PREFER_PKGSRC:Mbinutils)
+.  else
 BUILDLINK_USE_BUILTIN.binutils=        NO
-.endif
+.  endif
 
-.if defined(USE_BINUTILS)
+.  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
+.  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
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.binutils=        YES
+.  if defined(USE_BINUTILS)
+BUILDLINK_USE_BUILTIN.binutils=        NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
diff -r 5636914f3c43 -r 787ec6d1b251 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Wed Feb 18 16:04:50 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Wed Feb 18 16:35:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
@@ -50,33 +50,35 @@
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.gettext=${BUILDLINK_IS_BUILTIN.gettext}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.gettext= YES
-.else
-BUILDLINK_USE_BUILTIN.gettext= NO
-.endif
-
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_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])
+
+.if !defined(BUILDLINK_USE_BUILTIN.gettext)
+.  if !empty(BUILDLINK_IS_BUILTIN.gettext:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.gettext= YES
-.endif
-.if !empty(PREFER_PKGSRC:Mgettext)
+.  else
 BUILDLINK_USE_BUILTIN.gettext= NO
-.endif
+.  endif
 
-.if defined(USE_GNU_GETTEXT)
+.  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
+.  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
 
-.if !empty(BUILDLINK_CHECK_BUILTIN.gettext:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.gettext= YES
+.  if defined(USE_GNU_GETTEXT)
+BUILDLINK_USE_BUILTIN.gettext= NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
diff -r 5636914f3c43 -r 787ec6d1b251 devel/ncurses/buildlink3.mk
--- a/devel/ncurses/buildlink3.mk       Wed Feb 18 16:04:50 2004 +0000
+++ b/devel/ncurses/buildlink3.mk       Wed Feb 18 16:35:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=        ${NCURSES_BUILDLINK3_MK}+
@@ -91,36 +91,38 @@
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.ncurses= YES
-.else
-BUILDLINK_USE_BUILTIN.ncurses= NO
-.endif
-
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses= YES
 .endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.ncurses= NO
-.endif
-.if !empty(PREFER_NATIVE:Mncurses) && \
-    !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
+
+.if !defined(BUILDLINK_USE_BUILTIN.ncurses)
+.  if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.ncurses= YES
-.endif
-.if !empty(PREFER_PKGSRC:Mncurses)
+.  else
 BUILDLINK_USE_BUILTIN.ncurses= NO
-.endif
+.  endif
Prev by Date: [pkgsrc/trunk]: pkgsrc If we're using the built-in version of the software, t...
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/flac Include compiler.mk before checking the val...
Previous by Thread: [pkgsrc/trunk]: pkgsrc If we're using the built-in version of the software, t...
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/flac Include compiler.mk before checking the val...
Indexes:
Home | Main Index | Thread Index | Old Index