[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Allow BUILDLINK_BUILTIN_MK.<pkg> to poin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d040f5642f2
branches:  trunk
changeset: 483333:4d040f5642f2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 10 17:39:03 2004 +0000

description:
Allow BUILDLINK_BUILTIN_MK.<pkg> to point to the builtin.mk file for the
specified package.  This defaults to the builtin.mk file in the pkgsrc
package directory.

diffstat:

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

diffs (37 lines):

diff -r 2bdccd95d978 -r 4d040f5642f2 mk/buildlink3/bsd.builtin.mk
--- a/mk/buildlink3/bsd.builtin.mk      Wed Nov 10 17:29:37 2004 +0000
+++ b/mk/buildlink3/bsd.builtin.mk      Wed Nov 10 17:39:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.builtin.mk,v 1.2 2004/09/21 15:01:40 jlam Exp $
+# $NetBSD: bsd.builtin.mk,v 1.3 2004/11/10 17:39:03 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -123,18 +123,20 @@
 .endfor
 
 .for _pkg_ in ${BUILDLINK_PACKAGES}
-.  if ${PREFER.${_pkg_}} == "pkgsrc"
-USE_BUILTIN.${_pkg_}?= no
-.  endif
 #
 # builtin.mk files default to using the built-in software if it's
 # available (${PREFER.<pkg>} == "native") unless USE_BUILTIN.<pkg> has
 # been previously set.
 #
-.  if defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-.    if exists(${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk)
-.      include "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
-.    endif
+.  if ${PREFER.${_pkg_}} == "pkgsrc"
+USE_BUILTIN.${_pkg_}?= no
+.  endif
+#
+# Set the default path to the package builtin.mk file.
+#
+BUILDLINK_BUILTIN_MK.${_pkg_}?=        ${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk
+.  if exists(${BUILDLINK_BUILTIN_MK.${_pkg_}})
+.    include "${BUILDLINK_BUILTIN_MK.${_pkg_}}"
 .  endif
 .endfor