3 files changed, 120 insertions, 119 deletions

diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index d8608449aa5d..8ef0fd9a83a3 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -9,113 +9,80 @@
 #
 #
 font8x16.o			optional	std8x16font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
-	no-implicit-rule before-depend \
+	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c"				\
+	no-implicit-rule before-depend					\
 	clean		"${STD8X16FONT}-8x16 font8x16.c"
 # make sure apm.h gets made correctly
 apm.h				standard				\
 	compile-with		"echo '#define NAPM 0' > apm.h"		\
 	no-obj no-implicit-rule before-depend
-
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
+	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
+alpha/alpha/alpha-gdbstub.c	optional	ddb
+alpha/alpha/api_up1000.c	optional	api_up1000
+alpha/alpha/atomic.s		standard
 alpha/alpha/autoconf.c		standard
+alpha/alpha/busdma_machdep.c	standard
+alpha/alpha/clock.c		standard
+alpha/alpha/clock_if.m		standard
 alpha/alpha/cpuconf.c		standard
-alpha/alpha/atomic.s		standard
-alpha/alpha/api_up1000.c	optional	api_up1000
-alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
-alpha/alpha/dec_eb164.c		optional	dec_eb164
-alpha/alpha/dec_eb64plus.c	optional	dec_eb64plus
-alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
+alpha/alpha/db_disasm.c		optional	ddb
+alpha/alpha/db_interface.c	optional	ddb
+alpha/alpha/db_trace.c		optional	ddb
 alpha/alpha/dec_1000a.c		optional	dec_1000a
 alpha/alpha/dec_1000a.c		optional	dec_1000a
 alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
 alpha/alpha/dec_2100_a500.c	optional	dec_2100_a500
+alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
+alpha/alpha/dec_eb164.c		optional	dec_eb164
+alpha/alpha/dec_eb64plus.c	optional	dec_eb64plus
+alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
+alpha/alpha/dec_kn300.c		optional	dec_kn300
+alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
 alpha/alpha/dec_st550.c		optional	dec_st550
 alpha/alpha/dec_st6600.c	optional	dec_st6600
-alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
 alpha/alpha/dec_3000_300.c	optional	dec_3000_300
 alpha/alpha/dec_3000_500.c	optional	dec_3000_500
-alpha/alpha/dec_kn300.c		optional	dec_kn300
-alpha/alpha/mountroot.c		optional	slice
-alpha/alpha/ipl_funcs.c		standard
-alpha/alpha/pal.s		standard
-alpha/alpha/busdma_machdep.c	standard
-alpha/alpha/sgmap.c		standard
-alpha/alpha/prom.c		standard
-alpha/alpha/promcons.c		standard
-alpha/alpha/prom_disp.s		standard
-alpha/alpha/alpha-gdbstub.c	optional	ddb
-alpha/alpha/db_disasm.c		optional	ddb
-alpha/alpha/db_interface.c	optional	ddb
-alpha/alpha/db_trace.c		optional	ddb
+alpha/alpha/elf_machdep.c	standard
 alpha/alpha/exception.s		standard
+alpha/alpha/fp_emulate.c	standard
+alpha/alpha/ieee_float.c	standard
 alpha/alpha/in_cksum.c		optional	inet
+alpha/alpha/interrupt.c		standard
+alpha/alpha/ipl_funcs.c		standard
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # alpha/alpha/locore.s		standard
 alpha/alpha/machdep.c		standard
-alpha/alpha/fp_emulate.c	standard
-alpha/alpha/ieee_float.c	standard
 alpha/alpha/mem.c		standard
+alpha/alpha/mountroot.c		optional	slice
 alpha/alpha/mp_machdep.c	optional	smp
+alpha/alpha/pal.s		standard
 alpha/alpha/perfmon.c		optional	perfmon	profiling-routine
 alpha/alpha/perfmon.c		optional	perfmon
 alpha/alpha/pmap.c		standard
 alpha/alpha/procfs_machdep.c	standard
