Fixed most disordering (almost all except for i4b and targets with

complicated rules).

1 files changed, 248 insertions, 248 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 9e8624e..08d40da 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -40,50 +40,50 @@ bus_if.h			standard				\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/kern/bus_if.m"	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"bus_if.h"
-coda/coda_namecache.c	optional vcoda
-coda/coda_fbsd.c	optional vcoda
-coda/coda_psdev.c	optional vcoda
-coda/coda_subr.c	optional vcoda
-coda/coda_venus.c	optional vcoda
-coda/coda_vfsops.c	optional vcoda
-coda/coda_vnops.c	optional vcoda
 cam/cam.c		optional scbus
-cam/cam_xpt.c		optional scbus
 cam/cam_extend.c	optional scbus
-cam/cam_queue.c		optional scbus
 cam/cam_periph.c	optional scbus
+cam/cam_queue.c		optional scbus
 cam/cam_sim.c		optional scbus
+cam/cam_xpt.c		optional scbus
 cam/scsi/scsi_all.c	optional scbus
-cam/scsi/scsi_da.c	optional da
-cam/scsi/scsi_pt.c	optional pt
-cam/scsi/scsi_sa.c	optional sa
 cam/scsi/scsi_cd.c	optional cd
 cam/scsi/scsi_ch.c	optional ch
+cam/scsi/scsi_da.c	optional da
 cam/scsi/scsi_pass.c	optional pass
+cam/scsi/scsi_pt.c	optional pt
+cam/scsi/scsi_sa.c	optional sa
 cam/scsi/scsi_scan.c	optional scan
 cam/scsi/scsi_ses.c	optional ses
-cam/scsi/scsi_target.c	optional targ
 cam/scsi/scsi_targ_bh.c	optional targbh
-crypto/sha1.c		optional ipsec
-crypto/des/des_cbc.c	optional ipsec ipsec_esp
-crypto/des/des_ecb.c	optional ipsec ipsec_esp
-crypto/des/des_setkey.c	optional ipsec ipsec_esp
-crypto/des/des_3cbc.c	optional ipsec ipsec_esp
+cam/scsi/scsi_target.c	optional targ
+coda/coda_fbsd.c	optional vcoda
+coda/coda_namecache.c	optional vcoda
+coda/coda_psdev.c	optional vcoda
+coda/coda_subr.c	optional vcoda
+coda/coda_venus.c	optional vcoda
+coda/coda_vfsops.c	optional vcoda
+coda/coda_vnops.c	optional vcoda
 crypto/blowfish/bf_cbc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_cbc_m.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_enc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_skey.c	optional ipsec ipsec_esp
 crypto/cast128/cast128.c	optional ipsec ipsec_esp
 crypto/cast128/cast128_cbc.c	optional ipsec ipsec_esp
+crypto/des/des_3cbc.c	optional ipsec ipsec_esp
+crypto/des/des_cbc.c	optional ipsec ipsec_esp
+crypto/des/des_ecb.c	optional ipsec ipsec_esp
+crypto/des/des_setkey.c	optional ipsec ipsec_esp
 crypto/rc5/rc5.c		optional ipsec ipsec_esp
 crypto/rc5/rc5_cbc.c		optional ipsec ipsec_esp
+crypto/sha1.c		optional ipsec
 ddb/db_access.c		optional ddb
-ddb/db_kld.c		optional ddb
 ddb/db_break.c		optional ddb
 ddb/db_command.c	optional ddb
 ddb/db_examine.c	optional ddb
 ddb/db_expr.c		optional ddb
 ddb/db_input.c		optional ddb
+ddb/db_kld.c		optional ddb
 ddb/db_lex.c		optional ddb
 ddb/db_output.c		optional ddb
 ddb/db_print.c		optional ddb
@@ -105,13 +105,6 @@ dev/advansys/adw_pci.c	optional adw pci
 dev/advansys/adwcam.c	optional adw
 dev/advansys/adwlib.c	optional adw
 dev/advansys/adwmcode.c	optional adw
-dev/an/if_an.c		optional an
-dev/an/if_an_isa.c	optional an isa
-dev/an/if_an_pci.c	optional an pci
-dev/an/if_an_pccard.c	optional an card
-dev/amr/amr_disk.c	optional amr
-dev/amr/amr_pci.c	optional amr
-dev/amr/amr.c		optional amr
 dev/aha/aha.c		optional aha
 dev/aha/aha_isa.c	optional aha isa
 dev/aha/aha_mca.c	optional aha mca
@@ -119,31 +112,44 @@ dev/ahb/ahb.c		optional ahb eisa
 dev/aic/aic.c		optional aic
 dev/aic/aic_isa.c	optional aic isa
 dev/aic/aic_pccard.c	optional aic card
+dev/aic7xxx/93cx6.c	optional ahc
 dev/aic7xxx/ahc_eisa.c	optional ahc eisa	\
 	dependency	"aic7xxx_reg.h $S/dev/aic7xxx/ahc_eisa.c"
 dev/aic7xxx/ahc_pci.c	optional ahc pci	\
 	dependency	"aic7xxx_reg.h $S/dev/aic7xxx/ahc_pci.c"
 dev/aic7xxx/aic7xxx.c	optional ahc		\
 	dependency	"aic7xxx_{reg,seq}.h"
