svn commit: r274312 - head/tools/tools/sysbuild

[Poul-Henning Kamp]

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