PERFORCE change 173059 for review

Alexander Motin mav at FreeBSD.org
Wed Jan 13 07:55:51 UTC 2010


http://p4web.freebsd.org/chv.cgi?CH=173059

Change 173059 by mav at mav_mavbook on 2010/01/13 07:54:56

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/FIXES#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/b.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/lib.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/mac.code#2 delete
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/makefile#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/maketab.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/proctab.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/proto.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/one-true-awk/run.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/opie/libopie/getutmpentry.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/opie/libopie/insecure.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/opie/libopie/login.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.firewall#7 integrate
.. //depot/projects/scottl-camlock/src/etc/termcap.small#5 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/freebsd-tips#3 integrate
.. //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kdestroy/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kpasswd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_bindx.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_connectx.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getaddrlen.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getassocid.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getpaddrs.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_recvmsg.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_send.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/sctp_sendmsg.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc_auth_des.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/fread.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/fwrite.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_generic_recvmsg.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_generic_sendmsg.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/sctp_peeloff.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/dosfs.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass2.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#9 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/pthread_affinity_np.3#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/pthread_attr_affinity_np.3#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#18 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ath.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/cpufreq.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/vge.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/devfs.rules.5#3 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#6 integrate
.. //depot/projects/scottl-camlock/src/share/termcap/termcap.src#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#30 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/iodev.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/bootstrap.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/efi/include/efilib.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efifs.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/efipart.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#22 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/conf.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/version#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#68 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_file.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.mips#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#47 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#61 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#19 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.mips#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.mips64#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.32#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.64#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.octeon1.n32#1 branch
.. //depot/projects/scottl-camlock/src/sys/conf/options.mips#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#92 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#46 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_api.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_env.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ct/ct_isa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/flash/mx25l.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/flash/mx25lreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/ic/ns16550.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/io/iodev.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_cc.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac_private.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/uhso.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#39 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/procfs/procfs_status.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#29 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/io.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/locore.s#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#39 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/iodev.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/iodev_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sys_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/iodev.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/ia64/include/sysarch.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_environment.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_param.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/files.adm5120#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/obio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/aureg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/files.alchemy#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/obio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/std.alchemy#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/uart_bus_alchemy.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/alchemy/uart_cpu_alchemy.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/asm_octeon.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/driveid.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/files.octeon1#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/obiovar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeonreg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/std.octeon1#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_bus_octeonusart.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_dev_oct16550.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/conf/ALCHEMY#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA64#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/files.idt#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/obio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/idt/uart_cpu_rc32434.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_align.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_bus.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_types.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/asm.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/atomic.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/bus.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/bus_octeon.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/cache.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cache_mipsNN.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cdefs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpufunc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpuinfo.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/db_machdep.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/elf.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/endian.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/float.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/fls64.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/include/hwfunc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/intr.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/intr_machdep.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/kdb.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/locore.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/md_var.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pltfm.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/proc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/profile.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/psl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pte.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/regdef.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/regnum.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/ucontext.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/files.malta#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/gt_pci.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/maltareg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/obio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/std.malta#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/malta/yamon.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/bus_space_generic.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/cache.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/cache_mipsNN.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/copystr.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/cpu.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_trampoline.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/fp.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/gdb_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/genassym.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/in_cksum.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/inckern.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/intr_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mainbus.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/mem.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/nexus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/psraccess.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/ptrace_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/support.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/sys_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tlb.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/desc.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmilib.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmilib.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/rmisec.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/sec/stats.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/atx_cpld.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/xgmac_mdio.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcireg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/ehcivar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/files.xlr#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/iodi.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_i2c.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/rmi/xls_ehci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/files.sentry5#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/obio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_cc.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_mips.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/siba_sdram.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbbus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#40 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/epic/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/uhso/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/if_epair.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#23 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#25 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/authunix_prot.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_arg.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#28 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/epic.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/socket.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/systm.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#14 integrate
.. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/ath/athdecode/main.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/awk/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/awk/b.c.diff#3 delete
.. //depot/projects/scottl-camlock/src/usr.bin/awk/main.c.diff#3 delete
.. //depot/projects/scottl-camlock/src/usr.bin/awk/run.c.diff#2 delete
.. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/if.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#7 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.1#1 branch
.. //depot/projects/scottl-camlock/src/usr.sbin/uhsoctl/uhsoctl.c#1 branch
.. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.c#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.359 2010/01/08 19:01:50 bz Exp $
+# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $
 #
 # The user-driven targets are:
 #
