[pkgsrc/trunk]: pkgsrc Make PREFER_PKGSRC just yes/no or a list of packages. ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Make PREFER_PKGSRC just yes/no or a list of packages. ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:28:47 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/149eb3fcfdcb
branches:  trunk
changeset: 467687:149eb3fcfdcb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 05 07:17:14 2004 +0000

description:
Make PREFER_PKGSRC just yes/no or a list of packages.  This makes it
simpler to understand.

diffstat:

 archivers/bzip2/buildlink2.mk     |   8 +++-----
 archivers/bzip2/buildlink3.mk     |   8 +++-----
 converters/libiconv/buildlink2.mk |   8 +++-----
 converters/libiconv/buildlink3.mk |   8 +++-----
 databases/db/buildlink2.mk        |   8 +++-----
 databases/db/buildlink3.mk        |  10 +++++-----
 devel/binutils/buildlink2.mk      |   8 +++-----
 devel/binutils/buildlink3.mk      |   8 +++-----
 devel/cdk/buildlink2.mk           |  10 +++++-----
 devel/gettext-lib/buildlink2.mk   |   8 +++-----
 devel/gettext-lib/buildlink3.mk   |   8 +++-----
 devel/libevent/buildlink2.mk      |  10 +++++-----
 devel/ncurses/buildlink2.mk       |   8 +++-----
 devel/ncurses/buildlink3.mk       |   8 +++-----
 devel/readline/buildlink2.mk      |   8 +++-----
 devel/readline/buildlink3.mk      |   8 +++-----
 devel/zlib/buildlink2.mk          |   8 +++-----
 devel/zlib/buildlink3.mk          |   8 +++-----
 graphics/MesaLib/buildlink3.mk    |   8 +++-----
 graphics/freetype2/buildlink2.mk  |   8 +++-----
 graphics/freetype2/buildlink3.mk  |   8 +++-----
 graphics/glu/buildlink3.mk        |   8 +++-----
 mail/libmilter/buildlink2.mk      |   8 +++-----
 mk/buildlink3/bsd.buildlink3.mk   |   8 +++-----
 net/hesiod/buildlink2.mk          |  10 +++++-----
 net/libpcap/buildlink2.mk         |  10 +++++-----
 net/libpcap/buildlink3.mk         |   8 +++-----
 security/PAM/buildlink2.mk        |   8 +++-----
 security/PAM/buildlink3.mk        |   8 +++-----
 security/heimdal/buildlink3.mk    |   8 +++-----
 security/openssl/buildlink2.mk    |   8 +++-----
 security/openssl/buildlink3.mk    |   8 +++-----
 x11/Xrender/buildlink2.mk         |   8 +++-----
 x11/Xrender/buildlink3.mk         |   8 +++-----
 34 files changed, 112 insertions(+), 170 deletions(-)

diffs (truncated from 813 to 300 lines):

diff -r abe34749a0ea -r 149eb3fcfdcb archivers/bzip2/buildlink2.mk
--- a/archivers/bzip2/buildlink2.mk     Thu Feb 05 07:06:15 2004 +0000
+++ b/archivers/bzip2/buildlink2.mk     Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(BZIP2_BUILDLINK2_MK)
 BZIP2_BUILDLINK2_MK=   # defined
@@ -37,11 +37,9 @@
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbzip2)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbzip2)
 _NEED_BZIP2=           YES
-.  endif
 .endif
 
 .if ${_NEED_BZIP2} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk     Thu Feb 05 07:06:15 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk     Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=  ${BZIP2_BUILDLINK3_MK}+
@@ -26,11 +26,9 @@
 MAKEFLAGS+=    BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}"
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbzip2)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbzip2)
 BUILDLINK_USE_BUILTIN.bzip2=   NO
-.  endif
 .endif
 
 .if defined(USE_BZIP2)
diff -r abe34749a0ea -r 149eb3fcfdcb converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Thu Feb 05 07:06:15 2004 +0000
+++ b/converters/libiconv/buildlink2.mk Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=   # defined
@@ -33,11 +33,9 @@
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Miconv)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Miconv)
 _NEED_ICONV=           YES
-.  endif
 .endif
 
 .if ${_NEED_ICONV} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Thu Feb 05 07:06:15 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=  ${ICONV_BUILDLINK3_MK}+
@@ -20,11 +20,9 @@
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Miconv)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Miconv)
 BUILDLINK_USE_BUILTIN.iconv=   NO
-.  endif
 .endif
 
 .if defined(USE_GNU_ICONV)