-dev/aic7xxx/93cx6.c	optional ahc
+dev/amr/amr.c		optional amr
+dev/amr/amr_disk.c	optional amr
+dev/amr/amr_pci.c	optional amr
+dev/an/if_an.c		optional an
+dev/an/if_an_isa.c	optional an isa
+dev/an/if_an_pccard.c	optional an card
+dev/an/if_an_pci.c	optional an pci
+dev/bktr/bktr_audio.c	optional bktr pci
+dev/bktr/bktr_card.c	optional bktr pci
+dev/bktr/bktr_core.c	optional bktr pci
+dev/bktr/bktr_i2c.c	optional bktr pci smbus
+dev/bktr/bktr_os.c	optional bktr pci
+dev/bktr/bktr_tuner.c	optional bktr pci
 dev/buslogic/bt.c	optional bt
+dev/buslogic/bt_eisa.c	optional bt eisa
 dev/buslogic/bt_isa.c	optional bt isa
 dev/buslogic/bt_mca.c	optional bt mca
-dev/buslogic/bt_eisa.c	optional bt eisa
 dev/buslogic/bt_pci.c	optional bt pci
 dev/cardbus/cardbus.c	optional cardbus
 dev/ccd/ccd.c		optional ccd
 #dev/dpt/dpt_control.c	optional dpt
-dev/dpt/dpt_scsi.c	optional dpt
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
+dev/dpt/dpt_scsi.c	optional dpt
 dev/ed/if_ed_pci.c	optional ed pci
+dev/en/midway.c		optional en
 dev/ep/if_ep.c		optional ep
-dev/ep/if_ep_isa.c	optional ep isa
 dev/ep/if_ep_eisa.c	optional ep eisa
+dev/ep/if_ep_isa.c	optional ep isa
 dev/ep/if_ep_mca.c	optional ep mca
 dev/ep/if_ep_pccard.c	optional ep card
-dev/en/midway.c		optional en
 dev/ex/if_ex.c		optional ex isa
 dev/hea/eni.c		optional hea
 dev/hea/eni_buffer.c	optional hea
@@ -167,28 +173,63 @@ dev/hfa/fore_stats.c	optional hfa
 dev/hfa/fore_timer.c	optional hfa
 dev/hfa/fore_transmit.c	optional hfa
 dev/hfa/fore_vcm.c	optional hfa
-dev/ie/if_ie.c		optional ie isa
 dev/ida/ida.c		optional ida
 dev/ida/ida_disk.c	optional ida
 dev/ida/ida_eisa.c	optional ida eisa
 dev/ida/ida_pci.c	optional ida pci
-dev/isp/isp_freebsd.c	optional isp
+dev/ie/if_ie.c		optional ie isa
+iicbb_if.o		optional iicbb					\
+	dependency	"iicbb_if.c"					\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+iicbb_if.c		optional iicbb					\
+	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
+	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbb_if.m" \
+	no-obj no-implicit-rule before-depend local			\
+	clean		"iicbb_if.c"
+iicbb_if.h		optional iicbb					\
+	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
+	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbb_if.m" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"iicbb_if.h"
+iicbus_if.o		optional iicbus					\
+	dependency	"iicbus_if.c iicbus_if.h"			\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+iicbus_if.c		optional iicbus					\
+	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
+	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbus_if.m" \
+	no-obj no-implicit-rule before-depend local			\
+	clean		"iicbus_if.c"
+iicbus_if.h		optional iicbus					\
+	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
+	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbus_if.m" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"iicbus_if.h"
+dev/iicbus/if_ic.c	optional ic
+dev/iicbus/iic.c	optional iic
+dev/iicbus/iicbb.c	optional iicbb
+dev/iicbus/iicbus.c	optional iicbus
+dev/iicbus/iiconf.c	optional iicbus
+dev/iicbus/iicsmb.c	optional iicsmb					\
+	dependency	"iicbus_if.h"
 dev/isp/isp.c		optional isp
+dev/isp/isp_freebsd.c	optional isp
 dev/isp/isp_target.c	optional isp
 dev/mca/mca_bus.c	optional mca
 dev/md/md.c		optional md
-dev/mii/mii.c		optional miibus
-dev/mii/mii_physubr.c	optional miibus
-dev/mii/ukphy.c		optional miibus
-dev/mii/ukphy_subr.c	optional miibus
 dev/mii/amphy.c		optional miibus
 dev/mii/dcphy.c		optional miibus
 dev/mii/exphy.c		optional miibus
+dev/mii/mii.c		optional miibus
+dev/mii/mii_physubr.c	optional miibus
 dev/mii/mlphy.c		optional miibus
 dev/mii/nsphy.c		optional miibus
 dev/mii/pnphy.c		optional miibus
-dev/mii/tlphy.c		optional miibus
 dev/mii/rlphy.c		optional miibus
+dev/mii/tlphy.c		optional miibus
+dev/mii/ukphy.c		optional miibus
+dev/mii/ukphy_subr.c	optional miibus
 miibus_if.o		optional miibus					\
 	dependency	"miibus_if.c miibus_if.h"			\
 	compile-with	"${NORMAL_C}"					\
@@ -203,9 +244,9 @@ miibus_if.h		optional miibus					\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"miibus_if.h"
+dev/mlx/mlx.c		optional mlx
 dev/mlx/mlx_disk.c	optional mlx
 dev/mlx/mlx_pci.c	optional mlx