@@ -321,8 +321,9 @@
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
 universe_kernels: universe_kernconfs
-BUILD_ARCH!=	uname -p
-TARGET?=	${BUILD_ARCH}
+.if !defined(TARGET)
+TARGET!=	uname -m
+.endif
 KERNCONFS!=	cd ${.CURDIR}/sys/${TARGET}/conf && \
 		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
 		! -name DEFAULTS ! -name NOTES

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/FIXES#3 (text+ko) ====

@@ -25,6 +25,23 @@
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Nov 26, 2009:
+	fixed a long-standing issue with when FS takes effect.  a
+	change to FS is now noticed immediately for subsequent splits.
+
+	changed the name getline() to awkgetline() to avoid yet another
+	name conflict somewhere.
+
+Feb 11, 2009:
+	temporarily for now defined HAS_ISBLANK, since that seems to
+	be the best way through the thicket.  isblank arrived in C99,
+	but seems to be arriving at different systems at different
+	times.
+
+Oct 8, 2008:
+	fixed typo in b.c that set tmpvec wrongly.  no one had ever
+	run into the problem, apparently.  thanks to alistair crooks.
+
 Oct 23, 2007:
 	minor fix in lib.c: increase inputFS to 100, change malloc
 	for fields to n+1.  

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/b.c#3 (text+ko) ====

@@ -24,6 +24,9 @@
 
 /* lasciate ogne speranza, voi ch'intrate. */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/b.c,v 1.3 2010/01/10 08:02:07 ru Exp $");
+
 #define	DEBUG
 
 #include <ctype.h>
@@ -285,9 +288,21 @@
 	return c;
 }
 
