From 5a42d563e45a86eb15a8b0c4232e7ee9da6d83d7 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 4 Dec 2009 10:57:01 +0000
Subject: [PATCH] Add disk-magic for amd64: same as i386.

Pass PORTS_OPTS wherever we invoke ports makefiles

Add a logfile where we can see the progress of distfile prefetching
---
 tools/tools/sysbuild/sysbuild.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/tools/sysbuild/sysbuild.sh b/tools/tools/sysbuild/sysbuild.sh
index c3689ab47c9d..009973cca10d 100644
--- a/tools/tools/sysbuild/sysbuild.sh
+++ b/tools/tools/sysbuild/sysbuild.sh
@@ -41,6 +41,18 @@ if [ `uname -m` = "i386" ] ; then
 	s,s3a,s2a,
 	'`
 
+	# Where our build-bits are to be found
+	FREEBSD_PART=`echo $TARGET_PART | sed 's/s[12]a/s3/'`
+elif [ `uname -m` = "amd64" ] ; then
+	TARGET_PART=`df / | sed '
+	1d
+	s/[    ].*//
+	s,/dev/,,
+	s,s1a,s3a,
+	s,s2a,s1a,
+	s,s3a,s2a,
+	'`
+
 	# Where our build-bits are to be found
 	FREEBSD_PART=`echo $TARGET_PART | sed 's/s[12]a/s3/'`
 else
@@ -162,7 +174,7 @@ ports_recurse() (
 		else
 			(
 			cd $d
-			ports_recurse `make -V _DEPEND_DIRS`
+			ports_recurse `make -V _DEPEND_DIRS ${PORTS_OPTS}`
 			)
 			echo $d >> /tmp/_.plist
 		fi
@@ -195,7 +207,7 @@ ports_build() (
 				cd /usr/ports
 				cd $p
 				set +e
-				make clean
+				make clean ${PORTS_OPTS}
 				if make install ${PORTS_OPTS} ; then
 					if [ "x${PKG_DIR}" != "x" ] ; then
 						make package ${PORTS_OPTS}
@@ -217,9 +229,11 @@ ports_prefetch() (
 	true > /tmp/_.plist
 	ports_recurse $PORTS_WE_WANT
 
+	true > /mnt/_.prefetch
 	# Now checksump/fetch them
 	for p in `cat /tmp/_.plist`
 	do
+		echo "Prefetching $p" >> /mnt/_.prefetch
 		b=`echo $p | tr / _`
 		(
 			cd $p
@@ -434,6 +448,7 @@ if [ "x${OBJ_PATH}" != "x" ] ; then
 fi
 
 log_it Wait for ports prefetch
+log_it "(Tail /mnt/_.prefetch for progress)"
 wait
 
 log_it Move filesystems