[pkgsrc/trunk]: pkgsrc/mk Add BUILTIN_PKGS with the "builtin" package names t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/123d6be117da
branches:  trunk
changeset: 575641:123d6be117da
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Wed May 19 09:12:15 2010 +0000

description:
Add BUILTIN_PKGS with the "builtin" package names to the build information.

E.g if readline 6.0 and ncurses 5.7 are part of the system we get:
BUILTIN_PKGS=readline-6.0 ncurses-5.7

diffstat:

 mk/bsd.pkg.mk                |  13 ++++++++++++-
 mk/bsd.prefs.mk              |   3 ++-
 mk/buildlink3/bsd.builtin.mk |   5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (63 lines):

diff -r bce324dd70ec -r 123d6be117da mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed May 19 09:11:34 2010 +0000
+++ b/mk/bsd.pkg.mk     Wed May 19 09:12:15 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1970 2010/04/30 08:14:04 sbd Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1971 2010/05/19 09:12:15 sbd Exp $
 #
 # This file is in the public domain.
 #
@@ -519,6 +519,17 @@
 DEPENDS+=      osabi-${OPSYS}-${OS_VERSION}:../../pkgtools/osabi
 .endif # OSVERSION_SPECIFIC
 
+.for _pkg_ in ${_BUILTIN_PKGS}
+.  if defined(USE_BUILTIN.${_pkg_}) && \
+      !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \
+      defined(BUILTIN_PKG.${_pkg_}) && !empty(BUILTIN_PKG.${_pkg_})
+BUILTIN_PKGS+= ${BUILTIN_PKG.${_pkg_}}
+.  endif
+.endfor
+.if defined(BUILTIN_PKGS)
+_BUILD_DEFS+=  BUILTIN_PKGS
+.endif
+
 .PHONY: all
 .if !target(all)
 all: ${_PKGSRC_BUILD_TARGETS}
diff -r bce324dd70ec -r 123d6be117da mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed May 19 09:11:34 2010 +0000
+++ b/mk/bsd.prefs.mk   Wed May 19 09:12:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.309 2010/04/30 03:29:55 sbd Exp $
+# $NetBSD: bsd.prefs.mk,v 1.310 2010/05/19 09:12:15 sbd Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -637,6 +637,7 @@
 PKGDIR?=               ${.CURDIR}
 
 _PKGSRC_DEPS?=         # empty
+_BUILTIN_PKGS?=                # empty
 
 # If WRKOBJDIR is set, use that tree to build
 .if defined(WRKOBJDIR)
diff -r bce324dd70ec -r 123d6be117da mk/buildlink3/bsd.builtin.mk
--- a/mk/buildlink3/bsd.builtin.mk      Wed May 19 09:11:34 2010 +0000
+++ b/mk/buildlink3/bsd.builtin.mk      Wed May 19 09:12:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.builtin.mk,v 1.10 2009/03/20 19:25:01 joerg Exp $
+# $NetBSD: bsd.builtin.mk,v 1.11 2010/05/19 09:12:15 sbd Exp $
 #
 # Copyright (c) 2004-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -147,6 +147,9 @@
 _BLTN_PREFER.${_pkg_}= pkgsrc
 .  endif
 PREFER.${_pkg_}?=      ${_BLTN_PREFER.${_pkg_}}
+.  if empty(_BUILTIN_PKGS:M${_pkg_})
+_BUILTIN_PKGS+=        ${_pkg_}
+.  endif
 .endfor
 
 .include "../../mk/buildlink3/find-libs.mk"