Change the format of BUILDLINK_ORDER to contain depth information as well,

and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto

7 files changed, 38 insertions, 11 deletions

diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index e7a33946516..d22d10406ed 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.16 2006/07/08 22:39:30 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.17 2006/07/08 23:11:17 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  It abstracts finding the
@@ -132,7 +132,7 @@ PKG_FAIL_REASON=	\
 .elif ${BDB_TYPE} == "db1"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndb1}
 BUILDLINK_PACKAGES+=		db1
-BUILDLINK_ORDER+=		db1
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db1
 BUILDLINK_BUILTIN_MK.db1=	../../mk/db1.builtin.mk
 .else
 .  include "${_BDB_PKGSRCDIR.${BDB_TYPE}}/buildlink3.mk"
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 7c33469362c..8e5417d1651 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.181 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.182 2006/07/08 23:11:17 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1072,3 +1072,7 @@ do-buildlink:
 ###
 ### END: after the barrier
 ###
+
+.PHONY: show-buildlink3
+show-buildlink3:
+	@${SH} ${PKGSRCDIR}/mk/buildlink3/show-buildlink3.sh ${BUILDLINK_ORDER}
diff --git a/mk/buildlink3/show-buildlink3.sh b/mk/buildlink3/show-buildlink3.sh
new file mode 100644
index 00000000000..1d2255158d2
--- /dev/null
+++ b/mk/buildlink3/show-buildlink3.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $NetBSD: show-buildlink3.sh,v 1.1 2006/07/08 23:11:17 jlam Exp $
+#
+# This script is a helper for the show-buildlink3 target and outputs
+# the arguments, each on a new line with any leading "+" signs replaced
+# with four spaces.
+#
+
+while test $# -gt 0; do
+	pkg="$1"
+	pkg="${pkg#+}"
+	prefix=
+	stripped=no
+	while test $stripped = no; do
+		case $pkg in
+		+*)	prefix="    $prefix"; pkg="${pkg#+}"; stripped=no ;;
+		*)	stripped=yes ;;
+		esac
+	done
+	echo "$prefix$pkg"
+	shift
+done
diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk
index 4f52460ef29..4f9f3ce581c 100644
--- a/mk/dlopen.buildlink3.mk
+++ b/mk/dlopen.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.buildlink3.mk,v 1.11 2006/07/08 22:39:30 jlam Exp $
+# $NetBSD: dlopen.buildlink3.mk,v 1.12 2006/07/08 23:11:17 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles and
 # buildlink3.mk files for the packages that use dlopen().
@@ -18,7 +18,7 @@ DL_AUTO_VARS?=	no
 .if !empty(USE_BUILTIN.dl:M[yY][eE][sS])
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndl}
 BUILDLINK_PACKAGES+=		dl
-BUILDLINK_ORDER+=		dl
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dl
 BUILDLINK_BUILTIN_MK.dl=	../../mk/dlopen.builtin.mk
 BUILDLINK_AUTO_VARS.dl=		${DL_AUTO_VARS}
 .elif !empty(MACHINE_PLATFORM:MDarwin-[56].*)
diff --git a/mk/oss.buildlink3.mk b/mk/oss.buildlink3.mk
index 3b7e16fd43b..f05f8cc51ca 100644
--- a/mk/oss.buildlink3.mk
+++ b/mk/oss.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.5 2006/07/08 22:39:30 jlam Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.6 2006/07/08 23:11:17 jlam Exp $
 #
 # This Makefile fragment is included by packages that require an Open Sound
 # System (OSS) implementation.  After inclusion of this file, the following
@@ -30,7 +30,7 @@ OSS_TYPE=		${_OSS_TYPE}
 
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Noss}
 BUILDLINK_PACKAGES+=		oss
-BUILDLINK_ORDER+=		oss
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}oss
 BUILDLINK_BUILTIN_MK.oss=	../../mk/oss.builtin.mk
 
 .if !empty(OSS_BUILDLINK3_MK:M+)
diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk
index c48f5e10822..85131bf407d 100644
--- a/mk/pam.buildlink3.mk
+++ b/mk/pam.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pam.buildlink3.mk,v 1.6 2006/07/08 22:39:30 jlam Exp $
+# $NetBSD: pam.buildlink3.mk,v 1.7 2006/07/08 23:11:17 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a PAM implementation.  pam.buildlink3.mk will:
@@ -86,5 +86,5 @@ PKG_FAIL_REASON=	\
 .elif ${PAM_TYPE} == "solaris-pam"
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsolaris-pam}
 BUILDLINK_PACKAGES+=	solaris-pam
-BUILDLINK_ORDER+=	solaris-pam
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}solaris-pam
 .endif
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 9614142b7c1..a7b53cc4de9 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.23 2006/07/08 22:39:30 jlam Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.24 2006/07/08 23:11:17 jlam Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -111,7 +111,7 @@ PTHREAD_AUTO_VARS?=	no
 .if ${PTHREAD_TYPE} == "native"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Npthread}
 BUILDLINK_PACKAGES+=		pthread
-BUILDLINK_ORDER+=		pthread
+BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pthread
 BUILDLINK_BUILTIN_MK.pthread=	../../mk/pthread.builtin.mk
 BUILDLINK_AUTO_VARS.pthread?=	${PTHREAD_AUTO_VARS}
 .elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}"