+static int collate_range_cmp(int a, int b)
+{
+	static char s[2][2];
+
+	if ((uschar)a == (uschar)b)
+		return 0;
+	s[0][0] = a;
+	s[1][0] = b;
+	return (strcoll(s[0], s[1]));
+}
+
 char *cclenter(const char *argp)	/* add a character class */
 {
 	int i, c, c2;
+	int j;
 	uschar *p = (uschar *) argp;
 	uschar *op, *bp;
 	static uschar *buf = 0;
@@ -306,15 +321,18 @@
 				c2 = *p++;
 				if (c2 == '\\')
 					c2 = quoted((char **) &p);
-				if (c > c2) {	/* empty; ignore */
+				if (collate_range_cmp(c, c2) > 0) {
 					bp--;
 					i--;
 					continue;
 				}
-				while (c < c2) {
+				for (j = 0; j < NCHARS; j++) {
+					if ((collate_range_cmp(c, j) > 0) ||
+					    collate_range_cmp(j, c2) > 0)
+						continue;
 					if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1"))
 						FATAL("out of space for character class [%.10s...] 2", p);
-					*bp++ = ++c;
+					*bp++ = j;
 					i++;
 				}
 				continue;
@@ -731,6 +749,7 @@
  * to nelson beebe for the suggestion; let's see if it works everywhere.
  */
 
+/* #define HAS_ISBLANK */
 #ifndef HAS_ISBLANK
 
 int (isblank)(int c)
@@ -876,7 +895,7 @@
 					if (q[j] >= maxsetvec) {
 						maxsetvec *= 4;
 						setvec = (int *) realloc(setvec, maxsetvec * sizeof(int));
-						tmpset = (int *) realloc(setvec, maxsetvec * sizeof(int));
+						tmpset = (int *) realloc(tmpset, maxsetvec * sizeof(int));
 						if (setvec == 0 || tmpset == 0)
 							overflo("cgoto overflow");
 					}

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/lib.c#3 (text+ko) ====

@@ -274,6 +274,7 @@
 	}
 	fr = fields;
 	i = 0;	/* number of fields accumulated here */
+	strcpy(inputFS, *FS);
 	if (strlen(inputFS) > 1) {	/* it's a regular expression */
 		i = refldbld(r, inputFS);
 	} else if ((sep = *inputFS) == ' ') {	/* default whitespace */

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/main.c#3 (text+ko) ====

@@ -22,7 +22,10 @@
 THIS SOFTWARE.
 ****************************************************************/
 
-const char	*version = "version 20070501";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/main.c,v 1.3 2010/01/10 08:02:07 ru Exp $");
+
+const char	*version = "version 20091126 (FreeBSD)";
 
 #define DEBUG
 #include <stdio.h>
@@ -58,6 +61,7 @@
 	const char *fs = NULL;
 
 	setlocale(LC_CTYPE, "");
+	setlocale(LC_COLLATE, "");
 	setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
 	cmdname = argv[0];
 	if (argc == 1) {
@@ -86,13 +90,18 @@
 				safe = 1;
 			break;
 		case 'f':	/* next argument is program filename */
-			argc--;
-			argv++;
-			if (argc <= 1)
-				FATAL("no program filename");
-			if (npfile >= MAX_PFILE - 1)
-				FATAL("too many -f options"); 
-			pfile[npfile++] = argv[1];
+			if (argv[1][2] != 0) {	/* arg is -fsomething */
+				if (npfile >= MAX_PFILE - 1)
+					FATAL("too many -f options"); 
+				pfile[npfile++] = &argv[1][2];
+			} else {		/* arg is -f something */
+				argc--; argv++;
+				if (argc <= 1)
+					FATAL("no program filename");
+				if (npfile >= MAX_PFILE - 1)
+					FATAL("too many -f options"); 
+				pfile[npfile++] = argv[1];
+			}
 			break;
 		case 'F':	/* set field separator */
 			if (argv[1][2] != 0) {	/* arg is -Fsomething */
@@ -111,8 +120,14 @@
 				WARNING("field separator FS is empty");
 			break;
 		case 'v':	/* -v a=1 to be done NOW.  one -v for each */
-			if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
-				setclvar(argv[1]);
+			if (argv[1][2] != 0) {	/* arg is -vsomething */
+				if (argv[1][2] != 0)
+					setclvar(&argv[1][2]);
+			} else {		/* arg is -v something */
+				argc--; argv++;
+				if (argc > 1 && isclvar(argv[1]))
+					setclvar(argv[1]);
+			}
 			break;
 		case 'd':
 			dbg = atoi(&argv[1][2]);

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/makefile#3 (text+ko) ====

@@ -31,7 +31,6 @@
 CC = gcc -Wall -g
 CC = cc
 CC = gcc -O4
-CC = gcc -Wall -g
 
 
 YACC = bison -y

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/maketab.c#3 (text+ko) ====

@@ -102,7 +102,7 @@
 	{ CALL, "call", "call" },
 	{ ARG, "arg", "arg" },
 	{ VARNF, "getnf", "NF" },
-	{ GETLINE, "getline", "getline" },
+	{ GETLINE, "awkgetline", "getline" },
 	{ 0, "", "" },
 };
 

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/proctab.c#3 (text+ko) ====

@@ -180,7 +180,7 @@
 	nullproc,	/* NUMBER */
 	nullproc,	/* STRING */
 	nullproc,	/* REGEXPR */
-	getline,	/* GETLINE */
+	awkgetline,	/* GETLINE */
 	substr,	/* SUBSTR */
 	split,	/* SPLIT */
 	jump,	/* RETURN */

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/proto.h#2 (text+ko) ====

@@ -149,7 +149,7 @@
 extern	Cell	*copycell(Cell *);
 extern	Cell	*arg(Node **, int);
 extern	Cell	*jump(Node **, int);
-extern	Cell	*getline(Node **, int);
+extern	Cell	*awkgetline(Node **, int);
 extern	Cell	*getnf(Node **, int);
 extern	Cell	*array(Node **, int);
 extern	Cell	*awkdelete(Node **, int);

==== //depot/projects/scottl-camlock/src/contrib/one-true-awk/run.c#3 (text+ko) ====

@@ -22,6 +22,9 @@
 THIS SOFTWARE.
 ****************************************************************/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/run.c,v 1.3 2010/01/10 08:02:07 ru Exp $");
+
 #define DEBUG
 #include <stdio.h>
 #include <ctype.h>
@@ -388,7 +391,7 @@
 	return 0;	/* not reached */
 }
 
-Cell *getline(Node **a, int n)	/* get next line from specific input */
+Cell *awkgetline(Node **a, int n)	/* get next line from specific input */
 {		/* a[0] is variable, a[1] is operator, a[2] is filename */
 	Cell *r, *x;
 	extern Cell **fldtab;
@@ -653,7 +656,7 @@
 		j = x->fval - y->fval;
 		i = j<0? -1: (j>0? 1: 0);
 	} else {
-		i = strcmp(getsval(x), getsval(y));
+		i = strcoll(getsval(x), getsval(y));
 	}
 	tempfree(x);
 	tempfree(y);
@@ -1159,11 +1162,11 @@
 			x->sval, y->sval);
 	strcpy(s, x->sval);
 	strcpy(s+n1, y->sval);
+	tempfree(x);
 	tempfree(y);
 	z = gettemp();
 	z->sval = s;
 	z->tval = STR;
-	tempfree(x);
 	return(z);
 }
 

==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/getutmpentry.c#2 (text+ko) ====

@@ -15,13 +15,14 @@
 #include "opie_cfg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <utmp.h>
 
 #if DOUTMPX
 #include <utmpx.h>
 #define setutent setutxent
 #define getutline(x) getutxline(x)
 #define utmp utmpx
+#else
+#include <utmp.h>
 #endif /* DOUTMPX */
 
 #if HAVE_STRING_H

==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/insecure.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
         Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer
              assignment that should have been a comparison.
 
-$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.3 2002/03/21 23:42:52 markm Exp $
+$FreeBSD: src/contrib/opie/libopie/insecure.c,v 1.4 2010/01/11 16:27:56 ed Exp $
 
 */
 #include "opie_cfg.h"
@@ -39,11 +39,12 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include <utmp.h>
 #if DOUTMPX
 #include <utmpx.h>
 #define utmp utmpx
 #define endutent endutxent
+#else
+#include <utmp.h>
 #endif	/* DOUTMPX */
 
 #if HAVE_SYS_UTSNAME_H

==== //depot/projects/scottl-camlock/src/contrib/opie/libopie/login.c#2 (text+ko) ====

@@ -21,13 +21,14 @@
 #include "opie_cfg.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <utmp.h>
 
 #if DOUTMPX
 #include <utmpx.h>
 #define pututline(x) pututxline(x)
 #define endutent endutxent
 #define utmp utmpx
+#else
+#include <utmp.h>
 #endif /* DOUTMPX */
 
 #if HAVE_STRING_H

==== //depot/projects/scottl-camlock/src/etc/rc.firewall#7 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.firewall,v 1.63 2010/01/07 17:46:25 ume Exp $
+# $FreeBSD: src/etc/rc.firewall,v 1.64 2010/01/09 19:16:27 ume Exp $
 #
 
 #
@@ -220,6 +220,8 @@
 		# Allow any link-local multicast traffic
 		${fwcmd} add pass all from fe80::/10 to ff02::/16
 		${fwcmd} add pass all from ${net6} to ff02::/16
+		# Allow DHCPv6
+		${fwcmd} add pass udp from fe80::/10 to me6 546
 	fi
 
 	# Allow TCP through if setup succeeded

==== //depot/projects/scottl-camlock/src/etc/termcap.small#5 (text+ko) ====

@@ -30,7 +30,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)termcap.src	5.88 (Berkeley) 4/30/91
-# $FreeBSD: src/etc/termcap.small,v 1.32 2009/12/14 07:18:31 dougb Exp $
+# $FreeBSD: src/etc/termcap.small,v 1.33 2010/01/10 21:41:37 ed Exp $
 #
 # for syscons
 # common entry without semigraphics
