pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Support a new global variable:
details: https://anonhg.NetBSD.org/pkgsrc/rev/e93e0578b229
branches: trunk
changeset: 467685:e93e0578b229
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Feb 05 06:58:02 2004 +0000
description:
Support a new global variable:
BUILDLINK_PREFER_PKGSRC
This variable determines whether or not to prefer the pkgsrc
versions of software that is also present in the base system.
This variable is multi-state:
defined, or "yes" always prefer the pkgsrc versions
not defined, or "no" only use the pkgsrc versions if
needed by dependency requirements
This can also take a list of packages for which to prefer the
pkgsrc-installed software. The package names may be found by
consulting the value added to BUILDLINK_PACKAGES in the
buildlink[23].mk files for that package.
diffstat:
archivers/bzip2/buildlink2.mk | 10 +++++++++-
archivers/bzip2/buildlink3.mk | 10 +++++++++-
converters/libiconv/buildlink2.mk | 10 +++++++++-
converters/libiconv/buildlink3.mk | 10 +++++++++-
databases/db/buildlink2.mk | 10 +++++++++-
databases/db/buildlink3.mk | 10 +++++++++-
devel/binutils/buildlink2.mk | 10 +++++++++-
devel/binutils/buildlink3.mk | 10 +++++++++-
devel/cdk/buildlink2.mk | 10 +++++++++-
devel/gettext-lib/buildlink2.mk | 10 +++++++++-
devel/gettext-lib/buildlink3.mk | 10 +++++++++-
devel/libevent/buildlink2.mk | 10 +++++++++-
devel/ncurses/buildlink2.mk | 10 +++++++++-
devel/ncurses/buildlink3.mk | 10 +++++++++-
devel/readline/buildlink2.mk | 10 +++++++++-
devel/readline/buildlink3.mk | 10 +++++++++-
devel/zlib/buildlink2.mk | 10 +++++++++-
devel/zlib/buildlink3.mk | 10 +++++++++-
graphics/MesaLib/buildlink3.mk | 10 +++++++++-
graphics/freetype2/buildlink2.mk | 10 +++++++++-
graphics/freetype2/buildlink3.mk | 10 +++++++++-
graphics/glu/buildlink3.mk | 10 +++++++++-
mail/libmilter/buildlink2.mk | 10 +++++++++-
mk/buildlink3/bsd.buildlink3.mk | 12 +++++++++++-
net/hesiod/buildlink2.mk | 10 +++++++++-
net/libpcap/buildlink2.mk | 10 +++++++++-
net/libpcap/buildlink3.mk | 10 +++++++++-
security/PAM/buildlink2.mk | 10 +++++++++-
security/PAM/buildlink3.mk | 10 +++++++++-
security/heimdal/buildlink3.mk | 10 +++++++++-
security/openssl/buildlink2.mk | 10 +++++++++-
security/openssl/buildlink3.mk | 10 +++++++++-
x11/Xrender/buildlink2.mk | 10 +++++++++-
x11/Xrender/buildlink3.mk | 10 +++++++++-
34 files changed, 308 insertions(+), 34 deletions(-)
diffs (truncated from 818 to 300 lines):
diff -r 3eef67283c39 -r e93e0578b229 archivers/bzip2/buildlink2.mk
--- a/archivers/bzip2/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/archivers/bzip2/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/09/25 02:30:11 danw Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $
.if !defined(BZIP2_BUILDLINK2_MK)
BZIP2_BUILDLINK2_MK= # defined
@@ -37,6 +37,14 @@
. endfor
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mbzip2)
+_NEED_BZIP2= YES
+. endif
+.endif
+
.if ${_NEED_BZIP2} == "YES"
BUILDLINK_PACKAGES+= bzip2
EVAL_PREFIX+= BUILDLINK_PREFIX.bzip2=bzip2
diff -r 3eef67283c39 -r e93e0578b229 archivers/bzip2/buildlink3.mk
--- a/archivers/bzip2/buildlink3.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/archivers/bzip2/buildlink3.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+
@@ -26,6 +26,14 @@
MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}"
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mbzip2)
+BUILDLINK_USE_BUILTIN.bzip2= NO
+. endif
+.endif
+
.if defined(USE_BZIP2)
BUILDLINK_USE_BUILTIN.bzip2= NO
.endif
diff -r 3eef67283c39 -r e93e0578b229 converters/libiconv/buildlink2.mk
--- a/converters/libiconv/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/converters/libiconv/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/01/15 23:04:00 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 06:58:02 jlam Exp $
.if !defined(ICONV_BUILDLINK2_MK)
ICONV_BUILDLINK2_MK= # defined
@@ -33,6 +33,14 @@
. endfor
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Miconv)
+_NEED_ICONV= YES
+. endif
+.endif
+
.if ${_NEED_ICONV} == "YES"
# let other packages know that we're using the pkgsrc
# GNU libiconv
diff -r 3eef67283c39 -r e93e0578b229 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@
. endif
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Miconv)
+BUILDLINK_USE_BUILTIN.iconv= NO
+. endif
+.endif
+
.if defined(USE_GNU_ICONV)
BUILDLINK_USE_BUILTIN.iconv= NO
.endif
diff -r 3eef67283c39 -r e93e0578b229 databases/db/buildlink2.mk
--- a/databases/db/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/databases/db/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/01 21:10:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 06:58:02 jlam Exp $
.if !defined(DB_BUILDLINK2_MK)
DB_BUILDLINK2_MK= # defined
@@ -35,6 +35,14 @@
. endif
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mdb)
+_NEED_DB2= YES
+. endif
+.endif
+
.if ${_NEED_DB2} == "YES"
BUILDLINK_PACKAGES+= db
EVAL_PREFIX+= BUILDLINK_PREFIX.db=db
diff -r 3eef67283c39 -r e93e0578b229 databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/databases/db/buildlink3.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB2_BUILDLINK3_MK:= ${DB2_BUILDLINK3_MK}+
@@ -9,6 +9,14 @@
BUILDLINK_PKGSRCDIR.db?= ../../databases/db
.endif # DB2_BUILDLINK3_MK
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mdb)
+BUILDLINK_USE_BUILTIN.db= NO
+. endif
+.endif
+
.if !defined(BUILDLINK_USE_BUILTIN.db)
BUILDLINK_USE_BUILTIN.db= NO
. if defined(USE_DB185)
diff -r 3eef67283c39 -r e93e0578b229 devel/binutils/buildlink2.mk
--- a/devel/binutils/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/binutils/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/10/28 15:54:31 heinz Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
.if !defined(BINUTILS_BUILDLINK2_MK)
BINUTILS_BUILDLINK2_MK= # defined
@@ -31,6 +31,14 @@
. endfor
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils)
+_NEED_BINUTILS= YES
+. endif
+.endif
+
.if ${_NEED_BINUTILS} == "YES"
BUILDLINK_PACKAGES+= binutils
BUILDLINK_PREFIX.binutils= ${LOCALBASE}
diff -r 3eef67283c39 -r e93e0578b229 devel/binutils/buildlink3.mk
--- a/devel/binutils/buildlink3.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/binutils/buildlink3.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:02 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
@@ -18,6 +18,14 @@
BUILDLINK_IS_BUILTIN.binutils= YES
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils)
+BUILDLINK_USE_BUILTIN.binutils= NO
+. endif
+.endif
+
.if defined(USE_BINUTILS)
BUILDLINK_USE_BUILTIN.binutils= NO
.endif
diff -r 3eef67283c39 -r e93e0578b229 devel/cdk/buildlink2.mk
--- a/devel/cdk/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/cdk/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $
.if !defined(CDK_BUILDLINK2_MK)
CDK_BUILDLINK2_MK= # defined
@@ -14,6 +14,14 @@
_NEED_CDK= YES
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mcdk)
+_NEED_CDK= YES
+. endif
+.endif
+
.if ${_NEED_CDK} == "YES"
BUILDLINK_PACKAGES+= cdk
EVAL_PREFIX+= BUILDLINK_PREFIX.cdk=cdk
diff -r 3eef67283c39 -r e93e0578b229 devel/gettext-lib/buildlink2.mk
--- a/devel/gettext-lib/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/gettext-lib/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.25 2004/01/15 23:04:00 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.26 2004/02/05 06:58:03 jlam Exp $
.if !defined(GETTEXT_BUILDLINK2_MK)
GETTEXT_BUILDLINK2_MK= # defined
@@ -46,6 +46,14 @@
. endfor
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mgettext)
+_NEED_GNU_GETTEXT= YES
+. endif
+.endif
+
.if ${_NEED_GNU_GETTEXT} == "YES"
BUILDLINK_PACKAGES+= gettext
EVAL_PREFIX+= BUILDLINK_PREFIX.gettext=gettext-lib
diff -r 3eef67283c39 -r e93e0578b229 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@
. endif
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mgettext)
+BUILDLINK_USE_BUILTIN.gettext= NO
+. endif
+.endif
+
.if defined(USE_GNU_GETTEXT)
BUILDLINK_USE_BUILTIN.gettext= NO
.endif
diff -r 3eef67283c39 -r e93e0578b229 devel/libevent/buildlink2.mk
--- a/devel/libevent/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/libevent/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/06/23 13:28:53 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
#
# This Makefile fragment is included by packages that use libevent.
#
@@ -14,6 +14,14 @@
_NEED_LIBEVENT= YES
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mlibevent)
+_NEED_LIBEVENT= YES
+. endif
+.endif
+
.if ${_NEED_LIBEVENT} == "YES"
BUILDLINK_PACKAGES+= libevent
BUILDLINK_DEPENDS.libevent?= libevent>=0.6
diff -r 3eef67283c39 -r e93e0578b229 devel/ncurses/buildlink2.mk
--- a/devel/ncurses/buildlink2.mk Thu Feb 05 05:05:54 2004 +0000
+++ b/devel/ncurses/buildlink2.mk Thu Feb 05 06:58:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.15 2003/12/30 23:14:18 cjep Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2004/02/05 06:58:03 jlam Exp $
#
# Optionally define:
#
@@ -50,6 +50,14 @@
. endfor
.endif
Home |
Main Index |
Thread Index |
Old Index