+alpha/alpha/prom.c		standard
+alpha/alpha/promcons.c		standard
+alpha/alpha/prom_disp.s		standard
+alpha/alpha/sgmap.c		standard
 alpha/alpha/simplelock.s	optional	smp
 alpha/alpha/support.s		standard
 alpha/alpha/swtch.s		standard
 alpha/alpha/sys_machdep.c	standard
 alpha/alpha/trap.c		standard
-alpha/alpha/interrupt.c		standard
 alpha/alpha/userconfig.c	optional	userconfig
 alpha/alpha/vm_machdep.c	standard
-alpha/alpha/clock.c		standard
-alpha/alpha/clock_if.m		standard
-alpha/mcbus/mcbus.c		optional	dec_kn300
-alpha/mcbus/mcmem.c		optional	dec_kn300
-alpha/mcbus/mcpcia.c		optional	dec_kn300
-alpha/pci/mcpcia_pci.c		optional	dec_kn300
-alpha/tlsb/tlsb.c		optional	dec_kn8ae
-alpha/tlsb/tlsbmem.c		optional	dec_kn8ae
-alpha/tlsb/tlsbcpu.c		optional	dec_kn8ae
-alpha/tlsb/gbus.c		optional	dec_kn8ae
-alpha/tlsb/kftxx.c		optional	dec_kn8ae
-alpha/tlsb/mcclock_tlsb.c	optional	dec_kn8ae
-alpha/tlsb/zs_tlsb.c		optional	dec_kn8ae
-alpha/tlsb/dwlpx.c		optional	dec_kn8ae
-alpha/pci/dwlpx_pci.c		optional	dec_kn8ae
-alpha/tc/tcasic.c		optional	dec_3000_300
-alpha/tc/tcasic.c		optional	dec_3000_500
-alpha/tc/tc.c			optional	dec_3000_300
-alpha/tc/tc.c			optional	dec_3000_500
-alpha/tc/ioasic.c		optional	dec_3000_300
-alpha/tc/ioasic.c		optional	dec_3000_500
-alpha/tc/mcclock_ioasic.c	optional	dec_3000_300
-alpha/tc/mcclock_ioasic.c	optional	dec_3000_500
-alpha/tc/if_le_ioasic.c		optional	le dec_3000_300
-alpha/tc/if_le_ioasic.c		optional	le dec_3000_500
-alpha/tc/if_le_dec.c		optional	le dec_3000_300
-alpha/tc/if_le_dec.c		optional	le dec_3000_500
-alpha/tc/am7990.c		optional	le dec_3000_300
-alpha/tc/am7990.c		optional	le dec_3000_500
-alpha/tc/tcds.c			optional	esp dec_3000_300
-alpha/tc/tcds.c			optional	esp dec_3000_500
-alpha/tc/tcds_dma.c		optional	tcds dec_3000_300
-alpha/tc/tcds_dma.c		optional	tcds dec_3000_500
-alpha/tc/esp.c			optional	esp dec_3000_300
-alpha/tc/esp.c			optional	esp dec_3000_500
-dev/dec/mcclock.c		optional	mcclock
-dev/dec/mcclock_if.m		optional	mcclock
-alpha/alpha/elf_machdep.c	standard
 alpha/isa/isa.c			optional	isa
 alpha/isa/isa_dma.c		optional	isa
 alpha/isa/mcclock_isa.c		optional	isa
+alpha/mcbus/mcbus.c		optional	dec_kn300
+alpha/mcbus/mcmem.c		optional	dec_kn300
+alpha/mcbus/mcpcia.c		optional	dec_kn300
 alpha/pci/apecs.c		optional	dec_2100_a50
 alpha/pci/apecs.c		optional	dec_eb64plus
 alpha/pci/apecs.c		optional	dec_1000a
@@ -130,10 +97,12 @@ alpha/pci/cia_pci.c		optional	dec_eb164
 alpha/pci/cia_pci.c		optional	dec_kn20aa
 alpha/pci/cia_pci.c		optional	dec_st550
 alpha/pci/cia_pci.c		optional	dec_1000a