-dev/mlx/mlx.c		optional mlx
 dev/pccard/pccard.c	optional pccard
 dev/pccard/pccard_cis.c	optional pccard
 dev/pccard/pccard_cis_quirks.c optional pccard
@@ -228,8 +269,8 @@ dev/pcic/i82365_isa.c	optional pcic pccard
 dev/pdq/if_fea.c	optional fea eisa
 dev/pdq/if_fpa.c	optional fpa pci
 dev/pdq/pdq.c		optional fea eisa
-dev/pdq/pdq_ifsubr.c	optional fea eisa
 dev/pdq/pdq.c		optional fpa pci
+dev/pdq/pdq_ifsubr.c	optional fea eisa
 dev/pdq/pdq_ifsubr.c	optional fpa pci
 ppbus_if.o		optional ppbus					\
 	dependency	"ppbus_if.c ppbus_if.h"				\
@@ -245,19 +286,25 @@ ppbus_if.h		optional ppbus					\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/ppbus/ppbus_if.m" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"ppbus_if.h"
-dev/ppbus/immio.c	optional vpo
 dev/ppbus/if_plip.c	optional plip
+dev/ppbus/immio.c	optional vpo
 dev/ppbus/lpbb.c	optional lpbb
 dev/ppbus/lpt.c		optional lpt
 dev/ppbus/pcfclock.c	optional pcfclock
-dev/ppbus/ppb_base.c	optional ppbus
 dev/ppbus/ppb_1284.c	optional ppbus
+dev/ppbus/ppb_base.c	optional ppbus
 dev/ppbus/ppb_msq.c	optional ppbus
 dev/ppbus/ppbconf.c	optional ppbus
 dev/ppbus/ppi.c		optional ppi
 dev/ppbus/pps.c		optional pps
 dev/ppbus/vpo.c		optional vpo
 dev/ppbus/vpoio.c	optional vpo
+dev/si/si.c		optional si
+dev/si/si2_z280.c	optional si
+dev/si/si3_t225.c	optional si
+dev/si/si_eisa.c	optional si eisa
+dev/si/si_isa.c		optional si isa
+dev/si/si_pci.c		optional si pci
 smbus_if.o		optional smbus					\
 	dependency	"smbus_if.c smbus_if.h"				\
 	compile-with	"${NORMAL_C}"					\
@@ -272,53 +319,74 @@ smbus_if.h		optional smbus					\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/smbus/smbus_if.m" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"smbus_if.h"
+dev/smbus/smb.c		optional smb
 dev/smbus/smbconf.c	optional smbus
 dev/smbus/smbus.c	optional smbus
-dev/smbus/smb.c		optional smb
-dev/si/si.c		optional si
-dev/si/si2_z280.c	optional si
-dev/si/si3_t225.c	optional si
-dev/si/si_eisa.c	optional si eisa
-dev/si/si_isa.c		optional si isa
-dev/si/si_pci.c		optional si pci
 dev/sn/if_sn.c		optional sn
 dev/sn/if_sn_isa.c	optional sn isa
 dev/sn/if_sn_pccard.c	optional sn card
-dev/iicbus/iicbb.c	optional iicbb
-iicbb_if.o		optional iicbb					\
-	dependency	"iicbb_if.c"					\
-	compile-with	"${NORMAL_C}"					\
-	no-implicit-rule local
-iicbb_if.c		optional iicbb					\
-	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbb_if.m" \
-	no-obj no-implicit-rule before-depend local			\
-	clean		"iicbb_if.c"
-iicbb_if.h		optional iicbb					\
-	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbb_if.m" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"iicbb_if.h"
-dev/iicbus/iicsmb.c	optional iicsmb					\
-	dependency	"iicbus_if.h"
-iicbus_if.o		optional iicbus					\
-	dependency	"iicbus_if.c iicbus_if.h"			\
+dev/sound/isa/ad1816.c	optional pcm isa
+dev/sound/isa/es1888.c	optional pcm isa
+dev/sound/isa/gusc.c	optional gusc isa
+dev/sound/isa/gusc.c	optional pcm isa
+dev/sound/isa/mss.c	optional pcm isa
+dev/sound/isa/sb.c	optional pcm isa
+dev/sound/isa/sbc.c	optional pcm isa
+dev/sound/isa/sbc.c	optional sbc isa
+#dev/sound/pci/aureal.c	optional pcm pci
+dev/sound/pci/csa.c	optional csa pci
+dev/sound/pci/csa.c	optional pcm pci
+dev/sound/pci/csapcm.c	optional pcm pci
+dev/sound/pci/es137x.c	optional pcm pci
+dev/sound/pci/neomagic.c optional pcm pci
+dev/sound/pci/t4dwave.c	optional pcm pci
+dev/sound/pcm/ac97.c	optional pcm
+dev/sound/pcm/channel.c	optional pcm
+dev/sound/pcm/dsp.c	optional pcm
+dev/sound/pcm/fake.c	optional pcm
+dev/sound/pcm/feeder.c	optional pcm
+dev/sound/pcm/mixer.c	optional pcm
+dev/sound/pcm/sound.c	optional pcm
+dev/streams/streams.c	optional streams
+dev/sym/sym_hipd.c	optional sym					\
+	dependency	"$S/dev/sym/sym_{conf,defs}.h"
+#
+# USB support
+usb_if.o		optional usb					\
+	dependency	"usb_if.c"					\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-iicbus_if.c		optional iicbus					\
-	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbus_if.m" \
+usb_if.c		optional usb					\
+	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
+	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/usb/usb_if.m"	\
 	no-obj no-implicit-rule before-depend local			\
-	clean		"iicbus_if.c"
-iicbus_if.h		optional iicbus					\
-	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbus_if.m" \
+	clean		"usb_if.c"
+usb_if.h		optional usb					\
+	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
+	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/usb/usb_if.m"	\
 	no-obj no-implicit-rule before-depend				\
-	clean		"iicbus_if.h"
-dev/iicbus/iiconf.c	optional iicbus
-dev/iicbus/iicbus.c	optional iicbus
-dev/iicbus/if_ic.c	optional ic
-dev/iicbus/iic.c	optional iic
+	clean		"usb_if.h"
+dev/usb/hid.c		optional usb
+dev/usb/if_aue.c	optional aue
+dev/usb/if_cue.c	optional cue
+dev/usb/if_kue.c	optional kue
+dev/usb/ohci.c		optional ohci
+dev/usb/ugen.c		optional ugen
+dev/usb/uhci.c		optional uhci
+dev/usb/uhid.c		optional uhid
+dev/usb/uhub.c		optional usb
+dev/usb/ukbd.c		optional ukbd
+dev/usb/ulpt.c		optional ulpt
+dev/usb/umass.c		optional umass
+dev/usb/ums.c		optional ums
+dev/usb/urio.c		optional urio
+dev/usb/usb.c		optional usb
+dev/usb/usb_ethersubr.c	optional usb
+#dev/usb/usb_mem.c	optional usb
+dev/usb/usb_quirks.c	optional usb
+dev/usb/usb_subr.c	optional usb
+dev/usb/usbdi.c		optional usb
+dev/usb/usbdi_util.c	optional usb
 dev/vinum/vinum.c		optional vinum
 dev/vinum/vinumconfig.c		optional vinum
 dev/vinum/vinumdaemon.c		optional vinum
