Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Oct 2009 01:25:11 +0000 (UTC)
From:      Lawrence Stewart <lstewart@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r197925 - in projects/tcp_ffcaia2008_8.x: . bin/ps cddl/contrib/opensolaris contrib/bind9 contrib/bind9/bin/named contrib/cpio contrib/csup contrib/ee contrib/file contrib/gcc contrib/g...
Message-ID:  <200910100125.n9A1PB5g069053@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lstewart
Date: Sat Oct 10 01:25:11 2009
New Revision: 197925
URL: http://svn.freebsd.org/changeset/base/197925

Log:
  Merge 195779:196045 from head.
  
  Sponsored by:	FreeBSD Foundation

Added:
  projects/tcp_ffcaia2008_8.x/contrib/less/cvt.c
     - copied unchanged from r196045, head/contrib/less/cvt.c
  projects/tcp_ffcaia2008_8.x/contrib/less/pattern.c
     - copied unchanged from r196045, head/contrib/less/pattern.c
  projects/tcp_ffcaia2008_8.x/contrib/less/pattern.h
     - copied unchanged from r196045, head/contrib/less/pattern.h
  projects/tcp_ffcaia2008_8.x/etc/rc.d/hostid_save
     - copied unchanged from r196045, head/etc/rc.d/hostid_save
  projects/tcp_ffcaia2008_8.x/etc/rc.d/zvol
     - copied unchanged from r196045, head/etc/rc.d/zvol
  projects/tcp_ffcaia2008_8.x/lib/libkvm/kvm_vnet.c
     - copied unchanged from r196045, head/lib/libkvm/kvm_vnet.c
  projects/tcp_ffcaia2008_8.x/share/man/man4/siis.4
     - copied unchanged from r196045, head/share/man/man4/siis.4
  projects/tcp_ffcaia2008_8.x/sys/dev/ispfw/asm_2500.h
     - copied unchanged from r196045, head/sys/dev/ispfw/asm_2500.h
  projects/tcp_ffcaia2008_8.x/sys/dev/siis/
     - copied from r196045, head/sys/dev/siis/
  projects/tcp_ffcaia2008_8.x/sys/modules/if_epair/
     - copied from r196045, head/sys/modules/if_epair/
  projects/tcp_ffcaia2008_8.x/sys/modules/ispfw/isp_2400_multi/
     - copied from r196045, head/sys/modules/ispfw/isp_2400_multi/
  projects/tcp_ffcaia2008_8.x/sys/modules/ispfw/isp_2500/
     - copied from r196045, head/sys/modules/ispfw/isp_2500/
  projects/tcp_ffcaia2008_8.x/sys/modules/ispfw/isp_2500_multi/
     - copied from r196045, head/sys/modules/ispfw/isp_2500_multi/
  projects/tcp_ffcaia2008_8.x/sys/modules/siis/
     - copied from r196045, head/sys/modules/siis/
  projects/tcp_ffcaia2008_8.x/sys/vm/sg_pager.c
     - copied unchanged from r196045, head/sys/vm/sg_pager.c
Deleted:
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_vimage.c
  projects/tcp_ffcaia2008_8.x/sys/sys/vimage.h