+alpha/pci/dwlpx_pci.c		optional	dec_kn8ae
 alpha/pci/irongate.c		optional	api_up1000
 alpha/pci/irongate_pci.c	optional	api_up1000
 alpha/pci/lca.c			optional	dec_axppci_33
 alpha/pci/lca_pci.c		optional	dec_axppci_33
+alpha/pci/mcpcia_pci.c		optional	dec_kn300
 alpha/pci/pci_eb164_intr.s	optional	dec_eb164
 alpha/pci/pci_eb164_intr.s	optional	dec_kn20aa
 alpha/pci/pci_eb164_intr.s	optional	dec_st550
@@ -144,6 +113,34 @@ alpha/pci/t2.c			optional	dec_2100_a500
 alpha/pci/t2_pci.c		optional	dec_2100_a500
 alpha/pci/tsunami.c		optional	dec_st6600
 alpha/pci/tsunami_pci.c		optional	dec_st6600
+alpha/tc/am7990.c		optional	le dec_3000_300
+alpha/tc/am7990.c		optional	le dec_3000_500
+alpha/tc/esp.c			optional	esp dec_3000_300
+alpha/tc/esp.c			optional	esp dec_3000_500
+alpha/tc/if_le_dec.c		optional	le dec_3000_300
+alpha/tc/if_le_dec.c		optional	le dec_3000_500
+alpha/tc/if_le_ioasic.c		optional	le dec_3000_300
+alpha/tc/if_le_ioasic.c		optional	le dec_3000_500
+alpha/tc/ioasic.c		optional	dec_3000_300
+alpha/tc/ioasic.c		optional	dec_3000_500
+alpha/tc/mcclock_ioasic.c	optional	dec_3000_300
+alpha/tc/mcclock_ioasic.c	optional	dec_3000_500
+alpha/tc/tc.c			optional	dec_3000_300
+alpha/tc/tc.c			optional	dec_3000_500
+alpha/tc/tcasic.c		optional	dec_3000_300
+alpha/tc/tcasic.c		optional	dec_3000_500
+alpha/tc/tcds.c			optional	esp dec_3000_300
+alpha/tc/tcds.c			optional	esp dec_3000_500
+alpha/tc/tcds_dma.c		optional	tcds dec_3000_300
+alpha/tc/tcds_dma.c		optional	tcds dec_3000_500
+alpha/tlsb/dwlpx.c		optional	dec_kn8ae
+alpha/tlsb/gbus.c		optional	dec_kn8ae
+alpha/tlsb/kftxx.c		optional	dec_kn8ae
+alpha/tlsb/mcclock_tlsb.c	optional	dec_kn8ae
+alpha/tlsb/tlsb.c		optional	dec_kn8ae
+alpha/tlsb/tlsbcpu.c		optional	dec_kn8ae
+alpha/tlsb/tlsbmem.c		optional	dec_kn8ae
+alpha/tlsb/zs_tlsb.c		optional	dec_kn8ae
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
 dev/ata/ata-all.c		count		ata
@@ -155,6 +152,8 @@ dev/ata/atapi-all.c		count		atapist
 dev/ata/atapi-cd.c		optional	atapicd
 dev/ata/atapi-fd.c		optional	atapifd
 dev/ata/atapi-tape.c		optional	atapist
+dev/dec/mcclock.c		optional	mcclock
+dev/dec/mcclock_if.m		optional	mcclock
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			count		splash
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 1b4347d320f1..a47558256f3f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -7,56 +7,57 @@
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-linux_genassym.o		optional	compat_linux		   \
-	dependency 	"$S/i386/linux/linux_genassym.c"		   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
+linux_genassym.o		optional	compat_linux		\
+	dependency 	"$S/i386/linux/linux_genassym.c"		\
+	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			\
+	no-obj no-implicit-rule						\
 	clean		"linux_genassym.o"
 #
