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.
author: jlam <jlam@pkgsrc.org> 2004-02-05 06:58:02 +0000
committer: jlam <jlam@pkgsrc.org> 2004-02-05 06:58:02 +0000
commit: 07a9d8dfb209780130723eba289f41872654e7c3 (patch)
tree: 435c664e6b88ad088b762f222d98f5c10bace96c
parent: f3d1d8cfb0f2a3d26dc60f5cfbaa917b45790f02 (diff)
download: pkgsrc-07a9d8dfb209780130723eba289f41872654e7c3.tar.gz
34 files changed, 308 insertions, 34 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk
index b1e380792b7..f1f5ae64b2f 100644
--- a/archivers/bzip2/buildlink2.mk
+++ b/archivers/bzip2/buildlink2.mk
@@ -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 @@ _NEED_BZIP2=		YES
 .  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 --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index 4e7ea874ff2..7f07640137c 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -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 @@ BUILDLINK_IS_BUILTIN.bzip2!=						\
 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 --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index d5019d58c59..3db17f8708e 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -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 @@ _NEED_ICONV=		YES
 .  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 --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index 472501168a7..da417dcb558 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -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 @@ BUILDLINK_IS_BUILTIN.iconv=	YES
 .  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 --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk
index de5ec684459..356b3e68f74 100644
--- a/databases/db/buildlink2.mk
+++ b/databases/db/buildlink2.mk
@@ -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 @@ _NEED_DB2=			NO
 .  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 --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index c1a3f892a74..ef24887b2ce 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -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_DEPENDS.db+=		db>=2.7.3
 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 --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index dee91c66b4a..c2f655cb330 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -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 @@ _NEED_BINUTILS=          YES
 .  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 --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index ee8d5e0818c..c21c4b03c97 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -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_CHECK_BUILTIN.binutils?=	NO
 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 --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 928bbd85a58..a68692c197e 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -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=		NO
 _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 --git a/devel/gettext-lib/buildlink2.mk b/devel/gettext-lib/buildlink2.mk
index c60b8cbe0e9..427ceedefd1 100644
--- a/devel/gettext-lib/buildlink2.mk
+++ b/devel/gettext-lib/buildlink2.mk
@@ -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 @@ _NEED_GNU_GETTEXT=	YES
 .  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 --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 96dfba1cc96..9e797d8fdef 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -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 @@ BUILDLINK_IS_BUILTIN.gettext=	YES
 .  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 --git a/devel/libevent/buildlink2.mk b/devel/libevent/buildlink2.mk
index 8920f73681f..5f5b1d62abb 100644
--- a/devel/libevent/buildlink2.mk
+++ b/devel/libevent/buildlink2.mk
@@ -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=		NO
 _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 --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk
index e07c70a21d7..42d6307d36e 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/devel/ncurses/buildlink2.mk
@@ -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 @@ _NEED_NCURSES=		YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mncurses)
+_NEED_NCURSES=	YES
+.  endif
+.endif
+
 .if ${_NEED_NCURSES} == "YES"
 BUILDLINK_PACKAGES+=		ncurses
 EVAL_PREFIX+=			BUILDLINK_PREFIX.ncurses=ncurses
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index f7ef5fdab0b..b0423baa6db 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -40,6 +40,14 @@ BUILDLINK_IS_BUILTIN.ncurses!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses="${BUILDLINK_IS_BUILTIN.ncurses}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mncurses)
+BUILDLINK_USE_BUILTIN.ncurses=	NO
+.  endif
+.endif
+
 .if defined(USE_NCURSES)
 BUILDLINK_USE_BUILTIN.ncurses=	NO
 .endif
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk
index 1cc23a00d14..bdc16dcb45d 100644
--- a/devel/readline/buildlink2.mk
+++ b/devel/readline/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 21:46:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -36,6 +36,14 @@ _NEED_GNU_READLINE=	YES
 .  endfor
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mreadline)
+_NEED_GNU_READLINE=	YES
+.  endif
+.endif
+
 .if ${_NEED_GNU_READLINE} == "YES"
 BUILDLINK_PACKAGES+=		readline
 EVAL_PREFIX+=			BUILDLINK_PREFIX.readline=readline
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 48a538dff39..cfc0acd08e2 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:03 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -26,6 +26,14 @@ BUILDLINK_IS_BUILTIN.readline=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mreadline)
+BUILDLINK_USE_BUILTIN.readline=	NO
+.  endif
+.endif
+
 .if defined(USE_GNU_READLINE)
 BUILDLINK_USE_BUILTIN.readline=	NO
 .endif
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 9baa9cb6b80..e0e43e3fdfc 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/01/19 23:11:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -17,6 +17,14 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mzlib)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.  endif
+.endif
+
 .if defined(USE_ZLIB)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index 169b3edd3ab..6106e99cc0b 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/26 02:39:17 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -22,6 +22,14 @@ BUILDLINK_IS_BUILTIN.zlib=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mzlib)
