runlist.sh & list2sh.awk unification

43 files changed, 61 insertions, 837 deletions

diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 8a814fddb91..9f679a2e64c 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/04/25 22:00:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/04/25 22:10:27 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -29,7 +29,6 @@ RDSETROOT=	elfrdsetroot
 .include "${TOP}/inst-common/Makefile.inc"
 
 all: ${CBIN} bsd.rd
-	@echo "all done"
 
 DISKTYPE=       rdroot
 NBLKS=          5744
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index e52267b6d99..eb134a8015b 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2002/04/25 22:00:07 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2002/04/25 22:10:27 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -32,7 +32,6 @@ RDSETROOT=	elfrdsetroot
 .include "${TOP}/inst-common/Makefile.inc"
 
 all: ${CBIN} ${FLOPPY}
-	@echo "all done"
 
 DISKTYPE=       rdroot
 NBLKS=          5744
diff --git a/distrib/alpha/inst-common/Makefile.inc b/distrib/alpha/inst-common/Makefile.inc
index d7863c213ef..02dd5206fc1 100644
--- a/distrib/alpha/inst-common/Makefile.inc
+++ b/distrib/alpha/inst-common/Makefile.inc
@@ -1,11 +1,12 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.3 2001/02/08 14:32:31 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2002/04/25 22:10:27 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
 
 CBIN?=		raminst
 COMMONDIR=	${TOP}/inst-common
+UTILS=		${TOP}/../miniroot
 
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
@@ -22,7 +23,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS}\
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/alpha/list2sh.awk b/distrib/alpha/list2sh.awk
deleted file mode 100644
index 078e597c20a..00000000000
--- a/distrib/alpha/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.4 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("test -f ${TARGDIR}/%s && rm -fr ${TARGDIR}/%s\n", $3, $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/alpha/runlist.sh b/distrib/alpha/runlist.sh
deleted file mode 100644
index 0348213aa69..00000000000
--- a/distrib/alpha/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 1997/05/07 12:46:50 niklas Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/hp300/list2sh.awk b/distrib/hp300/list2sh.awk
deleted file mode 100644
index 078e597c20a..00000000000
--- a/distrib/hp300/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.4 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("test -f ${TARGDIR}/%s && rm -fr ${TARGDIR}/%s\n", $3, $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index bffa43b6ac1..da0d805f4c5 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 1999/08/16 09:30:05 downsj Exp $
+#	$OpenBSD: Makefile,v 1.16 2002/04/25 22:10:27 deraadt Exp $
 #	$NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
 
 TOP=		${.CURDIR}/..
@@ -21,7 +21,6 @@ GZIP?=		gzip
 GZIPFLAGS?=	-9f
 
 all: ${CBIN} ${IMAGE} bsd.rd bsd.rd.gz
-	@echo "all done"
 
 install: bsd.rd
 	cp bsd.rd ${DESTDIR}/snapshot/bsd.rd
diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc
index 0ffff9584d9..02285d49fa9 100644
--- a/distrib/hp300/ramdisk/Makefile.inc
+++ b/distrib/hp300/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.2 1998/03/28 23:40:48 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2002/04/25 22:10:27 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
 #
 
@@ -7,6 +7,7 @@
 
 CBIN?=		raminst
 COMMONDIR=	${TOP}/ramdisk
+UTILS?=		${TOP}/../miniroot
 
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
@@ -23,7 +24,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/hp300/runlist.sh b/distrib/hp300/runlist.sh
deleted file mode 100644
index 515da627d8c..00000000000
--- a/distrib/hp300/runlist.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.3 1998/03/28 23:40:46 millert Exp $
-#	$NetBSD: runlist.sh,v 1.1 1995/10/03 22:47:57 thorpej Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 1a94fd05675..6d168f2c0a8 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/04/22 02:40:02 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2002/04/25 22:10:27 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -8,6 +8,7 @@ CBIN?=		instbin
 CRUNCHCONF?=	${CBIN}.conf
 CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
 LISTS?=		${.CURDIR}/../common/list ${.CURDIR}
+UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
 MTREE=		${.CURDIR}/../common/mtree.conf
@@ -34,7 +35,8 @@ ${FS}:	bsd.gz
 	newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY}
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTFLOPPY}
 	/usr/mdec/installboot -v -s ${FLOPPYSECS} -h 2 ${MOUNT_POINT}/boot \
 	    ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV}
 	@echo ""
