summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-12 02:35:06 +0000
committerjlam <jlam>2004-02-12 02:35:06 +0000
commit904fb99528f41da42271c33b5e2c2fb70a5898a8 (patch)
treeabedabb5e0a307cd66dc653a926873635736358e /archivers
parent7a53d0f6f6f5347ca16705bd2c05ed41a190a6e0 (diff)
downloadpkgsrc-904fb99528f41da42271c33b5e2c2fb70a5898a8.tar.gz
Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC. Preferences are determined by the most specific instance of the package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is specified in neither or in both variables, then PREFER_PKGSRC has precedence over PREFER_NATIVE.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/bzip2/buildlink2.mk23
-rw-r--r--archivers/bzip2/buildlink3.mk16
2 files changed, 32 insertions, 7 deletions
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk
index 28ed9e56b6c..4a81d2dd85e 100644
--- a/archivers/bzip2/buildlink2.mk
+++ b/archivers/bzip2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/12 02:35:06 jlam Exp $
.if !defined(BZIP2_BUILDLINK2_MK)
BZIP2_BUILDLINK2_MK= # defined
@@ -28,13 +28,28 @@ _BUILTIN_BZIP2= 0
.endfor
.if ${_BUILTIN_BZIP2} == "0"
-_NEED_BZIP2= YES
+_NEED_BZIP2= YES
.else
-_NEED_BZIP2= NO
+_NEED_BZIP2= NO
+.endif
+
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+ ${_BUILTIN_BZIP2} != 0
+_NEED_BZIP= NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_BZIP= YES
+.endif
+.if !empty(PREFER_NATIVE:Mbzip2) && \
+ ${_BUILTIN_BZIP2} != 0
+_NEED_BZIP= NO
+.endif
+.if !empty(PREFER_PKGSRC:Mbzip2)
+_NEED_BZIP= YES
.endif
.if defined(USE_BZIP2)
-_NEED_BZIP2= YES
+_NEED_BZIP2= YES
.endif
.if ${_NEED_BZIP2} == "YES"
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index a8284bf9d32..57b813e838f 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+
@@ -44,8 +44,18 @@ BUILDLINK_USE_BUILTIN.bzip2= YES
BUILDLINK_USE_BUILTIN.bzip2= NO
.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:Mbzip2)
+.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
+.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