From owner-svn-src-head@freebsd.org  Fri Dec 29 15:38:45 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E253EA102A;
 Fri, 29 Dec 2017 15:38:45 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DEF2F6E034;
 Fri, 29 Dec 2017 15:38:44 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBTFcigc081381;
 Fri, 29 Dec 2017 15:38:44 GMT (envelope-from phk@FreeBSD.org)
Received: (from phk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBTFchoN081380;
 Fri, 29 Dec 2017 15:38:43 GMT (envelope-from phk@FreeBSD.org)
Message-Id: <201712291538.vBTFchoN081380@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: phk set sender to phk@FreeBSD.org
 using -f
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 29 Dec 2017 15:38:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327345 - head/tools/tools/sysbuild
X-SVN-Group: head
X-SVN-Commit-Author: phk
X-SVN-Commit-Paths: head/tools/tools/sysbuild
X-SVN-Commit-Revision: 327345
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Dec 2017 15:38:45 -0000

Author: phk
Date: Fri Dec 29 15:38:43 2017
New Revision: 327345
URL: https://svnweb.freebsd.org/changeset/base/327345

Log:
  Add a crude workaround for ports with flavors

Modified:
  head/tools/tools/sysbuild/sysbuild.sh

Modified: head/tools/tools/sysbuild/sysbuild.sh
==============================================================================
--- head/tools/tools/sysbuild/sysbuild.sh	Fri Dec 29 15:04:49 2017	(r327344)
+++ head/tools/tools/sysbuild/sysbuild.sh	Fri Dec 29 15:38:43 2017	(r327345)
@@ -196,13 +196,20 @@ ports_recurse() (
 	echo "$t" >> /tmp/_.plist.tdone
 	for d
 	do
+		fl=""
 		if [ ! -d $d ] ; then
-			echo "Missing port $d ($t)" 1>&2
-			continue
+			fl=FLAVOR=`expr $d : '.*@\(.*\)'`
+			bd=`expr $d : '\(.*\)@.*'`
+			if [ ! -d $bd ] ; then
+				echo "Missing port $d ($t) (fl $fl) (bd $bd)" 1>&2
+				continue
+			fi
+			echo "Flavored port $d ($t) (fl $fl) (bd $bd)" 1>&2
+			d=$bd
 		fi
 		d=`cd /usr/ports && cd $d && /bin/pwd`
 		if [ ! -f $d/Makefile ] ; then
-			echo "Missing port $d" 1>&2
+			echo "Missing port (Makefile) $d" 1>&2
 			continue
 		fi
 		if [ "x$t" != "x." ] ; then
@@ -216,7 +223,7 @@ ports_recurse() (
 			(
 			cd $d
 			l=""
-			for a in `ports_make -V _UNIFIED_DEPENDS`
+			for a in `ports_make -V _UNIFIED_DEPENDS $fl`
 			do
 				x=`expr "$a" : '.*:\(.*\)'`
 				l="${l} ${x}"