@@ -384,6 +452,25 @@ i4b/layer4/i4b_i4bdrv.c	 optional i4b
 i4b/layer4/i4b_l4.c	 optional i4b
 i4b/layer4/i4b_l4mgmt.c	 optional i4b
 i4b/layer4/i4b_l4timer.c optional i4b
+isa_if.o		optional isa					\
+	dependency	"isa_if.c isa_if.h"				\
+	compile-with	"${NORMAL_C}"					\
+	no-implicit-rule local
+isa_if.c		optional isa					\
+	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
+	compile-with	"perl5 $S/kern/makedevops.pl -c $S/isa/isa_if.m" \
+	no-obj no-implicit-rule before-depend local			\
+	clean		"isa_if.c"
+isa_if.h		optional isa					\
+	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
+	compile-with	"perl5 $S/kern/makedevops.pl -h $S/isa/isa_if.m" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"isa_if.h"
+isa/isa_common.c	optional isa
+isa/isahint.c		optional isa
+isa/joy.c		optional joy
+isa/pnp.c		optional isa
+isa/pnpparse.c		optional isa
 isofs/cd9660/cd9660_bmap.c	optional cd9660
 isofs/cd9660/cd9660_lookup.c	optional cd9660
 isofs/cd9660/cd9660_node.c	optional cd9660
@@ -398,11 +485,6 @@ kern/imgact_shell.c	standard
 kern/inflate.c		optional gzip
 kern/init_main.c	standard
 kern/init_sysent.c	standard
-kern/kern_intr.c	standard
-kern/kern_module.c	standard
-kern/kern_linker.c	standard
-kern/link_aout.c	standard
-kern/link_elf.c		standard
 kern/kern_acct.c	standard
 kern/kern_acl.c		standard
 kern/kern_clock.c	standard
@@ -412,13 +494,16 @@ kern/kern_environment.c	standard
 kern/kern_exec.c	standard
 kern/kern_exit.c	standard
 kern/kern_fork.c	standard
+kern/kern_intr.c	standard
 kern/kern_jail.c	standard
 kern/kern_kthread.c	standard
 kern/kern_ktrace.c	standard
+kern/kern_linker.c	standard
 kern/kern_lock.c	standard
 kern/kern_lockf.c	standard
 kern/kern_malloc.c	standard
 kern/kern_mib.c		standard
+kern/kern_module.c	standard
 kern/kern_ntptime.c	standard
 kern/kern_physio.c	standard
 kern/kern_proc.c	standard
@@ -431,12 +516,16 @@ kern/kern_switch.c	standard
 kern/kern_synch.c	standard
 kern/kern_syscalls.c	standard
 kern/kern_sysctl.c	standard
+kern/kern_tc.c		standard
+kern/kern_threads.c	standard
 kern/kern_time.c	standard
 kern/kern_timeout.c	standard
-kern/kern_tc.c		standard
 kern/kern_xxx.c		standard
+kern/link_aout.c	standard
+kern/link_elf.c		standard
 kern/md5c.c		standard
 kern/subr_autoconf.c	standard
+kern/subr_blist.c	standard
 kern/subr_bus.c		standard
 kern/subr_devstat.c	standard
 kern/subr_disk.c	standard