+BUILDLINK_USE_BUILTIN.zlib=	NO
+.  endif
+.endif
+
 .if defined(USE_ZLIB)
 BUILDLINK_USE_BUILTIN.zlib=	NO
 .endif
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 0bf083a75e9..6414e13a52e 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -31,6 +31,14 @@ BUILDLINK_IS_BUILTIN.MesaLib!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib="${BUILDLINK_IS_BUILTIN.MesaLib}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:MMesaLib)
+BUILDLINK_USE_BUILTIN.MesaLib=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.MesaLib:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.MesaLib=	YES
 .endif
diff --git a/graphics/freetype2/buildlink2.mk b/graphics/freetype2/buildlink2.mk
index 972f0b04f3f..779cd021d3e 100644
--- a/graphics/freetype2/buildlink2.mk
+++ b/graphics/freetype2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/10/30 12:28:56 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(FREETYPE2_BUILDLINK2_MK)
 FREETYPE2_BUILDLINK2_MK=	# defined
@@ -51,6 +51,14 @@ _NEED_FREETYPE2!= \
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mfreetype2)
+_NEED_FREETYPE2=	YES
+.  endif
+.endif
+
 .if ${_NEED_FREETYPE2} == "YES"
 BUILDLINK_PACKAGES+=			freetype2
 EVAL_PREFIX+=	BUILDLINK_PREFIX.freetype2=freetype2
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index 6d54538e606..2fb0433a192 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -31,6 +31,14 @@ MAKEFLAGS+=	\
 	BUILDLINK_IS_BUILTIN.freetype2="${BUILDLINK_IS_BUILTIN.freetype2}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mfreetype2)
+BUILDLINK_USE_BUILTIN.freetype2=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.freetype2:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.freetype2=	YES
 .endif
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 155ac7035d8..9525514d3cf 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -31,6 +31,14 @@ BUILDLINK_IS_BUILTIN.glu!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu="${BUILDLINK_IS_BUILTIN.glu}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mglu)
+BUILDLINK_USE_BUILTIN.glu=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.glu:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.glu=	YES
 .endif
diff --git a/mail/libmilter/buildlink2.mk b/mail/libmilter/buildlink2.mk
index 881fbaf1962..c64d1bbdfa6 100644
--- a/mail/libmilter/buildlink2.mk
+++ b/mail/libmilter/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/09/24 12:43:57 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmilter.
 #
@@ -22,6 +22,14 @@ _NEED_LIBMILTER=	NO
 _NEED_LIBMILTER=	YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mlibmilter)
+_NEED_LIBMILTER=	YES
+.  endif
+.endif
+
 .if ${_NEED_LIBMILTER} == "YES"
 BUILDLINK_PACKAGES+=		libmilter
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libmilter=libmilter
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 7934eb34b38..d305874a427 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.72 2004/02/05 00:00:05 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.73 2004/02/05 06:58:03 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -202,6 +202,16 @@ BUILDLINK_USE_BUILTIN.${_pkg_}?=	yes
 BUILDLINK_USE_BUILTIN.${_pkg_}?=	no
 .  endif
 #
+# If we prefer the pkgsrc version, then don't user the built-in package.
+#
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M${_pkg_})
+BUILDLINK_USE_BUILTIN.${_pkg_}?=	no
+.  endif
+.endif
+#
 # If we're using the built-in package, then provide sensible defaults.
 #
 .  if !empty(BUILDLINK_USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk
index 15dff9b311a..c818a4f09ea 100644
--- a/net/hesiod/buildlink2.mk
+++ b/net/hesiod/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:32 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(HESIOD_BUILDLINK2_MK)
 HESIOD_BUILDLINK2_MK=	# defined
@@ -16,6 +16,14 @@ _NEED_HESIOD=		YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mhesiod)
+_NEED_HESIOD=	YES
+.  endif
+.endif
+
 .if ${_NEED_HESIOD} == "YES"
 BUILDLINK_PACKAGES+=	hesiod
 EVAL_PREFIX+=		BUILDLINK_PREFIX.hesiod=hesiod
diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk
index b1e13bae93e..49fd2076de3 100644
--- a/net/libpcap/buildlink2.mk
+++ b/net/libpcap/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/25 10:51:13 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(LIBPCAP_BUILDLINK2_MK)
 LIBPCAP_BUILDLINK2_MK=	# defined
@@ -12,6 +12,14 @@ _NEED_LIBPCAP=		NO
 _NEED_LIBPCAP=		YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mlibpcap)
+_NEED_LIBPCAP=	YES
+.  endif
+.endif
+
 .if ${_NEED_LIBPCAP} == "YES"
 BUILDLINK_PACKAGES+=	libpcap
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libpcap=libpcap
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index c8cc751ce3a..95393793c68 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -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:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.libpcap=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mlibpcap)
+BUILDLINK_USE_BUILTIN.libpcap=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.libpcap=	YES
 .endif
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index 14cc2a7d512..8543afaedf2 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:48 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(PAM_BUILDLINK2_MK)
 PAM_BUILDLINK2_MK=	# defined
@@ -14,6 +14,14 @@ _NEED_PAM=		NO
 _NEED_PAM=		YES
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mpam)
+_NEED_PAM=	YES
+.  endif
+.endif
+
 .if ${_NEED_PAM} == "YES"
 
 BUILDLINK_PACKAGES+=	pam
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 08dd8c4a553..fb548519bed 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -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:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.pam=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mpam)
+BUILDLINK_USE_BUILTIN.pam=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.pam=	YES
 .endif
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 1adcc7e2391..e85926668e0 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/02 11:30:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -29,6 +29,14 @@ BUILDLINK_IS_BUILTIN.heimdal!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.heimdal="${BUILDLINK_IS_BUILTIN.heimdal}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mheimdal)
+BUILDLINK_USE_BUILTIN.heimdal=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.heimdal=	YES
 .endif
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index 911f9a04771..670158b4900 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.15 2004/01/21 10:03:41 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK=	# defined
@@ -24,6 +24,14 @@ BUILDLINK_IS_BUILTIN.openssl=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mopenssl)
+_NEED_OPENSSL=	YES
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS])
 _NEED_OPENSSL=	NO
 .else
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index e6a6f4fe61e..bb2d0abb8dc 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/01/30 10:59:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -28,6 +28,14 @@ BUILDLINK_IS_BUILTIN.openssl=	YES
 .  endif
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:Mopenssl)
+BUILDLINK_USE_BUILTIN.openssl=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.openssl=	YES
 .endif
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk
index 4ae9180ff56..0f5e88c6d8b 100644
--- a/x11/Xrender/buildlink2.mk
+++ b/x11/Xrender/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/11/10 02:26:53 fredb Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $
 
 .if !defined(XRENDER_BUILDLINK2_MK)
 XRENDER_BUILDLINK2_MK=	# defined
@@ -52,6 +52,14 @@ _NEED_XRENDER!= \
 BUILDLINK_FILES.Xrender=	include/X11/extensions/Xrender.h
 BUILDLINK_FILES.Xrender+=	lib/libXrender.*
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:MXrender)
+_NEED_XRENDER=	YES
+.  endif
+.endif
+
 .if ${_NEED_XRENDER} == "YES"
 BUILDLINK_PACKAGES+=			Xrender
 EVAL_PREFIX+=	BUILDLINK_PREFIX.Xrender=Xrender
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index ca4632a0776..de5eb77a8bb 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 06:58:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -29,6 +29,14 @@ BUILDLINK_IS_BUILTIN.Xrender!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}"
 .endif
 
+.if defined(BUILDLINK_PREFER_PKGSRC)
+.  if empty(BUILDLINK_PREFER_PKGSRC) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(BUILDLINK_PREFER_PKGSRC:MXrender)
+BUILDLINK_USE_BUILTIN.Xrender=	NO
+.  endif
+.endif
+
 .if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.Xrender=	YES
 .endif
author	jlam <jlam@pkgsrc.org>	2004-02-05 06:58:02 +0000
committer	jlam <jlam@pkgsrc.org>	2004-02-05 06:58:02 +0000
commit	07a9d8dfb209780130723eba289f41872654e7c3 (patch)
tree	435c664e6b88ad088b762f222d98f5c10bace96c
parent	f3d1d8cfb0f2a3d26dc60f5cfbaa917b45790f02 (diff)
download	pkgsrc-07a9d8dfb209780130723eba289f41872654e7c3.tar.gz