From 7a9f1afb155f05f4eab8a0f4c46681d70826ddcd Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 25 Aug 2007 07:56:04 +0000
Subject: [PATCH] add message that shows we exited a directory after an error,
 stops log there during rebuilds.

---
 infrastructure/build/portslogger     | 7 ++++++-
 infrastructure/mk/bsd.port.subdir.mk | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/infrastructure/build/portslogger b/infrastructure/build/portslogger
index 10a567aa0e9..10b59677e03 100755
--- a/infrastructure/build/portslogger
+++ b/infrastructure/build/portslogger
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $OpenBSD: portslogger,v 1.13 2005/01/08 00:05:16 espie Exp $
+# $OpenBSD: portslogger,v 1.14 2007/08/25 07:56:04 espie Exp $
 # Copyright (c) 2001 Marc Espie.  All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -122,6 +122,11 @@ while (<>) {
 			$context = $ncontext;
 			$logfile = new Logger $context;
 		}
+	} elsif (m/^\=\=\=\> Exiting\s+(.*)\s+with an error$/) {
+		$ncontext = $1;
+		if ($ncontext eq $context) {
+			undef $context;
+		}
 	}
 	unless (defined $context) {
 		$context = default;
diff --git a/infrastructure/mk/bsd.port.subdir.mk b/infrastructure/mk/bsd.port.subdir.mk
index e1d518b43da..bbe0a5bb5b1 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.88 2007/07/08 17:57:56 espie Exp $
+#	$OpenBSD: bsd.port.subdir.mk,v 1.89 2007/08/25 07:56:04 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
@@ -113,6 +113,7 @@ _subdir_fragment = \
 		${_flavor_fragment}; \
 		eval $${echo_msg} "===\> $$subdir"; \
 		if ! (eval $$toset exec ${MAKE} $$target); then \
+			eval $${echo_msg} "===\> Exiting $$subdir with an error"; \
 			${REPORT_PROBLEM}; \
 		fi; \
 		_STARTDIR_SEEN=true; \