@@ -446,13 +535,12 @@ kern/subr_log.c		standard
 kern/subr_module.c	standard
 kern/subr_prf.c		standard
 kern/subr_prof.c	standard
-kern/subr_blist.c	standard
+kern/subr_rman.c	standard
 kern/subr_scanf.c	standard
 kern/subr_xxx.c		standard
 kern/sys_generic.c	standard
 kern/sys_pipe.c		standard
 kern/sys_process.c	standard
-kern/subr_rman.c	standard
 kern/sys_socket.c	standard
 kern/sysv_ipc.c		standard
 kern/sysv_msg.c		optional sysvmsg
@@ -473,6 +561,7 @@ kern/uipc_socket.c	standard
 kern/uipc_socket2.c	standard
 kern/uipc_syscalls.c	standard
 kern/uipc_usrreq.c	standard
+kern/vfs_aio.c		standard
 kern/vfs_bio.c		standard
 kern/vfs_cache.c	standard
 kern/vfs_cluster.c	standard
@@ -483,8 +572,33 @@ kern/vfs_lookup.c	standard
 kern/vfs_subr.c		standard
 kern/vfs_syscalls.c	standard
 kern/vfs_vnops.c	standard
-kern/kern_threads.c	standard
-kern/vfs_aio.c		standard
+#
+# These files in libkern/ are those needed by all architectures.  Some
+# of the files in libkern/ are only needed on some architectures, e.g.,
+# libkern/divdi3.c is needed by i386 but not alpha.  Also, some of these
+# routines may be optimized for a particular platform.  In either case,
+# the file should be moved to <arch>/conf/files.<arch> from here.
+#
+libkern/arc4random.c	standard
+libkern/bcd.c		standard
+libkern/index.c		standard
+libkern/inet_ntoa.c	standard
+libkern/mcount.c	optional	profiling-routine
+libkern/qsort.c		standard
+libkern/random.c	standard
+libkern/rindex.c	standard
+libkern/scanc.c		standard
+libkern/skpc.c		standard
+libkern/strcat.c	standard
+libkern/strcmp.c	standard
+libkern/strcpy.c	standard
+libkern/strlen.c	standard
+libkern/strncmp.c	standard
+libkern/strncpy.c	standard
+libkern/strtol.c	standard
+libkern/strtoq.c	standard
+libkern/strtoul.c	standard
+libkern/strtouq.c	standard
 miscfs/deadfs/dead_vnops.c	standard
 miscfs/devfs/devfs_tree.c	optional devfs
 miscfs/devfs/devfs_vfsops.c	optional devfs
@@ -506,12 +620,12 @@ miscfs/procfs/procfs_map.c	optional procfs
 miscfs/procfs/procfs_mem.c	standard
 miscfs/procfs/procfs_note.c	optional procfs
 miscfs/procfs/procfs_regs.c	standard
+miscfs/procfs/procfs_rlimit.c	optional procfs
 miscfs/procfs/procfs_status.c	optional procfs
 miscfs/procfs/procfs_subr.c	optional procfs
 miscfs/procfs/procfs_type.c	optional procfs
 miscfs/procfs/procfs_vfsops.c	optional procfs
 miscfs/procfs/procfs_vnops.c	optional procfs
-miscfs/procfs/procfs_rlimit.c	optional procfs
 miscfs/specfs/spec_vnops.c	standard
 miscfs/umapfs/umap_subr.c	optional umapfs
 miscfs/umapfs/umap_vfsops.c	optional umapfs
@@ -525,13 +639,9 @@ msdosfs/msdosfs_fat.c		optional msdosfs
 msdosfs/msdosfs_lookup.c	optional msdosfs
 msdosfs/msdosfs_vfsops.c	optional msdosfs
 msdosfs/msdosfs_vnops.c		optional msdosfs
-ntfs/ntfs_vfsops.c		optional ntfs
-ntfs/ntfs_vnops.c		optional ntfs
-ntfs/ntfs_subr.c		optional ntfs
-ntfs/ntfs_compr.c		optional ntfs
-ntfs/ntfs_ihash.c		optional ntfs
 net/bpf.c		standard
 net/bpf_filter.c	optional bpf
+net/bpf_filter.c	optional netgraph_bpf
 net/bridge.c		optional bridge
 net/bsd_comp.c		optional ppp_bsdcomp
 #net/hostcache.c		standard
@@ -540,10 +650,10 @@ net/if_atmsubr.c	optional atm
 net/if_disc.c		optional disc
 net/if_ef.c		optional ef
 net/if_ethersubr.c	optional ether
-net/if_iso88025subr.c	optional token
 net/if_faith.c		optional faith
 net/if_fddisubr.c	optional fddi
 net/if_gif.c		optional gif
+net/if_iso88025subr.c	optional token
 net/if_loop.c		optional loop
 net/if_media.c		standard
 net/if_mib.c		standard
@@ -552,10 +662,10 @@ net/if_sl.c		optional sl
 net/if_spppsubr.c	optional sppp
 net/if_tun.c		optional tun
 net/if_vlan.c		optional vlan
+net/intrq.c		standard
 net/net_osdep.c		standard
 net/ppp_deflate.c	optional ppp_deflate
 net/ppp_tty.c		optional ppp
-net/intrq.c		standard
 net/radix.c		standard
 net/raw_cb.c		standard
 net/raw_usrreq.c	standard
