summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-05 07:17:14 +0000
committerjlam <jlam>2004-02-05 07:17:14 +0000
commitb73424bff76ebe25bdbdf29bcd59d4f38e4d4310 (patch)
treeedbbed6f9491b43337c846644df6d1c3e8ce8f32 /mk
parent32391ffbcd4f12fd3f21bccebcf6fbdff457ad7f (diff)
downloadpkgsrc-b73424bff76ebe25bdbdf29bcd59d4f38e4d4310.tar.gz
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 6097bc2d72d..28a4be01c85 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.74 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.75 2004/02/05 07:17:14 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -204,11 +204,9 @@ BUILDLINK_USE_BUILTIN.${_pkg_}?= no
#
# If we prefer the pkgsrc version, then don't user the built-in package.
#
-.if defined(PREFER_PKGSRC)
-. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:M${_pkg_})
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(PREFER_PKGSRC:M${_pkg_})
BUILDLINK_USE_BUILTIN.${_pkg_}?= no
-. endif
.endif
#
# If we're using the built-in package, then provide sensible defaults.