@@ -112,7 +114,8 @@ ${CRUNCHCONF}: ${CRUNCHCONFS}
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
diff --git a/distrib/i386/list2sh.awk b/distrib/i386/list2sh.awk
deleted file mode 100644
index c32a1d4667c..00000000000
--- a/distrib/i386/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -fr ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/i386/runlist.sh b/distrib/i386/runlist.sh
deleted file mode 100644
index bf5b8ee55f3..00000000000
--- a/distrib/i386/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/mac68k/list2sh.awk b/distrib/mac68k/list2sh.awk
deleted file mode 100644
index 62919dc39b9..00000000000
--- a/distrib/mac68k/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.3 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("test -f ${TARGDIR}/%s && rm -fr ${TARGDIR}/%s\n", $3, $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("test -f ${TARGDIR}/%s && rm -f ${TARGDIR}/%s\n", $i, $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
index fb5cf1b6ed8..d3770725f70 100644
--- a/distrib/mac68k/ramdisk/Makefile
+++ b/distrib/mac68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2002/04/24 22:33:41 miod Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/04/25 22:10:27 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -89,7 +89,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/mac68k/runlist.sh b/distrib/mac68k/runlist.sh
deleted file mode 100644
index 6fb8ea8b172..00000000000
--- a/distrib/mac68k/runlist.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.2 1999/06/13 10:33:30 downsj Exp $
-#	$NetBSD: runlist.sh,v 1.1 1995/10/03 22:47:57 thorpej Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/macppc/Makefile.inc b/distrib/macppc/Makefile.inc
deleted file mode 100644
index 4f2888a2118..00000000000
--- a/distrib/macppc/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2001/09/01 16:47:03 drahn Exp $
-
-REV=	${OSrev}
-
-BSDSRCDIR?=     /usr/src
-SRCSYSDIR?=     ${BSDSRCDIR}/sys
diff --git a/distrib/macppc/list2sh.awk b/distrib/macppc/list2sh.awk
deleted file mode 100644
index b80106f1fa4..00000000000
--- a/distrib/macppc/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.1 2001/09/01 16:47:03 drahn Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -fr ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index e25e381f079..53abcc8face 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,8 +1,9 @@
-#	$OpenBSD: Makefile,v 1.5 2001/09/21 02:38:17 miod Exp $
+#	$OpenBSD: Makefile,v 1.6 2002/04/25 22:10:28 deraadt Exp $
+
+REV=	${OSrev}
 
 TOP=		${.CURDIR}/..
 
-.include "${TOP}/Makefile.inc"
 BSD_RD=		bsd.rd
 IMAGE=		mr.fs
 CBIN?=		instbin
@@ -92,7 +93,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${TOP}/../miniroot/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/macppc/runlist.sh b/distrib/macppc/runlist.sh
deleted file mode 100644
index 24c15e5ebb0..00000000000
--- a/distrib/macppc/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 2001/09/01 16:47:03 drahn Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/mvme68k/list2sh.awk b/distrib/mvme68k/list2sh.awk
deleted file mode 100644
index a2b68db47bf..00000000000
--- a/distrib/mvme68k/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.3 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -fr ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index 8b8fd01b33b..8253bd6f60b 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2002/04/17 01:59:57 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -79,7 +79,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/mvme68k/ramdisk/Makefile.inc b/distrib/mvme68k/ramdisk/Makefile.inc
index 238933a2a53..45706ac53b6 100644
--- a/distrib/mvme68k/ramdisk/Makefile.inc
+++ b/distrib/mvme68k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.4 2000/03/01 22:10:04 todd Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2002/04/25 22:10:28 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
 #
 
@@ -34,7 +34,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/mvme68k/runlist.sh b/distrib/mvme68k/runlist.sh
deleted file mode 100644
index 40054c51e1a..00000000000
--- a/distrib/mvme68k/runlist.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.3 2000/03/01 22:10:03 todd Exp $
-#	$NetBSD: runlist.sh,v 1.1 1995/07/18 04:13:01 briggs Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/mvme88k/list2sh.awk b/distrib/mvme88k/list2sh.awk
deleted file mode 100644
index 55dcac08756..00000000000
--- a/distrib/mvme88k/list2sh.awk
+++ /dev/null
@@ -1,37 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.2 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/mvme88k/ramdisk/Makefile b/distrib/mvme88k/ramdisk/Makefile
index f1e9f818700..facdd0b3987 100644
--- a/distrib/mvme88k/ramdisk/Makefile
+++ b/distrib/mvme88k/ramdisk/Makefile
@@ -30,7 +30,8 @@ all:	bsd.rd
 #	newfs -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
 #	mount ${VND_DEV} ${MOUNT_POINT}
 #	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-#	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY}
+#	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+#	    sh ${UTILS}/runlist.sh ${LISTFLOPPY}
 #	/usr/mdec/installboot -v /mnt/boot ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV}
 #	@echo ""
 #	@df -i ${MOUNT_POINT}
diff --git a/distrib/mvme88k/ramdisk/Makefile.inc b/distrib/mvme88k/ramdisk/Makefile.inc
index bb279d114d6..264d0e1c391 100644
--- a/distrib/mvme88k/ramdisk/Makefile.inc
+++ b/distrib/mvme88k/ramdisk/Makefile.inc
@@ -1,11 +1,12 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.1 1998/12/17 02:16:31 smurph Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2002/04/25 22:10:28 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
 
 CBIN?=		raminst
 COMMONDIR=	${TOP}/ramdisk
+UTILS?=		${TOP}/../miniroot
 
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
@@ -24,7 +25,8 @@ do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -U 
 	@echo mtree done...
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/mvme88k/runlist.sh b/distrib/mvme88k/runlist.sh
deleted file mode 100644
index e599f45d301..00000000000
--- a/distrib/mvme88k/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 1998/12/17 02:16:30 smurph Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/mvmeppc/list2sh.awk b/distrib/mvmeppc/list2sh.awk
deleted file mode 100644
index d3faf9adab3..00000000000
--- a/distrib/mvmeppc/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.2 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -fr ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/mvmeppc/ramdisk/Makefile b/distrib/mvmeppc/ramdisk/Makefile
index 3d794316ee5..196fb48c226 100644
--- a/distrib/mvmeppc/ramdisk/Makefile
+++ b/distrib/mvmeppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2001/06/26 22:23:25 smurph Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -90,7 +90,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${TOP}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/mvmeppc/runlist.sh b/distrib/mvmeppc/runlist.sh
deleted file mode 100644
index c6107e59572..00000000000
--- a/distrib/mvmeppc/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 2001/06/26 22:23:23 smurph Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 982cf9ce4c2..f9faa5587cb 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/04/21 17:56:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -34,7 +34,6 @@ CLEANFILES+=	bsd.rd_unz elfrdsetroot
 #.include "${TOP}/common/Makefile.inc"
 
 all: ${CBIN} bsd.rd
-	@echo "all done"
 
 DISKTYPE=       rdroot
 NBLKS=          5744
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 7b0ab095852..47000833ce3 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2002/04/21 07:30:58 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.4 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -7,6 +7,7 @@ IMAGE=		mr.fs
 CBIN?=		instbin
 CRUNCHCONF?=    ${.CURDIR}/../common/${CBIN}.conf
 LISTS?=		${.CURDIR}/list
+UTILS?=		${.CURDIR}/../../miniroot
 
 MOUNT_POINT=	/mnt
 MTREE=		${.CURDIR}/../common/mtree.conf
@@ -33,7 +34,8 @@ ${FS}:	bsd.rd
 	newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/common/runlist.sh ${LISTFLOPPY}
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTFLOPPY}
 	/usr/mdec/installboot -v ${DESTDIR}/usr/mdec/bootblk ${VND_CRDEV}
 	@echo ""
 	@df -i ${MOUNT_POINT}
@@ -91,7 +93,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/common/runlist.sh ${LISTS}
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
diff --git a/distrib/sparc64/common/runlist.sh b/distrib/sparc64/common/runlist.sh
deleted file mode 100644
index 356287640de..00000000000
--- a/distrib/sparc64/common/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.1 2001/10/10 04:21:02 deraadt Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}
diff --git a/distrib/sparc64/list2sh.awk b/distrib/sparc64/list2sh.awk
deleted file mode 100644
index 1d1dd739da5..00000000000
--- a/distrib/sparc64/list2sh.awk
+++ /dev/null
@@ -1,69 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.3 2002/04/10 06:04:33 deraadt Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("rm -fr ${TARGDIR}/%s\n", $3);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index b66df0b214c..a5efd966237 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2001/10/10 04:21:02 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -123,7 +123,7 @@ do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} \
-	    sh ${TOP}/common/runlist.sh ${LISTS}
+	    UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 1f3a6e30ea2..85bbd35ac9e 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2001/10/10 04:21:02 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/04/25 22:10:28 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -123,7 +123,7 @@ do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} \
-	    sh ${TOP}/common/runlist.sh ${LISTS}
+	    UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/vax/inst-common/Makefile.inc b/distrib/vax/common/Makefile.inc
index 66b11f0c266..11f6c6ecdb9 100644
--- a/distrib/vax/inst-common/Makefile.inc
+++ b/distrib/vax/common/Makefile.inc
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2001/03/16 04:55:52 hugh Exp $
+#	$OpenBSD: Makefile.inc,v 1.1 2002/04/25 22:10:28 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
 CBIN=		instbin