@@ -651,11 +761,10 @@ netatm/uni/unisig_sigmgr_state.c	optional atm_uni atm_core
 netatm/uni/unisig_subr.c	optional atm_uni atm_core
 netatm/uni/unisig_util.c	optional atm_uni atm_core
 netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
-netgraph/ng_base.c	optional netgraph
-netgraph/ng_parse.c	optional netgraph
+netgraph/ng_UI.c	optional netgraph_UI
 netgraph/ng_async.c	optional netgraph_async
+netgraph/ng_base.c	optional netgraph
 netgraph/ng_bpf.c	optional netgraph_bpf
-net/bpf_filter.c	optional netgraph_bpf
 netgraph/ng_cisco.c	optional netgraph_cisco
 netgraph/ng_echo.c	optional netgraph_echo
 netgraph/ng_frame_relay.c	optional netgraph_frame_relay
@@ -663,6 +772,7 @@ netgraph/ng_hole.c	optional netgraph_hole
 netgraph/ng_iface.c	optional netgraph_iface
 netgraph/ng_ksocket.c	optional netgraph_ksocket
 netgraph/ng_lmi.c	optional netgraph_lmi
+netgraph/ng_parse.c	optional netgraph
 netgraph/ng_ppp.c	optional netgraph_ppp
 netgraph/ng_pppoe.c	optional netgraph_pppoe
 netgraph/ng_pptpgre.c	optional netgraph_pptpgre
@@ -670,28 +780,36 @@ netgraph/ng_rfc1490.c	optional netgraph_rfc1490
 netgraph/ng_socket.c	optional netgraph_socket
 netgraph/ng_tee.c	optional netgraph_tee
 netgraph/ng_tty.c	optional netgraph_tty
-netgraph/ng_UI.c	optional netgraph_UI
 netgraph/ng_vjc.c	optional netgraph_vjc
 net/slcompress.c	optional netgraph_vjc
+netinet/fil.c		optional ipfilter inet
 netinet/if_atm.c	optional atm
 netinet/if_ether.c	optional ether
-netinet/in_gif.c	optional gif inet
 netinet/igmp.c		optional inet
 netinet/in.c		optional inet
+netinet/in_gif.c	optional gif inet
 #netinet/in_hostcache.c	optional inet
 netinet/in_pcb.c	optional inet
 netinet/in_proto.c	optional inet
 netinet/in_rmx.c	optional inet
-netinet/ip_ecn.c	optional inet
-netinet/ip_ecn.c	optional inet6
+netinet/ip_auth.c	optional ipfilter inet
 netinet/ip_divert.c	optional ipdivert
 netinet/ip_dummynet.c	optional dummynet
+netinet/ip_ecn.c	optional inet
+netinet/ip_ecn.c	optional inet6
+netinet/ip_fil.c	optional ipfilter inet
 netinet/ip_flow.c	optional inet
+netinet/ip_frag.c	optional ipfilter inet
 netinet/ip_fw.c		optional ipfirewall
 netinet/ip_icmp.c	optional inet
 netinet/ip_input.c	optional inet
+netinet/ip_log.c	optional ipfilter inet
 netinet/ip_mroute.c	optional inet
+netinet/ip_nat.c	optional ipfilter inet
 netinet/ip_output.c	optional inet
+netinet/ip_proxy.c	optional ipfilter inet
+netinet/ip_state.c	optional ipfilter inet
+netinet/mlfk_ipl.c	optional ipfilter inet
 netinet/raw_ip.c	optional inet
 netinet/tcp_debug.c	optional tcpdebug
 netinet/tcp_input.c	optional inet
@@ -700,38 +818,29 @@ netinet/tcp_subr.c	optional inet
 netinet/tcp_timer.c	optional inet
 netinet/tcp_usrreq.c	optional inet
 netinet/udp_usrreq.c	optional inet
-netinet/ip_fil.c	optional ipfilter inet
-netinet/fil.c		optional ipfilter inet
-netinet/ip_nat.c	optional ipfilter inet
-netinet/ip_frag.c	optional ipfilter inet
-netinet/ip_state.c	optional ipfilter inet
-netinet/ip_auth.c	optional ipfilter inet
-netinet/ip_proxy.c	optional ipfilter inet
-netinet/ip_log.c	optional ipfilter inet
-netinet/mlfk_ipl.c	optional ipfilter inet
 netinet6/ah_core.c	optional ipsec
 netinet6/ah_input.c	optional ipsec
 netinet6/ah_output.c	optional ipsec
+netinet6/dest6.c	optional inet6
 netinet6/esp_core.c	optional ipsec ipsec_esp
 netinet6/esp_input.c	optional ipsec ipsec_esp
 netinet6/esp_output.c	optional ipsec ipsec_esp
-netinet6/ipsec.c	optional ipsec
-netinet6/dest6.c	optional inet6
 netinet6/frag6.c	optional inet6
 netinet6/icmp6.c	optional inet6
 netinet6/in6.c		optional inet6
 netinet6/in6_cksum.c	optional inet6
 netinet6/in6_gif.c	optional gif inet6
-netinet6/ip6_forward.c	optional inet6
-netinet6/ip6_fw.c	optional inet6 ipv6firewall
 netinet6/in6_ifattach.c	optional inet6