Modified:
  projects/tcp_ffcaia2008_8.x/   (props changed)
  projects/tcp_ffcaia2008_8.x/ObsoleteFiles.inc
  projects/tcp_ffcaia2008_8.x/UPDATING
  projects/tcp_ffcaia2008_8.x/bin/ps/ps.c
  projects/tcp_ffcaia2008_8.x/cddl/contrib/opensolaris/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/bind9/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/bind9/CHANGES
  projects/tcp_ffcaia2008_8.x/contrib/bind9/bin/named/update.c
  projects/tcp_ffcaia2008_8.x/contrib/bind9/version
  projects/tcp_ffcaia2008_8.x/contrib/cpio/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/csup/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/ee/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/file/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/gcc/dwarf2out.c
  projects/tcp_ffcaia2008_8.x/contrib/gdb/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/gdtoa/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/less/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/less/LICENSE
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.aut
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsb
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsg
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsu
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.in
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o2e
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9c
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9u
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnb
  projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnm
  projects/tcp_ffcaia2008_8.x/contrib/less/NEWS
  projects/tcp_ffcaia2008_8.x/contrib/less/README
  projects/tcp_ffcaia2008_8.x/contrib/less/brac.c
  projects/tcp_ffcaia2008_8.x/contrib/less/ch.c
  projects/tcp_ffcaia2008_8.x/contrib/less/charset.c
  projects/tcp_ffcaia2008_8.x/contrib/less/charset.h
  projects/tcp_ffcaia2008_8.x/contrib/less/cmd.h
  projects/tcp_ffcaia2008_8.x/contrib/less/cmdbuf.c
  projects/tcp_ffcaia2008_8.x/contrib/less/command.c
  projects/tcp_ffcaia2008_8.x/contrib/less/configure.ac
  projects/tcp_ffcaia2008_8.x/contrib/less/decode.c
  projects/tcp_ffcaia2008_8.x/contrib/less/defines.ds
  projects/tcp_ffcaia2008_8.x/contrib/less/defines.o2
  projects/tcp_ffcaia2008_8.x/contrib/less/defines.o9
  projects/tcp_ffcaia2008_8.x/contrib/less/defines.wn
  projects/tcp_ffcaia2008_8.x/contrib/less/edit.c
  projects/tcp_ffcaia2008_8.x/contrib/less/filename.c
  projects/tcp_ffcaia2008_8.x/contrib/less/forwback.c
  projects/tcp_ffcaia2008_8.x/contrib/less/funcs.h
  projects/tcp_ffcaia2008_8.x/contrib/less/ifile.c
  projects/tcp_ffcaia2008_8.x/contrib/less/input.c
  projects/tcp_ffcaia2008_8.x/contrib/less/jump.c
  projects/tcp_ffcaia2008_8.x/contrib/less/less.h
  projects/tcp_ffcaia2008_8.x/contrib/less/less.man
  projects/tcp_ffcaia2008_8.x/contrib/less/less.nro
  projects/tcp_ffcaia2008_8.x/contrib/less/lessecho.c
  projects/tcp_ffcaia2008_8.x/contrib/less/lessecho.man
  projects/tcp_ffcaia2008_8.x/contrib/less/lessecho.nro
  projects/tcp_ffcaia2008_8.x/contrib/less/lesskey.c
  projects/tcp_ffcaia2008_8.x/contrib/less/lesskey.h
  projects/tcp_ffcaia2008_8.x/contrib/less/lesskey.man
  projects/tcp_ffcaia2008_8.x/contrib/less/lesskey.nro
  projects/tcp_ffcaia2008_8.x/contrib/less/lglob.h
  projects/tcp_ffcaia2008_8.x/contrib/less/line.c
  projects/tcp_ffcaia2008_8.x/contrib/less/linenum.c
  projects/tcp_ffcaia2008_8.x/contrib/less/lsystem.c
  projects/tcp_ffcaia2008_8.x/contrib/less/main.c
  projects/tcp_ffcaia2008_8.x/contrib/less/mark.c
  projects/tcp_ffcaia2008_8.x/contrib/less/mkhelp.c
  projects/tcp_ffcaia2008_8.x/contrib/less/optfunc.c
  projects/tcp_ffcaia2008_8.x/contrib/less/option.c
  projects/tcp_ffcaia2008_8.x/contrib/less/option.h
  projects/tcp_ffcaia2008_8.x/contrib/less/opttbl.c
  projects/tcp_ffcaia2008_8.x/contrib/less/os.c
  projects/tcp_ffcaia2008_8.x/contrib/less/output.c
  projects/tcp_ffcaia2008_8.x/contrib/less/pckeys.h
  projects/tcp_ffcaia2008_8.x/contrib/less/position.c
  projects/tcp_ffcaia2008_8.x/contrib/less/position.h
  projects/tcp_ffcaia2008_8.x/contrib/less/prompt.c
  projects/tcp_ffcaia2008_8.x/contrib/less/screen.c
  projects/tcp_ffcaia2008_8.x/contrib/less/scrsize.c
  projects/tcp_ffcaia2008_8.x/contrib/less/search.c
  projects/tcp_ffcaia2008_8.x/contrib/less/signal.c
  projects/tcp_ffcaia2008_8.x/contrib/less/tags.c
  projects/tcp_ffcaia2008_8.x/contrib/less/ttyin.c
  projects/tcp_ffcaia2008_8.x/contrib/less/version.c
  projects/tcp_ffcaia2008_8.x/contrib/libpcap/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/ncurses/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/netcat/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/ntp/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/NEWS
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/README
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/VERSION
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/config/config.h
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/configure
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/configure.ac
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/etc/audit_event
  projects/tcp_ffcaia2008_8.x/contrib/openbsm/tools/audump.c
  projects/tcp_ffcaia2008_8.x/contrib/openpam/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/pf/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/sendmail/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/tcpdump/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/tcsh/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/top/   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/top/install-sh   (props changed)
  projects/tcp_ffcaia2008_8.x/contrib/wpa/   (props changed)
  projects/tcp_ffcaia2008_8.x/crypto/openssh/   (props changed)
  projects/tcp_ffcaia2008_8.x/crypto/openssl/   (props changed)
  projects/tcp_ffcaia2008_8.x/etc/portsnap.conf
  projects/tcp_ffcaia2008_8.x/etc/rc.d/Makefile
  projects/tcp_ffcaia2008_8.x/etc/rc.d/hostid
  projects/tcp_ffcaia2008_8.x/etc/rc.d/zfs
  projects/tcp_ffcaia2008_8.x/lib/libarchive/archive_read_support_format_iso9660.c
  projects/tcp_ffcaia2008_8.x/lib/libc/   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/gen/pw_scan.c
  projects/tcp_ffcaia2008_8.x/lib/libc/stdio/asprintf.c   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/stdtime/   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/string/ffsll.c   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/string/flsll.c   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/string/wcpcpy.c   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/string/wcpncpy.c   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libc/sys/mmap.2
  projects/tcp_ffcaia2008_8.x/lib/libjail/jail.c
  projects/tcp_ffcaia2008_8.x/lib/libjail/jail.h
  projects/tcp_ffcaia2008_8.x/lib/libkvm/Makefile
  projects/tcp_ffcaia2008_8.x/lib/libkvm/kvm.c
  projects/tcp_ffcaia2008_8.x/lib/libkvm/kvm_private.h
  projects/tcp_ffcaia2008_8.x/lib/libkvm/kvm_proc.c
  projects/tcp_ffcaia2008_8.x/lib/libusb/   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb.3
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb.h
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb10.c
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb10.h
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb10_desc.c
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb10_io.c
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb20.3   (contents, props changed)
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb20_compat01.c
  projects/tcp_ffcaia2008_8.x/lib/libusb/libusb20_int.h
  projects/tcp_ffcaia2008_8.x/lib/libusb/usb.h   (props changed)
  projects/tcp_ffcaia2008_8.x/lib/libutil/   (props changed)
  projects/tcp_ffcaia2008_8.x/sbin/   (props changed)
  projects/tcp_ffcaia2008_8.x/sbin/dhclient/dispatch.c
  projects/tcp_ffcaia2008_8.x/sbin/ifconfig/ifconfig.c
  projects/tcp_ffcaia2008_8.x/sbin/ifconfig/ifieee80211.c
  projects/tcp_ffcaia2008_8.x/sbin/ipfw/   (props changed)
  projects/tcp_ffcaia2008_8.x/sbin/mount_nfs/mount_nfs.8
  projects/tcp_ffcaia2008_8.x/share/man/man4/Makefile
  projects/tcp_ffcaia2008_8.x/share/man/man4/ahci.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/altq.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/asmc.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/epair.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/mxge.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/u3g.4
  projects/tcp_ffcaia2008_8.x/share/man/man4/urtw.4
  projects/tcp_ffcaia2008_8.x/share/man/man9/netisr.9
  projects/tcp_ffcaia2008_8.x/share/misc/committers-ports.dot
  projects/tcp_ffcaia2008_8.x/share/zoneinfo/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/amd64/amd64/initcpu.c
  projects/tcp_ffcaia2008_8.x/sys/amd64/amd64/machdep.c
  projects/tcp_ffcaia2008_8.x/sys/amd64/amd64/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/amd64/include/cpufunc.h
  projects/tcp_ffcaia2008_8.x/sys/amd64/include/md_var.h
  projects/tcp_ffcaia2008_8.x/sys/amd64/include/xen/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/arm/arm/cpufunc.c
  projects/tcp_ffcaia2008_8.x/sys/arm/arm/minidump_machdep.c
  projects/tcp_ffcaia2008_8.x/sys/arm/arm/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/boot/forth/loader.conf
  projects/tcp_ffcaia2008_8.x/sys/cam/cam_ccb.h
  projects/tcp_ffcaia2008_8.x/sys/cam/cam_xpt.c
  projects/tcp_ffcaia2008_8.x/sys/cddl/contrib/opensolaris/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  projects/tcp_ffcaia2008_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  projects/tcp_ffcaia2008_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  projects/tcp_ffcaia2008_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/tcp_ffcaia2008_8.x/sys/compat/freebsd32/freebsd32_misc.c
  projects/tcp_ffcaia2008_8.x/sys/compat/linprocfs/linprocfs.c
  projects/tcp_ffcaia2008_8.x/sys/compat/linux/linux_ioctl.c
  projects/tcp_ffcaia2008_8.x/sys/compat/linux/linux_mib.c
  projects/tcp_ffcaia2008_8.x/sys/compat/linux/linux_socket.c
  projects/tcp_ffcaia2008_8.x/sys/compat/svr4/svr4_sockio.c
  projects/tcp_ffcaia2008_8.x/sys/conf/NOTES
  projects/tcp_ffcaia2008_8.x/sys/conf/files
  projects/tcp_ffcaia2008_8.x/sys/contrib/altq/altq/altq_subr.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/dev/acpica/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/contrib/ipfilter/netinet/fil.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/pf/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/contrib/pf/net/pf.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/pf/net/pf_if.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/pf/net/pf_ioctl.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/pf/net/pf_subr.c
  projects/tcp_ffcaia2008_8.x/sys/contrib/rdma/rdma_cma.c
  projects/tcp_ffcaia2008_8.x/sys/ddb/db_sym.c
  projects/tcp_ffcaia2008_8.x/sys/dev/aac/aac.c
  projects/tcp_ffcaia2008_8.x/sys/dev/acpica/acpi.c
  projects/tcp_ffcaia2008_8.x/sys/dev/acpica/acpi_battery.c
  projects/tcp_ffcaia2008_8.x/sys/dev/acpica/acpi_cpu.c
  projects/tcp_ffcaia2008_8.x/sys/dev/acpica/acpi_dock.c
  projects/tcp_ffcaia2008_8.x/sys/dev/acpica/acpi_thermal.c
  projects/tcp_ffcaia2008_8.x/sys/dev/adb/adb_bus.c
  projects/tcp_ffcaia2008_8.x/sys/dev/alc/if_alc.c
  projects/tcp_ffcaia2008_8.x/sys/dev/amdtemp/amdtemp.c
  projects/tcp_ffcaia2008_8.x/sys/dev/amr/amr.c
  projects/tcp_ffcaia2008_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c
  projects/tcp_ffcaia2008_8.x/sys/dev/ath/if_ath.c
  projects/tcp_ffcaia2008_8.x/sys/dev/ath/if_athvar.h
  projects/tcp_ffcaia2008_8.x/sys/dev/atkbdc/psm.c
  projects/tcp_ffcaia2008_8.x/sys/dev/bktr/bktr_os.c
  projects/tcp_ffcaia2008_8.x/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/tcp_ffcaia2008_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  projects/tcp_ffcaia2008_8.x/sys/dev/drm/drm_drv.c
  projects/tcp_ffcaia2008_8.x/sys/dev/e1000/e1000_ich8lan.c
  projects/tcp_ffcaia2008_8.x/sys/dev/e1000/if_em.c
  projects/tcp_ffcaia2008_8.x/sys/dev/e1000/if_igb.c
  projects/tcp_ffcaia2008_8.x/sys/dev/if_ndis/if_ndis.c
  projects/tcp_ffcaia2008_8.x/sys/dev/ips/ips_pci.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_freebsd.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_freebsd.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_ioctl.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_library.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_library.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_pci.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_sbus.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_stds.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_target.c
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/isp_target.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/ispmbox.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/ispreg.h
  projects/tcp_ffcaia2008_8.x/sys/dev/isp/ispvar.h
  projects/tcp_ffcaia2008_8.x/sys/dev/ispfw/asm_2300.h
  projects/tcp_ffcaia2008_8.x/sys/dev/ispfw/asm_2400.h
  projects/tcp_ffcaia2008_8.x/sys/dev/ispfw/ispfw.c
  projects/tcp_ffcaia2008_8.x/sys/dev/ixgbe/ixgbe.c
  projects/tcp_ffcaia2008_8.x/sys/dev/mfi/mfi.c
  projects/tcp_ffcaia2008_8.x/sys/dev/mlx/mlx.c
  projects/tcp_ffcaia2008_8.x/sys/dev/mmc/mmc.c
  projects/tcp_ffcaia2008_8.x/sys/dev/mn/if_mn.c   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/dev/mxge/if_mxge.c
  projects/tcp_ffcaia2008_8.x/sys/dev/pccbb/pccbb.c
  projects/tcp_ffcaia2008_8.x/sys/dev/pci/pci.c
  projects/tcp_ffcaia2008_8.x/sys/dev/pst/pst-iop.c
  projects/tcp_ffcaia2008_8.x/sys/dev/rp/rp.c
  projects/tcp_ffcaia2008_8.x/sys/dev/sound/pci/hda/hdac.c
  projects/tcp_ffcaia2008_8.x/sys/dev/twe/twe.c
  projects/tcp_ffcaia2008_8.x/sys/dev/uart/uart_cpu_powerpc.c
  projects/tcp_ffcaia2008_8.x/sys/dev/usb/controller/avr32dci.c
  projects/tcp_ffcaia2008_8.x/sys/dev/usb/usbdi.h
  projects/tcp_ffcaia2008_8.x/sys/dev/usb/wlan/if_uath.c
  projects/tcp_ffcaia2008_8.x/sys/dev/usb/wlan/if_upgt.c
  projects/tcp_ffcaia2008_8.x/sys/dev/xen/blkback/blkback.c
  projects/tcp_ffcaia2008_8.x/sys/dev/xen/netback/netback.c
  projects/tcp_ffcaia2008_8.x/sys/dev/xen/xenpci/   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/fs/nfs/nfsport.h
  projects/tcp_ffcaia2008_8.x/sys/fs/nfsclient/nfs_clbio.c
  projects/tcp_ffcaia2008_8.x/sys/fs/nfsclient/nfs_clrpcops.c
  projects/tcp_ffcaia2008_8.x/sys/fs/nfsclient/nfs_clstate.c
  projects/tcp_ffcaia2008_8.x/sys/fs/nfsclient/nfs_clvnops.c
  projects/tcp_ffcaia2008_8.x/sys/fs/procfs/procfs_map.c
  projects/tcp_ffcaia2008_8.x/sys/fs/unionfs/union_subr.c
  projects/tcp_ffcaia2008_8.x/sys/i386/acpica/acpi_machdep.c
  projects/tcp_ffcaia2008_8.x/sys/i386/bios/smapi.c
  projects/tcp_ffcaia2008_8.x/sys/i386/bios/smbios.c
  projects/tcp_ffcaia2008_8.x/sys/i386/bios/vpd.c
  projects/tcp_ffcaia2008_8.x/sys/i386/i386/initcpu.c
  projects/tcp_ffcaia2008_8.x/sys/i386/i386/machdep.c
  projects/tcp_ffcaia2008_8.x/sys/i386/i386/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/i386/i386/vm_machdep.c
  projects/tcp_ffcaia2008_8.x/sys/i386/include/cpufunc.h
  projects/tcp_ffcaia2008_8.x/sys/i386/include/md_var.h
  projects/tcp_ffcaia2008_8.x/sys/i386/include/pmap.h
  projects/tcp_ffcaia2008_8.x/sys/i386/include/sf_buf.h
  projects/tcp_ffcaia2008_8.x/sys/i386/xen/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/ia64/ia64/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_cons.c   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_exec.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_jail.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_linker.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_poll.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_proc.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_sysctl.c
  projects/tcp_ffcaia2008_8.x/sys/kern/kern_uuid.c
  projects/tcp_ffcaia2008_8.x/sys/kern/subr_bus.c
  projects/tcp_ffcaia2008_8.x/sys/kern/sys_socket.c
  projects/tcp_ffcaia2008_8.x/sys/kern/tty_pts.c
  projects/tcp_ffcaia2008_8.x/sys/kern/tty_ttydisc.c
  projects/tcp_ffcaia2008_8.x/sys/kern/uipc_domain.c
  projects/tcp_ffcaia2008_8.x/sys/kern/uipc_socket.c
  projects/tcp_ffcaia2008_8.x/sys/kern/uipc_syscalls.c
  projects/tcp_ffcaia2008_8.x/sys/kern/uipc_usrreq.c
  projects/tcp_ffcaia2008_8.x/sys/kern/vfs_lookup.c
  projects/tcp_ffcaia2008_8.x/sys/kern/vfs_mount.c
  projects/tcp_ffcaia2008_8.x/sys/kern/vfs_syscalls.c
  projects/tcp_ffcaia2008_8.x/sys/mips/mips/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/modules/Makefile
  projects/tcp_ffcaia2008_8.x/sys/modules/ispfw/Makefile
  projects/tcp_ffcaia2008_8.x/sys/modules/wlan/Makefile
  projects/tcp_ffcaia2008_8.x/sys/net/bpf.c
  projects/tcp_ffcaia2008_8.x/sys/net/bridgestp.c
  projects/tcp_ffcaia2008_8.x/sys/net/flowtable.c
  projects/tcp_ffcaia2008_8.x/sys/net/if.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_bridge.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_clone.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_clone.h
  projects/tcp_ffcaia2008_8.x/sys/net/if_ef.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_enc.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_epair.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_ethersubr.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_faith.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_gif.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_gre.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_llatbl.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_loop.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_mib.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_spppsubr.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_stf.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_tun.c
  projects/tcp_ffcaia2008_8.x/sys/net/if_var.h
  projects/tcp_ffcaia2008_8.x/sys/net/if_vlan.c
  projects/tcp_ffcaia2008_8.x/sys/net/netisr.c
  projects/tcp_ffcaia2008_8.x/sys/net/netisr.h
  projects/tcp_ffcaia2008_8.x/sys/net/raw_cb.c
  projects/tcp_ffcaia2008_8.x/sys/net/raw_usrreq.c
  projects/tcp_ffcaia2008_8.x/sys/net/route.c
  projects/tcp_ffcaia2008_8.x/sys/net/rtsock.c
  projects/tcp_ffcaia2008_8.x/sys/net/vnet.c
  projects/tcp_ffcaia2008_8.x/sys/net/vnet.h
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_crypto.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_crypto.h
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_ddb.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_freebsd.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_hwmp.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_input.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_ioctl.h
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_mesh.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_mesh.h
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_output.c
  projects/tcp_ffcaia2008_8.x/sys/net80211/ieee80211_scan_sta.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/atm/ng_atm.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/bluetooth/socket/ng_btsocket.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/netgraph.h
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_base.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_bridge.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_eiface.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_ether.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_gif.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_iface.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_pipe.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_socket.c
  projects/tcp_ffcaia2008_8.x/sys/netgraph/ng_source.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/icmp6.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/icmp_var.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/if_ether.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/igmp.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_gif.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_mcast.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_pcb.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_pcb.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_proto.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/in_rmx.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_carp.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_divert.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_fastfwd.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_icmp.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_input.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_ipsec.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_mroute.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_options.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_output.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/ip_var.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/raw_ip.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_auth.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_indata.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_os_bsd.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_sysctl.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_sysctl.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctp_uio.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctputil.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/sctputil.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_hostcache.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_input.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_offload.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_output.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_reass.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_sack.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_subr.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_syncache.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_timer.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_timewait.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_usrreq.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/tcp_var.h
  projects/tcp_ffcaia2008_8.x/sys/netinet/udp_usrreq.c
  projects/tcp_ffcaia2008_8.x/sys/netinet/udp_var.h
  projects/tcp_ffcaia2008_8.x/sys/netinet6/dest6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/frag6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/icmp6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_gif.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_ifattach.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_mcast.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_pcb.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_proto.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_rmx.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/in6_src.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/ip6_forward.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/ip6_input.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/ip6_ipsec.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/ip6_mroute.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/ip6_output.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/mld6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/nd6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/nd6_nbr.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/nd6_rtr.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/raw_ip6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/route6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/scope6.c
  projects/tcp_ffcaia2008_8.x/sys/netinet6/udp6_usrreq.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/ipsec.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/ipsec_input.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/ipsec_mbuf.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/ipsec_output.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/key.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/keysock.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/xform_ah.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/xform_esp.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/xform_ipcomp.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/xform_ipip.c
  projects/tcp_ffcaia2008_8.x/sys/netipsec/xform_tcp.c
  projects/tcp_ffcaia2008_8.x/sys/nfsclient/bootp_subr.c
  projects/tcp_ffcaia2008_8.x/sys/nfsclient/nfs_diskless.c
  projects/tcp_ffcaia2008_8.x/sys/nfsclient/nfs_vnops.c
  projects/tcp_ffcaia2008_8.x/sys/pc98/cbus/fdc.c
  projects/tcp_ffcaia2008_8.x/sys/powerpc/booke/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/powerpc/mpc85xx/lbc.h
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit.c
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit.h
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit_arg.c
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit_bsm.c
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit_bsm_klib.c
  projects/tcp_ffcaia2008_8.x/sys/security/audit/audit_private.h
  projects/tcp_ffcaia2008_8.x/sys/security/mac/mac_cred.c   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/security/mac_bsdextended/ugidfw_system.c   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c   (props changed)
  projects/tcp_ffcaia2008_8.x/sys/sparc64/include/param.h
  projects/tcp_ffcaia2008_8.x/sys/sparc64/sparc64/pmap.c
  projects/tcp_ffcaia2008_8.x/sys/sys/bus.h
  projects/tcp_ffcaia2008_8.x/sys/sys/domain.h
  projects/tcp_ffcaia2008_8.x/sys/sys/jail.h
  projects/tcp_ffcaia2008_8.x/sys/sys/kernel.h
  projects/tcp_ffcaia2008_8.x/sys/sys/param.h
  projects/tcp_ffcaia2008_8.x/sys/sys/priv.h
  projects/tcp_ffcaia2008_8.x/sys/sys/sysctl.h
  projects/tcp_ffcaia2008_8.x/sys/sys/user.h
  projects/tcp_ffcaia2008_8.x/sys/vm/vm.h
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_fault.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_map.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_meter.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_object.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_object.h
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_page.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_pageout.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_pager.c
  projects/tcp_ffcaia2008_8.x/sys/vm/vm_pager.h
  projects/tcp_ffcaia2008_8.x/sys/xen/evtchn/evtchn.c
  projects/tcp_ffcaia2008_8.x/sys/xen/xenbus/xenbus_probe.c
  projects/tcp_ffcaia2008_8.x/tools/regression/lib/msun/test-conj.t   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/regression/poll/Makefile
  projects/tcp_ffcaia2008_8.x/tools/regression/usr.bin/pkill/pgrep-_g.t   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/regression/usr.bin/pkill/pgrep-_s.t   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/regression/usr.bin/pkill/pkill-_g.t   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/ath/common/dumpregs.h   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/ath/common/dumpregs_5210.c   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/ath/common/dumpregs_5211.c   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/ath/common/dumpregs_5212.c   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/ath/common/dumpregs_5416.c   (props changed)
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/stumbler/stumbler.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/README
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/ap/ap.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/assoc/assoc.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/expand/expand.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/prga/prga.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/w00t/redir/redir.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/wesside/wesside/wesside.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/wlaninject/wlaninject.c
  projects/tcp_ffcaia2008_8.x/tools/tools/net80211/wlanstats/wlanstats.c
  projects/tcp_ffcaia2008_8.x/tools/tools/termcap/termcap.pl   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.bin/calendar/calendars/calendar.freebsd
  projects/tcp_ffcaia2008_8.x/usr.bin/csup/   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.bin/gzip/gzip.c
  projects/tcp_ffcaia2008_8.x/usr.bin/less/Makefile
  projects/tcp_ffcaia2008_8.x/usr.bin/locate/locate/fastfind.c
  projects/tcp_ffcaia2008_8.x/usr.bin/locate/locate/locate.c
  projects/tcp_ffcaia2008_8.x/usr.bin/procstat/   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.bin/procstat/procstat_cred.c
  projects/tcp_ffcaia2008_8.x/usr.bin/procstat/procstat_vm.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/acpi/acpidump/acpi.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/acpi/acpidump/acpidump.h
  projects/tcp_ffcaia2008_8.x/usr.sbin/dumpcis/cardinfo.h   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/dumpcis/cis.h   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/getpmac/getpmac.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/jail/jail.8
  projects/tcp_ffcaia2008_8.x/usr.sbin/jail/jail.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/jls/jls.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/makefs/getid.c   (props changed)
  projects/tcp_ffcaia2008_8.x/usr.sbin/sysinstall/disks.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/sysinstall/help/usage.hlp
  projects/tcp_ffcaia2008_8.x/usr.sbin/sysinstall/label.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/sysinstall/user.c
  projects/tcp_ffcaia2008_8.x/usr.sbin/zic/   (props changed)

