From f9ad29c2e96882362b5d0142154269d430cfc980 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Wed, 10 Oct 2012 10:55:33 +0000
Subject: [PATCH] tweak things a bit... no need for an extra _fullpath
 variable. also, use a broken() function to simplify THAT particular shell
 fragment. I've been running with this for ages...

---
 infrastructure/mk/bsd.port.subdir.mk |  4 +-
 infrastructure/mk/pkgpath.mk         | 63 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/infrastructure/mk/bsd.port.subdir.mk b/infrastructure/mk/bsd.port.subdir.mk
index 21d02699f14..2b9619f8282 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.108 2012/05/28 09:38:04 espie Exp $
+#	$OpenBSD: bsd.port.subdir.mk,v 1.109 2012/10/10 10:55:33 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
@@ -111,7 +111,6 @@ _subdir_fragment = \
 	_STARTDIR_SEEN=${_STARTDIR_SEEN}; \
 	unset SUBDIR SUBDIRLIST || true; \
 	export _STARTDIR_SEEN; \
-	_fullpath=${_FULLPATH}; \
 	for subdir in ${_FULLSUBDIR:QL}; do \
 		if ! $${_STARTDIR_SEEN}; then \
 			case "${STARTDIR}" in \
@@ -124,6 +123,7 @@ _subdir_fragment = \
 			esac; \
 		fi; \
 		${_SKIP_STUFF}; \
+		sawflavor=${_FULLPATH}; \
 		if ${_pflavor_fragment}; then \
 			eval $${echo_msg} "===\> $$subdir"; \
 			if ! (eval $$toset exec ${MAKE} $$target); then \
diff --git a/infrastructure/mk/pkgpath.mk b/infrastructure/mk/pkgpath.mk
index f8ca9427e0d..1a23989aa3b 100644
--- a/infrastructure/mk/pkgpath.mk
+++ b/infrastructure/mk/pkgpath.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: pkgpath.mk,v 1.49 2012/08/18 07:58:20 espie Exp $
+# $OpenBSD: pkgpath.mk,v 1.50 2012/10/10 10:55:33 espie Exp $
 # ex:ts=4 sw=4 filetype=make:
 #	pkgpath.mk - 2003 Marc Espie
 #	This file is in the public domain.
@@ -24,59 +24,59 @@ PKGPATH =${.CURDIR}
 # Code to invoke to split dir,-multi,flavor
 
 _pflavor_fragment = \
-	unset FLAVOR SUBPACKAGE || true; \
-	multi=''; flavor=''; space=''; sawflavor=$${_fullpath}; \
+	broken() { \
+	  echo 1>&2 ">> Broken dependency: $$@ $$extra_msg"; \
+	  reported=true; \
+	} ; \
+	multi=''; flavor=''; space=''; \
 	reported=false; found_dir=false; sawmulti=false; \
 	case "$$subdir" in \
 	"") \
-		echo 1>&2 ">> Broken dependency: empty directory $$extra_msg"; \
-		reported=true;; \
+		broken "empty directory";; \
 	*,*) \
 		esubdir=$$subdir,; IFS=,; first=true; \
 		for i in $$esubdir; do \
 			if $$first; then \
-				dir=$$i; first=false; \
-			else \
-				case X"$$i" in \
-					X-*) \
-						if $$sawmulti; then \
-							echo 1>&2 ">> Broken dependency: several subpackages in $$subdir $$extra_msg"; \
-							reported=true; \
-						fi; \
-						multi="$$i"; sawmulti=true;; \
-					,) \
-						sawflavor=true;; \
-					*) \
-						sawflavor=true; \
-						flavor="$$flavor$$space$$i"; \
-						space=' ';; \
-				esac \
+				dir=$$i; first=false; continue; \
 			fi; \
+			case X"$$i" in \
+				X-*) \
+					if $$sawmulti; then \
+						broken "several subpackages in $$subdir"; \
+					fi; \
+					multi="$$i"; sawmulti=true;; \
+				,) \
+					sawflavor=true;; \
+				*) \
+					sawflavor=true; \
+					flavor="$$flavor$$space$$i"; \
+					space=' ';; \
+			esac \
 		done; \
 		unset IFS;; \
 	*) \
 		dir=$$subdir;; \
 	esac; \
 	toset="PKGPATH=$$dir ARCH=${ARCH}"; \
-	case X$$multi in "X");; *) \
-		toset="$$toset SUBPACKAGE=\"$$multi\"";; \
+	case X"$$multi" in \
+		X) unset SUBPACKAGE || true;; \
+		*) toset="$$toset SUBPACKAGE=\"$$multi\"";; \
 	esac; \
 	case $$dir in \
-	*/) echo 1>&2 ">> Broken dependency, $$dir ends with / - $$extra_msg"; \
-		reported=true;; \
-	*//*) echo 1>&2 ">> Broken dependency, $$dir contains // - $$extra_msg"; \
-		reported=true;; \
+	*/) broken "$$dir ends with /";; \
+	*//*) broken "$$dir contains //";; \
 	esac; \
 	if $$sawflavor; then \
 		toset="$$toset FLAVOR=\"$$flavor\""; \
+	else \
+		unset FLAVOR||true; \
 	fi; \
 	if ! $$reported; then \
 		IFS=:; bases=${PORTSDIR_PATH}; \
 		for base in $$bases; do \
 			cd $$base 2>/dev/null || continue; \
 			if [ -L $$dir ]; then \
-				echo 1>&2 ">> Broken dependency: $$base/$$dir is a symbolic link $$extra_msg"; \
-				reported=true; \
+				broken "$$base/$$dir is a symbolic link"; \
 				break; \
 			fi; \
 			if cd $$dir 2>/dev/null; then \
@@ -85,11 +85,10 @@ _pflavor_fragment = \
 			fi; \
 		done; unset IFS; \
 	fi; \
-	$$found_dir || $$reported || \
-	    echo 1>&2 ">> Broken dependency: $$dir non existent $$extra_msg"; \
+	$$found_dir || $$reported || broken "$$dir non existent"; \
 	$$found_dir
 
-_flavor_fragment = _fullpath=false; ${_pflavor_fragment}
+_flavor_fragment = sawflavor=false; ${_pflavor_fragment}
 
 _depfile_fragment = \
 	case X$${_DEPENDS_FILE} in \