-COMMONDIR=	${TOP}/inst-common
+COMMONDIR=	${TOP}/common
+UTILS=		${TOP}/../miniroot
 
 MOUNT_POINT?=	/mnt
 VND?=		svnd0
@@ -25,7 +26,8 @@ all: ${CBIN} bootroot
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/common/instbin.conf
index d56f0efa5fb..4da3b2007a4 100644
--- a/distrib/vax/inst-common/instbin.conf
+++ b/distrib/vax/common/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.9 2002/04/18 21:50:27 deraadt Exp $	
+# $OpenBSD: instbin.conf,v 1.1 2002/04/25 22:10:28 deraadt Exp $	
 #
 # instbin.conf - unified binary for the kc floppy
 #
diff --git a/distrib/vax/inst-common/list b/distrib/vax/common/list
index 0355ce4ab80..3a450d53e10 100644
--- a/distrib/vax/inst-common/list
+++ b/distrib/vax/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2002/04/18 21:50:27 deraadt Exp $
+#	$OpenBSD: list,v 1.1 2002/04/25 22:10:28 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -63,7 +63,7 @@ COPY	${DESTDIR}/etc/services		etc
 COPY	${DESTDIR}/etc/spwd.db		etc
 
 # and the common installation tools
-COPY	${TOPDIR}/inst-common/termcap.vt	usr/share/misc/termcap
+COPY	${TOPDIR}/common/termcap.vt	usr/share/misc/termcap
 
 COPY	${DESTDIR}/bsd			.
 COPY	${DESTDIR}/boot			.