Modified: projects/tcp_ffcaia2008_8.x/ObsoleteFiles.inc
==============================================================================
--- projects/tcp_ffcaia2008_8.x/ObsoleteFiles.inc	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/ObsoleteFiles.inc	Sat Oct 10 01:25:11 2009	(r197925)
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090801: vimage.h removed in favour of vnet.h
+OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
@@ -88,6 +90,7 @@ OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
+OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
@@ -228,6 +231,10 @@ OLD_FILES+=etc/pam.d/gdm
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
+# 20090712: ieee80211.4 -> net80211.4
+OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
+# 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
+OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
@@ -482,8 +489,6 @@ OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
-OLD_FILES+=usr/include/dev/usb/usbdi.h
-OLD_FILES+=usr/include/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 # 20090203: removal of pccard header files
@@ -2071,7 +2076,6 @@ OLD_FILES+=usr/sbin/kenv
 OLD_FILES+=usr/bin/kenv
 OLD_FILES+=usr/sbin/elf2aout
 # 200210XX
-OLD_FILES+=usr/include/libusb.h
 OLD_FILES+=usr/include/libusbhid.h
 OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
 OLD_FILES+=usr/share/man/man3/CheckRules.3.gz

Modified: projects/tcp_ffcaia2008_8.x/UPDATING
==============================================================================
--- projects/tcp_ffcaia2008_8.x/UPDATING	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/UPDATING	Sat Oct 10 01:25:11 2009	(r197925)
@@ -65,9 +65,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 
 20090624:
 	The ABI of various structures related to the SYSV IPC API have