-netinet6/ip6_input.c	optional inet6
-netinet6/ip6_mroute.c	optional inet6
-netinet6/ip6_output.c	optional inet6
 netinet6/in6_pcb.c	optional inet6
 netinet6/in6_prefix.c	optional inet6
 netinet6/in6_proto.c	optional inet6
 netinet6/in6_rmx.c	optional inet6
+netinet6/ip6_forward.c	optional inet6
+netinet6/ip6_fw.c	optional inet6 ipv6firewall
+netinet6/ip6_input.c	optional inet6
+netinet6/ip6_mroute.c	optional inet6
+netinet6/ip6_output.c	optional inet6
+netinet6/ipsec.c	optional ipsec
 netinet6/mld6.c		optional inet6
 netinet6/nd6.c		optional inet6
 netinet6/nd6_nbr.c	optional inet6
@@ -775,6 +884,8 @@ netns/ns_pcb.c		optional ns
 netns/ns_proto.c	optional ns
 netns/spp_debug.c	optional ns
 netns/spp_usrreq.c	optional ns
+nfs/bootp_subr.c	optional bootp
+nfs/krpc_subr.c		optional bootp
 nfs/nfs_bio.c		optional nfs
 nfs/nfs_node.c		optional nfs
 nfs/nfs_nqlease.c	optional nfs
@@ -785,8 +896,11 @@ nfs/nfs_subs.c		optional nfs
 nfs/nfs_syscalls.c	optional nfs
 nfs/nfs_vfsops.c	optional nfs
 nfs/nfs_vnops.c		optional nfs
-nfs/bootp_subr.c	optional bootp
-nfs/krpc_subr.c		optional bootp
+ntfs/ntfs_compr.c		optional ntfs
+ntfs/ntfs_ihash.c		optional ntfs
+ntfs/ntfs_subr.c		optional ntfs
+ntfs/ntfs_vfsops.c		optional ntfs
+ntfs/ntfs_vnops.c		optional ntfs
 nwfs/nwfs_io.c		optional nwfs
 nwfs/nwfs_ioctl.c	optional nwfs
 nwfs/nwfs_node.c	optional nwfs
@@ -797,15 +911,8 @@ pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
 pccard/pccard_nbk.c	optional card
 pccard/pcic.c		optional pcic card
+pci/alpm.c		optional alpm
 pci/amd.c		optional amd
-pci/pcic_p.c		optional pcic pci
-dev/bktr/bktr_core.c	optional bktr pci
-dev/bktr/bktr_i2c.c	optional bktr pci smbus
-dev/bktr/bktr_card.c	optional bktr pci
-dev/bktr/bktr_tuner.c	optional bktr pci
-dev/bktr/bktr_audio.c	optional bktr pci
-dev/bktr/bktr_os.c	optional bktr pci
-pci/pccbb.c		optional pccbb cardbus
 pci/cy_pci.c		optional cy pci
 pci/if_ar_p.c		optional ar pci
 pci/if_dc.c		optional dc
@@ -818,8 +925,8 @@ pci/if_rl.c		optional rl
 pci/if_sf.c		optional sf
 pci/if_sis.c		optional sis
 pci/if_sk.c		optional sk
-pci/if_ste.c		optional ste
 pci/if_sr_p.c		optional sr pci
+pci/if_ste.c		optional ste
 pci/if_ti.c		optional ti
 pci/if_tl.c		optional tl
 pci/if_tx.c		optional tx
@@ -827,14 +934,15 @@ pci/if_vr.c		optional vr
 pci/if_wb.c		optional wb
 pci/if_wx.c		optional wx
 pci/if_xl.c		optional xl
-pci/isp_pci.c		optional isp
 pci/intpm.c		optional intpm
+pci/isp_pci.c		optional isp
 pci/meteor.c		optional meteor pci
 pci/ncr.c		optional ncr
-dev/sym/sym_hipd.c	optional sym					\
-	dependency	"$S/dev/sym/sym_{conf,defs}.h"
+pci/ohci_pci.c		optional ohci
+pci/pccbb.c		optional pccbb cardbus
 pci/pci.c		optional pci
 pci/pci_compat.c	optional pci
+pci/pcic_p.c		optional pcic pci
 pci/pcisupport.c	optional pci
 pci_if.o		optional pci					\
 	dependency	"pci_if.c pci_if.h"				\
@@ -851,19 +959,19 @@ pci_if.h		optional pci					\
 	no-obj no-implicit-rule before-depend				\
 	clean		"pci_if.h"
 pci/simos.c		optional simos
-pci/alpm.c		optional alpm
+pci/uhci_pci.c		optional uhci
 pci/xrpu.c		optional xrpu
-posix4/posix4_mib.c	standard
-posix4/p1003_1b.c	standard
 posix4/ksched.c	optional _kposix_priority_scheduling
+posix4/p1003_1b.c	standard
+posix4/posix4_mib.c	standard
 ufs/ffs/ffs_alloc.c	optional ffs
 ufs/ffs/ffs_alloc.c	optional mfs
 ufs/ffs/ffs_balloc.c	optional ffs
 ufs/ffs/ffs_balloc.c	optional mfs
 ufs/ffs/ffs_inode.c	optional ffs
 ufs/ffs/ffs_inode.c	optional mfs