-svr4_genassym.o			optional	compat_svr4		   \
-	dependency 	"$S/i386/svr4/svr4_genassym.c"			   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"svr4_genassym.o"
-#
-linux_assym.h			optional	compat_linux		   \
-	dependency 	"$S/kern/genassym.sh linux_genassym.o"		   \
+linux_assym.h			optional	compat_linux		\
+	dependency 	"$S/kern/genassym.sh linux_genassym.o"		\
 	compile-with	"sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \
-	no-obj no-implicit-rule before-depend				   \
+	no-obj no-implicit-rule before-depend				\
 	clean		"linux_assym.h"
 #
-svr4_assym.h			optional	compat_svr4		   \
-	dependency 	"$S/kern/genassym.sh svr4_genassym.o"	   	   \
+svr4_genassym.o			optional	compat_svr4		\
+	dependency 	"$S/i386/svr4/svr4_genassym.c"			\
+	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			\
+	no-obj no-implicit-rule						\
+	clean		"svr4_genassym.o"
+#
+svr4_assym.h			optional	compat_svr4		\
+	dependency 	"$S/kern/genassym.sh svr4_genassym.o"	   	\
 	compile-with	"sh $S/kern/genassym.sh svr4_genassym.o > ${.TARGET}" \
-	no-obj no-implicit-rule before-depend				   \
+	no-obj no-implicit-rule before-depend				\
 	clean		"svr4_assym.h"
 #
 font.h				optional	sc_dflt_font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
+	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"									\
 	no-obj no-implicit-rule before-depend				\
 	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
+	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
 ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"				\
+	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-contrib/dev/fla/fla.c		optional	fla
 msysosak.o			optional	fla			\
-	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
-	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
+	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 	\
+	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu" \
 	no-implicit-rule
 #
-contrib/dev/oltr/if_oltr.c	optional	oltr
 trlld.o				optional	oltr			\
 	dependency	"$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	no-implicit-rule
+#
+contrib/dev/fla/fla.c		optional	fla
+contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
 contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
@@ -214,10 +215,10 @@ i386/isa/if_wi.c		optional	wi card
 i386/isa/if_wl.c		count		wl
 i386/isa/if_wlp.c		optional	wlp
 i386/isa/intr_machdep.c		standard
-i386/isa/ipl_funcs.c		standard				   \
+i386/isa/ipl_funcs.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/isa/isa.c			optional	isa
-i386/isa/isa_compat.c		optional	isa compat_oldisa \
+i386/isa/isa_compat.c		optional	isa compat_oldisa	\
 	warning "Old ISA driver compatability shims present."
 i386/isa/isa_dma.c		optional	isa
 i386/isa/istallion.c		optional	stli
@@ -250,7 +251,7 @@ i386/isa/sound/ad1848.c		optional	sscape_mss
 i386/isa/sound/ad1848.c		optional	trix
 i386/isa/sound/adlib_card.c	optional	opl
 i386/isa/sound/adlib_card.c	optional	trix
-i386/isa/sound/audio.c		optional	snd	\
+i386/isa/sound/audio.c		optional	snd			\
 	warning "The snd drivers are deprecated. Please see pcm/sbc/etc."
 i386/isa/sound/cs4232.c		optional	css
 i386/isa/sound/dev_table.c	optional	snd
@@ -315,7 +316,7 @@ i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_file.c		optional	compat_linux
 i386/linux/linux_ioctl.c	optional	compat_linux
 i386/linux/linux_ipc.c		optional	compat_linux
-i386/linux/linux_locore.s	optional	compat_linux		   \
+i386/linux/linux_locore.s	optional	compat_linux		\
 	dependency 	"linux_assym.h"
 i386/linux/linux_mib.c		optional	compat_linux
 i386/linux/linux_misc.c		optional	compat_linux