-	been changed.  As a result, the COMPAT_FREEBSD[456] kernel
-	options now all require COMPAT_FREEBSD7.  Bump __FreeBSD_version
-	to 800100.
+	been changed.  As a result, the COMPAT_FREEBSD[456] and COMPAT_43
+	kernel options now all require COMPAT_FREEBSD7.
+	Bump __FreeBSD_version to 800100.
 
 20090622:
 	Layout of struct vnet has changed as routing related variables

Modified: projects/tcp_ffcaia2008_8.x/bin/ps/ps.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/bin/ps/ps.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/bin/ps/ps.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1331,7 +1331,7 @@ check_procfs(void)
 static void
 usage(void)
 {
-#define	SINGLE_OPTS	"[-aCce" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
+#define	SINGLE_OPTS	"[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
 
 	(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
 	    "usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]",

Modified: projects/tcp_ffcaia2008_8.x/contrib/bind9/CHANGES
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/bind9/CHANGES	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/bind9/CHANGES	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,3 +1,7 @@
+	--- 9.6.1-P1 released ---
+
+2640.	[security]	A specially crafted update packet will cause named
+			to exit. [RT #20000]
 
 	--- 9.6.1 released ---
 

Modified: projects/tcp_ffcaia2008_8.x/contrib/bind9/bin/named/update.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/bind9/bin/named/update.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/bind9/bin/named/update.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */
+/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */
 
 #include <config.h>
 
@@ -979,7 +979,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *
 			if (type == dns_rdatatype_rrsig ||
 			    type == dns_rdatatype_sig)
 				covers = dns_rdata_covers(&t->rdata);
-			else
+			else if (type == dns_rdatatype_any) {
+				dns_db_detachnode(db, &node);
+				dns_diff_clear(&trash);
+				return (DNS_R_NXRRSET);
+			} else
 				covers = 0;
 
 			/*

Modified: projects/tcp_ffcaia2008_8.x/contrib/bind9/version
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/bind9/version	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/bind9/version	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $
+# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=6
 PATCHVER=1
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1

Modified: projects/tcp_ffcaia2008_8.x/contrib/gcc/dwarf2out.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/gcc/dwarf2out.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/gcc/dwarf2out.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -10007,7 +10007,7 @@ reference_to_unused (tree * tp, int * wa
     return NULL_TREE;
   else if (!cgraph_global_info_ready
 	   && (TREE_CODE (*tp) == VAR_DECL || TREE_CODE (*tp) == FUNCTION_DECL))
-    gcc_unreachable ();
+    return *tp;
   else if (DECL_P (*tp) && TREE_CODE (*tp) == VAR_DECL)
     {
       struct cgraph_varpool_node *node = cgraph_varpool_node (*tp);

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/LICENSE
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/LICENSE	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/LICENSE	Sat Oct 10 01:25:11 2009	(r197925)
@@ -2,7 +2,7 @@
                           ------------
 
 Less
-Copyright (C) 1984-2008  Mark Nudelman
+Copyright (C) 1984-2009  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.aut
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.aut	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.aut	Sat Oct 10 01:25:11 2009	(r197925)
@@ -10,10 +10,10 @@ srcdir = .
 
 SRC = \
 	main.c screen.c brac.c ch.c charset.c cmdbuf.c \
-	command.c decode.c edit.c filename.c forwback.c \
+	command.c cvt.c decode.c edit.c filename.c forwback.c \
 	help.c ifile.c input.c jump.c line.c linenum.c \
 	lsystem.c mark.c optfunc.c option.c opttbl.c os.c \
-	output.c position.c prompt.c search.c signal.c \
+	output.c pattern.c position.c prompt.c search.c signal.c \
 	tags.c ttyin.c version.c  
 DISTFILES_W = \
 	defines.ds  Makefile.dsb Makefile.dsg Makefile.dsu \
@@ -24,7 +24,8 @@ DISTFILES = \
 	${SRC} regexp.c regexp.h \
 	COPYING INSTALL LICENSE Makefile.in Makefile.aut NEWS README \
 	configure configure.ac lesskey.c lessecho.c scrsize.c \
-	charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h pckeys.h position.h \
+	charset.h cmd.h funcs.h lglob.h less.h lesskey.h option.h \
+	pckeys.h pattern.h position.h \
 	install.sh defines.h.in mkinstalldirs \
 	less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man \
 	less.hlp \
@@ -109,6 +110,8 @@ dist: ${DISTFILES}
 	cd $$REL; chmod +w ${DISTFILES_W}; cd ..; \
 	echo "Creating release/$$REL/$$REL.tar.gz"; \
 	tar -cf - $$REL | gzip -c >release/$$REL/$$REL.tar.gz; \
+	echo "Signing release/$$REL/$$REL.tar.gz"; \
+	gpg --detach-sign release/$$REL/$$REL.tar.gz; \
 	echo "Creating release/$$REL/$$REL.zip"; \
 	zip -rq release/$$REL/$$REL.zip $$REL; \
 	rm -rf $$REL

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsb
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsb	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsb	Sat Oct 10 01:25:11 2009	(r197925)
@@ -18,12 +18,13 @@ EXT = .EXE
 .c.obj:
 	$(CC) -c -I. $(CPPFLAGS) $(CFLAGS) $<
 
-OBJ =	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \
-	decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \
-	input.obj jump.obj line.obj linenum.obj lsystem.obj \
-	mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \
-	position.obj prompt.obj search.obj signal.obj tags.obj \
-	ttyin.obj version.obj
+OBJ = \
+	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
+	command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
+	help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
+	lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
+	output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
+	tags.obj ttyin.obj version.obj
 
 all: less$(EXT) lesskey$(EXT)
 

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsg
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsg	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsg	Sat Oct 10 01:25:11 2009	(r197925)
@@ -33,11 +33,12 @@ manext = 1
 .c.o:
 	${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
-	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
+OBJ = \
+	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
+	command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
 	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
 	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
-	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
+	output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
 	tags.${O} ttyin.${O} version.${O}
 
 all: less lesskey lessecho

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsu
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsu	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.dsu	Sat Oct 10 01:25:11 2009	(r197925)
@@ -27,12 +27,13 @@ LIBS = $(LIBDIR)\llibce.lib $(LIBDIR)\gr
 .c.obj:
 	$(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $<
 
-OBJ =	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \
-	decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \
-	input.obj jump.obj line.obj linenum.obj lsystem.obj \
-	mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \
-	position.obj prompt.obj search.obj signal.obj tags.obj \
-	ttyin.obj version.obj
+OBJ = \
+	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
+	command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
+	help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
+	lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
+	output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
+	tags.obj  ttyin.obj version.obj
 
 all: less lesskey
 

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.in
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.in	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.in	Sat Oct 10 01:25:11 2009	(r197925)
@@ -43,11 +43,12 @@ SHELL = /bin/sh
 .c.o:
 	${CC} -I. ${CFLAGS_COMPILE_ONLY} -DBINDIR=\"${bindir}\" -DSYSDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
-	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
+OBJ = \
+	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
+	command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
 	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
 	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
-	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
+	output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
 	tags.${O} ttyin.${O} version.${O}  @REGEX_O@
 
 all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o2e
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o2e	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o2e	Sat Oct 10 01:25:11 2009	(r197925)
@@ -18,11 +18,12 @@ O = obj
 .c.${O}:
 	${CC} -c ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
-	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
+OBJ = \
+	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
+	command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
 	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
 	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
-	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
+	output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
 	tags.${O} ttyin.${O} version.${O}  regexp.${O}
 
 all:    less.exe lesskey.exe scrsize.exe

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -22,11 +22,12 @@ O = r
 .c.${O}:
 	${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
-	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
+OBJ = \
+	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
+	command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
 	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
 	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
-	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
+	output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
 	tags.${O} ttyin.${O} version.${O}  regexp.${O}
 
 all: less lessecho lesskey

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9u
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9u	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.o9u	Sat Oct 10 01:25:11 2009	(r197925)
@@ -21,11 +21,12 @@ O = r
 .c.${O}:
 	${CC} ${CFLAGS_COMPILE_ONLY} ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
-	command.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
+OBJ = \
+	main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \
+	command.${O} cvt.${O} decode.${O} edit.${O} filename.${O} forwback.${O} \
 	help.${O} ifile.${O} input.${O} jump.${O} line.${O} linenum.${O} \
 	lsystem.${O} mark.${O} optfunc.${O} option.${O} opttbl.${O} os.${O} \
-	output.${O} position.${O} prompt.${O} search.${O} signal.${O} \
+	output.${O} pattern.${O} position.${O} prompt.${O} search.${O} signal.${O} \
 	tags.${O} ttyin.${O} version.${O}  regexp.${O}
 
 all: less lesskey

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnb
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnb	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnb	Sat Oct 10 01:25:11 2009	(r197925)
@@ -25,12 +25,13 @@ LIBS = ${LIBDIR}\import32.lib ${LIBDIR}\
 .c.obj:
 	${CC} -c -I. ${CPPFLAGS} ${CFLAGS} $<
 
-OBJ =	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \
-	decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \
-	input.obj jump.obj line.obj linenum.obj lsystem.obj \
-	mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \
-	position.obj prompt.obj search.obj signal.obj tags.obj \
-	ttyin.obj version.obj regexp.obj
+OBJ = \
+	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
+	command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
+	help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
+	lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
+	output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
+	tags.obj ttyin.obj version.obj regexp.obj
 
 all: less lesskey lessecho
 

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnm
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnm	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/Makefile.wnm	Sat Oct 10 01:25:11 2009	(r197925)
@@ -23,12 +23,13 @@ LIBS = user32.lib
 .c.obj:
 	$(CC) $(CFLAGS) $<
 
-OBJ =   main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \
-	decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \
-	input.obj jump.obj line.obj linenum.obj lsystem.obj \
-	mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \
-	position.obj prompt.obj search.obj signal.obj tags.obj \
-	ttyin.obj version.obj regexp.obj
+OBJ = \
+	main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj \
+	command.obj cvt.obj decode.obj edit.obj filename.obj forwback.obj \
+	help.obj ifile.obj input.obj jump.obj line.obj linenum.obj \
+	lsystem.obj mark.obj optfunc.obj option.obj opttbl.obj os.obj \
+	output.obj pattern.obj position.obj prompt.obj search.obj signal.obj \
+	tags.obj ttyin.obj version.obj regexp.obj
 
 all: less.exe lesskey.exe
 

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/NEWS
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/NEWS	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/NEWS	Sat Oct 10 01:25:11 2009	(r197925)
@@ -12,6 +12,18 @@
 
 ======================================================================
 
+	Major changes between "less" versions 429 and 436
+
+* Don't pass "-" to non-pipe LESSOPEN unless it starts with "-".
+
+* Allow a fraction as the argument to the -# (--shift) option.
+
+* Fix highlight bug when underlined/overstruck text matches at end of line.
+
+* Fix non-regex searches with ctrl-R.
+
+======================================================================
+
 	Major changes between "less" versions 424 and 429
 
 * LESSOPEN pipe will now be used on standard input, if the LESSOPEN

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/README
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/README	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/README	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,7 +1,7 @@
 
-                            Less, version 429
+                            Less, version 436
 
-    This is the distribution of less, version 429, released 11 Apr 2009.
+    This is the distribution of less, version 436, released 07 Jul 2009.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/brac.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/brac.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/brac.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/ch.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/ch.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/ch.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/charset.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/charset.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/charset.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.
@@ -425,7 +425,7 @@ prchar(c)
 
 	c &= 0377;
 	if ((c < 128 || !utf_mode) && !control_char(c))
-		SNPRINTF1(buf, sizeof(buf), "%c", c);
+		SNPRINTF1(buf, sizeof(buf), "%c", (int) c);
 	else if (c == ESC)
 		strcpy(buf, "ESC");
 #if IS_EBCDIC_HOST
@@ -442,7 +442,7 @@ prchar(c)
 		"..V....D....TU.Z"[c]);
 #else
   	else if (c < 128 && !control_char(c ^ 0100))
-  		SNPRINTF1(buf, sizeof(buf), "^%c", c ^ 0100);
+  		SNPRINTF1(buf, sizeof(buf), "^%c", (int) (c ^ 0100));
 #endif
 	else
 		SNPRINTF1(buf, sizeof(buf), binfmt, c);

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/charset.h
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/charset.h	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/charset.h	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008  Mark Nudelman
+ * Copyright (C) 2005-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/cmd.h
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/cmd.h	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/cmd.h	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/cmdbuf.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/cmdbuf.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/cmdbuf.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/command.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/command.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/command.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,6 +1,6 @@
 /* $FreeBSD$ */
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/configure.ac
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/configure.ac	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/configure.ac	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1984-2008  Mark Nudelman
+# Copyright (C) 1984-2009  Mark Nudelman
 #
 # You may distribute under the terms of either the GNU General Public
 # License or the Less License, as specified in the README file.

Copied: projects/tcp_ffcaia2008_8.x/contrib/less/cvt.c (from r196045, head/contrib/less/cvt.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/cvt.c	Sat Oct 10 01:25:11 2009	(r197925, copy of r196045, head/contrib/less/cvt.c)
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 1984-2009  Mark Nudelman
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Less License, as specified in the README file.
+ *
+ * For more information about less, or for information on how to 
+ * contact the author, see the README file.
+ */
+
+/*
+ * Routines to convert text in various ways.  Used by search.
+ */
+
+#include "less.h"
+#include "charset.h"
+
+extern int utf_mode;
+
+/*
+ * Get the length of a buffer needed to convert a string.
+ */
+	public int
+cvt_length(len, ops)
+	int len;
+	int ops;
+{
+	if (utf_mode)
+		/*
+		 * Just copying a string in UTF-8 mode can cause it to grow 
+		 * in length.
+		 * Four output bytes for one input byte is the worst case.
+		 */
+		len *= 4;
+	return (len + 1);
+}
+
+/*
+ * Allocate a chpos array for use by cvt_text.
+ */
+	public int *
+cvt_alloc_chpos(len)
+	int len;
+{
+	int i;
+	int *chpos = (int *) ecalloc(sizeof(int), len);
+	/* Initialize all entries to an invalid position. */
+	for (i = 0;  i < len;  i++)
+		chpos[i] = -1;
+	return (chpos);
+}
+
+/*
+ * Convert text.  Perform the transformations specified by ops.
+ * Returns converted text in odst.  The original offset of each
+ * odst character (when it was in osrc) is returned in the chpos array.
+ */
+	public void
+cvt_text(odst, osrc, chpos, lenp, ops)
+	char *odst;
+	char *osrc;
+	int *chpos;
+	int *lenp;
+	int ops;
+{
+	char *dst;
+	char *src;
+	register char *src_end;
+	LWCHAR ch;
+
+	if (lenp != NULL)
+		src_end = osrc + *lenp;
+	else
+		src_end = osrc + strlen(osrc);
+
+	for (src = osrc, dst = odst;  src < src_end;  )
+	{
+		int src_pos = src - osrc;
+		int dst_pos = dst - odst;
+		ch = step_char(&src, +1, src_end);
+		if ((ops & CVT_BS) && ch == '\b' && dst > odst)
+		{
+			/* Delete backspace and preceding char. */
+			do {
+				dst--;
+			} while (dst > odst &&
+				!IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst));
+		} else if ((ops & CVT_ANSI) && IS_CSI_START(ch))
+		{
+			/* Skip to end of ANSI escape sequence. */
+			src++;  /* skip the CSI start char */
+			while (src < src_end)
+				if (!is_ansi_middle(*src++))
+					break;
+		} else
+		{
+			/* Just copy the char to the destination buffer. */
+			if ((ops & CVT_TO_LC) && IS_UPPER(ch))
+				ch = TO_LOWER(ch);
+			put_wchar(&dst, ch);
+			/*
+			 * Record the original position of the char.
+			 * But if we've already recorded a position
+			 * for this char (due to a backspace), leave
+			 * it alone; if multiple source chars map to
+			 * one destination char, we want the position
+			 * of the first one.
+			 */
+			if (chpos != NULL && chpos[dst_pos] < 0)
+				chpos[dst_pos] = src_pos;
+		}
+	}
+	if ((ops & CVT_CRLF) && dst > odst && dst[-1] == '\r')
+		dst--;
+	*dst = '\0';
+	if (lenp != NULL)
+		*lenp = dst - odst;
+	if (chpos != NULL)
+		chpos[dst - odst] = src - osrc;
+}

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/decode.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/decode.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/decode.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/defines.ds
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/defines.ds	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/defines.ds	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/defines.o2
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/defines.o2	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/defines.o2	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/defines.o9
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/defines.o9	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/defines.o9	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/defines.wn
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/defines.wn	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/defines.wn	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/edit.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/edit.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/edit.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/filename.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/filename.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/filename.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.
@@ -843,17 +843,17 @@ open_altfile(filename, pf, pfd)
 #else
 		lessopen++;
 		returnfd = 1;
-		if (*lessopen == '-') {
-			/*
-			 * Lessopen preprocessor will accept "-" as a filename.
-			 */
-			lessopen++;
-		} else {
-			if (strcmp(filename, "-") == 0)
-				return (NULL);
-		}
 #endif
 	}
+	if (*lessopen == '-') {
+		/*
+		 * Lessopen preprocessor will accept "-" as a filename.
+		 */
+		lessopen++;
+	} else {
+		if (strcmp(filename, "-") == 0)
+			return (NULL);
+	}
 
 	len = strlen(lessopen) + strlen(filename) + 2;
 	cmd = (char *) ecalloc(len, sizeof(char));

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/forwback.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/forwback.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/forwback.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,6 +1,6 @@
 /* $FreeBSD$ */
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/funcs.h
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/funcs.h	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/funcs.h	Sat Oct 10 01:25:11 2009	(r197925)
@@ -83,6 +83,9 @@
 	public void ungetcc ();
 	public void ungetsc ();
 	public void commands ();
+	public int cvt_length ();
+	public int * cvt_alloc_chpos ();
+	public void cvt_text ();
 	public void init_cmds ();
 	public void add_fcmd_table ();
 	public void add_ecmd_table ();
@@ -193,6 +196,8 @@
 	public void opt_l ();
 	public void opt_j ();
 	public void calc_jump_sline ();
+	public void opt_shift ();
+	public void calc_shift_count ();
 	public void opt_k ();
 	public void opt_t ();
 	public void opt__T ();
@@ -233,6 +238,10 @@
 	public void error ();
 	public void ierror ();
 	public int query ();
+	public int compile_pattern ();
+	public void uncompile_pattern ();
+	public int is_null_pattern ();
+	public int match_pattern ();
 	public POSITION position ();
 	public void add_forw_pos ();
 	public void add_back_pos ();
@@ -248,6 +257,7 @@
 	public char * eq_message ();
 	public char * pr_string ();
 	public char * wait_message ();
+	public void init_search ();
 	public void repaint_hilite ();
 	public void clear_attn ();
 	public void undo_search ();

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/ifile.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/ifile.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/ifile.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/input.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/input.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/input.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.
@@ -196,7 +196,7 @@ get_forw_line:
 		c = ch_forw_get();
 	}
 
-	pdone(endline, c);
+	pdone(endline, 1);
 
 #if HILITE_SEARCH
 	if (is_filtered(base_pos))
@@ -398,7 +398,7 @@ get_back_line:
 		}
 	} while (new_pos < curr_pos);
 
