[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Move section that checks for PREFER_PKGS...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc1062a6e6fb
branches:  trunk
changeset: 468696:bc1062a6e6fb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 16 03:08:52 2004 +0000

description:
Move section that checks for PREFER_PKGSRC a little higher so that it
actually has some effect.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 3563564492c2 -r bc1062a6e6fb mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 16 02:40:00 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Mon Feb 16 03:08:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.85 2004/02/15 14:50:11 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.86 2004/02/16 03:08:52 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -196,6 +196,13 @@
 .for _pkg_ in ${_BLNK_PACKAGES} ${_BLNK_X11_LINKS_PACKAGE}
 BUILDLINK_IS_BUILTIN.${_pkg_}?=                no
 #
+# If we prefer the pkgsrc version, then don't use the built-in package.
+#
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+      !empty(PREFER_PKGSRC:M${_pkg_})
+BUILDLINK_USE_BUILTIN.${_pkg_}?=       no
+.  endif
+#
 # If the "built-in" package (the software supplied by the base operating
 # system) is available, then use it by default.
 #
@@ -205,13 +212,6 @@
 BUILDLINK_USE_BUILTIN.${_pkg_}?=       no
 .  endif
 #
-# If we prefer the pkgsrc version, then don't user the built-in package.
-#
-.  if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:M${_pkg_})
-BUILDLINK_USE_BUILTIN.${_pkg_}?=       no
-.  endif
-#
 # If we're using the built-in package, then provide sensible defaults.
 #
 .  if !empty(BUILDLINK_USE_BUILTIN.${_pkg_}:M[yY][eE][sS])