Sync to HEAD.

3 files changed, 27 insertions, 21 deletions

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index a072b8c229b..b5ade286a5d 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.45 2003/07/11 23:54:32 grant Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.45.2.1 2003/08/01 19:00:36 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -126,8 +126,8 @@ bulk-cache:
 	@${ECHO_MSG} "BULK> Sorting build order."
 	tsort ${DEPENDSTREEFILE} > ${ORDERFILE}
 	@${ECHO_MSG} "BULK> Generating up and down dependency files."
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -u ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -d ${DEPENDSTREEFILE} > ${DEPENDSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
 	@${ECHO_MSG} "BULK> Generating package name <=> package directory cross reference file"
 	@${ECHO_MSG} "      (this may take a while)."
 	cd ${_PKGSRCDIR} && ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE}
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index c77cd78a815..ca43e4a3a89 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.20 2003/05/06 17:42:03 jmmv Exp $
+# $NetBSD: mksandbox,v 1.20.4.1 2003/08/01 19:00:37 jlam Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -43,7 +43,9 @@ pkgsrc=/usr/pkgsrc
 src=/usr/src
 
 kernel=""
-sandboxDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail"
+sandboxMountDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail"
+sandboxEmptyDirs="/var/run /var/log /var/spool/mqueue"
+sandboxEmptyFiles="/var/run/utmp /var/run/utmpx /var/log/wtmp /var/log/wtmpx"
 
 opsys=`uname -s`
 case "$opsys" in
@@ -99,7 +101,7 @@ SunOS)
 	mountprog=/sbin/mount
 	paxprog=/bin/pax
 	sedprog=/usr/xpg4/bin/sed
-	sandboxDirs="/bin /sbin /kernel /lib /proc /usr/X11R6 /usr/bin /usr/ccs /usr/games /usr/include /usr/lib /usr/openwin /usr/share /usr/sbin /usr/ucb /usr/xpg4 /var/mail"
+	sandboxMountDirs="/bin /sbin /kernel /lib /proc /usr/X11R6 /usr/bin /usr/ccs /usr/games /usr/include /usr/lib /usr/openwin /usr/share /usr/sbin /usr/ucb /usr/xpg4 /var/mail"
 	;;
 *)
 	echo "Unknown Operating System ($opsys) - good luck"
@@ -197,7 +199,7 @@ rm -f $sandbox/etc/localtime
 $cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime
 
 echo "Make empty dirs upon which to mount the null mounts"
-for d in $sandboxDirs; do	
+for d in $sandboxMountDirs; do	
 	test -d $d || continue;
 	$mkdirprog $sandbox$d;
 	$mountprog $mountflags -r $d $sandbox$d;
@@ -213,13 +215,17 @@ $mkdirprog $sandbox/var/games
 $chownprog games:games $sandbox/var/games
 $chmodprog 2775 $sandbox/var/games
 
-echo "Making /var/run and /var/run/utmp(x) in $sandbox"
-$mkdirprog $sandbox/var/run
-cp /dev/null $sandbox/var/run/utmp
-cp /dev/null $sandbox/var/run/utmpx
+for d in $sandboxEmptyDirs; do
+	test -d $d || continue
+	echo "Making $d in $sandbox"
+	$mkdirprog $sandbox$d
+done
 
-echo "Making /var/spool/mqueue in $sandbox"
-$mkdirprog $sandbox/var/spool/mqueue
+for f in $sandboxEmptyFiles; do
+	test -f $f || continue
+	echo "Making $f in $sandbox"
+	$cpprog /dev/null $sandbox$f
+done
 
 echo "Mount $src from $sandbox"
 $mkdirprog $sandbox/usr/src
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index f1fd17424f2..5a25b298062 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.9 2003/07/11 23:54:33 grant Exp $
+# $NetBSD: tflat,v 1.9.2.1 2003/08/01 19:00:38 jlam Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,11 +42,11 @@ BEGIN {
 		exit(1);
 	}
 
-	if ( ARGV[1] == "-u" ) {
+	if ( ARGV[1] == "up" ) {
 		up=1;
 	}
 	else{
-		if ( ARGV[1] == "-d" ) { up=0; }
+		if ( ARGV[1] == "down" ) { up=0; }
 		else{
 			printf("tflat: unknown option  \"%s\"\n",ARGV[1]);
 			usage();
@@ -177,10 +177,10 @@ function usage(){
 	printf("         packages which depend upon a given package or alternatively\n");
 	printf("         all packages which are depend upon by a given package.\n");
 	printf("\n");
-	printf("Usage:\ttflat -u|-d depfile\n");
+	printf("Usage:\ttflat up|down depfile\n");
 	printf("\n");
-	printf("Options:\t-d\tgo down the depends tree (ie \"foo depends on:\")\n");
-	printf("        \t-u\tgo up the depends tree (ie \"foo is depended on by:\")\n");
+	printf("Options:\tdown\tgo down the depends tree (ie \"foo depends on:\")\n");
+	printf("        \tup\tgo up the depends tree (ie \"foo is depended on by:\")\n");
 	printf("\n");
 	printf("Input file format is in the form\n");
 	printf("foo	bar\n");
@@ -194,8 +194,8 @@ function usage(){
 	printf("The typical use is:\n");
 	printf("cd /usr/pkgsrc\n");
 	printf("./mk/bulk/printdepends > .depends\n");
-	printf("./mk/bulk/tflat -u .depends > .supports\n");
-	printf("./mk/bulk/tflat -d .depends > .requires\n");
+	printf("./mk/bulk/tflat up .depends > .supports\n");
+	printf("./mk/bulk/tflat down .depends > .requires\n");
 	printf("\n");
 
 }