-	pdone(endline, ch_forw_get());
+	pdone(endline, 0);
 
 #if HILITE_SEARCH
 	if (is_filtered(base_pos))

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/jump.c
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/jump.c	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/jump.c	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/less.h
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/less.h	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/less.h	Sat Oct 10 01:25:11 2009	(r197925)
@@ -1,6 +1,6 @@
 /* $FreeBSD$ */
 /*
- * Copyright (C) 1984-2008  Mark Nudelman
+ * Copyright (C) 1984-2009  Mark Nudelman
  *
  * You may distribute under the terms of either the GNU General Public
  * License or the Less License, as specified in the README file.
@@ -489,6 +489,12 @@ struct textlist
 
 #define	FAKE_HELPFILE	"@/\\less/\\help/\\file/\\@"
 
+/* Flags for cvt_text */
+#define	CVT_TO_LC	01	/* Convert upper-case to lower-case */
+#define	CVT_BS		02	/* Do backspace processing */
+#define	CVT_CRLF	04	/* Remove CR after LF */
+#define	CVT_ANSI	010	/* Remove ANSI escape sequences */
+
 #include "funcs.h"
 
 /* Functions not included in funcs.h */

Modified: projects/tcp_ffcaia2008_8.x/contrib/less/less.man
==============================================================================
--- projects/tcp_ffcaia2008_8.x/contrib/less/less.man	Sat Oct 10 01:17:12 2009	(r197924)
+++ projects/tcp_ffcaia2008_8.x/contrib/less/less.man	Sat Oct 10 01:25:11 2009	(r197925)
@@ -809,51 +809,58 @@ LESS(1)                                 
               Specifies the default number of positions to scroll horizontally
               in the RIGHTARROW and LEFTARROW commands.  If the number  speci-
               fied  is  zero,  it  sets the default number of positions to one
