4 files changed, 5 insertions, 91 deletions
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}