summaryrefslogtreecommitdiff
path: root/archivers/bzip2
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-05 06:58:02 +0000
committerjlam <jlam@pkgsrc.org>2004-02-05 06:58:02 +0000
commit07a9d8dfb209780130723eba289f41872654e7c3 (patch)
tree435c664e6b88ad088b762f222d98f5c10bace96c /archivers/bzip2
parentf3d1d8cfb0f2a3d26dc60f5cfbaa917b45790f02 (diff)
downloadpkgsrc-07a9d8dfb209780130723eba289f41872654e7c3.tar.gz
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 (limited to 'archivers/bzip2')
-rw-r--r--archivers/bzip2/buildlink2.mk10
-rw-r--r--archivers/bzip2/buildlink3.mk10
2 files changed, 18 insertions, 2 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