@@ -325,7 +326,7 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i386/svr4/svr4_locore.s		optional	compat_svr4		   \
+i386/svr4/svr4_locore.s		optional	compat_svr4		\
 	dependency	"svr4_assym.h"
 i386/svr4/svr4_machdep.c	optional	compat_svr4
 i4b/layer1/i4b_asuscom_ipac.c	optional	isic
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index f7434b0b8edd..61003debd29c 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -9,51 +9,52 @@
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-linux_genassym.o		optional	compat_linux		   \
-	dependency 	"$S/i386/linux/linux_genassym.c"		   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
+linux_genassym.o		optional	compat_linux		\
+	dependency 	"$S/i386/linux/linux_genassym.c"		\
+	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			\
+	no-obj no-implicit-rule						\
 	clean		"linux_genassym.o"
 #
-svr4_genassym.o			optional	compat_svr4		   \
-	dependency 	"$S/i386/svr4/svr4_genassym.c"			   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"svr4_genassym.o"
-#
-linux_assym.h			optional	compat_linux		   \
-	dependency 	"$S/kern/genassym.sh linux_genassym.o"		   \
+linux_assym.h			optional	compat_linux		\
+	dependency 	"$S/kern/genassym.sh linux_genassym.o"		\
 	compile-with	"sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \
-	no-obj no-implicit-rule before-depend				   \
+	no-obj no-implicit-rule before-depend				\
 	clean		"linux_assym.h"
 #
-svr4_assym.h			optional	compat_svr4		   \
-	dependency 	"$S/kern/genassym.sh svr4_genassym.o"	   	   \
+svr4_genassym.o			optional	compat_svr4		\
+	dependency 	"$S/i386/svr4/svr4_genassym.c"			\
+	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			\
+	no-obj no-implicit-rule						\
+	clean		"svr4_genassym.o"
+#
+svr4_assym.h			optional	compat_svr4		\
+	dependency 	"$S/kern/genassym.sh svr4_genassym.o"	   	\
 	compile-with	"sh $S/kern/genassym.sh svr4_genassym.o > ${.TARGET}" \
-	no-obj no-implicit-rule before-depend				   \
+	no-obj no-implicit-rule before-depend				\
 	clean		"svr4_assym.h"
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
+	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
 ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"				\
+	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-contrib/dev/fla/fla.c		optional	fla
 msysosak.o			optional	fla			\
-	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
-	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
+	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 	\
+	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu" \
 	no-implicit-rule
 #
-contrib/dev/oltr/if_oltr.c	optional	oltr
 trlld.o				optional	oltr			\
 	dependency	"$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
 	no-implicit-rule
+#
+contrib/dev/fla/fla.c		optional	fla
+contrib/dev/oltr/if_oltr.c	optional	oltr
 contrib/dev/oltr/trlldbm.c	optional	oltr
 contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
@@ -202,10 +203,10 @@ i386/isa/if_sr.c		count		sr
 i386/isa/if_wi.c		optional	wi card
 i386/isa/if_wl.c		count		wl
 i386/isa/intr_machdep.c		standard
-i386/isa/ipl_funcs.c		standard				   \
+i386/isa/ipl_funcs.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/isa/isa.c			optional	isa
-i386/isa/isa_compat.c		optional	isa compat_oldisa \
+i386/isa/isa_compat.c		optional	isa compat_oldisa	\
 	warning "Old ISA driver compatability shims present."
 i386/isa/istallion.c		optional	stli
 i386/isa/labpc.c		count		labpc
@@ -298,7 +299,7 @@ i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_file.c		optional	compat_linux
 i386/linux/linux_ioctl.c	optional	compat_linux
 i386/linux/linux_ipc.c		optional	compat_linux
-i386/linux/linux_locore.s	optional	compat_linux		   \
+i386/linux/linux_locore.s	optional	compat_linux		\
 	dependency 	"linux_assym.h"
 i386/linux/linux_mib.c		optional	compat_linux
 i386/linux/linux_misc.c		optional	compat_linux
@@ -308,7 +309,7 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i386/svr4/svr4_locore.s		optional	compat_svr4		   \
+i386/svr4/svr4_locore.s		optional	compat_svr4		\
 	dependency	"svr4_assym.h"
 i386/svr4/svr4_machdep.c	optional	compat_svr4
 i4b/layer1/i4b_asuscom_ipac.c	optional	isic