@@ -294,9 +294,9 @@
 # $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
 #
 xterm-new|modern xterm:\
-	:*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+	:@7=\EOF:@8=\EOM:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kI=\E[2~:\
 	:kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
 	:tc=xterm-basic:
 #

==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/freebsd-tips#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.47 2009/01/12 19:17:43 simon Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.48 2010/01/11 21:17:49 gavin Exp $
 %
 Any user that is a member of the wheel group can use "su -" to simulate
 a root login. You can add a user to the wheel group by editing /etc/group.
@@ -50,18 +50,6 @@
 be able to run it unless you first type "rehash".
 		-- Dru <genesis at istar.ca>
 %
-If you are running xterm, the default TERM variable will be 'xterm'.  If you
-set this environment variable to 'xterm-color' instead, a lot of programs will
-use colors.  You can do this by
-
-	TERM=xterm-color; export TERM
-
-in Bourne-derived shells, and
-
-	setenv TERM xterm-color
-
-in csh-derived shells.
-%
 If you do not want to get beeps in X11 (X Windows), you can turn them off with
 
 	xset b off

==== //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kdestroy/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.16 2008/05/07 13:53:08 dfr Exp $
+# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.17 2010/01/09 18:51:50 antoine Exp $
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509) ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err

==== //depot/projects/scottl-camlock/src/kerberos5/usr.bin/kpasswd/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.15 2008/05/07 13:53:08 dfr Exp $
+# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.16 2010/01/09 18:53:03 antoine Exp $
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBHX509 ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 LDADD=	-lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err