diff --git a/distrib/vax/inst-common/mtree.conf b/distrib/vax/common/mtree.conf
index 7b2a5b5f3b1..1fa6be687c2 100644
--- a/distrib/vax/inst-common/mtree.conf
+++ b/distrib/vax/common/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.3 2000/03/01 22:10:14 todd Exp $
+#	$OpenBSD: mtree.conf,v 1.1 2002/04/25 22:10:28 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
diff --git a/distrib/vax/inst-common/termcap.vt b/distrib/vax/common/termcap.vt
index ab09ce92e6b..4954731814c 100644
--- a/distrib/vax/inst-common/termcap.vt
+++ b/distrib/vax/common/termcap.vt
@@ -1,4 +1,4 @@
-#	$OpenBSD: termcap.vt,v 1.2 2000/03/01 22:10:14 todd Exp $
+#	$OpenBSD: termcap.vt,v 1.1 2002/04/25 22:10:28 deraadt Exp $
 
 # Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
 # All rights reserved.
diff --git a/distrib/vax/list2sh.awk b/distrib/vax/list2sh.awk
deleted file mode 100644
index 9319f40e0ad..00000000000
--- a/distrib/vax/list2sh.awk
+++ /dev/null
@@ -1,65 +0,0 @@
-#	$OpenBSD: list2sh.awk,v 1.5 2001/08/29 15:01:17 krw Exp $
-
-BEGIN {
-	printf("cd ${CURDIR}\n");
-	printf("\n");
-}
-/^$/ || /^#/ {
-	print $0;
-	next;
-}
-$1 == "COPY" {
-	printf("echo '%s'\n", $0);
-	printf("cp %s ${TARGDIR}/%s\n", $2, $3);
-	next;
-}
-$1 == "LINK" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}; ln %s %s)\n", $2, $3);
-	next;
-}
-$1 == "SYMLINK" {
-	printf("echo '%s'\n", $0);
-	for (i = 3; i <= NF; i++) {
-		printf("rm -f ${TARGDIR}/%s\n", $i);
-		printf("(cd ${TARGDIR}; ln -s %s %s)\n", $2, $i);
-	}
-	next;
-}
-$1 == "ARGVLINK" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "SRCDIRS" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "CRUNCHSPECIAL" {
-	# crunchgen directive; ignored here
-	next;
-}
-$1 == "COPYDIR" {
-	printf("echo '%s'\n", $0);
-	printf("(cd ${TARGDIR}/%s && find . ! -name . | xargs /bin/rm -rf)\n",
-	    $3);
-	printf("(cd %s && find . ! -name . | cpio -pdamu ${TARGDIR}/%s)\n", $2,
-	    $3);
-	next;
-}
-$1 == "SPECIAL" {
-	printf("echo '%s'\n", $0);
-	sub(/^[ \t]*SPECIAL[ \t]*/, "");
-	printf("(cd ${TARGDIR}; %s)\n", $0);
-	next;
-}
-{
-	printf("echo '%s'\n", $0);
-	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
-	printf("exit 1\n");
-	exit 1;
-}
-END {
-	printf("\n");
-	printf("exit 0\n");
-	exit 0;
-}
diff --git a/distrib/vax/runlist.sh b/distrib/vax/runlist.sh
deleted file mode 100644
index 52b9e2cbcd7..00000000000
--- a/distrib/vax/runlist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: runlist.sh,v 1.3 2000/03/01 22:10:13 todd Exp $
-
-if [ "X$1" = "X-d" ]; then
-	SHELLCMD=cat
-	shift
-else
-	SHELLCMD="sh -e"
-fi
-
-( while [ "X$1" != "X" ]; do
-	cat $1
-	shift
-done ) | awk -f ${TOPDIR}/list2sh.awk | ${SHELLCMD}