-ufs/ffs/ffs_softdep_stub.c	standard
 ufs/ffs/ffs_softdep.c	optional softupdates
+ufs/ffs/ffs_softdep_stub.c	standard
 ufs/ffs/ffs_subr.c	optional ffs
 ufs/ffs/ffs_subr.c	optional mfs
 ufs/ffs/ffs_tables.c	optional ffs
@@ -898,113 +1006,5 @@ vm/vm_pageout.c		standard
 vm/vm_pager.c		standard
 vm/vm_swap.c		standard
 vm/vm_unix.c		standard
-vm/vnode_pager.c	standard
 vm/vm_zone.c		standard
-dev/streams/streams.c	optional streams
-#
-# USB support
-pci/uhci_pci.c		optional uhci
-pci/ohci_pci.c		optional ohci
-usb_if.o		optional usb					\
-	dependency	"usb_if.c"					\
-	compile-with	"${NORMAL_C}"					\
-	no-implicit-rule local
-usb_if.c		optional usb					\
-	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/usb/usb_if.m"	\
-	no-obj no-implicit-rule before-depend local			\
-	clean		"usb_if.c"
-usb_if.h		optional usb					\
-	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/usb/usb_if.m"	\
-	no-obj no-implicit-rule before-depend				\
-	clean		"usb_if.h"
-dev/usb/uhci.c		optional uhci
-dev/usb/ohci.c		optional ohci
-dev/usb/usb.c		optional usb
-dev/usb/usbdi.c		optional usb
-dev/usb/usbdi_util.c	optional usb
-#dev/usb/usb_mem.c	optional usb
-dev/usb/usb_ethersubr.c	optional usb
-dev/usb/usb_subr.c	optional usb
-dev/usb/usb_quirks.c	optional usb
-dev/usb/hid.c		optional usb
-dev/usb/ugen.c		optional ugen
-dev/usb/uhid.c		optional uhid
-dev/usb/ums.c		optional ums
-dev/usb/ulpt.c		optional ulpt
-dev/usb/ukbd.c		optional ukbd
-dev/usb/umass.c		optional umass
-dev/usb/uhub.c		optional usb
-dev/usb/urio.c		optional urio
-dev/usb/if_aue.c	optional aue
-dev/usb/if_cue.c	optional cue
-dev/usb/if_kue.c	optional kue
-isa_if.o		optional isa					\
-	dependency	"isa_if.c isa_if.h"				\
-	compile-with	"${NORMAL_C}"					\
-	no-implicit-rule local
-isa_if.c		optional isa					\
-	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/isa/isa_if.m" \
-	no-obj no-implicit-rule before-depend local			\
-	clean		"isa_if.c"
-isa_if.h		optional isa					\
-	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/isa/isa_if.m" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"isa_if.h"
-isa/isa_common.c	optional isa
-isa/isahint.c		optional isa
-isa/joy.c		optional joy
-isa/pnp.c		optional isa
-isa/pnpparse.c		optional isa
-dev/sound/isa/ad1816.c	optional pcm isa
-dev/sound/isa/es1888.c	optional pcm isa
-dev/sound/isa/gusc.c	optional gusc isa
-dev/sound/isa/gusc.c	optional pcm isa
-dev/sound/isa/mss.c	optional pcm isa
-dev/sound/isa/sb.c	optional pcm isa
-dev/sound/isa/sbc.c	optional pcm isa
-dev/sound/isa/sbc.c	optional sbc isa
-dev/sound/pcm/sound.c	optional pcm
-dev/sound/pcm/ac97.c	optional pcm
-dev/sound/pcm/dsp.c	optional pcm
-dev/sound/pcm/channel.c	optional pcm
-dev/sound/pcm/feeder.c	optional pcm
-dev/sound/pcm/fake.c	optional pcm
-dev/sound/pcm/mixer.c	optional pcm
-dev/sound/pci/csa.c	optional csa pci
-dev/sound/pci/csa.c	optional pcm pci
-dev/sound/pci/csapcm.c	optional pcm pci
-dev/sound/pci/es137x.c	optional pcm pci
-dev/sound/pci/neomagic.c optional pcm pci
-dev/sound/pci/t4dwave.c	optional pcm pci
-#dev/sound/pci/aureal.c	optional pcm pci
-#
-# These files in libkern/ are those needed by all architectures.  Some
-# of the files in libkern/ are only needed on some architectures, e.g.,
-# libkern/divdi3.c is needed by i386 but not alpha.  Also, some of these
-# routines may be optimized for a particular platform.  In either case,
-# the file should be moved to <arch>/conf/files.<arch> from here.
-#
-libkern/arc4random.c	standard
-libkern/bcd.c		standard
-libkern/index.c		standard
-libkern/inet_ntoa.c	standard
-libkern/mcount.c	optional	profiling-routine
-libkern/qsort.c		standard
-libkern/random.c	standard
-libkern/rindex.c	standard
-libkern/scanc.c		standard
-libkern/skpc.c		standard
-libkern/strcat.c	standard
-libkern/strcmp.c	standard
-libkern/strcpy.c	standard
-libkern/strlen.c	standard
-libkern/strncmp.c	standard
-libkern/strncpy.c	standard
-libkern/strtol.c	standard
-libkern/strtoq.c	standard
-libkern/strtoul.c	standard
-libkern/strtouq.c	standard
+vm/vnode_pager.c	standard