From owner-svn-src-head@FreeBSD.ORG  Sun Nov  9 15:33:32 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06B264FB;
 Sun,  9 Nov 2014 15:33:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E6DFE650;
 Sun,  9 Nov 2014 15:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA9FXVLd033623;
 Sun, 9 Nov 2014 15:33:31 GMT (envelope-from phk@FreeBSD.org)
Received: (from phk@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA9FXVJL033622;
 Sun, 9 Nov 2014 15:33:31 GMT (envelope-from phk@FreeBSD.org)
Message-Id: <201411091533.sA9FXVJL033622@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: phk set sender to phk@FreeBSD.org
 using -f
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 9 Nov 2014 15:33:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274312 - head/tools/tools/sysbuild
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2014 15:33:32 -0000

Author: phk
Date: Sun Nov  9 15:33:31 2014
New Revision: 274312
URL: https://svnweb.freebsd.org/changeset/base/274312

Log:
  Handle full-path-resolutions to detect the magic-ness of the pkg port.

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

Modified: head/tools/tools/sysbuild/sysbuild.sh
==============================================================================
--- head/tools/tools/sysbuild/sysbuild.sh	Sun Nov  9 14:07:24 2014	(r274311)
+++ head/tools/tools/sysbuild/sysbuild.sh	Sun Nov  9 15:33:31 2014	(r274312)
@@ -160,7 +160,6 @@ fi
 set -e
 
 log_it() (
-	set +x
 	a="$*"
 	set `cat /tmp/_sb_log`
 	TX=`date +%s`
@@ -175,7 +174,6 @@ log_it() (
 
 
 ports_recurse() (
-	set +x
 	t=$1
 	shift
 	if [ "x$t" = "x." ] ; then
@@ -218,7 +216,6 @@ ports_recurse() (
 )
 
 ports_build() (
-	set +x
 
 	ports_recurse . $PORTS_WE_WANT 
 
@@ -229,20 +226,24 @@ ports_build() (
 		t=`echo $p | sed 's,/usr/ports/,,'`
 		pn=`cd $p && make package-name`
 
-		if pkg info $pn > /dev/null 2>&1 ; then
-			log_it "Already installed: $t ($pn)"
-			continue
-		fi
-
-		if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" ] ; then
+		if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" -o \
+		     "x$p" == "x/freebsd/ports/ports-mgmt/pkg" ] ; then
 			log_it "Very Special: $t ($pn)"
+
 			(
 			cd $p
-			make clean all install ${PORTS_OPTS}
+			make clean ${PORTS_OPTS}
+			make all ${PORTS_OPTS}
+			make install ${PORTS_OPTS}
 			) > _.$b 2>&1 < /dev/null
 			continue
 		fi
 
+		if pkg info $pn > /dev/null 2>&1 ; then
+			log_it "Already installed: $t ($pn)"
+			continue
+		fi
+
 		if [ "x${PKG_DIR}" != "x" -a -f ${PKG_DIR}/$pn.txz ] ; then
 			if [ "x$use_pkg" = "x-p" ] ; then
 				log_it "Install $t ($pn)"
@@ -380,7 +381,6 @@ done
 #######################################################################
 
 if [ "x$1" = "xchroot_script" ] ; then
-	set +x
 	set -e
 
 	shift