==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#4 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.21 2010/01/09 05:40:46 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.22 2010/01/12 01:30:05 davidxu Exp $
 .\"
-.Dd January 7, 2010
+.Dd January 9, 2010
 .Dt SEM_INIT 3
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@
 specifies a shared semaphore that can be used by multiple processes,
 the semaphore should be located in shared memory region (see
 .Xr mmap 2 ,
-.Xr shm_open 2 , 
+.Xr shm_open 2 ,
 and
 .Xr shmget 2 ) ,
 any process having read and write access to address

==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_open.3#4 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.14 2010/01/09 05:40:46 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_open.3,v 1.15 2010/01/12 01:30:05 davidxu Exp $
 .\"
-.Dd January 15, 2003
+.Dd January 9, 2010
 .Dt SEM_OPEN 3
 .Os
 .Sh NAME
@@ -61,8 +61,8 @@
 This implementation places strict requirements on the value of
 .Fa name :
 it must begin with a slash
-.Pq Ql / ,
-contain no other slash characters.
+.Pq Ql /
+and contain no other slash characters.
 .Pp
 The following bits may be set in the
 .Fa oflag

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_bindx.3#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_bindx.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_bindx.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_BINDX 3
@@ -90,7 +90,7 @@
 .Sh ERRORS
 The
 .Fn sctp_bindx
-can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 This value is returned if the

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_connectx.3#3 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.6 2007/09/25 16:48:08 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_connectx.3,v 1.7 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd June 19, 2007
 .Dt SCTP_CONNECTX 3
@@ -44,7 +44,7 @@
 .In sys/socket.h
 .In netinet/sctp.h
 .Ft int
-.Fn sctp_connectx "int s" "struct sockaddr *" "int addrcnt" "sctp_assoc_t *"
+.Fn sctp_connectx "int sd" "struct sockaddr *addrs" "int addrcnt" "sctp_assoc_t *id"
 .Sh DESCRIPTION
 The
 .Fn sctp_connectx
@@ -75,7 +75,7 @@
 call will be silently discarded from the association.
 On
 successful completion the provided
-.Fa "sctp_assoc_t *"
+.Fa id
 will be
 filled in with the association identification of the newly
 forming association.
@@ -84,7 +84,7 @@
 .Sh ERRORS
 The
 .Fn sctp_connectx
-can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 An address listed has an invalid family or no

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getaddrlen.3#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_getaddrlen.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_getaddrlen.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GETADDRLEN 3
@@ -76,7 +76,7 @@
 .Sh ERRORS
 The
 .Fn sctp_getaddrlen
-function can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The address family specified does NOT exist.

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getassocid.3#3 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/net/sctp_getassocid.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_getassocid.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_GETASSOCID 3
@@ -58,7 +58,7 @@
 .Sh ERRORS
 The
 .Fn sctp_getassocid
-function can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er ENOENT
 The address does not have an association setup to it.

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_getpaddrs.3#3 (text+ko) ====

@@ -30,10 +30,10 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_getpaddrs.3,v 1.3 2007/06/18 10:20:32 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_getpaddrs.3,v 1.4 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd December 15, 2006
-.Dt SCTP_GETPADDR 3
+.Dt SCTP_GETPADDRS 3
 .Os
 .Sh NAME
 .Nm sctp_getpaddrs ,
@@ -64,7 +64,7 @@
 .Fa addrs
 upon success.
 .Pp
-After the caller is through the function
+After the caller is finished, the function
 .Fn sctp_freepaddrs
 or
 .Fn sctp_freeladdrs
@@ -76,7 +76,7 @@
 .Fa addrs
 upon success.
 .Sh ERRORS
-The functions can return the following errors.
+The functions can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 An address listed has an invalid family or no

==== //depot/projects/scottl-camlock/src/lib/libc/net/sctp_opt_info.3#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.4 2007/09/25 16:48:08 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_opt_info.3,v 1.5 2010/01/12 21:45:03 brueffer Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_OPT_INFO 3
@@ -45,7 +45,7 @@
 .In sys/socket.h

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list