-              half of the screen width.
+              half of the screen width.  Alternately, the number may be speci-
+              fied  as  a fraction of the width of the screen, starting with a
+              decimal point: .5 is half of  the  screen  width,  .3  is  three
+              tenths  of the screen width, and so on.  If the number is speci-
+              fied as a fraction, the actual number  of  scroll  positions  is
+              recalculated  if  the  terminal  window  is resized, so that the
+              actual scroll remains at the specified fraction  of  the  screen
+              width.
 
        --no-keypad
-              Disables sending the keypad initialization and  deinitialization
+              Disables  sending the keypad initialization and deinitialization
               strings to the terminal.  This is sometimes useful if the keypad
               strings make the numeric keypad behave in an undesirable manner.
 
        --follow-name
-              Normally,  if  the  input  file is renamed while an F command is
-              executing, less will continue to display  the  contents  of  the
-              original  file  despite  its  name  change.  If --follow-name is
+              Normally, if the input file is renamed while  an  F  command  is
+              executing,  less  will  continue  to display the contents of the
+              original file despite its  name  change.   If  --follow-name  is
               specified, during an F command less will periodically attempt to
               reopen the file by name.  If the reopen succeeds and the file is
-              a different file from the original (which means that a new  file
-              has  been  created  with  the  same  name  as  the original (now
+              a  different file from the original (which means that a new file
+              has been created  with  the  same  name  as  the  original  (now
               renamed) file), less will display the contents of that new file.
 
-       --     A  command  line  argument of "--" marks the end of option argu-
-              ments.  Any arguments following this are  interpreted  as  file-
+       --     A command line argument of "--" marks the end  of  option  argu-
+              ments.   Any  arguments  following this are interpreted as file-
               names.  This can be useful when viewing a file whose name begins
               with a "-" or "+".
 
-       +      If a command line option begins with +, the  remainder  of  that
-              option  is taken to be an initial command to less.  For example,
-              +G tells less to start at the end of the file  rather  than  the
-              beginning,  and  +/xyz tells it to start at the first occurrence
-              of "xyz" in the file.  As a special case,  +<number>  acts  like
+       +      If  a  command  line option begins with +, the remainder of that
+              option is taken to be an initial command to less.  For  example,
+              +G  tells  less  to start at the end of the file rather than the
+              beginning, and +/xyz tells it to start at the  first  occurrence
+              of  "xyz"  in  the file.  As a special case, +<number> acts like
               +<number>g; that is, it starts the display at the specified line
-              number (however, see the caveat under the  "g"  command  above).
-              If  the  option  starts  with ++, the initial command applies to
-              every file being viewed, not just the first one.  The +  command
+              number  (however,  see  the caveat under the "g" command above).
+              If the option starts with ++, the  initial  command  applies  to
+              every  file being viewed, not just the first one.  The + command
               described previously may also be used to set (or change) an ini-
               tial command for every file.
 
 
 LINE EDITING
-       When entering command line at the bottom of the screen (for example,  a
+       When  entering command line at the bottom of the screen (for example, a
        filename for the :e command, or the pattern for a search command), cer-
-       tain keys can be used to manipulate the command  line.   Most  commands
-       have  an alternate form in [ brackets ] which can be used if a key does
-       not exist on a particular keyboard.  (Note  that  the  forms  beginning
-       with  ESC do not work in some MS-DOS and Windows systems because ESC is
-       the line erase character.)  Any of these special keys  may  be  entered
-       literally  by  preceding  it with the "literal" character, either ^V or
-       ^A.  A backslash itself may also be entered literally by  entering  two
+       tain  keys  can  be used to manipulate the command line.  Most commands
+       have an alternate form in [ brackets ] which can be used if a key  does
+       not  exist  on  a  particular keyboard.  (Note that the forms beginning
+       with ESC do not work in some MS-DOS and Windows systems because ESC  is
+       the  line  erase  character.)  Any of these special keys may be entered
+       literally by preceding it with the "literal" character,  either  ^V  or
+       ^A.   A  backslash itself may also be entered literally by entering two
        backslashes.
 
        LEFTARROW [ ESC-h ]
@@ -863,7 +870,7 @@ LESS(1)                                 
               Move the cursor one space to the right.
 
        ^LEFTARROW [ ESC-b or ESC-LEFTARROW ]
-              (That  is, CONTROL and LEFTARROW simultaneously.)  Move the cur-
+              (That is, CONTROL and LEFTARROW simultaneously.)  Move the  cur-
               sor one word to the left.
 
        ^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]
@@ -877,18 +884,18 @@ LESS(1)                                 
               Move the cursor to the end of the line.
 
        BACKSPACE
-              Delete  the  character  to the left of the cursor, or cancel the
+              Delete the character to the left of the cursor,  or  cancel  the
               command if the command line is empty.
 
        DELETE or [ ESC-x ]
               Delete the character under the cursor.
 
        ^BACKSPACE [ ESC-BACKSPACE ]
-              (That is, CONTROL and  BACKSPACE  simultaneously.)   Delete  the
+              (That  is,  CONTROL  and  BACKSPACE simultaneously.)  Delete the
               word to the left of the cursor.
 
        ^DELETE [ ESC-X or ESC-DELETE ]
-              (That  is,  CONTROL and DELETE simultaneously.)  Delete the word
+              (That is, CONTROL and DELETE simultaneously.)  Delete  the  word
               under the cursor.
 
        UPARROW [ ESC-k ]
@@ -897,96 +904,96 @@ LESS(1)                                 
        DOWNARROW [ ESC-j ]
               Retrieve the next command line.
 
-       TAB    Complete the partial filename to the left of the cursor.  If  it
-              matches  more than one filename, the first match is entered into
-              the command line.  Repeated  TABs  will  cycle  thru  the  other
+       TAB    Complete  the partial filename to the left of the cursor.  If it
+              matches more than one filename, the first match is entered  into
+              the  command  line.   Repeated  TABs  will  cycle thru the other
               matching filenames.  If the completed filename is a directory, a
-              "/" is appended to the filename.  (On MS-DOS systems, a  "\"  is
-              appended.)   The  environment variable LESSSEPARATOR can be used
-              to specify a different character to append to a directory  name.
+              "/"  is  appended to the filename.  (On MS-DOS systems, a "\" is
+              appended.)  The environment variable LESSSEPARATOR can  be  used
+              to  specify a different character to append to a directory name.
 
        BACKTAB [ ESC-TAB ]
               Like, TAB, but cycles in the reverse direction thru the matching
               filenames.
 
-       ^L     Complete the partial filename to the left of the cursor.  If  it
+       ^L     Complete  the partial filename to the left of the cursor.  If it
               matches more than one filename, all matches are entered into the
               command line (if they fit).
 
        ^U (Unix and OS/2) or ESC (MS-DOS)
-              Delete the entire command line, or cancel  the  command  if  the
+              Delete  the  entire  command  line, or cancel the command if the
               command line is empty.  If you have changed your line-kill char-
               acter in Unix to something other than ^U, that character is used
               instead of ^U.
 
 
 KEY BINDINGS
-       You  may define your own less commands by using the program lesskey (1)
-       to create a lesskey file.  This file specifies a set  of  command  keys
-       and  an  action  associated with each key.  You may also use lesskey to
+       You may define your own less commands by using the program lesskey  (1)
+       to  create  a  lesskey file.  This file specifies a set of command keys
+       and an action associated with each key.  You may also  use  lesskey  to
        change the line-editing keys (see LINE EDITING), and to set environment
-       variables.   If the environment variable LESSKEY is set, less uses that
-       as the name of the lesskey file.  Otherwise, less looks in  a  standard
-       place  for  the lesskey file: On Unix systems, less looks for a lesskey
-       file called "$HOME/.less".  On MS-DOS and Windows systems,  less  looks
-       for  a lesskey file called "$HOME/_less", and if it is not found there,
+       variables.  If the environment variable LESSKEY is set, less uses  that
+       as  the  name of the lesskey file.  Otherwise, less looks in a standard
+       place for the lesskey file: On Unix systems, less looks for  a  lesskey
+       file  called  "$HOME/.less".  On MS-DOS and Windows systems, less looks
+       for a lesskey file called "$HOME/_less", and if it is not found  there,
        then looks for a lesskey file called "_less" in any directory specified
-       in  the  PATH  environment variable.  On OS/2 systems, less looks for a
-       lesskey file called "$HOME/less.ini", and if  it  is  not  found,  then
-       looks  for  a lesskey file called "less.ini" in any directory specified
+       in the PATH environment variable.  On OS/2 systems, less  looks  for  a
+       lesskey  file  called  "$HOME/less.ini",  and  if it is not found, then
+       looks for a lesskey file called "less.ini" in any  directory  specified
        in the INIT environment variable, and if it not found there, then looks
-       for  a lesskey file called "less.ini" in any directory specified in the
-       PATH environment variable.   See  the  lesskey  manual  page  for  more
+       for a lesskey file called "less.ini" in any directory specified in  the
+       PATH  environment  variable.   See  the  lesskey  manual  page for more
        details.
 
-       A  system-wide lesskey file may also be set up to provide key bindings.
+       A system-wide lesskey file may also be set up to provide key  bindings.
        If a key is defined in both a local lesskey file and in the system-wide

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910100125.n9A1PB5g069053>