10 files changed, 263 insertions, 67 deletions

diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index f8f87cab64d6e..c5c68cb090be0 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,19 +15,31 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_nfs
+progs newfs
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index f8f87cab64d6e..c5c68cb090be0 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,19 +15,31 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_nfs
+progs newfs
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index f8f87cab64d6e..c5c68cb090be0 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,19 +15,31 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_nfs
+progs newfs
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf
index 24a7458d5ecb4..49cc5f192d8af 100644
--- a/release/i386/fixit_crunch.conf
+++ b/release/i386/fixit_crunch.conf
@@ -3,23 +3,49 @@
 buildopts -DRELEASE_CRUNCH
 
 srcdirs /usr/src/bin
-progs cat chmod cp dd df echo expr kill
-progs ln ls mkdir mv rm rmdir sleep sync
+progs cat
+progs chmod
+progs cp
+progs dd
+progs df
+progs echo
+progs expr
+progs kill
+progs ln
+progs ls
+progs mkdir
+progs mv
+progs rm
+progs rmdir
+progs sleep
+progs sync
 
 srcdirs /usr/src/sbin
-progs bsdlabel clri dmesg fdisk mknod
-progs mount mount_cd9660 mount_msdosfs
-progs reboot restore swapon umount
+progs bsdlabel
+progs clri
+progs dmesg
+progs fdisk
+progs mknod
+progs mount
+progs mount_cd9660
+progs mount_msdosfs
+progs reboot
+progs restore
+progs swapon
+progs umount
 ln bsdlabel disklabel
 ln restore rrestore
 
 srcdirs /usr/src/usr.bin
-progs ftp telnet vi
+progs ftp
+progs telnet
+progs vi
 ln vi view
 ln vi ex
 
 srcdirs /usr/src/usr.sbin
-progs chown chroot
+progs chown
+progs chroot
 ln chown chgrp
 
 libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil
diff --git a/release/ia64/boot_crunch.conf b/release/ia64/boot_crunch.conf
index f46973e99d1c4..eb50eb18db29a 100644
--- a/release/ia64/boot_crunch.conf
+++ b/release/ia64/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,17 +15,33 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs camcontrol dhclient fsck_ffs gpt ifconfig mount_msdosfs mount_nfs
-progs newfs newfs_msdos route rtsol tunefs
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs gpt
+progs ifconfig
+progs mount_msdosfs
+progs mount_nfs
+progs newfs
+progs newfs_msdos
+progs route
+progs rtsol
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 6c83a6c37bef8..9005b00d416c7 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,18 +15,30 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_nfs
+progs newfs
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard
-progs arp pccardc pccardd ppp
+progs arp
+progs pccardc
+progs pccardd
+progs ppp
 progs sysinstall
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf
index bd675c10b084c..9ad70d57b55b3 100644
--- a/release/pc98/fixit-small_crunch.conf
+++ b/release/pc98/fixit-small_crunch.conf
@@ -3,24 +3,50 @@
 buildopts -DRELEASE_CRUNCH
 
 srcdirs /usr/src/bin
-progs cat chmod cp dd df echo expr kill
-progs ln ls mkdir mv rm rmdir sleep sync
+progs cat
+progs chmod
+progs cp
+progs dd
+progs df
+progs echo
+progs expr
+progs kill
+progs ln
+progs ls
+progs mkdir
+progs mv
+progs rm
+progs rmdir
+progs sleep
+progs sync
 
 srcdirs /usr/src/sbin
-progs bsdlabel clri dmesg fdisk mknod
-progs mount mount_cd9660 mount_msdosfs
-progs reboot restore swapon umount
+progs bsdlabel
+progs clri
+progs dmesg
+progs fdisk
+progs mknod
+progs mount
+progs mount_cd9660
+progs mount_msdosfs
+progs reboot
+progs restore
+progs swapon
+progs umount
 ln bsdlabel disklabel
 ln restore rrestore
 
 special fdisk srcdir /usr/src/sbin/fdisk_pc98
 
 srcdirs /usr/src/usr.bin
-progs ee ftp telnet
+progs ee
+progs ftp
+progs telnet
 ln ee edit
 
 srcdirs /usr/src/usr.sbin
-progs chown chroot
+progs chown
+progs chroot
 ln chown chgrp
 
 libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil
diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf
index bacd5ba101090..24881773d5ead 100644
--- a/release/pc98/fixit_crunch.conf
+++ b/release/pc98/fixit_crunch.conf
@@ -3,25 +3,51 @@
 buildopts -DRELEASE_CRUNCH
 
 srcdirs /usr/src/bin
-progs cat chmod cp dd df echo expr kill
-progs ln ls mkdir mv rm rmdir sleep sync
+progs cat
+progs chmod
+progs cp
+progs dd
+progs df
+progs echo
+progs expr
+progs kill
+progs ln
+progs ls
+progs mkdir
+progs mv
+progs rm
+progs rmdir
+progs sleep
+progs sync
 
 srcdirs /usr/src/sbin
-progs bsdlabel clri dmesg fdisk mknod
-progs mount mount_cd9660 mount_msdosfs
-progs reboot restore swapon umount
+progs bsdlabel
+progs clri
+progs dmesg
+progs fdisk
+progs mknod
+progs mount
+progs mount_cd9660
+progs mount_msdosfs
+progs reboot
+progs restore
+progs swapon
+progs umount
 ln bsdlabel disklabel
 ln restore rrestore
 
 special fdisk srcdir /usr/src/sbin/fdisk_pc98
 
 srcdirs /usr/src/usr.bin
-progs ftp telnet vi
+progs ftp
+progs telnet
+progs vi
 ln vi view
 ln vi ex
 
 srcdirs /usr/src/usr.sbin
-progs chown chroot
+progs chown
+progs chroot
 ln chown chgrp
 
 libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil
diff --git a/release/powerpc/boot_crunch.conf b/release/powerpc/boot_crunch.conf
index 15c6332a98ea3..fa65cf9f65c64 100644
--- a/release/powerpc/boot_crunch.conf
+++ b/release/powerpc/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,19 +15,33 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_msdosfs mount_nfs newfs newfs_msdos route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_msdosfs
+progs mount_nfs
+progs newfs
+progs newfs_msdos
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
diff --git a/release/sparc64/boot_crunch.conf b/release/sparc64/boot_crunch.conf
index f8f87cab64d6e..c5c68cb090be0 100644
--- a/release/sparc64/boot_crunch.conf
+++ b/release/sparc64/boot_crunch.conf
@@ -3,7 +3,11 @@
 buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
-progs hostname pwd rm sh test
+progs hostname
+progs pwd
+progs rm
+progs sh
+progs test
 ln sh -sh
 ln test [
 
@@ -11,19 +15,31 @@ srcdirs /usr/src/gnu/usr.bin
 progs cpio
 
 srcdirs /usr/src/sbin
-progs dhclient fsck_ffs ifconfig
-progs mount_nfs newfs route rtsol
-progs slattach tunefs camcontrol
+progs camcontrol
+progs dhclient
+progs fsck_ffs
+progs ifconfig
+progs mount_nfs
+progs newfs
+progs route
+progs rtsol
+progs slattach
+progs tunefs
 
 srcdirs /usr/src/usr.bin
-progs find minigzip sed
+progs find
+progs minigzip
+progs sed
 ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
 srcdirs /usr/src/usr.sbin
-progs arp ppp
-progs sysinstall usbd usbdevs
+progs arp
+progs ppp
+progs sysinstall
+progs usbd
+progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs