From 5efd6b68e4d7b15fb298753f3c5487df3e4c7244 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Mon, 18 Dec 2006 12:52:34 +0000
Subject: [PATCH] duplicate the print-plist targets, add a version
 -with-depends, which is slower, but shows dependency lines as well...

Also fix target evaluation to work like it does elsewhere
---
 infrastructure/mk/bsd.port.mk        | 14 ++++++++++++--
 infrastructure/mk/bsd.port.subdir.mk |  9 ++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 75e250bcf6f..ebeefa1f9ac 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.874 2006/12/16 11:53:46 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.875 2006/12/18 12:52:34 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -2161,12 +2161,21 @@ _register_plist = perl ${PORTSDIR}/infrastructure/package/register-plist ${PLIST
 print-plist:
 	@${PKG_CMD} -n -q ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
 
+print-plist-with-depends:
+	@${PKG_CMD} -n -q `SUBPACKAGE=${SUBPACKAGE} ${MAKE} _print-package-args|sort -u` ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
+
 print-plist-all:
 .for _S in ${MULTI_PACKAGES}
 	@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
 	@${PKG_CMD} -n -q ${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}
 .endfor
 
+print-plist-all-with-depends:
+.for _S in ${MULTI_PACKAGES}
+	@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
+	@${PKG_CMD} -n -q `SUBPACKAGE=${_S} ${MAKE} _print-package-args|sort -u `${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}
+.endfor
+
 print-plist-contents:
 	@${PKG_CMD} -n -Q ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
 
@@ -2923,4 +2932,5 @@ dump-vars:
 	_internal-install-all install-all \
 	subpackage _internal-subupdate _internal-update \
 	regress-dir-depends _recurse-regress-dir-depends \
-	full-regress-depends print-plist-all
+	full-regress-depends print-plist-all \
+	print-plist-with-depends print-plist-all-with-depends
diff --git a/infrastructure/mk/bsd.port.subdir.mk b/infrastructure/mk/bsd.port.subdir.mk
index 73b5348476a..6a9d4ac49c0 100644
--- a/infrastructure/mk/bsd.port.subdir.mk
+++ b/infrastructure/mk/bsd.port.subdir.mk
@@ -1,7 +1,7 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$OpenBSD: bsd.port.subdir.mk,v 1.80 2006/12/02 11:27:46 espie Exp $
+#	$OpenBSD: bsd.port.subdir.mk,v 1.81 2006/12/18 12:52:34 espie Exp $
 #	FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
 #
 # The include file <bsd.port.subdir.mk> contains the default targets
@@ -92,11 +92,10 @@ _subdir_fragment = \
 	for subdir in ${_FULLSUBDIR}; do \
 		${_flavor_fragment}; \
 		eval $${echo_msg} "===\> $$subdir"; \
-		set +e; \
-		if ! eval  $$toset ${MAKE} $$target; then \
+		if ! (eval $$toset exec ${MAKE} $$target); then \
 			${REPORT_PROBLEM}; \
 		fi; \
-	done; set -e
+	done
 
 .for __target in all fetch package fake extract patch configure \
 	build distclean deinstall install update \
@@ -111,7 +110,7 @@ ${__target}:
 
 .for __target in describe show verbose-show dump-vars \
 	homepage-links print-plist print-plist-contents \
-	print-plist-all
+	print-plist-all print-plist-with-depends print-plist-all-with-depends
 ${__target}:
 	@DESCRIBE_TARGET=Yes; export DESCRIBE_TARGET; ${_subdir_fragment}
 .endfor