diff -r abe34749a0ea -r 149eb3fcfdcb databases/db/buildlink2.mk
--- a/databases/db/buildlink2.mk        Thu Feb 05 07:06:15 2004 +0000
+++ b/databases/db/buildlink2.mk        Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(DB_BUILDLINK2_MK)
 DB_BUILDLINK2_MK=      # defined
@@ -35,11 +35,9 @@
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mdb)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mdb)
 _NEED_DB2=     YES
-.  endif
 .endif
 
 .if ${_NEED_DB2} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk        Thu Feb 05 07:06:15 2004 +0000
+++ b/databases/db/buildlink3.mk        Thu Feb 05 07:17:14 2004 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=    ${DB2_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(DB2_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=           db
 BUILDLINK_DEPENDS.db+=         db>=2.7.3
 BUILDLINK_PKGSRCDIR.db?=       ../../databases/db
 .endif # DB2_BUILDLINK3_MK
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mdb)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mdb)
 BUILDLINK_USE_BUILTIN.db=      NO
-.  endif
 .endif
 
 .if !defined(BUILDLINK_USE_BUILTIN.db)
diff -r abe34749a0ea -r 149eb3fcfdcb devel/binutils/buildlink2.mk
--- a/devel/binutils/buildlink2.mk      Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/binutils/buildlink2.mk      Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=        # defined
@@ -31,11 +31,9 @@
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbinutils)
 _NEED_BINUTILS=                YES
-.  endif
 .endif
 
 .if ${_NEED_BINUTILS} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk      Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/binutils/buildlink3.mk      Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=       ${BINUTILS_BUILDLINK3_MK}+
@@ -18,11 +18,9 @@
 BUILDLINK_IS_BUILTIN.binutils= YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mbinutils)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=        NO
-.  endif
 .endif
 
 .if defined(USE_BINUTILS)
diff -r abe34749a0ea -r 149eb3fcfdcb devel/cdk/buildlink2.mk
--- a/devel/cdk/buildlink2.mk   Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/cdk/buildlink2.mk   Thu Feb 05 07:17:14 2004 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 07:06:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:17:15 jlam Exp $
 
 .if !defined(CDK_BUILDLINK2_MK)
 CDK_BUILDLINK2_MK=     # defined
 
+.include "../../mk/bsd.prefs.mk"
+
 BUILDLINK_DEPENDS.cdk?=                cdk>=4.9.9nb1
 BUILDLINK_PKGSRCDIR.cdk?=      ../../devel/cdk
 
@@ -14,11 +16,9 @@
 _NEED_CDK=             YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mcdk)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mcdk)
 _NEED_CDK=     YES
-.  endif
 .endif
 
 .if ${_NEED_CDK} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb devel/gettext-lib/buildlink2.mk
--- a/devel/gettext-lib/buildlink2.mk   Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/gettext-lib/buildlink2.mk   Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.27 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.28 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(GETTEXT_BUILDLINK2_MK)
 GETTEXT_BUILDLINK2_MK= # defined
@@ -46,11 +46,9 @@
 .  endfor
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mgettext)
 _NEED_GNU_GETTEXT=     YES
-.  endif
 .endif
 
 .if ${_NEED_GNU_GETTEXT} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
@@ -20,11 +20,9 @@
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mgettext)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mgettext)
 BUILDLINK_USE_BUILTIN.gettext= NO
-.  endif
 .endif
 
 .if defined(USE_GNU_GETTEXT)
diff -r abe34749a0ea -r 149eb3fcfdcb devel/libevent/buildlink2.mk
--- a/devel/libevent/buildlink2.mk      Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/libevent/buildlink2.mk      Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:17:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libevent.
 #
@@ -8,17 +8,17 @@
 .if !defined(LIBEVENT_BUILDLINK2_MK)
 LIBEVENT_BUILDLINK2_MK=        # defined
 
+.include "../../mk/bsd.prefs.mk"
+
 .if exists(/usr/include/event.h)
 _NEED_LIBEVENT=                NO
 .else
 _NEED_LIBEVENT=                YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mlibevent)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mlibevent)
 _NEED_LIBEVENT=        YES
-.  endif
 .endif
 
 .if ${_NEED_LIBEVENT} == "YES"
diff -r abe34749a0ea -r 149eb3fcfdcb devel/ncurses/buildlink2.mk
--- a/devel/ncurses/buildlink2.mk       Thu Feb 05 07:06:15 2004 +0000
+++ b/devel/ncurses/buildlink2.mk       Thu Feb 05 07:17:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2004/02/05 07:06:15 jlam Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so tha...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk Pass the PATH when executing ${CC} so that the comp...
Previous by Thread: [pkgsrc/trunk]: pkgsrc Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so tha...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk Pass the PATH when executing ${CC} so that the comp...
Indexes:
Home | Main Index | Thread Index | Old Index