PERFORCE change 98523 for review
Matt Jacob
mjacob at FreeBSD.org
Mon Jun 5 06:07:13 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=98523
Change 98523 by mjacob at mjacob_feral on 2006/06/05 06:05:11
Integrate from mainline.
Affected files ...
.. //depot/projects/mjscratch/MAINTAINERS#2 integrate
.. //depot/projects/mjscratch/Makefile.inc1#2 integrate
.. //depot/projects/mjscratch/ObsoleteFiles.inc#2 integrate
.. //depot/projects/mjscratch/contrib/bsnmp/NEWS#2 integrate
.. //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate
.. //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/mjscratch/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate
.. //depot/projects/mjscratch/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate
.. //depot/projects/mjscratch/contrib/netcat/atomicio.c#2 integrate
.. //depot/projects/mjscratch/contrib/netcat/atomicio.h#1 branch
.. //depot/projects/mjscratch/contrib/netcat/nc.1#2 integrate
.. //depot/projects/mjscratch/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/mjscratch/contrib/netcat/socks.c#2 integrate
.. //depot/projects/mjscratch/etc/bluetooth/hcsecd.conf#2 integrate
.. //depot/projects/mjscratch/etc/defaults/rc.conf#2 integrate
.. //depot/projects/mjscratch/etc/devd.conf#2 integrate
.. //depot/projects/mjscratch/etc/hosts.allow#2 integrate
.. //depot/projects/mjscratch/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/mjscratch/etc/netstart#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/Makefile#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/bridge#1 branch
.. //depot/projects/mjscratch/etc/rc.d/devd#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/isdnd#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/jail#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/mdconfig#1 branch
.. //depot/projects/mjscratch/etc/rc.d/mdconfig2#1 branch
.. //depot/projects/mjscratch/etc/rc.d/moused#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/netif#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/pcvt#2 delete
.. //depot/projects/mjscratch/etc/rc.d/pf#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/syscons#2 integrate
.. //depot/projects/mjscratch/etc/rc.d/sysctl#2 integrate
.. //depot/projects/mjscratch/etc/rc.subr#2 integrate
.. //depot/projects/mjscratch/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/mjscratch/include/arpa/nameser.h#2 integrate
.. //depot/projects/mjscratch/include/glob.h#2 integrate
.. //depot/projects/mjscratch/include/netdb.h#2 integrate
.. //depot/projects/mjscratch/include/res_update.h#2 integrate
.. //depot/projects/mjscratch/include/resolv.h#2 integrate
.. //depot/projects/mjscratch/kerberos5/lib/libroken/Makefile#2 integrate
.. //depot/projects/mjscratch/lib/csu/common/crtbegin.c#2 delete
.. //depot/projects/mjscratch/lib/csu/common/crtend.c#2 delete
.. //depot/projects/mjscratch/lib/libatm/Makefile#2 integrate
.. //depot/projects/mjscratch/lib/libc/Makefile#2 integrate
.. //depot/projects/mjscratch/lib/libc/arm/SYS.h#2 integrate
.. //depot/projects/mjscratch/lib/libc/gen/getgrent.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/gen/gethostname.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/gen/glob.3#2 integrate
.. //depot/projects/mjscratch/lib/libc/gen/glob.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/gen/signal.3#2 integrate
.. //depot/projects/mjscratch/lib/libc/include/isc/list.h#1 branch
.. //depot/projects/mjscratch/lib/libc/nameser/Symbol.map#2 integrate
.. //depot/projects/mjscratch/lib/libc/nameser/ns_samedomain.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/Symbol.map#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/gai_strerror.3#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/gai_strerror.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/gethostnamadr.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/getnameinfo.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/net/res_mkupdate.c#2 delete
.. //depot/projects/mjscratch/lib/libc/net/res_update.c#2 delete
.. //depot/projects/mjscratch/lib/libc/resolv/Makefile.inc#2 integrate
.. //depot/projects/mjscratch/lib/libc/resolv/Symbol.map#2 integrate
.. //depot/projects/mjscratch/lib/libc/resolv/h_errno.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/resolv/res_findzonecut.c#1 branch
.. //depot/projects/mjscratch/lib/libc/resolv/res_mkupdate.c#1 branch
.. //depot/projects/mjscratch/lib/libc/resolv/res_state.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/resolv/res_update.c#1 branch
.. //depot/projects/mjscratch/lib/libc/stdlib/a64l.c#2 integrate
.. //depot/projects/mjscratch/lib/libc/stdlib/strtol.3#2 integrate
.. //depot/projects/mjscratch/lib/libc/stdlib/strtoul.3#2 integrate
.. //depot/projects/mjscratch/lib/libc/sys/truncate.2#2 integrate
.. //depot/projects/mjscratch/lib/libc/sys/wait.2#2 integrate
.. //depot/projects/mjscratch/lib/libpthread/pthread.map#2 integrate
.. //depot/projects/mjscratch/lib/libpthread/thread/thr_symbols.c#2 integrate
.. //depot/projects/mjscratch/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/mjscratch/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/mjscratch/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/mjscratch/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/mjscratch/lib/libthread_db/libpthread_db.h#2 integrate
.. //depot/projects/mjscratch/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/mjscratch/lib/libutil/Makefile#2 integrate
.. //depot/projects/mjscratch/lib/libutil/kld.c#2 integrate
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#2 delete
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 integrate
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 delete
.. //depot/projects/mjscratch/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/mjscratch/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate
.. //depot/projects/mjscratch/release/pc98/fixit-small_crunch.conf#2 integrate
.. //depot/projects/mjscratch/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/mjscratch/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/mjscratch/sbin/fsdb/fsdb.8#2 integrate
.. //depot/projects/mjscratch/sbin/fsdb/fsdb.c#2 integrate
.. //depot/projects/mjscratch/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/mjscratch/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/mjscratch/sbin/mount/mount.8#2 integrate
.. //depot/projects/mjscratch/sbin/mount/mount.c#2 integrate
.. //depot/projects/mjscratch/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate
.. //depot/projects/mjscratch/sbin/mount_std/mount_std.8#2 integrate
.. //depot/projects/mjscratch/sbin/rcorder/rcorder.c#2 integrate
.. //depot/projects/mjscratch/share/examples/diskless/clone_root#2 integrate
.. //depot/projects/mjscratch/share/examples/kld/cdev/module/cdevmod.c#2 integrate
.. //depot/projects/mjscratch/share/examples/mdoc/example.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/Makefile#2 integrate
.. //depot/projects/mjscratch/share/man/man4/acpi_dock.4#1 branch
.. //depot/projects/mjscratch/share/man/man4/aha.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ahb.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ahc.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ahd.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/altq.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/arcmsr.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/atkbd.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ciss.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/geom.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/hptmv.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ida.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/isp.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ispfw.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/kbdmux.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/ktr.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/lmc.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/mlx.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/mly.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/mpt.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/pcvt.4#2 delete
.. //depot/projects/mjscratch/share/man/man4/pst.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/sio.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/splash.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/trm.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/twa.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/twe.4#2 integrate
.. //depot/projects/mjscratch/share/man/man4/vkbd.4#2 integrate
.. //depot/projects/mjscratch/share/man/man5/Makefile#2 integrate
.. //depot/projects/mjscratch/share/man/man5/devfs.5#2 integrate
.. //depot/projects/mjscratch/share/man/man5/ext2fs.5#1 branch
.. //depot/projects/mjscratch/share/man/man5/linprocfs.5#2 integrate
.. //depot/projects/mjscratch/share/man/man5/nsswitch.conf.5#2 integrate
.. //depot/projects/mjscratch/share/man/man5/procfs.5#2 integrate
.. //depot/projects/mjscratch/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/mjscratch/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/mjscratch/share/man/man7/build.7#2 integrate
.. //depot/projects/mjscratch/share/man/man7/hier.7#2 integrate
.. //depot/projects/mjscratch/share/man/man9/Makefile#2 integrate
.. //depot/projects/mjscratch/share/man/man9/crypto.9#2 integrate
.. //depot/projects/mjscratch/share/man/man9/device_get_sysctl.9#1 branch
.. //depot/projects/mjscratch/share/man/man9/suser.9#2 integrate
.. //depot/projects/mjscratch/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/mjscratch/share/misc/iso3166#2 integrate
.. //depot/projects/mjscratch/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/mjscratch/sys/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/mjscratch/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/mjscratch/sys/amd64/include/mutex.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/mjscratch/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_reg.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/sa11x0_var.h#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/xscale/i80321/i80321_space.c#2 integrate
.. //depot/projects/mjscratch/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/mjscratch/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/mjscratch/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/mjscratch/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/mjscratch/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/mjscratch/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/mjscratch/sys/conf/NOTES#2 integrate
.. //depot/projects/mjscratch/sys/conf/files#2 integrate
.. //depot/projects/mjscratch/sys/conf/files.amd64#2 integrate
.. //depot/projects/mjscratch/sys/conf/files.i386#2 integrate
.. //depot/projects/mjscratch/sys/conf/files.pc98#2 integrate
.. //depot/projects/mjscratch/sys/conf/kern.mk#2 integrate
.. //depot/projects/mjscratch/sys/conf/kmod.mk#2 integrate
.. //depot/projects/mjscratch/sys/conf/options#2 integrate
.. //depot/projects/mjscratch/sys/conf/options.i386#2 integrate
.. //depot/projects/mjscratch/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/awi/awi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/drm/drm.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/drm/i915_drv.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/drm/mga_drv.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/em/if_em_hw.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/hifn/hifn7751var.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ic/ns16550.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/isp/isp_tpublic.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/le/if_le_cbus.c#1 branch
.. //depot/projects/mjscratch/sys/dev/le/if_le_isa.c#1 branch
.. //depot/projects/mjscratch/sys/dev/lmc/if_lmc.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfi_linux.c#1 branch
.. //depot/projects/mjscratch/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_cam.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_raid.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/mpt/mpt_reg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/pccbb/pccbb_isa.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/pci/fixup_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/safe/safevar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/sound/midi/midi.c#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/midi.h#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/midiq.h#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/mpu401.c#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/mpu401.h#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/mpu_if.m#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/mpufoi_if.m#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/sequencer.c#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/sequencer.h#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/midi/synth_if.m#1 branch
.. //depot/projects/mjscratch/sys/dev/sound/pci/cmi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/syscons/apm/apm_saver.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/uart/uart_dbg.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/ubsec/ubsecvar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ohci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ohcireg.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ohcivar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/sl811hs.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/sl811hsvar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/uhci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/uhcivar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/usbdi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/usb/usbdivar.h#2 integrate
.. //depot/projects/mjscratch/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/mjscratch/sys/dev/zs/zs.c#2 integrate
.. //depot/projects/mjscratch/sys/doc/subsys/Dependencies#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-cam#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-crypto#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_pci#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_sound#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-dev_usb#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-geom#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-i4b#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-kern#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-libkern#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-linux#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-net80211#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netgraph#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netinet#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netinet6#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-netipsec#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-opencrypto#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Doxyfile-vm#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/Makefile#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/README#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/common-Doxyfile#1 branch
.. //depot/projects/mjscratch/sys/doc/subsys/notreviewed.dox#1 branch
.. //depot/projects/mjscratch/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/mjscratch/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/gdb/gdb.h#2 integrate
.. //depot/projects/mjscratch/sys/gdb/gdb_cons.c#2 integrate
.. //depot/projects/mjscratch/sys/gdb/gdb_main.c#2 integrate
.. //depot/projects/mjscratch/sys/gdb/gdb_packet.c#2 integrate
.. //depot/projects/mjscratch/sys/geom/geom_bsd.c#2 integrate
.. //depot/projects/mjscratch/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_attr.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_bit.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_inode.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_trans.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/bios/apm.h#2 integrate
.. //depot/projects/mjscratch/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/mjscratch/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/mjscratch/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/mjscratch/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/i386/ptrace_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/include/clock.h#2 integrate
.. //depot/projects/mjscratch/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/mjscratch/sys/i386/include/mutex.h#2 integrate
.. //depot/projects/mjscratch/sys/i386/include/npx.h#2 integrate
.. //depot/projects/mjscratch/sys/i386/include/pcvt_ioctl.h#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_conf.h#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_drv.c#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_ext.c#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_hdr.h#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_kbd.c#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_kbd.h#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_out.c#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_sup.c#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_tbl.h#2 delete
.. //depot/projects/mjscratch/sys/i386/isa/pcvt/pcvt_vtf.c#2 delete
.. //depot/projects/mjscratch/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/mjscratch/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/mjscratch/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/mjscratch/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/mjscratch/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_event.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/subr_disk.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/mjscratch/sys/kern/vnode_if.src#2 integrate
.. //depot/projects/mjscratch/sys/modules/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/acpi/acpi_asus/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/acpi/acpi_video/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/cpufreq/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/fdc/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/geom/geom_eli/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/le/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/mfi/mfi_linux/Makefile#1 branch
.. //depot/projects/mjscratch/sys/modules/sound/driver/cmi/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/sound/driver/emu10k1/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/modules/sound/sound/Makefile#2 integrate
.. //depot/projects/mjscratch/sys/net/bpf.c#2 integrate
.. //depot/projects/mjscratch/sys/net/bpf.h#2 integrate
.. //depot/projects/mjscratch/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/mjscratch/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/mjscratch/sys/net/if.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_bridge.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_disc.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_faith.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_fwsubr.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_gif.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_gre.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_loop.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_media.h#2 integrate
.. //depot/projects/mjscratch/sys/net/if_sl.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_stf.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_tap.c#2 integrate
.. //depot/projects/mjscratch/sys/net/if_tun.c#2 integrate
.. //depot/projects/mjscratch/sys/net/raw_cb.c#2 integrate
.. //depot/projects/mjscratch/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/mjscratch/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/mjscratch/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/mjscratch/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_fw.h#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/tcp_timer.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/mjscratch/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/mjscratch/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/mjscratch/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/mjscratch/sys/netipsec/key.c#2 integrate
.. //depot/projects/mjscratch/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/mjscratch/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/mjscratch/sys/nfs4client/nfs4_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_node.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/mjscratch/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/criov.c#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/crypto.c#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/cryptosoft.h#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/mjscratch/sys/opencrypto/xform.h#2 integrate
.. //depot/projects/mjscratch/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/mjscratch/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/mjscratch/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/mjscratch/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/mjscratch/sys/pc98/include/pcvt_ioctl.h#2 delete
.. //depot/projects/mjscratch/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/mjscratch/sys/pci/agp_sis.c#2 integrate
.. //depot/projects/mjscratch/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/mjscratch/sys/posix4/ksched.c#2 integrate
.. //depot/projects/mjscratch/sys/posix4/p1003_1b.c#2 integrate
.. //depot/projects/mjscratch/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/mjscratch/sys/sparc64/include/pmap.h#2 integrate
.. //depot/projects/mjscratch/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/mjscratch/sys/sys/cons.h#2 integrate
.. //depot/projects/mjscratch/sys/sys/elf_common.h#2 integrate
.. //depot/projects/mjscratch/sys/sys/kernel.h#2 integrate
.. //depot/projects/mjscratch/sys/sys/mutex.h#2 integrate
.. //depot/projects/mjscratch/sys/sys/proc.h#2 integrate
.. //depot/projects/mjscratch/sys/sys/queue.h#2 integrate
.. //depot/projects/mjscratch/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/mjscratch/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/mjscratch/sys/ufs/ufs/dinode.h#2 integrate
.. //depot/projects/mjscratch/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/mjscratch/sys/vm/uma_core.c#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_map.c#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_map.h#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/mjscratch/sys/vm/vm_page.c#2 integrate
.. //depot/projects/mjscratch/tools/build/options/WITHOUT_PCVT#2 delete
.. //depot/projects/mjscratch/tools/build/options/makeman#2 integrate
.. //depot/projects/mjscratch/tools/debugscripts/dot.gdbinit#2 integrate
.. //depot/projects/mjscratch/tools/make_libdeps.sh#2 integrate
.. //depot/projects/mjscratch/tools/regression/execve/Makefile#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/doexec.c#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/execve.t#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/badinterplen#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/devnullscript#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/goodaout.c#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/goodscript#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/nonexistshell#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/scriptarg#1 branch
.. //depot/projects/mjscratch/tools/regression/execve/tests/scriptarg-nospace#1 branch
.. //depot/projects/mjscratch/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate
.. //depot/projects/mjscratch/tools/regression/ipsec/ipsec.t#1 branch
.. //depot/projects/mjscratch/tools/regression/netinet/rawconnect/rawconnect.t#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/sendfile/Makefile#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/sendfile/sendfile.c#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/socketpair/Makefile#2 integrate
.. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/Makefile#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/README#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch
.. //depot/projects/mjscratch/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch
.. //depot/projects/mjscratch/tools/tools/README#2 integrate
.. //depot/projects/mjscratch/tools/tools/crypto/cryptotest.c#2 integrate
.. //depot/projects/mjscratch/tools/tools/crypto/ubsecstats.c#2 integrate
.. //depot/projects/mjscratch/tools/tools/recoverdisk/Makefile#2 integrate
.. //depot/projects/mjscratch/tools/tools/recoverdisk/recoverdisk.c#2 integrate
.. //depot/projects/mjscratch/tools/tools/tinderbox/.cvsignore#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/Makefile#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/Makefile#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/default.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/head.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_4.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_5.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/releng_6.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_head.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_4.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_5.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/etc/update_releng_6.rc#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/powerpc.diff#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/tbmaster.1#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/tbmaster.pl#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/tinderbox.1#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/tinderbox.pl#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/.cvsignore#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/Makefile#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/daemon.png.uu#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/index.cgi#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/tb.css#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/valid-css.png.uu#2 delete
.. //depot/projects/mjscratch/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete
.. //depot/projects/mjscratch/usr.bin/calendar/day.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/file/magic.5#2 integrate
.. //depot/projects/mjscratch/usr.bin/find/find.1#2 integrate
.. //depot/projects/mjscratch/usr.bin/find/function.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/id/id.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/kdump/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.bin/kdump/kdump.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/kdump/kdump_subr.h#1 branch
.. //depot/projects/mjscratch/usr.bin/kdump/mksubr#1 branch
.. //depot/projects/mjscratch/usr.bin/rpcgen/rpc_svcout.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/sed/process.c#2 integrate
.. //depot/projects/mjscratch/usr.bin/systat/systat.1#2 integrate
.. //depot/projects/mjscratch/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate
.. //depot/projects/mjscratch/usr.sbin/bluetooth/hccontrol/node.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/cron/cron/do_command.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/cron/cron/popen.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/gstat/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.sbin/gstat/gstat.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/gstat/gstat.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ipfwpcap/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ipfwpcap/ipfwpcap.8#1 branch
.. //depot/projects/mjscratch/usr.sbin/jail/jail.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/mountd/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/mrouted/cfparse.y#2 integrate
.. //depot/projects/mjscratch/usr.sbin/mrouted/config.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/config.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/connect.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/debug.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/dot.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/list.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/main.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/mkpeer.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/msg.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/name.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/ngctl.h#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/rmhook.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/show.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/shutdown.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/status.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/types.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ngctl/write.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/Makefile#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntp-keygen.8#1 branch
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntp.conf.5#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpd.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpdate.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpdc.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ntp/doc/ntpq.8#2 integrate
.. //depot/projects/mjscratch/usr.sbin/pcvt/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Makefile.inc#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Acknowledgements#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Bibliography#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/CharGen#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Charsets#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/EscapeSequences#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Keyboard.HP#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Keyboard.VT#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Doc/NotesAndHints#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Termcap#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/Terminfo#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/pcvt.el#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/pcvt.sh#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Etc/xmodmap-german#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/Makefile.inc#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/Misc/README.FIRST#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/cursor.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/cursor/cursor.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/README#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/chardemo.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/colors.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/cowscene.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/outerlimit.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/playvt.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/sgr.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/twzone.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/demo/xmas.vt.gz.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/edit.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/fed.h#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/misc.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fed/select.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/README#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/fontedit.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fontedit/fontedit.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/COPYRIGHT#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt100pc.814.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt100sg.814.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.808.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.810.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.814.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220h.816.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.808.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.810.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.814.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/fonts/vt220l.816.uu#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/ispcvt.8#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/ispcvt/ispcvt.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/kbdio.y#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kbdio/lex.l#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/kcon.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/kcon/kcon.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.3#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.h#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/keycap.src#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/keycap/man5/keycap.5#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/loadfont.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/loadfont/loadfont.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/scon/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/scon/scon.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/scon/scon.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/vt220keys.1#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/userkeys/vt220keys.c#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/CAUTION#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/Makefile#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/lex.l#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.8#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.h#2 delete
.. //depot/projects/mjscratch/usr.sbin/pcvt/vgaio/vgaio.y#2 delete
.. //depot/projects/mjscratch/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate
.. //depot/projects/mjscratch/usr.sbin/rpc.lockd/kern.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/sysinstall/dist.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/sysinstall/installUpgrade.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate
.. //depot/projects/mjscratch/usr.sbin/ypserv/yp_access.c#2 integrate
Differences ...
==== //depot/projects/mjscratch/MAINTAINERS#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.131 2006/05/05 20:12:30 rodrigc Exp $
+$FreeBSD: src/MAINTAINERS,v 1.135 2006/06/03 01:52:11 scottl Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -20,6 +20,7 @@
subsystem login notes
-----------------------------
+kqueue jmg Pre-commit review requested.
mergemaster dougb Prefers to pre-approve commits
libc/posix1e rwatson Pre-commit review requested.
POSIX.1e ACLs rwatson Pre-commit review requested.
@@ -41,15 +42,8 @@
cdboot jhb Pre-commit review requested.
pxeboot jhb Pre-commit review requested.
witness jhb Pre-commit review requested.
-twe vkashyap Pre-commit review requested
-twa vkashyap Pre-commit review requested
-aac scottl Pre-commit review requested
-udf scottl Pre-commit review requested.
-ips scottl Pre-commit review requested.
-iir scottl Pre-commit review requested.
-mlx scottl Pre-commit review requested.
-mly scottl Pre-commit review requested.
-maestro3 scottl Pre-commit review requested.
+twe aradford at amcc.com Pre-commit review requested
+twa aradford at amcc.com Pre-commit review requested
CAM gibbs,
ken Pre-commit review requested. send to scsi at freebsd.org
devstat(9) ken Pre-commit review requested.
==== //depot/projects/mjscratch/Makefile.inc1#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.545 2006/03/31 14:10:35 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.547 2006/05/26 18:10:06 netchild Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -17,6 +17,7 @@
# The intended user-driven targets are:
# buildworld - rebuild *everything*, including glue to help do upgrades
# installworld- install everything built by "buildworld"
+# doxygen - build API documentation of the kernel
# update - convenient way to update your source tree (eg: cvsup/cvs)
#
# Standard targets (not defined here) are documented in the makefiles in
@@ -421,7 +422,7 @@
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
.endfor
-.for _dir in usr.sbin/pcvt/keycap usr.bin/lex/lib
+.for _dir in usr.bin/lex/lib
cd ${.CURDIR}/${_dir}; \
${LIB32MAKE} DESTDIR=${LIB32TMP} obj
.endfor
@@ -711,6 +712,18 @@
${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
#
+# doxygen
+#
+# Build the API documentation with doxygen
+#
+doxygen:
+ @if [ ! -x `/usr/bin/which doxygen` ]; then \
+ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
+ exit 1; \
+ fi
+ cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all
+
+#
# update
#
# Update the source tree, by running cvsup and/or running cvs to update to the
@@ -1010,10 +1023,6 @@
_generic_libs+= usr.bin/lex/lib
-.if ${MACHINE} == "i386"
-_generic_libs+= usr.sbin/pcvt/keycap
-.endif
-
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
${_lib}__L: .PHONY
.if exists(${.CURDIR}/${_lib})
==== //depot/projects/mjscratch/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.35 2006/05/15 20:41:11 maxim Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,59 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060517: pcvt removed
+OLD_FILES+=usr/share/pcvt/README.FIRST
+OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
+OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
+OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
+OLD_FILES+=usr/share/pcvt/Etc/Terminfo
+OLD_FILES+=usr/share/pcvt/Etc/Termcap
+OLD_DIRS+=usr/share/pcvt/Etc
+OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
+OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
+OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
+OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
+OLD_FILES+=usr/share/pcvt/Doc/Charsets
+OLD_FILES+=usr/share/pcvt/Doc/CharGen
+OLD_FILES+=usr/share/pcvt/Doc/Bibliography
+OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
+OLD_DIRS+=usr/share/pcvt/Doc
+OLD_DIRS+=usr/share/pcvt
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
+OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
+OLD_DIRS+=usr/share/misc/pcvtfonts
+OLD_FILES+=usr/share/misc/keycap.pcvt
+OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
+OLD_FILES+=usr/share/man/man5/keycap.5.gz
+OLD_FILES+=usr/share/man/man4/vt.4.gz
+OLD_FILES+=usr/share/man/man4/pcvt.4.gz
+OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
+OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
+OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
+OLD_FILES+=usr/share/man/man3/kgetent.3.gz
+OLD_FILES+=usr/share/man/man3/keycap.3.gz
+OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
+OLD_FILES+=usr/share/man/man1/scon.1.gz
+OLD_FILES+=usr/share/man/man1/loadfont.1.gz
+OLD_FILES+=usr/share/man/man1/kcon.1.gz
+OLD_FILES+=usr/share/man/man1/fontedit.1.gz
+OLD_FILES+=usr/share/man/man1/cursor.1.gz
+OLD_FILES+=usr/sbin/vt220keys
+OLD_FILES+=usr/sbin/scon
+OLD_FILES+=usr/sbin/loadfont
+OLD_FILES+=usr/sbin/kcon
+OLD_FILES+=usr/sbin/ispcvt
+OLD_FILES+=usr/sbin/fontedit
+OLD_FILES+=usr/sbin/cursor
+OLD_FILES+=usr/lib/libkeycap_p.a
+OLD_FILES+=usr/lib/libkeycap.a
+OLD_FILES+=usr/include/machine/pcvt_ioctl.h
# 20060514: lnc(4) replaced by le(4)
OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
# 20060512: remove ip6fw
@@ -22,6 +75,8 @@
OLD_FILES+=sbin/ip6fw
OLD_FILES+=usr/include/netinet6/ip6_fw.h
OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
+# 20060424: sab(4) removed
+OLD_FILES+=usr/share/man/man4/sab.4.gz
# 20060328: remove redundant rc.d script
OLD_FILES+=etc/rc.d/ike
# 20060127: revert libdisk to static-only
==== //depot/projects/mjscratch/contrib/bsnmp/NEWS#2 (text+ko) ====
@@ -1,3 +1,7 @@
+1.12a
+ Support for ENUM and BITS in gensnmp{tree,def}. Include directives
+ and typedefs.
+
1.12
A couple of man page fixes from various submitters.
==== //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (C) 2004-2005
+.\" Copyright (C) 2004-2006
.\" Hartmut Brandt.
.\" All rights reserved.
.\"
@@ -26,9 +26,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.5 2005/10/04 08:46:46 brandt_h Exp $
+.\" $Begemot: gensnmpdef.1 383 2006-05-30 07:40:49Z brandt_h $
.\"
-.Dd June 14, 2005
+.Dd May 28, 2006
.Dt GENSNMPDEF 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd "generate a MIB description file from MIBs"
.Sh SYNOPSIS
.Nm
-.Op Fl h
+.Op Fl hEe
.Op Fl c Ar cut
.Ar name Op Ar ...
.Sh DESCRIPTION
@@ -48,13 +48,28 @@
for feeding it into
.Xr gensnmptree 1 .
.Pp
-The
-.Fl c
-option specifies the number of initial sub-oids that should be omitted
-from the tree.
+The following options are available:
+.Bl -tag -width indent
+.It Fl c Ar cut
+Specify the number of initial sub-oids that should be omitted
+from the tree in the output.
.Xr gensnmptree 1
automatically adds 1.3.6 in front of all OIDs so the default value
of 3 is just correct in most cases.
+.It Fl E
+Generate typedefs for named enumerations.
+These are enumerations defined via the TEXTUAL-CONVENTION macro.
+The normal tree output is suppressed.
+.It Fl e
+Generate typedefs for unnamed enumerations.
+These are enumerations defined in the SYNTAX clause of an OBJECT-TYPE macro.
+The name of the enumeration is formed by appending the string
+.Ql Type
+to the name of the object.
+The normal tree output is suppressed.
+.It Fl h
+Print a short help text and exit.
+.El
.Pp
.Nm
does no attempt on sorting the OID tree so in case of complex and
==== //depot/projects/mjscratch/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004
+ * Copyright (C) 2004-2006
* Hartmut Brandt.
* All rights reserved.
*
@@ -26,8 +26,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Begemot: bsnmp/gensnmpdef/gensnmpdef.c,v 1.3 2004/08/06 08:46:45 brandt Exp $
+ * $Begemot: gensnmpdef.c 383 2006-05-30 07:40:49Z brandt_h $
*/
+#include <sys/queue.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -38,9 +40,13 @@
#include <smi.h>
static const char usgtxt[] =
-"Usage: gensnmpdef [-h] [-c <cut>] MIB [MIB ...]\n"
+"Usage: gensnmpdef [-hEe] [-c <cut>] MIB [MIB ...]\n"
"Options:\n"
" -c specify the number of initial sub-oids to cut from the oids\n"
+" -E extract named enum types. Print a typedef for all enums defined\n"
+" in syntax clauses of normal objects. Suppress normal output.\n"
+" -e extract unnamed enum types. Print a typedef for all enums defined\n"
+" as textual conventions. Suppress normal output.\n"
" -h print this help\n"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list