summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/alpha/common/list19
-rw-r--r--distrib/alpha/inst-common/list108
-rw-r--r--distrib/amiga/miniroot/list18
-rw-r--r--distrib/amiga/ramdisk/list20
-rw-r--r--distrib/hp300/ramdisk/list125
-rw-r--r--distrib/i386/common/list138
-rw-r--r--distrib/mac68k/ramdisk/list117
-rw-r--r--distrib/macppc/ramdisk/list112
-rw-r--r--distrib/miniroot/list10
-rw-r--r--distrib/mvme68k/ramdisk/list120
-rw-r--r--distrib/mvme88k/miniroot/list18
-rw-r--r--distrib/mvme88k/ramdisk/list131
-rw-r--r--distrib/mvmeppc/ramdisk/list135
-rw-r--r--distrib/ramdisk/list96
-rw-r--r--distrib/sparc/miniroot/list27
-rw-r--r--distrib/sparc/ramdisk/list20
-rw-r--r--distrib/sparc64/bsd.rd/list102
-rw-r--r--distrib/sparc64/ramdisk/list102
-rw-r--r--distrib/sparc64/ramdiskB/list102
-rw-r--r--distrib/sun3/miniroot/list28
-rw-r--r--distrib/sun3/ramdisk/list16
-rw-r--r--distrib/vax/common/list4
-rw-r--r--distrib/vax/ramdisk/list16
23 files changed, 784 insertions, 800 deletions
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index 310e6cfaca6..cf4339dccbb 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,15 +1,10 @@
-# $OpenBSD: list,v 1.5 2002/04/22 02:43:16 deraadt Exp $
-
-# we strip comments from files since we need the space...
-
-# the disktab explanation file
-#SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/disktab.preinstall > etc/disktab.preinstall
+# $OpenBSD: list,v 1.6 2002/04/30 01:31:19 deraadt Exp $
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../common/disktab.shadow > etc/disktab.shadow
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../common/disktab.shadow etc/disktab.shadow
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../common/install.md install.md
SPECIAL chmod 755 install upgrade
diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list
index ee0cc345c34..3a3d3116316 100644
--- a/distrib/alpha/inst-common/list
+++ b/distrib/alpha/inst-common/list
@@ -1,70 +1,70 @@
#
-# $OpenBSD: list,v 1.24 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.25 2002/04/30 01:31:19 deraadt Exp $
#
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/raminst raminst
-LINK raminst bin/cat
-LINK raminst bin/chmod bin/chgrp sbin/chown
-LINK raminst bin/cp
-LINK raminst bin/cpio
-LINK raminst bin/dd
-LINK raminst bin/df
-LINK raminst bin/ed
-#LINK raminst bin/expr
-LINK raminst bin/ln
-LINK raminst bin/ls
-LINK raminst bin/mkdir
-LINK raminst bin/mv
-LINK raminst bin/ksh bin/sh
-ARGVLINK ksh -sh
-LINK raminst bin/rm
-LINK raminst bin/stty
-LINK raminst bin/sleep
-LINK raminst bin/tar
-LINK raminst sbin/disklabel
-LINK raminst sbin/dmesg
-LINK raminst sbin/hostname
-LINK raminst sbin/fsck
-LINK raminst sbin/halt
-#LINK raminst sbin/dhclient
-LINK raminst sbin/ifconfig
-LINK raminst sbin/init
-LINK raminst sbin/mknod
-LINK raminst sbin/mount
-#LINK raminst sbin/mount_cd9660
-LINK raminst sbin/mount_ffs
-LINK raminst sbin/mount_mfs
-LINK raminst sbin/newfs
-LINK raminst sbin/reboot
-LINK raminst sbin/route
-LINK raminst sbin/umount
-LINK raminst usr/bin/ftp
-LINK raminst usr/bin/egrep
-LINK raminst usr/bin/fgrep
-LINK raminst usr/bin/grep
-LINK raminst usr/bin/gzip
-LINK raminst usr/bin/less
-LINK raminst usr/bin/more
-LINK raminst usr/bin/sed
-LINK raminst usr/bin/pax
-#LINK raminst usr/mdec/installboot
+COPY ${OBJDIR}/raminst raminst
+LINK raminst bin/cat
+LINK raminst bin/chmod bin/chgrp sbin/chown
+LINK raminst bin/cp
+LINK raminst bin/cpio
+LINK raminst bin/dd
+LINK raminst bin/df
+LINK raminst bin/ed
+#LINK raminst bin/expr
+LINK raminst bin/ln
+LINK raminst bin/ls
+LINK raminst bin/mkdir
+LINK raminst bin/mv
+LINK raminst bin/ksh bin/sh
+ARGVLINK ksh -sh
+LINK raminst bin/rm
+LINK raminst bin/stty
+LINK raminst bin/sleep
+LINK raminst bin/tar
+LINK raminst sbin/disklabel
+LINK raminst sbin/dmesg
+LINK raminst sbin/hostname
+LINK raminst sbin/fsck
+LINK raminst sbin/halt
+#LINK raminst sbin/dhclient
+LINK raminst sbin/ifconfig
+LINK raminst sbin/init
+LINK raminst sbin/mknod
+LINK raminst sbin/mount
+#LINK raminst sbin/mount_cd9660
+LINK raminst sbin/mount_ffs
+LINK raminst sbin/mount_mfs
+LINK raminst sbin/newfs
+LINK raminst sbin/reboot
+LINK raminst sbin/route
+LINK raminst sbin/umount
+LINK raminst usr/bin/ftp
+LINK raminst usr/bin/egrep
+LINK raminst usr/bin/fgrep
+LINK raminst usr/bin/grep
+LINK raminst usr/bin/gzip
+LINK raminst usr/bin/less
+LINK raminst usr/bin/more
+LINK raminst usr/bin/sed
+LINK raminst usr/bin/pax
+#LINK raminst usr/mdec/installboot
SPECIAL /bin/rm raminst
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec XXX - no it's not necessary and won't fit.
-#COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
-#COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx
+#COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
+#COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/group etc/group
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# so DNS can work
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/amiga/miniroot/list b/distrib/amiga/miniroot/list
index 1bc3c4128c2..cbfbb6fda64 100644
--- a/distrib/amiga/miniroot/list
+++ b/distrib/amiga/miniroot/list
@@ -1,19 +1,19 @@
-# $OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.14 2002/04/30 01:31:19 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
-LINK instbin sbin/disklabel
-LINK instbin sbin/mount_msdos
-LINK instbin usr/bin/cksum usr/bin/sum
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
+LINK instbin sbin/disklabel
+LINK instbin sbin/mount_msdos
+LINK instbin usr/bin/cksum usr/bin/sum
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV all
TERMCAP vt100,vt200,dumb usr/share/misc/termcap
@@ -29,4 +29,4 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/hosts etc/hosts
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md
diff --git a/distrib/amiga/ramdisk/list b/distrib/amiga/ramdisk/list
index 920a77c1d3c..a19135422ef 100644
--- a/distrib/amiga/ramdisk/list
+++ b/distrib/amiga/ramdisk/list
@@ -1,20 +1,20 @@
-# $OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.14 2002/04/30 01:31:19 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
-LINK instbin sbin/disklabel
-LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_ados
-LINK instbin usr/bin/cksum usr/bin/sum
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
+LINK instbin sbin/disklabel
+LINK instbin sbin/mount_msdos
+LINK instbin sbin/mount_ados
+LINK instbin usr/bin/cksum usr/bin/sum
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
TERMCAP vt100,vt200,dumb usr/share/misc/termcap
@@ -27,4 +27,4 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/hosts etc/hosts
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index f29ed4da949..c49f182d6c9 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,82 +1,81 @@
-# $OpenBSD: list,v 1.29 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.30 2002/04/30 01:31:20 deraadt Exp $
-COPY ${OBJDIR}/raminst raminst
-LINK raminst bin/cat
-LINK raminst bin/chmod bin/chgrp sbin/chown
-LINK raminst bin/cp
-LINK raminst bin/df
-LINK raminst bin/dd
-LINK raminst bin/ed
-LINK raminst bin/expr
-LINK raminst bin/hostname
-LINK raminst bin/ln
-LINK raminst bin/ls
-LINK raminst bin/mkdir
-LINK raminst bin/mv
-LINK raminst bin/rm
-LINK raminst bin/sh
-LINK bin/sh bin/-sh
-LINK raminst bin/sleep
-LINK raminst bin/stty
-LINK raminst bin/sync
-LINK raminst sbin/disklabel
-LINK raminst sbin/fsck
-LINK raminst sbin/dmesg
-LINK raminst sbin/halt
-LINK raminst sbin/ifconfig
-LINK raminst sbin/init
-LINK raminst sbin/mknod
-LINK raminst usr/bin/more
-LINK raminst sbin/mount
-LINK raminst sbin/mount_cd9660
-LINK raminst sbin/mount_ffs
-LINK raminst sbin/mount_nfs
-LINK raminst sbin/mount_mfs
-LINK raminst sbin/newfs
-LINK raminst sbin/reboot
-LINK raminst sbin/route
-LINK raminst sbin/umount
-LINK raminst usr/bin/ftp
-LINK raminst usr/bin/egrep
-LINK raminst usr/bin/grep
-LINK raminst usr/bin/gzip
-LINK raminst usr/bin/less
-LINK raminst usr/bin/sed
-LINK raminst usr/bin/sort
-LINK raminst bin/pax
-LINK raminst usr/bin/tar
-LINK raminst sbin/dhclient
+COPY ${OBJDIR}/raminst raminst
+LINK raminst bin/cat
+LINK raminst bin/chmod bin/chgrp sbin/chown
+LINK raminst bin/cp
+LINK raminst bin/df
+LINK raminst bin/dd
+LINK raminst bin/ed
+LINK raminst bin/expr
+LINK raminst bin/hostname
+LINK raminst bin/ln
+LINK raminst bin/ls
+LINK raminst bin/mkdir
+LINK raminst bin/mv
+LINK raminst bin/rm
+LINK raminst bin/sh
+LINK bin/sh bin/-sh
+LINK raminst bin/sleep
+LINK raminst bin/stty
+LINK raminst bin/sync
+LINK raminst sbin/disklabel
+LINK raminst sbin/fsck
+LINK raminst sbin/dmesg
+LINK raminst sbin/halt
+LINK raminst sbin/ifconfig
+LINK raminst sbin/init
+LINK raminst sbin/mknod
+LINK raminst usr/bin/more
+LINK raminst sbin/mount
+LINK raminst sbin/mount_cd9660
+LINK raminst sbin/mount_ffs
+LINK raminst sbin/mount_nfs
+LINK raminst sbin/mount_mfs
+LINK raminst sbin/newfs
+LINK raminst sbin/reboot
+LINK raminst sbin/route
+LINK raminst sbin/umount
+LINK raminst usr/bin/ftp
+LINK raminst usr/bin/egrep
+LINK raminst usr/bin/grep
+LINK raminst usr/bin/gzip
+LINK raminst usr/bin/less
+LINK raminst usr/bin/sed
+LINK raminst usr/bin/sort
+LINK raminst bin/pax
+LINK raminst usr/bin/tar
+LINK raminst sbin/dhclient
SPECIAL /bin/rm raminst
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec (XXX)
-COPY ${DESTDIR}/usr/mdec/uboot.lif usr/mdec/uboot.lif
-LINK usr/mdec/uboot.lif usr/mdec/bootct
-LINK usr/mdec/uboot.lif usr/mdec/boothd
-LINK usr/mdec/uboot.lif usr/mdec/bootsd
-LINK usr/mdec/uboot.lif usr/mdec/ctboot
-LINK usr/mdec/uboot.lif usr/mdec/hdboot
-LINK usr/mdec/uboot.lif usr/mdec/sdboot
+COPY ${DESTDIR}/usr/mdec/uboot.lif usr/mdec/uboot.lif
+LINK usr/mdec/uboot.lif usr/mdec/bootct
+LINK usr/mdec/uboot.lif usr/mdec/boothd
+LINK usr/mdec/uboot.lif usr/mdec/bootsd
+LINK usr/mdec/uboot.lif usr/mdec/ctboot
+LINK usr/mdec/uboot.lif usr/mdec/hdboot
+LINK usr/mdec/uboot.lif usr/mdec/sdboot
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
-SPECIAL sed -e '/^#[ ].*$/d' < ${DESTDIR}/etc/disktab > etc/disktab
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab
TERMCAP vt100,vt200,dumb,hp2392,hpansi,hpsub,hpex,hp300h,hp700-wy,hp70092 usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" -e '/^[ ]*#$/d' < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
-
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
# so DNS can work
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 618ec17d66c..6ab65be188b 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,86 +1,84 @@
-# $OpenBSD: list,v 1.3 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.4 2002/04/30 01:31:20 deraadt Exp $
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod
-LINK instbin bin/chgrp
-LINK instbin bin/cp
-LINK instbin bin/cpio bin/pax bin/tar
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mv
-LINK instbin bin/rm
-LINK instbin bin/hostname
-LINK instbin bin/sh bin/ksh
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin sbin/chown
-LINK instbin sbin/disklabel
-LINK instbin sbin/dhclient
-LINK instbin sbin/fdisk
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck sbin/fsck_ffs
-LINK instbin sbin/halt sbin/reboot
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_ext2fs
-LINK instbin sbin/ping
-LINK instbin sbin/newfs
-LINK instbin sbin/restore
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin sbin/kbd
-LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/rsh
-LINK instbin usr/bin/sed
-LINK instbin usr/mdec/installboot
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod
+LINK instbin bin/chgrp
+LINK instbin bin/cp
+LINK instbin bin/cpio bin/pax bin/tar
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mv
+LINK instbin bin/rm
+LINK instbin bin/hostname
+LINK instbin bin/sh bin/ksh
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin sbin/chown
+LINK instbin sbin/disklabel
+LINK instbin sbin/dhclient
+LINK instbin sbin/fdisk
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck sbin/fsck_ffs
+LINK instbin sbin/halt sbin/reboot
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_msdos
+LINK instbin sbin/mount_ext2fs
+LINK instbin sbin/ping
+LINK instbin sbin/newfs
+LINK instbin sbin/restore
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin sbin/kbd
+LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/rsh
+LINK instbin usr/bin/sed
+LINK instbin usr/mdec/installboot
+ARGVLINK ksh -sh
SPECIAL /bin/rm instbin
-# `internal' crunchgen links
-ARGVLINK ksh -sh
-
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
-COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot
-COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
-COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
+COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot
+COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
-COPY ${CURDIR}/../../miniroot/protocols etc/protocols
-COPY ${CURDIR}/../../miniroot/services etc/services
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+COPY ${CURDIR}/../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../miniroot/services etc/services
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
-SYMLINK /tmp/disktab.shadow etc/disktab
-SYMLINK /tmp/fstab.shadow etc/fstab
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
-SYMLINK /tmp/hosts etc/hosts
+SYMLINK /tmp/disktab.shadow etc/disktab
+SYMLINK /tmp/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../common/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
index 68f7b5260c5..4c1201e6a41 100644
--- a/distrib/mac68k/ramdisk/list
+++ b/distrib/mac68k/ramdisk/list
@@ -1,70 +1,69 @@
-# $OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.14 2002/04/30 01:31:20 deraadt Exp $
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/ksh bin/sh
-ARGVLINK ksh -sh
-LINK instbin bin/stty
-LINK instbin bin/test bin/[
-LINK instbin sbin/dhclient
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck
-LINK instbin sbin/fsck_ffs
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs
-LINK instbin sbin/ping
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/ksh bin/sh
+ARGVLINK ksh -sh
+LINK instbin bin/stty
+LINK instbin bin/test bin/[
+LINK instbin sbin/dhclient
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck
+LINK instbin sbin/fsck_ffs
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs
+LINK instbin sbin/ping
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/sed
SPECIAL rm instbin
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
-COPY ${CURDIR}/../../miniroot/protocols etc/protocols
-COPY ${CURDIR}/../../miniroot/services etc/services
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-SYMLINK /tmp/disktab.shadow etc/disktab
-SYMLINK /tmp/fstab.shadow etc/fstab
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
-SYMLINK /tmp/hosts etc/hosts
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/group etc/group
+COPY ${CURDIR}/../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../miniroot/services etc/services
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+SYMLINK /tmp/disktab.shadow etc/disktab
+SYMLINK /tmp/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
-
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 9aa6b5ae032..5ec1827ca73 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,62 +1,62 @@
-# $OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.14 2002/04/30 01:31:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt bin/eject
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/ksh bin/sh
-ARGVLINK ksh -sh
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin bin/sync
-LINK instbin bin/test bin/[
-LINK instbin sbin/disklabel
-LINK instbin sbin/pdisk
-LINK instbin sbin/fdisk
-LINK instbin sbin/fsck
-LINK instbin sbin/fsck_ffs
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/dhclient
-LINK instbin sbin/dmesg
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs
-LINK instbin sbin/newfs_msdos
-LINK instbin sbin/ping
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin sbin/wicontrol
-LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt bin/eject
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/ksh bin/sh
+ARGVLINK ksh -sh
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin bin/sync
+LINK instbin bin/test bin/[
+LINK instbin sbin/disklabel
+LINK instbin sbin/pdisk
+LINK instbin sbin/fdisk
+LINK instbin sbin/fsck
+LINK instbin sbin/fsck_ffs
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/dhclient
+LINK instbin sbin/dmesg
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_msdos
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs
+LINK instbin sbin/newfs_msdos
+LINK instbin sbin/ping
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin sbin/wicontrol
+LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/sed
SPECIAL /bin/rm instbin
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
@@ -79,9 +79,9 @@ TERMCAP vt100,vt200,dumb usr/share/misc/termcap
COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index d4355d40ec6..83fe897692c 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.28 2002/04/28 19:25:09 deraadt Exp $
+# $OpenBSD: list,v 1.29 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -53,8 +53,8 @@ COPY ${CURDIR}/../miniroot/protocols etc/protocols
COPY ${CURDIR}/../miniroot/services etc/services
# and the installation scripts
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub
+SPECIAL ${CURDIR}/dot.profile .profile
+SPECIAL ${CURDIR}/upgrade.sh upgrade
+SPECIAL ${CURDIR}/install.sh install
+SPECIAL ${CURDIR}/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list
index 0c869eddfb5..86ca4e0a5a5 100644
--- a/distrib/mvme68k/ramdisk/list
+++ b/distrib/mvme68k/ramdisk/list
@@ -1,79 +1,79 @@
-# $OpenBSD: list,v 1.19 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.20 2002/04/30 01:31:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/ksh bin/sh
-ARGVLINK ksh -sh
-LINK instbin bin/stty
-LINK instbin bin/test bin/[
-#LINK instbin sbin/dhclient
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck
-LINK instbin sbin/fsck_ffs
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs
-LINK instbin sbin/ping
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/ksh bin/sh
+ARGVLINK ksh -sh
+LINK instbin bin/stty
+LINK instbin bin/test bin/[
+#LINK instbin sbin/dhclient
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck
+LINK instbin sbin/fsck_ffs
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs
+LINK instbin sbin/ping
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/sed
SPECIAL rm instbin
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
-COPY ${DESTDIR}/usr/mdec/netboot usr/mdec/netboot
-COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx
-COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/bootsd
-COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
+COPY ${DESTDIR}/usr/mdec/netboot usr/mdec/netboot
+COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx
+COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/bootsd
+COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/group etc/group
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-SYMLINK /tmp/disktab.shadow etc/disktab
-SYMLINK /tmp/fstab.shadow etc/fstab
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
-SYMLINK /tmp/hosts etc/hosts
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+SYMLINK /tmp/disktab.shadow etc/disktab
+SYMLINK /tmp/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index f2fbb56727a..1576055f4cc 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,19 +1,19 @@
-# $OpenBSD: list,v 1.9 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.10 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
-LINK instbin sbin/disklabel
-LINK instbin sbin/mount_msdos
-LINK instbin usr/bin/cksum usr/bin/sum
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
+LINK instbin sbin/disklabel
+LINK instbin sbin/mount_msdos
+LINK instbin usr/bin/cksum usr/bin/sum
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV all
# copy the kernel
@@ -28,4 +28,4 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index ae51f90f9ef..5fa8bff71c0 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,82 +1,81 @@
-# $OpenBSD: list,v 1.14 2002/04/29 17:13:38 deraadt Exp $
+# $OpenBSD: list,v 1.15 2002/04/30 01:31:20 deraadt Exp $
-COPY ${OBJDIR}/raminst raminst
-LINK raminst bin/cat
-LINK raminst bin/chmod bin/chgrp sbin/chown
-LINK raminst bin/cp
-LINK raminst bin/df
-LINK raminst bin/dd
-LINK raminst bin/ed
-LINK raminst bin/expr
-LINK raminst bin/ln
-LINK raminst bin/ls
-LINK raminst bin/kill
-LINK raminst bin/hostname
-LINK raminst bin/mkdir
-LINK raminst bin/mt
-LINK raminst bin/mv
-LINK raminst bin/pwd
-LINK raminst bin/rm
-LINK raminst bin/sh
-LINK bin/sh bin/-sh
-LINK bin/sh bin/bash
-LINK raminst bin/stty
-LINK raminst bin/sleep
-LINK raminst bin/sync
-LINK raminst bin/test
-LINK raminst bin/pax bin/tar bin/cpio
-LINK raminst bin/[
-LINK raminst sbin/disklabel
-LINK raminst sbin/dmesg
-LINK raminst sbin/fsck
-LINK raminst sbin/halt
-LINK raminst sbin/ifconfig
-LINK raminst sbin/init
-LINK raminst sbin/mknod
-LINK raminst sbin/mount
-LINK raminst sbin/mount_cd9660
-LINK raminst sbin/mount_ffs
-LINK raminst sbin/mount_nfs
-LINK raminst sbin/mount_mfs
-LINK raminst sbin/newfs
-LINK raminst sbin/reboot
-LINK raminst sbin/route
-LINK raminst sbin/umount
-LINK raminst usr/bin/ftp
-LINK raminst usr/bin/egrep
-LINK raminst usr/bin/grep
-LINK raminst usr/bin/gzip
-LINK raminst usr/bin/more
-LINK raminst usr/bin/less
-LINK raminst usr/bin/sed
-LINK raminst usr/bin/tar
-LINK raminst usr/bin/pax
+COPY ${OBJDIR}/raminst raminst
+LINK raminst bin/cat
+LINK raminst bin/chmod bin/chgrp sbin/chown
+LINK raminst bin/cp
+LINK raminst bin/df
+LINK raminst bin/dd
+LINK raminst bin/ed
+LINK raminst bin/expr
+LINK raminst bin/ln
+LINK raminst bin/ls
+LINK raminst bin/kill
+LINK raminst bin/hostname
+LINK raminst bin/mkdir
+LINK raminst bin/mt
+LINK raminst bin/mv
+LINK raminst bin/pwd
+LINK raminst bin/rm
+LINK raminst bin/sh
+LINK bin/sh bin/-sh
+LINK bin/sh bin/bash
+LINK raminst bin/stty
+LINK raminst bin/sleep
+LINK raminst bin/sync
+LINK raminst bin/test
+LINK raminst bin/pax bin/tar bin/cpio
+LINK raminst bin/[
+LINK raminst sbin/disklabel
+LINK raminst sbin/dmesg
+LINK raminst sbin/fsck
+LINK raminst sbin/halt
+LINK raminst sbin/ifconfig
+LINK raminst sbin/init
+LINK raminst sbin/mknod
+LINK raminst sbin/mount
+LINK raminst sbin/mount_cd9660
+LINK raminst sbin/mount_ffs
+LINK raminst sbin/mount_nfs
+LINK raminst sbin/mount_mfs
+LINK raminst sbin/newfs
+LINK raminst sbin/reboot
+LINK raminst sbin/route
+LINK raminst sbin/umount
+LINK raminst usr/bin/ftp
+LINK raminst usr/bin/egrep
+LINK raminst usr/bin/grep
+LINK raminst usr/bin/gzip
+LINK raminst usr/bin/more
+LINK raminst usr/bin/less
+LINK raminst usr/bin/sed
+LINK raminst usr/bin/tar
+LINK raminst usr/bin/pax
SPECIAL /bin/rm raminst
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# mdec
-COPY ${DESTDIR}/usr/mdec/installboot usr/mdec
-COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec
-COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec
+COPY ${DESTDIR}/usr/mdec/installboot usr/mdec
+COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec
+COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/group etc/group
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# the disktab explanation file
-COPY disktab.preinstall etc
+COPY disktab.preinstall etc
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
-
diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list
index 896c3ab6e77..188a2c508f3 100644
--- a/distrib/mvmeppc/ramdisk/list
+++ b/distrib/mvmeppc/ramdisk/list
@@ -1,87 +1,86 @@
-# $OpenBSD: list,v 1.9 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.10 2002/04/30 01:31:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt bin/eject
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/ksh bin/sh
-ARGVLINK ksh -sh
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin bin/sync
-LINK instbin bin/test bin/[
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/pdisk
-LINK instbin sbin/fdisk
-LINK instbin sbin/fsck
-LINK instbin sbin/fsck_ffs
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/dhclient
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs
-LINK instbin sbin/newfs_msdos
-LINK instbin sbin/ping
-LINK instbin sbin/restore
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt bin/eject
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/ksh bin/sh
+ARGVLINK ksh -sh
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin bin/sync
+LINK instbin bin/test bin/[
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/pdisk
+LINK instbin sbin/fdisk
+LINK instbin sbin/fsck
+LINK instbin sbin/fsck_ffs
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/dhclient
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_msdos
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs
+LINK instbin sbin/newfs_msdos
+LINK instbin sbin/ping
+LINK instbin sbin/restore
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/grep usr/bin/fgrep usr/bin/egrep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/sed
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
-COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
-COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
-COPY ${DESTDIR}/usr/mdec/msdos1mb.gz usr/mdec/msdos1mb.gz
+COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
+COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/msdos1mb.gz usr/mdec/msdos1mb.gz
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/group etc/group
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-SYMLINK /tmp/disktab.shadow etc/disktab
-SYMLINK /tmp/fstab.shadow etc/fstab
-SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
-SYMLINK /tmp/hosts etc/hosts
-TERMCAP vt100,vt200,dumb usr/share/misc/termcap
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+SYMLINK /tmp/disktab.shadow etc/disktab
+SYMLINK /tmp/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
+TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
-# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index e1af234e3e0..f8ea42a9137 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,63 +1,63 @@
-# $OpenBSD: list,v 1.20 2002/04/22 02:43:16 deraadt Exp $
+# $OpenBSD: list,v 1.21 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/ksh bin/sh
-LINK instbin bin/stty
-LINK instbin bin/sleep
-LINK instbin bin/sync
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck_ffs sbin/fsck
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/ifconfig
-LINK instbin sbin/dhclient
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs sbin/mount_mfs
-LINK instbin sbin/ping
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/ksh bin/sh
+LINK instbin bin/stty
+LINK instbin bin/sleep
+LINK instbin bin/sync
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck_ffs sbin/fsck
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/ifconfig
+LINK instbin sbin/dhclient
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs sbin/mount_mfs
+LINK instbin sbin/ping
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/sed
ARGVLINK ksh -sh
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/group etc/group
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-COPY ${CURDIR}/../miniroot/protocols etc/protocols
-COPY ${CURDIR}/../miniroot/services etc/services
+COPY ${DESTDIR}/etc/group etc/group
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${CURDIR}/../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../miniroot/services etc/services
# and the installation scripts
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../miniroot/install.sh install
+SCRIPT ${CURDIR}/../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index 3429a3b4eab..1bd207ab4f9 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,31 +1,28 @@
-# $OpenBSD: list,v 1.18 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.19 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
-LINK instbin sbin/disklabel
-LINK instbin sbin/dhclient
-LINK instbin usr/bin/cksum usr/bin/sum
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/sbin/installboot
+LINK instbin sbin/disklabel
+LINK instbin sbin/dhclient
+LINK instbin usr/bin/cksum usr/bin/sum
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/sbin/installboot
SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sparc/stand
-# crunchgen source directory specials
-#CRUNCHSPECIAL installboot srcdir sys/arch/sparc/stand/installboot
-
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV all
# we need the contents of /usr/mdec
-COPYDIR ${DESTDIR}/usr/mdec usr/mdec
-SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
+COPYDIR ${DESTDIR}/usr/mdec usr/mdec
+SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
# copy the kernel
COPY bsd bsd
@@ -39,7 +36,7 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md
COPY ${DESTDIR}/usr/mdec/boot boot
SPECIAL sync; ${DESTDIR}/usr/mdec/binstall -v ffs ${TARGDIR}
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 2e5c1a58bcd..e984ec10aef 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,12 +1,12 @@
-# $OpenBSD: list,v 1.15 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.16 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
-LINK instbin sbin/disklabel
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/sbin/installboot
+LINK instbin sbin/disklabel
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/sbin/installboot
SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sparc/stand
@@ -15,12 +15,12 @@ SRCDIRS sys/arch/sparc/stand
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec (but not boot or binstall)
-COPYDIR ${DESTDIR}/usr/mdec usr/mdec
-SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
+COPYDIR ${DESTDIR}/usr/mdec usr/mdec
+SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
@@ -31,4 +31,4 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt220,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index 6f915abe100..88d27f257ed 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,57 +1,57 @@
-# $OpenBSD: list,v 1.9 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.10 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ksh bin/sh
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt bin/eject
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin bin/sync
-LINK instbin bin/test bin/[
-LINK instbin sbin/dhclient
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck_ffs sbin/fsck
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/mount_nfs
-LINK instbin sbin/newfs sbin/mount_mfs
-LINK instbin sbin/ping
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ksh bin/sh
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt bin/eject
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin bin/sync
+LINK instbin bin/test bin/[
+LINK instbin sbin/dhclient
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck_ffs sbin/fsck
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/mount_nfs
+LINK instbin sbin/newfs sbin/mount_mfs
+LINK instbin sbin/ping
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/sed
SPECIAL /bin/rm instbin
-ARGVLINK ksh -sh
+ARGVLINK ksh -sh
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# various files that we need in /etc for the install
@@ -66,12 +66,12 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation scripts
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../common/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/install.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 1c85b080349..c72bfe1349f 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,60 +1,60 @@
-# $OpenBSD: list,v 1.14 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.15 2002/04/30 01:31:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ksh bin/sh
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt bin/eject
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin bin/sync
-LINK instbin bin/test bin/[
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck_ffs sbin/fsck
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-#LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/newfs sbin/mount_mfs
-LINK instbin sbin/ping
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ksh bin/sh
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt bin/eject
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin bin/sync
+LINK instbin bin/test bin/[
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck_ffs sbin/fsck
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+#LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/newfs sbin/mount_mfs
+LINK instbin sbin/ping
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/sed
SPECIAL /bin/rm instbin
-ARGVLINK ksh -sh
+ARGVLINK ksh -sh
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
-#COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
-#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
-#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
+#COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
+#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
+#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
@@ -68,9 +68,9 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../common/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index 474bff04244..03716f31bd9 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,60 +1,60 @@
-# $OpenBSD: list,v 1.10 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.11 2002/04/30 01:31:20 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
# copy the crunched binary, link to it, and kill it
-COPY ${OBJDIR}/instbin instbin
-LINK instbin bin/cat
-LINK instbin bin/chmod bin/chgrp sbin/chown
-LINK instbin bin/cp
-LINK instbin bin/dd
-LINK instbin bin/df
-LINK instbin bin/ed
-LINK instbin bin/expr
-LINK instbin bin/hostname
-LINK instbin bin/ksh bin/sh
-LINK instbin bin/ln
-LINK instbin bin/ls
-LINK instbin bin/mkdir
-LINK instbin bin/mt bin/eject
-LINK instbin bin/mv
-LINK instbin bin/pax bin/tar bin/cpio
-LINK instbin bin/rm
-LINK instbin bin/sleep
-LINK instbin bin/stty
-LINK instbin bin/sync
-LINK instbin bin/test bin/[
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/fsck_ffs sbin/fsck
-LINK instbin sbin/ifconfig
-LINK instbin sbin/init
-LINK instbin sbin/mknod
-LINK instbin sbin/mount
-#LINK instbin sbin/mount_cd9660
-LINK instbin sbin/mount_ffs
-LINK instbin sbin/newfs sbin/mount_mfs
-LINK instbin sbin/ping
-LINK instbin sbin/reboot sbin/halt
-LINK instbin sbin/route
-LINK instbin sbin/umount
-LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
-LINK instbin usr/bin/ftp
-LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/bin/sed
+COPY ${OBJDIR}/instbin instbin
+LINK instbin bin/cat
+LINK instbin bin/chmod bin/chgrp sbin/chown
+LINK instbin bin/cp
+LINK instbin bin/dd
+LINK instbin bin/df
+LINK instbin bin/ed
+LINK instbin bin/expr
+LINK instbin bin/hostname
+LINK instbin bin/ksh bin/sh
+LINK instbin bin/ln
+LINK instbin bin/ls
+LINK instbin bin/mkdir
+LINK instbin bin/mt bin/eject
+LINK instbin bin/mv
+LINK instbin bin/pax bin/tar bin/cpio
+LINK instbin bin/rm
+LINK instbin bin/sleep
+LINK instbin bin/stty
+LINK instbin bin/sync
+LINK instbin bin/test bin/[
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/fsck_ffs sbin/fsck
+LINK instbin sbin/ifconfig
+LINK instbin sbin/init
+LINK instbin sbin/mknod
+LINK instbin sbin/mount
+#LINK instbin sbin/mount_cd9660
+LINK instbin sbin/mount_ffs
+LINK instbin sbin/newfs sbin/mount_mfs
+LINK instbin sbin/ping
+LINK instbin sbin/reboot sbin/halt
+LINK instbin sbin/route
+LINK instbin sbin/umount
+LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep
+LINK instbin usr/bin/ftp
+LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/bin/sed
SPECIAL /bin/rm instbin
-ARGVLINK ksh -sh
+ARGVLINK ksh -sh
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec
-#COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
-#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
-#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
+#COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
+#COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
+#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
@@ -68,9 +68,9 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
+SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
+SCRIPT ${CURDIR}/../common/install.md install.md
+SCRIPT ${CURDIR}/../../miniroot/install.sh install
+SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
+SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SPECIAL chmod 755 install upgrade
diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list
index 49bc05f3179..ded9646a953 100644
--- a/distrib/sun3/miniroot/list
+++ b/distrib/sun3/miniroot/list
@@ -1,26 +1,23 @@
-# $OpenBSD: list,v 1.8 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.9 2002/04/30 01:31:20 deraadt Exp $
# Sun3 extras
-LINK instbin sbin/disklabel
-LINK instbin sbin/dmesg
-LINK instbin sbin/dhclient
-LINK instbin usr/bin/cksum usr/bin/sum
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/sbin/installboot
+LINK instbin sbin/disklabel
+LINK instbin sbin/dmesg
+LINK instbin sbin/dhclient
+LINK instbin usr/bin/cksum usr/bin/sum
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/sbin/installboot
SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sun3/stand
-# crunchgen source directory specials
-#CRUNCHSPECIAL installboot srcdir sys/arch/sun3/stand/installboot
-
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV all
# we need the contents of /usr/mdec
@@ -40,6 +37,7 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${CURDIR}/../common/install.md > install.md
+SCRIPT ${CURDIR}/../common/install.md install.md
-SPECIAL sync; ${DESTDIR}/usr/mdec/installboot ${TARGDIR}/boot ${DESTDIR}/usr/mdec/bootxx /dev/rsvnd0c
+SPECIAL sync
+SPECIAL ${DESTDIR}/usr/mdec/installboot ${TARGDIR}/boot ${DESTDIR}/usr/mdec/bootxx /dev/rsvnd0c
diff --git a/distrib/sun3/ramdisk/list b/distrib/sun3/ramdisk/list
index 6c04698a92e..0c5f63ecd43 100644
--- a/distrib/sun3/ramdisk/list
+++ b/distrib/sun3/ramdisk/list
@@ -1,11 +1,11 @@
-# $OpenBSD: list,v 1.10 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.11 2002/04/30 01:31:20 deraadt Exp $
# Sun3 extra's
-LINK instbin sbin/disklabel
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
-LINK instbin usr/sbin/installboot
+LINK instbin sbin/disklabel
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
+LINK instbin usr/sbin/installboot
SPECIAL /bin/rm instbin
SRCDIRS sys/arch/sun3/stand
@@ -14,7 +14,7 @@ SRCDIRS sys/arch/sun3/stand
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec (but not installboot)
@@ -30,4 +30,4 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb,sun usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md > install.md
+SCRIPT ${CURDIR}/../common/install.md install.md
diff --git a/distrib/vax/common/list b/distrib/vax/common/list
index 530f3df1bc5..f24dada4497 100644
--- a/distrib/vax/common/list
+++ b/distrib/vax/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.3 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.4 2002/04/30 01:31:20 deraadt Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -47,7 +47,7 @@ LINK instbin usr/sbin/chown
SPECIAL /bin/rm instbin
# copy the MAKEDEV script and make some devices
-COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
+COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# we need the contents of /usr/mdec (XXX)
diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list
index a53236b9ff9..25843607541 100644
--- a/distrib/vax/ramdisk/list
+++ b/distrib/vax/ramdisk/list
@@ -1,18 +1,18 @@
-# $OpenBSD: list,v 1.14 2002/04/29 17:13:39 deraadt Exp $
+# $OpenBSD: list,v 1.15 2002/04/30 01:31:20 deraadt Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# extras
-LINK instbin sbin/disklabel
-LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK instbin usr/bin/tset usr/bin/reset
-LINK instbin usr/bin/less usr/bin/more
+LINK instbin sbin/disklabel
+LINK instbin usr/bin/grep usr/bin/egrep usr/bin/fgrep
+LINK instbin usr/bin/tset usr/bin/reset
+LINK instbin usr/bin/less usr/bin/more
SPECIAL /bin/rm instbin
# Minimize use of MFS
SYMLINK /tmp var/tmp
# copy the MAKEDEV script and make some devices
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV
+SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
# copy and link first stage boot code
@@ -23,7 +23,7 @@ LINK usr/mdec/xxboot usr/mdec/rdboot
LINK usr/mdec/xxboot usr/mdec/sdboot
# various files that we need in /etc for the install
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/etc/disktab > etc/disktab.shadow
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
SYMLINK /tmp/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
@@ -31,4 +31,4 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt200,dumb usr/share/misc/termcap
# and the installation tools
-SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md > install.md
+SCRIPT ${ARCHDIR}/../install.md install.md