svn commit: r191506 - in user/thompsa/vaptq: . bin/ls bin/sh contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gdb contrib/gdtoa contrib/ipfilter/ipsend contrib/libpcap contrib/ncurses c...

Sun Apr 26 02:44:43 UTC 2009

Author: thompsa
Date: Sun Apr 26 02:44:41 2009
New Revision: 191506
URL: http://svn.freebsd.org/changeset/base/191506

Log:
  MFH r190976-191505

Added:
  user/thompsa/vaptq/contrib/openbsm/libbsm/au_fcntl_cmd.3
     - copied unchanged from r191505, head/contrib/openbsm/libbsm/au_fcntl_cmd.3
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_fcntl.c
     - copied unchanged from r191505, head/contrib/openbsm/libbsm/bsm_fcntl.c
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit_fcntl.h
     - copied unchanged from r191505, head/contrib/openbsm/sys/bsm/audit_fcntl.h
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_xz.c
     - copied unchanged from r191505, head/lib/libarchive/archive_read_support_compression_xz.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_xz.c
     - copied unchanged from r191505, head/lib/libarchive/archive_write_set_compression_xz.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_xz.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_compat_xz.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_xz_1.txz.uu
     - copied unchanged from r191505, head/lib/libarchive/test/test_compat_xz_1.txz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_open_fd.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_open_fd.c
  user/thompsa/vaptq/lib/libarchive/test/test_open_file.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_open_file.c
  user/thompsa/vaptq/lib/libarchive/test/test_open_filename.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_open_filename.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_disk_entry_from_file.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_read_disk_entry_from_file.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_xz.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_read_format_cpio_bin_xz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_lzma.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_read_format_gtar_lzma.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
     - copied unchanged from r191505, head/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_txz.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_read_format_txz.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_bzip2.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_write_compress_bzip2.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_gzip.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_write_compress_gzip.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_lzma.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_write_compress_lzma.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_xz.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_write_compress_xz.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_format_mtree.c
     - copied unchanged from r191505, head/lib/libarchive/test/test_write_format_mtree.c
  user/thompsa/vaptq/share/man/man4/man4.powerpc/tsec.4
     - copied unchanged from r191505, head/share/man/man4/man4.powerpc/tsec.4
  user/thompsa/vaptq/sys/arm/at91/at91_cfata.c
     - copied unchanged from r191505, head/sys/arm/at91/at91_cfata.c
  user/thompsa/vaptq/sys/bsm/audit_fcntl.h
     - copied unchanged from r191505, head/sys/bsm/audit_fcntl.h
  user/thompsa/vaptq/sys/net/flowtable.c
     - copied unchanged from r191505, head/sys/net/flowtable.c
  user/thompsa/vaptq/sys/net/flowtable.h
     - copied unchanged from r191505, head/sys/net/flowtable.h
  user/thompsa/vaptq/sys/net/if_dead.c
     - copied unchanged from r191505, head/sys/net/if_dead.c
  user/thompsa/vaptq/sys/powerpc/mpc85xx/atpic.c
     - copied unchanged from r191505, head/sys/powerpc/mpc85xx/atpic.c
  user/thompsa/vaptq/sys/powerpc/mpc85xx/isa.c
     - copied unchanged from r191505, head/sys/powerpc/mpc85xx/isa.c
  user/thompsa/vaptq/sys/security/audit/audit_bsm_fcntl.c
     - copied unchanged from r191505, head/sys/security/audit/audit_bsm_fcntl.c
  user/thompsa/vaptq/tools/regression/bin/sh/parser/
     - copied from r191505, head/tools/regression/bin/sh/parser/
  user/thompsa/vaptq/tools/tools/nanobsd/fill_pkg.sh
     - copied unchanged from r191505, head/tools/tools/nanobsd/fill_pkg.sh
Deleted:
  user/thompsa/vaptq/share/man/man4/man4.i386/ar.4
  user/thompsa/vaptq/share/man/man4/man4.i386/ray.4
  user/thompsa/vaptq/share/man/man4/man4.i386/sr.4
  user/thompsa/vaptq/sys/dev/ar/
  user/thompsa/vaptq/sys/dev/ray/
  user/thompsa/vaptq/sys/dev/sr/
  user/thompsa/vaptq/sys/legacy/dev/usb/if_aue.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_auereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_axe.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_axereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_cdce.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_cdcereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_cue.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_cuereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_kue.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_kuereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_rue.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_ruereg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_rum.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_rumreg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_rumvar.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_udav.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_udavreg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_ural.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_uralreg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_uralvar.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_zyd.c
  user/thompsa/vaptq/sys/legacy/dev/usb/if_zydfw.h
  user/thompsa/vaptq/sys/legacy/dev/usb/if_zydreg.h
  user/thompsa/vaptq/sys/legacy/dev/usb/kue_fw.h
  user/thompsa/vaptq/sys/modules/ar/
  user/thompsa/vaptq/sys/modules/netgraph/sync_ar/
  user/thompsa/vaptq/sys/modules/netgraph/sync_sr/
  user/thompsa/vaptq/sys/modules/ray/
  user/thompsa/vaptq/sys/modules/sr/
  user/thompsa/vaptq/usr.sbin/raycontrol/
  user/thompsa/vaptq/usr.sbin/xntpd/
Modified:
  user/thompsa/vaptq/   (props changed)
  user/thompsa/vaptq/ObsoleteFiles.inc
  user/thompsa/vaptq/UPDATING
  user/thompsa/vaptq/bin/ls/ls.1
  user/thompsa/vaptq/bin/sh/parser.c
  user/thompsa/vaptq/contrib/bind9/   (props changed)
  user/thompsa/vaptq/contrib/cpio/   (props changed)
  user/thompsa/vaptq/contrib/csup/   (props changed)
  user/thompsa/vaptq/contrib/file/   (props changed)
  user/thompsa/vaptq/contrib/gdb/   (props changed)
  user/thompsa/vaptq/contrib/gdtoa/   (props changed)
  user/thompsa/vaptq/contrib/ipfilter/ipsend/sbpf.c
  user/thompsa/vaptq/contrib/libpcap/   (props changed)
  user/thompsa/vaptq/contrib/ncurses/   (props changed)
  user/thompsa/vaptq/contrib/netcat/   (props changed)
  user/thompsa/vaptq/contrib/ntp/   (props changed)
  user/thompsa/vaptq/contrib/ntp/ntpq/ntpq.c
  user/thompsa/vaptq/contrib/openbsm/   (props changed)
  user/thompsa/vaptq/contrib/openbsm/CREDITS
  user/thompsa/vaptq/contrib/openbsm/INSTALL
  user/thompsa/vaptq/contrib/openbsm/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/NEWS
  user/thompsa/vaptq/contrib/openbsm/README
  user/thompsa/vaptq/contrib/openbsm/TODO
  user/thompsa/vaptq/contrib/openbsm/VERSION
  user/thompsa/vaptq/contrib/openbsm/aclocal.m4
  user/thompsa/vaptq/contrib/openbsm/bin/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bin/audit/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bin/audit/audit.c
  user/thompsa/vaptq/contrib/openbsm/bin/auditd/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bin/auditd/auditd.c
  user/thompsa/vaptq/contrib/openbsm/bin/auditfilterd/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bin/auditfilterd/auditfilterd.8
  user/thompsa/vaptq/contrib/openbsm/bin/auditreduce/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bin/praudit/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bsm/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/bsm/audit_uevents.h
  user/thompsa/vaptq/contrib/openbsm/bsm/libbsm.h
  user/thompsa/vaptq/contrib/openbsm/config/config.h.in
  user/thompsa/vaptq/contrib/openbsm/config/ltmain.sh
  user/thompsa/vaptq/contrib/openbsm/configure
  user/thompsa/vaptq/contrib/openbsm/configure.ac
  user/thompsa/vaptq/contrib/openbsm/etc/audit_class
  user/thompsa/vaptq/contrib/openbsm/etc/audit_control
  user/thompsa/vaptq/contrib/openbsm/etc/audit_event
  user/thompsa/vaptq/contrib/openbsm/libbsm/Makefile.am
  user/thompsa/vaptq/contrib/openbsm/libbsm/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/libbsm/au_control.3
  user/thompsa/vaptq/contrib/openbsm/libbsm/audit_submit.3
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_audit.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_control.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_io.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_notify.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_token.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/bsm_wrappers.c
  user/thompsa/vaptq/contrib/openbsm/libbsm/libbsm.3
  user/thompsa/vaptq/contrib/openbsm/man/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/man/auditon.2
  user/thompsa/vaptq/contrib/openbsm/modules/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/modules/auditfilter_noop/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/sys/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/Makefile.am
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit.h
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit_kevents.h
  user/thompsa/vaptq/contrib/openbsm/sys/bsm/audit_record.h
  user/thompsa/vaptq/contrib/openbsm/test/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/test/bsm/Makefile.in
  user/thompsa/vaptq/contrib/openbsm/tools/Makefile.in
  user/thompsa/vaptq/contrib/openpam/   (props changed)
  user/thompsa/vaptq/contrib/pf/   (props changed)
  user/thompsa/vaptq/contrib/sendmail/   (props changed)
  user/thompsa/vaptq/contrib/tcpdump/   (props changed)
  user/thompsa/vaptq/contrib/top/   (props changed)
  user/thompsa/vaptq/contrib/wpa/   (props changed)
  user/thompsa/vaptq/crypto/openssh/   (props changed)
  user/thompsa/vaptq/crypto/openssl/   (props changed)
  user/thompsa/vaptq/crypto/openssl/crypto/asn1/asn1.h
  user/thompsa/vaptq/crypto/openssl/crypto/asn1/asn1_err.c
  user/thompsa/vaptq/crypto/openssl/crypto/asn1/tasn_dec.c
  user/thompsa/vaptq/include/signal.h
  user/thompsa/vaptq/lib/libarchive/Makefile
  user/thompsa/vaptq/lib/libarchive/archive.h
  user/thompsa/vaptq/lib/libarchive/archive_entry.c
  user/thompsa/vaptq/lib/libarchive/archive_platform.h
  user/thompsa/vaptq/lib/libarchive/archive_read.3
  user/thompsa/vaptq/lib/libarchive/archive_read.c
  user/thompsa/vaptq/lib/libarchive/archive_read_open_fd.c
  user/thompsa/vaptq/lib/libarchive/archive_read_open_file.c
  user/thompsa/vaptq/lib/libarchive/archive_read_open_filename.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_all.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_bzip2.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_compress.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_compression_gzip.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_empty.c
  user/thompsa/vaptq/lib/libarchive/archive_read_support_format_mtree.c
  user/thompsa/vaptq/lib/libarchive/archive_write.3
  user/thompsa/vaptq/lib/libarchive/archive_write.c
  user/thompsa/vaptq/lib/libarchive/archive_write_disk.c
  user/thompsa/vaptq/lib/libarchive/archive_write_disk_set_standard_lookup.c
  user/thompsa/vaptq/lib/libarchive/archive_write_open_filename.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_bzip2.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_compression_gzip.c
  user/thompsa/vaptq/lib/libarchive/archive_write_set_format_mtree.c
  user/thompsa/vaptq/lib/libarchive/config_freebsd.h
  user/thompsa/vaptq/lib/libarchive/libarchive-formats.5
  user/thompsa/vaptq/lib/libarchive/test/Makefile
  user/thompsa/vaptq/lib/libarchive/test/main.c
  user/thompsa/vaptq/lib/libarchive/test/read_open_memory.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_bzip2.c
  user/thompsa/vaptq/lib/libarchive/test/test_compat_gzip.c
  user/thompsa/vaptq/lib/libarchive/test/test_entry.c
  user/thompsa/vaptq/lib/libarchive/test/test_entry_strmode.c
  user/thompsa/vaptq/lib/libarchive/test/test_pax_filename_encoding.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_compress_program.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_bin_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_gtar_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_iso_gz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_isorr_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_mtree.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_pax_bz2.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tbz.c
  user/thompsa/vaptq/lib/libarchive/test/test_read_format_tgz.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_compress_program.c
  user/thompsa/vaptq/lib/libarchive/test/test_write_disk_sparse.c
  user/thompsa/vaptq/lib/libbluetooth/Makefile
  user/thompsa/vaptq/lib/libbluetooth/bluetooth.3
  user/thompsa/vaptq/lib/libbluetooth/bluetooth.h
  user/thompsa/vaptq/lib/libbsm/Makefile
  user/thompsa/vaptq/lib/libc/   (props changed)
  user/thompsa/vaptq/lib/libc/stdtime/   (props changed)
  user/thompsa/vaptq/lib/libc/string/ffsll.c   (props changed)
  user/thompsa/vaptq/lib/libc/string/flsll.c   (props changed)
  user/thompsa/vaptq/lib/libc/string/memchr.3
  user/thompsa/vaptq/lib/libc/string/strmode.3
  user/thompsa/vaptq/lib/libc/string/strmode.c
  user/thompsa/vaptq/lib/libc/sys/sctp_generic_recvmsg.2
  user/thompsa/vaptq/lib/libc/sys/sctp_generic_sendmsg.2
  user/thompsa/vaptq/lib/libc/sys/sctp_peeloff.2
  user/thompsa/vaptq/lib/libc/sys/setfib.2
  user/thompsa/vaptq/lib/libthr/thread/thr_rtld.c
  user/thompsa/vaptq/lib/libusb/   (props changed)
  user/thompsa/vaptq/lib/libutil/   (props changed)
  user/thompsa/vaptq/libexec/rtld-elf/amd64/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/arm/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/i386/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/ia64/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/mips/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/powerpc/rtld_machdep.h
  user/thompsa/vaptq/libexec/rtld-elf/rtld_lock.c
  user/thompsa/vaptq/libexec/rtld-elf/sparc64/rtld_machdep.h
  user/thompsa/vaptq/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/thompsa/vaptq/release/doc/share/misc/dev.archlist.txt
  user/thompsa/vaptq/rescue/rescue/Makefile
  user/thompsa/vaptq/sbin/   (props changed)
  user/thompsa/vaptq/sbin/ifconfig/af_inet.c
  user/thompsa/vaptq/sbin/ifconfig/ifconfig.c
  user/thompsa/vaptq/sbin/ipfw/   (props changed)
  user/thompsa/vaptq/sbin/pflogd/Makefile
  user/thompsa/vaptq/sbin/route/keywords
  user/thompsa/vaptq/sbin/route/route.c
  user/thompsa/vaptq/sbin/savecore/savecore.8
  user/thompsa/vaptq/share/man/man4/cpuctl.4
  user/thompsa/vaptq/share/man/man4/ed.4
  user/thompsa/vaptq/share/man/man4/man4.i386/Makefile
  user/thompsa/vaptq/share/man/man4/man4.i386/glxsb.4
  user/thompsa/vaptq/share/man/man4/man4.powerpc/Makefile
  user/thompsa/vaptq/share/man/man4/man4.powerpc/bm.4
  user/thompsa/vaptq/share/man/man4/pts.4
  user/thompsa/vaptq/share/man/man4/route.4
  user/thompsa/vaptq/share/man/man4/u3g.4
  user/thompsa/vaptq/share/man/man4/vlan.4
  user/thompsa/vaptq/share/man/man5/rc.conf.5
  user/thompsa/vaptq/share/man/man9/altq.9
  user/thompsa/vaptq/share/misc/committers-ports.dot
  user/thompsa/vaptq/share/zoneinfo/   (props changed)
  user/thompsa/vaptq/share/zoneinfo/asia
  user/thompsa/vaptq/sys/   (props changed)
  user/thompsa/vaptq/sys/amd64/amd64/busdma_machdep.c
  user/thompsa/vaptq/sys/amd64/amd64/mp_machdep.c
  user/thompsa/vaptq/sys/amd64/conf/DEFAULTS
  user/thompsa/vaptq/sys/amd64/include/metadata.h
  user/thompsa/vaptq/sys/amd64/include/param.h
  user/thompsa/vaptq/sys/amd64/include/pc/bios.h
  user/thompsa/vaptq/sys/amd64/include/xen/   (props changed)
  user/thompsa/vaptq/sys/arm/arm/busdma_machdep.c
  user/thompsa/vaptq/sys/arm/arm/cpufunc_asm_armv5_ec.S
  user/thompsa/vaptq/sys/arm/at91/at91.c
  user/thompsa/vaptq/sys/arm/at91/at91_machdep.c
  user/thompsa/vaptq/sys/arm/at91/at91rm92reg.h
  user/thompsa/vaptq/sys/arm/at91/files.at91
  user/thompsa/vaptq/sys/arm/conf/AVILA.hints
  user/thompsa/vaptq/sys/arm/conf/BWCT
  user/thompsa/vaptq/sys/arm/conf/BWCT.hints
  user/thompsa/vaptq/sys/arm/conf/CAMBRIA.hints
  user/thompsa/vaptq/sys/arm/include/param.h
  user/thompsa/vaptq/sys/arm/mv/common.c
  user/thompsa/vaptq/sys/arm/mv/gpio.c
  user/thompsa/vaptq/sys/arm/mv/ic.c
  user/thompsa/vaptq/sys/arm/mv/mv_pci.c
  user/thompsa/vaptq/sys/arm/mv/mvreg.h
  user/thompsa/vaptq/sys/boot/i386/libi386/biosdisk.c
  user/thompsa/vaptq/sys/boot/i386/libi386/biossmap.c
  user/thompsa/vaptq/sys/boot/sparc64/loader/main.c
  user/thompsa/vaptq/sys/bsm/audit.h
  user/thompsa/vaptq/sys/bsm/audit_kevents.h
  user/thompsa/vaptq/sys/bsm/audit_record.h
  user/thompsa/vaptq/sys/cam/scsi/scsi_sa.c
  user/thompsa/vaptq/sys/cam/scsi/scsi_ses.c
  user/thompsa/vaptq/sys/cddl/dev/dtnfsclient/   (props changed)
  user/thompsa/vaptq/sys/compat/linux/linux_emul.c
  user/thompsa/vaptq/sys/compat/linux/linux_emul.h
  user/thompsa/vaptq/sys/compat/linux/linux_futex.c
  user/thompsa/vaptq/sys/conf/NOTES
  user/thompsa/vaptq/sys/conf/files
  user/thompsa/vaptq/sys/conf/files.powerpc
  user/thompsa/vaptq/sys/conf/options
  user/thompsa/vaptq/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  user/thompsa/vaptq/sys/contrib/pf/   (props changed)
  user/thompsa/vaptq/sys/contrib/pf/net/if_pflog.c
  user/thompsa/vaptq/sys/contrib/pf/net/if_pfsync.c
  user/thompsa/vaptq/sys/contrib/pf/net/pf.c
  user/thompsa/vaptq/sys/dev/agp/agp.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ah.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c
  user/thompsa/vaptq/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
  user/thompsa/vaptq/sys/dev/ath/ath_rate/sample/sample.c
  user/thompsa/vaptq/sys/dev/ath/if_ath.c
  user/thompsa/vaptq/sys/dev/atkbdc/atkbd.c
  user/thompsa/vaptq/sys/dev/drm/drm_drv.c
  user/thompsa/vaptq/sys/dev/e1000/if_em.c
  user/thompsa/vaptq/sys/dev/e1000/if_em.h
  user/thompsa/vaptq/sys/dev/e1000/if_igb.c
  user/thompsa/vaptq/sys/dev/ed/if_ed.c
  user/thompsa/vaptq/sys/dev/ed/if_ed_cbus.c
  user/thompsa/vaptq/sys/dev/ed/if_ed_isa.c
  user/thompsa/vaptq/sys/dev/ed/if_ed_pccard.c
  user/thompsa/vaptq/sys/dev/ed/if_ed_pci.c
  user/thompsa/vaptq/sys/dev/ed/if_edvar.h
  user/thompsa/vaptq/sys/dev/fb/creator.c
  user/thompsa/vaptq/sys/dev/fb/machfb.c
  user/thompsa/vaptq/sys/dev/fxp/if_fxp.c
  user/thompsa/vaptq/sys/dev/if_ndis/if_ndis.c
  user/thompsa/vaptq/sys/dev/iicbus/ds133x.c
  user/thompsa/vaptq/sys/dev/iicbus/ds1672.c
  user/thompsa/vaptq/sys/dev/iicbus/if_ic.c
  user/thompsa/vaptq/sys/dev/joy/joy.c
  user/thompsa/vaptq/sys/dev/lmc/if_lmc.c
  user/thompsa/vaptq/sys/dev/lmc/if_lmc.h
  user/thompsa/vaptq/sys/dev/mge/if_mge.c
  user/thompsa/vaptq/sys/dev/mlx/mlx.c
  user/thompsa/vaptq/sys/dev/mly/mly.c
  user/thompsa/vaptq/sys/dev/mse/mse.c
  user/thompsa/vaptq/sys/dev/nve/if_nve.c
  user/thompsa/vaptq/sys/dev/pccard/pccarddevs
  user/thompsa/vaptq/sys/dev/pci/pci.c
  user/thompsa/vaptq/sys/dev/pci/pcireg.h
  user/thompsa/vaptq/sys/dev/powermac_nvram/powermac_nvram.c
  user/thompsa/vaptq/sys/dev/ppbus/if_plip.c
  user/thompsa/vaptq/sys/dev/re/if_re.c
  user/thompsa/vaptq/sys/dev/sound/pci/envy24.c
  user/thompsa/vaptq/sys/dev/sound/pci/envy24ht.c
  user/thompsa/vaptq/sys/dev/tdfx/tdfx_pci.c
  user/thompsa/vaptq/sys/dev/twa/tw_osl_freebsd.c
  user/thompsa/vaptq/sys/dev/twe/twe_freebsd.c
  user/thompsa/vaptq/sys/dev/usb/controller/at91dci.c
  user/thompsa/vaptq/sys/dev/usb/controller/at91dci.h
  user/thompsa/vaptq/sys/dev/usb/controller/atmegadci.c
  user/thompsa/vaptq/sys/dev/usb/controller/atmegadci.h
  user/thompsa/vaptq/sys/dev/usb/controller/ehci.c
  user/thompsa/vaptq/sys/dev/usb/controller/ehci.h
  user/thompsa/vaptq/sys/dev/usb/controller/musb_otg.c
  user/thompsa/vaptq/sys/dev/usb/controller/ohci.c
  user/thompsa/vaptq/sys/dev/usb/controller/ohci.h
  user/thompsa/vaptq/sys/dev/usb/controller/uhci.c
  user/thompsa/vaptq/sys/dev/usb/controller/uhci.h
  user/thompsa/vaptq/sys/dev/usb/controller/usb_controller.c
  user/thompsa/vaptq/sys/dev/usb/controller/uss820dci.c
  user/thompsa/vaptq/sys/dev/usb/controller/uss820dci.h
  user/thompsa/vaptq/sys/dev/usb/serial/uftdi.c
  user/thompsa/vaptq/sys/dev/usb/template/usb_template.c
  user/thompsa/vaptq/sys/dev/usb/usb_bus.h
  user/thompsa/vaptq/sys/dev/usb/usb_controller.h
  user/thompsa/vaptq/sys/dev/usb/usb_core.h
  user/thompsa/vaptq/sys/dev/usb/usb_device.c
  user/thompsa/vaptq/sys/dev/usb/usb_device.h
  user/thompsa/vaptq/sys/dev/usb/usb_dynamic.c
  user/thompsa/vaptq/sys/dev/usb/usb_dynamic.h
  user/thompsa/vaptq/sys/dev/usb/usb_generic.c
  user/thompsa/vaptq/sys/dev/usb/usb_handle_request.c
  user/thompsa/vaptq/sys/dev/usb/usb_hub.c
  user/thompsa/vaptq/sys/dev/usb/usb_request.c
  user/thompsa/vaptq/sys/dev/usb/usb_request.h
  user/thompsa/vaptq/sys/dev/usb/usb_revision.h
  user/thompsa/vaptq/sys/dev/usb/usb_transfer.c
  user/thompsa/vaptq/sys/dev/usb/usbdevs
  user/thompsa/vaptq/sys/dev/xen/netfront/   (props changed)
  user/thompsa/vaptq/sys/dev/xen/xenpci/   (props changed)
  user/thompsa/vaptq/sys/dev/xl/if_xl.c
  user/thompsa/vaptq/sys/geom/part/g_part.c
  user/thompsa/vaptq/sys/geom/part/g_part_ebr.c
  user/thompsa/vaptq/sys/geom/part/g_part_if.m
  user/thompsa/vaptq/sys/geom/vinum/geom_vinum.c
  user/thompsa/vaptq/sys/geom/vinum/geom_vinum_rename.c
  user/thompsa/vaptq/sys/i386/conf/DEFAULTS
  user/thompsa/vaptq/sys/i386/i386/busdma_machdep.c
  user/thompsa/vaptq/sys/i386/i386/mp_machdep.c
  user/thompsa/vaptq/sys/i386/include/metadata.h
  user/thompsa/vaptq/sys/i386/include/param.h
  user/thompsa/vaptq/sys/i386/include/pc/bios.h
  user/thompsa/vaptq/sys/ia64/ia64/busdma_machdep.c
  user/thompsa/vaptq/sys/ia64/include/param.h
  user/thompsa/vaptq/sys/ia64/isa/isa.c
  user/thompsa/vaptq/sys/kern/kern_conf.c
  user/thompsa/vaptq/sys/kern/kern_cpuset.c
  user/thompsa/vaptq/sys/kern/kern_descrip.c
  user/thompsa/vaptq/sys/kern/kern_exit.c
  user/thompsa/vaptq/sys/kern/kern_malloc.c
  user/thompsa/vaptq/sys/kern/kern_umtx.c
  user/thompsa/vaptq/sys/kern/kern_uuid.c
  user/thompsa/vaptq/sys/kern/tty_pts.c
  user/thompsa/vaptq/sys/kern/uipc_sockbuf.c
  user/thompsa/vaptq/sys/kern/vfs_acl.c
  user/thompsa/vaptq/sys/kern/vfs_bio.c
  user/thompsa/vaptq/sys/kern/vfs_cache.c
  user/thompsa/vaptq/sys/kern/vfs_vnops.c
  user/thompsa/vaptq/sys/legacy/dev/usb/   (props changed)
  user/thompsa/vaptq/sys/mips/include/param.h
  user/thompsa/vaptq/sys/mips/mips/pmap.c
  user/thompsa/vaptq/sys/modules/Makefile
  user/thompsa/vaptq/sys/modules/dtrace/dtnfsclient/   (props changed)
  user/thompsa/vaptq/sys/modules/ip6_mroute_mod/   (props changed)
  user/thompsa/vaptq/sys/modules/ipmi/ipmi_linux/   (props changed)
  user/thompsa/vaptq/sys/net/ethernet.h
  user/thompsa/vaptq/sys/net/if.c
  user/thompsa/vaptq/sys/net/if.h
  user/thompsa/vaptq/sys/net/if_arc.h
  user/thompsa/vaptq/sys/net/if_arcsubr.c
  user/thompsa/vaptq/sys/net/if_atm.h
  user/thompsa/vaptq/sys/net/if_atmsubr.c
  user/thompsa/vaptq/sys/net/if_disc.c
  user/thompsa/vaptq/sys/net/if_enc.c
  user/thompsa/vaptq/sys/net/if_ethersubr.c
  user/thompsa/vaptq/sys/net/if_faith.c
  user/thompsa/vaptq/sys/net/if_fddisubr.c
  user/thompsa/vaptq/sys/net/if_fwsubr.c
  user/thompsa/vaptq/sys/net/if_gif.c
  user/thompsa/vaptq/sys/net/if_gif.h
  user/thompsa/vaptq/sys/net/if_gre.c
  user/thompsa/vaptq/sys/net/if_iso88025subr.c
  user/thompsa/vaptq/sys/net/if_lagg.c
  user/thompsa/vaptq/sys/net/if_lagg.h
  user/thompsa/vaptq/sys/net/if_llatbl.c
  user/thompsa/vaptq/sys/net/if_llatbl.h
  user/thompsa/vaptq/sys/net/if_loop.c
  user/thompsa/vaptq/sys/net/if_mib.c
  user/thompsa/vaptq/sys/net/if_spppsubr.c
  user/thompsa/vaptq/sys/net/if_stf.c
  user/thompsa/vaptq/sys/net/if_tun.c
  user/thompsa/vaptq/sys/net/if_var.h
  user/thompsa/vaptq/sys/net/if_vlan.c
  user/thompsa/vaptq/sys/net/iso88025.h
  user/thompsa/vaptq/sys/net/radix_mpath.c
  user/thompsa/vaptq/sys/net/route.c
  user/thompsa/vaptq/sys/net/route.h
  user/thompsa/vaptq/sys/net/rtsock.c
  user/thompsa/vaptq/sys/net80211/ieee80211.c
  user/thompsa/vaptq/sys/net80211/ieee80211_node.c
  user/thompsa/vaptq/sys/net80211/ieee80211_output.c
  user/thompsa/vaptq/sys/net80211/ieee80211_proto.h
  user/thompsa/vaptq/sys/net80211/ieee80211_sta.c
  user/thompsa/vaptq/sys/net80211/ieee80211_var.h
  user/thompsa/vaptq/sys/netatalk/at_control.c
  user/thompsa/vaptq/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  user/thompsa/vaptq/sys/netgraph/ng_eiface.c
  user/thompsa/vaptq/sys/netgraph/ng_fec.c
  user/thompsa/vaptq/sys/netgraph/ng_iface.c
  user/thompsa/vaptq/sys/netinet/if_ether.c
  user/thompsa/vaptq/sys/netinet/igmp.c
  user/thompsa/vaptq/sys/netinet/in.c
  user/thompsa/vaptq/sys/netinet/in_mcast.c
  user/thompsa/vaptq/sys/netinet/in_pcb.c
  user/thompsa/vaptq/sys/netinet/in_pcb.h
  user/thompsa/vaptq/sys/netinet/in_var.h
  user/thompsa/vaptq/sys/netinet/ip_carp.c
  user/thompsa/vaptq/sys/netinet/ip_divert.c
  user/thompsa/vaptq/sys/netinet/ip_fastfwd.c
  user/thompsa/vaptq/sys/netinet/ip_fw2.c
  user/thompsa/vaptq/sys/netinet/ip_fw_nat.c
  user/thompsa/vaptq/sys/netinet/ip_icmp.c
  user/thompsa/vaptq/sys/netinet/ip_input.c
  user/thompsa/vaptq/sys/netinet/ip_mroute.h
  user/thompsa/vaptq/sys/netinet/ip_output.c
  user/thompsa/vaptq/sys/netinet/sctp_bsd_addr.c
  user/thompsa/vaptq/sys/netinet/sctp_indata.c
  user/thompsa/vaptq/sys/netinet/sctp_structs.h
  user/thompsa/vaptq/sys/netinet/tcp_var.h
  user/thompsa/vaptq/sys/netinet/vinet.h
  user/thompsa/vaptq/sys/netinet6/icmp6.c
  user/thompsa/vaptq/sys/netinet6/in6.c
  user/thompsa/vaptq/sys/netinet6/in6.h
  user/thompsa/vaptq/sys/netinet6/in6_ifattach.c
  user/thompsa/vaptq/sys/netinet6/in6_var.h
  user/thompsa/vaptq/sys/netinet6/ip6_input.c
  user/thompsa/vaptq/sys/netinet6/mld6.c
  user/thompsa/vaptq/sys/netinet6/nd6.c
  user/thompsa/vaptq/sys/netinet6/nd6.h
  user/thompsa/vaptq/sys/netinet6/nd6_rtr.c
  user/thompsa/vaptq/sys/netipx/ipx_outputfl.c
  user/thompsa/vaptq/sys/nfsclient/nfs_socket.c
  user/thompsa/vaptq/sys/pc98/cbus/olpt.c
  user/thompsa/vaptq/sys/pci/if_rlreg.h
  user/thompsa/vaptq/sys/powerpc/aim/machdep.c
  user/thompsa/vaptq/sys/powerpc/aim/trap.c
  user/thompsa/vaptq/sys/powerpc/aim/trap_subr.S
  user/thompsa/vaptq/sys/powerpc/booke/locore.S
  user/thompsa/vaptq/sys/powerpc/booke/machdep.c
  user/thompsa/vaptq/sys/powerpc/booke/pmap.c
  user/thompsa/vaptq/sys/powerpc/booke/swtch.S
  user/thompsa/vaptq/sys/powerpc/booke/vm_machdep.c
  user/thompsa/vaptq/sys/powerpc/conf/MPC85XX
  user/thompsa/vaptq/sys/powerpc/include/hid.h
  user/thompsa/vaptq/sys/powerpc/include/intr_machdep.h
  user/thompsa/vaptq/sys/powerpc/include/param.h
  user/thompsa/vaptq/sys/powerpc/include/pte.h
  user/thompsa/vaptq/sys/powerpc/include/trap_aim.h
  user/thompsa/vaptq/sys/powerpc/include/vmparam.h
  user/thompsa/vaptq/sys/powerpc/mpc85xx/ocpbus.c
  user/thompsa/vaptq/sys/powerpc/mpc85xx/pci_ocp.c
  user/thompsa/vaptq/sys/powerpc/powerpc/autoconf.c
  user/thompsa/vaptq/sys/powerpc/powerpc/bus_machdep.c
  user/thompsa/vaptq/sys/powerpc/powerpc/cpu.c
  user/thompsa/vaptq/sys/powerpc/powerpc/intr_machdep.c
  user/thompsa/vaptq/sys/rpc/svc.h
  user/thompsa/vaptq/sys/security/audit/audit.c
  user/thompsa/vaptq/sys/security/audit/audit_bsm.c
  user/thompsa/vaptq/sys/security/audit/audit_bsm_token.c
  user/thompsa/vaptq/sys/security/audit/audit_pipe.c
  user/thompsa/vaptq/sys/security/audit/audit_private.h
  user/thompsa/vaptq/sys/security/audit/audit_syscalls.c
  user/thompsa/vaptq/sys/sparc64/include/param.h
  user/thompsa/vaptq/sys/sun4v/include/param.h
  user/thompsa/vaptq/sys/sys/acl.h
  user/thompsa/vaptq/sys/sys/malloc.h
  user/thompsa/vaptq/sys/sys/param.h
  user/thompsa/vaptq/sys/ufs/ufs/ufs_extern.h
  user/thompsa/vaptq/sys/ufs/ufs/ufs_lookup.c
  user/thompsa/vaptq/sys/ufs/ufs/ufs_vnops.c
  user/thompsa/vaptq/sys/vm/swap_pager.c
  user/thompsa/vaptq/sys/vm/vm_fault.c
  user/thompsa/vaptq/sys/vm/vm_map.c
  user/thompsa/vaptq/sys/vm/vm_object.c
  user/thompsa/vaptq/sys/vm/vm_pageout.c
  user/thompsa/vaptq/sys/vm/vnode_pager.c
  user/thompsa/vaptq/tools/regression/acltools/tools-posix.test
  user/thompsa/vaptq/tools/regression/bin/sh/builtins/type1.0.stderr   (props changed)
  user/thompsa/vaptq/tools/regression/lib/msun/test-conj.t   (props changed)
  user/thompsa/vaptq/tools/tools/net80211/scripts/setup.wdsmain
  user/thompsa/vaptq/tools/tools/net80211/wlanwds/wlanwds.c
  user/thompsa/vaptq/usr.bin/cpio/Makefile
  user/thompsa/vaptq/usr.bin/cpio/bsdcpio.1
  user/thompsa/vaptq/usr.bin/cpio/cmdline.c
  user/thompsa/vaptq/usr.bin/cpio/cpio.c
  user/thompsa/vaptq/usr.bin/cpio/cpio.h
  user/thompsa/vaptq/usr.bin/cpio/cpio_platform.h
  user/thompsa/vaptq/usr.bin/cpio/pathmatch.c
  user/thompsa/vaptq/usr.bin/cpio/pathmatch.h
  user/thompsa/vaptq/usr.bin/cpio/test/main.c
  user/thompsa/vaptq/usr.bin/cpio/test/test.h
  user/thompsa/vaptq/usr.bin/cpio/test/test_0.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_basic.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_format_newc.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_gcpio_compat.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_a.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_c.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_d.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_f.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_m.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_t.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_u.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_version.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_y.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_option_z.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_owner_parse.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_passthrough_dotdot.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_passthrough_reverse.c
  user/thompsa/vaptq/usr.bin/cpio/test/test_pathmatch.c
  user/thompsa/vaptq/usr.bin/csup/   (props changed)
  user/thompsa/vaptq/usr.bin/login/login_audit.c
  user/thompsa/vaptq/usr.bin/ncal/Makefile
  user/thompsa/vaptq/usr.bin/ncal/ncal.c
  user/thompsa/vaptq/usr.bin/netstat/mroute.c
  user/thompsa/vaptq/usr.bin/procstat/   (props changed)
  user/thompsa/vaptq/usr.bin/tar/Makefile
  user/thompsa/vaptq/usr.bin/tar/bsdtar.1
  user/thompsa/vaptq/usr.bin/tar/bsdtar.c
  user/thompsa/vaptq/usr.bin/tar/bsdtar.h
  user/thompsa/vaptq/usr.bin/tar/bsdtar_platform.h
  user/thompsa/vaptq/usr.bin/tar/cmdline.c
  user/thompsa/vaptq/usr.bin/tar/read.c
  user/thompsa/vaptq/usr.bin/tar/test/main.c
  user/thompsa/vaptq/usr.bin/tar/test/test.h
  user/thompsa/vaptq/usr.bin/tar/test/test_0.c
  user/thompsa/vaptq/usr.bin/tar/test/test_basic.c
  user/thompsa/vaptq/usr.bin/tar/test/test_copy.c
  user/thompsa/vaptq/usr.bin/tar/test/test_patterns.c
  user/thompsa/vaptq/usr.bin/tar/test/test_strip_components.c
  user/thompsa/vaptq/usr.bin/tar/test/test_symlink_dir.c
  user/thompsa/vaptq/usr.bin/tar/tree.c
  user/thompsa/vaptq/usr.bin/tar/util.c
  user/thompsa/vaptq/usr.bin/tar/write.c
  user/thompsa/vaptq/usr.bin/truss/main.c
  user/thompsa/vaptq/usr.bin/truss/setup.c
  user/thompsa/vaptq/usr.sbin/Makefile
  user/thompsa/vaptq/usr.sbin/bluetooth/btpand/event.c
  user/thompsa/vaptq/usr.sbin/cpucontrol/cpucontrol.8
  user/thompsa/vaptq/usr.sbin/crashinfo/crashinfo.8
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_bswap.c   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ffs_subr.c   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/ffs/ufs_bswap.h   (props changed)
  user/thompsa/vaptq/usr.sbin/makefs/getid.c   (props changed)
  user/thompsa/vaptq/usr.sbin/pciconf/cap.c
  user/thompsa/vaptq/usr.sbin/pkg_install/add/main.c
  user/thompsa/vaptq/usr.sbin/ppp/iface.c
  user/thompsa/vaptq/usr.sbin/ppp/ipcp.c
  user/thompsa/vaptq/usr.sbin/ppp/ipv6cp.c
  user/thompsa/vaptq/usr.sbin/ppp/route.c
  user/thompsa/vaptq/usr.sbin/ppp/route.h
  user/thompsa/vaptq/usr.sbin/setfib/setfib.1
  user/thompsa/vaptq/usr.sbin/sysinstall/devices.c
  user/thompsa/vaptq/usr.sbin/sysinstall/index.c
  user/thompsa/vaptq/usr.sbin/sysinstall/menus.c
  user/thompsa/vaptq/usr.sbin/zic/   (props changed)

Modified: user/thompsa/vaptq/ObsoleteFiles.inc
==============================================================================

--- user/thompsa/vaptq/ObsoleteFiles.inc	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/ObsoleteFiles.inc	Sun Apr 26 02:44:41 2009	(r191506)
@@ -14,8 +14,31 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090417: removal of legacy versions of USB network interface drivers
+OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
+# 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
+OLD_FILES+=usr/sbin/raycontrol
+OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
+OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
+OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
+OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
+# 20090406: usb_sw_transfer.h removed
+OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
@@ -54,6 +77,7 @@ OLD_FILES+=usr/lib/libusb20.a
 OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
+OLD_FILES+=usr/include/libusb20_compat10.h
 .if ${TARGET_ARCH} == "amd64"
 OLD_LIBS+=usr/lib32/libusb20.so.1
 OLD_FILES+=usr/lib32/libusb20.a
@@ -97,6 +121,8 @@ OLD_FILES+=usr/include/dev/usb/if_udavre
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
+OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
+OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h

Modified: user/thompsa/vaptq/UPDATING
==============================================================================
--- user/thompsa/vaptq/UPDATING	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/UPDATING	Sun Apr 26 02:44:41 2009	(r191506)
@@ -22,6 +22,35 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090422:
+	Implement low-level Bluetooth HCI API.
+	Bump __FreeBSD_version to 800083.
+
+20090419:
+	The layout of struct malloc_type, used by modules to register new
+	memory allocation types, has changed.  Most modules will need to
+	be rebuilt or panics may be experienced.
+	Bump __FreeBSD_version to 800081.
+
+20090415:
+	Anticipate overflowing inp_flags - add inp_flags2.
+	This changes most offsets in inpcb, so checking v4 connection
+	state will require a world rebuild.
+	Bump __FreeBSD_version to 800080.
+
+20090415:
+	Add an llentry to struct route and struct route_in6. Modules
+	embedding a struct route will need to be recompiled.
+	Bump __FreeBSD_version to 800079.
+
+20090414:
+	The size of rt_metrics_lite and by extension rtentry has changed.
+	Networking administration apps will need to be recompiled.
+	The route command now supports show as an alias for get, weighting
+	of routes, sticky and nostick flags to alter the behavior of stateful
+	load balancing.
+	Bump __FreeBSD_version to 800078.
+
 20090408:
 	Do not use Giant for kbdmux(4) locking. This is wrong and
 	apparently causing more problems than it solves. This will
@@ -41,7 +70,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	GEOM_PART has become the default partition slicer for storage devices,
 	replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It
 	introduces some changes:
-	
+
 	MSDOS/EBR: the devices created from MSDOS extended partition entries
 	(EBR) can be named differently than with GEOM_MBR and are now symlinks
 	to devices with offset-based names. fstabs may need to be modified.
@@ -50,7 +79,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	cases but it points to problems in file system misalignment with
 	disk geometry. The "c" partition is now implicit, covers the whole
 	top-level drive and cannot be (mis)used by users.
-	
+
 	General: Kernel dumps are now not allowed to be written to devices
 	whose partition types indicate they are meant to be used for file
 	systems (or, in case of MSDOS partitions, as something else than

Modified: user/thompsa/vaptq/bin/ls/ls.1
==============================================================================
--- user/thompsa/vaptq/bin/ls/ls.1	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/bin/ls/ls.1	Sun Apr 26 02:44:41 2009	(r191506)
@@ -680,6 +680,7 @@ specification.
 .Xr sort 1 ,
 .Xr xterm 1 ,
 .Xr strftime 3 ,
+.Xr strmode 3 ,
 .Xr termcap 5 ,
 .Xr maclabel 7 ,
 .Xr symlink 7 ,

Modified: user/thompsa/vaptq/bin/sh/parser.c
==============================================================================
--- user/thompsa/vaptq/bin/sh/parser.c	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/bin/sh/parser.c	Sun Apr 26 02:44:41 2009	(r191506)
@@ -250,6 +250,7 @@ pipeline(void)
 	int negate;
 
 	negate = 0;
+	checkkwd = 2;
 	TRACE(("pipeline: entered\n"));
 	while (readtoken() == TNOT)
 		negate = !negate;

Modified: user/thompsa/vaptq/contrib/ipfilter/ipsend/sbpf.c
==============================================================================
--- user/thompsa/vaptq/contrib/ipfilter/ipsend/sbpf.c	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/ipfilter/ipsend/sbpf.c	Sun Apr 26 02:44:41 2009	(r191506)
@@ -28,9 +28,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
 
 #include <stdio.h>
 #include <netdb.h>

Modified: user/thompsa/vaptq/contrib/ntp/ntpq/ntpq.c
==============================================================================
--- user/thompsa/vaptq/contrib/ntp/ntpq/ntpq.c	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/ntp/ntpq/ntpq.c	Sun Apr 26 02:44:41 2009	(r191506)
@@ -3185,9 +3185,9 @@ cookedprint(
 				if (!decodeuint(value, &uval))
 				    output_raw = '?';
 				else {
-					char b[10];
+					char b[12];
 
-					(void) sprintf(b, "%03lo", uval);
+					(void) snprintf(b, sizeof(b), "%03lo", uval);
 					output(fp, name, b);
 				}
 				break;

Modified: user/thompsa/vaptq/contrib/openbsm/CREDITS
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/CREDITS	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/CREDITS	Sun Apr 26 02:44:41 2009	(r191506)
@@ -28,6 +28,7 @@ the development of OpenBSM:
     Xin LI
     Stacey Son
     Todd Heberlein
+    Gary Hoo
 
 In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel
 Software's FlexeLint tool were used to identify a number of bugs in the

Modified: user/thompsa/vaptq/contrib/openbsm/INSTALL
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/INSTALL	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/INSTALL	Sun Apr 26 02:44:41 2009	(r191506)
@@ -2,9 +2,8 @@ OpenBSM Build and Installation Instructi
 
 OpenBSM is currently built using autoconf and automake, which should allow
 for building on a range of operating systems, including FreeBSD, Mac OS X,
-and Linux.  Depending on the availability of audit facilities in the
-underlying operating system, some components that depend on kernel audit
-support are built conditionally.  Typically, build will be performed using:
+and Linux.  Some components are built only if appropriate kernel audit
+suppport is found.  Typical builds will be performed using:
 
     ./configure
     make
@@ -15,10 +14,14 @@ force the compile to fail if a warning i
 
     CFLAGS="-Wall -Werror" ./configure
 
-To install, use:
+To install the library, binaries, and man pages, use:
 
     make install
 
+The OpenBSM install will not install files in /etc; these have to be
+manually installed or merged.  Currently, the locations of these files are
+not configurable.
+
 You may wish to specify that the OpenBSM components not be installed in the
 base system, rather in a specific directory.  This may be done using the
 --prefix argument to configure.  If installing to a specific directory,
@@ -29,7 +32,3 @@ directory the correct libbsm is used:
     make
     make install
     LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH
-
-You will need to manually propagate openbsm/etc/* into /etc/security on your
-system; this is not done automatically so as to avoid disrupting the current
-configuration.  Currently, the locations of these files is not configurable.

Modified: user/thompsa/vaptq/contrib/openbsm/Makefile.in
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/Makefile.in	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/Makefile.in	Sun Apr 26 02:44:41 2009	(r191506)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $
+# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -97,6 +97,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -121,6 +122,7 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MIG = @MIG@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -184,6 +186,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys
@@ -332,8 +335,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -358,8 +361,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -369,13 +372,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -446,6 +448,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -472,6 +478,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -623,8 +631,8 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \

Modified: user/thompsa/vaptq/contrib/openbsm/NEWS
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/NEWS	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/NEWS	Sun Apr 26 02:44:41 2009	(r191506)
@@ -1,5 +1,23 @@
 OpenBSM Version History
 
+OpenBSM 1.1
+
+- Change auditon(2) parameters and data structures to be 32/64-bit architecture
+  independent.  Add more information to man page about auditon(2) parameters. 
+- Add wrapper functions for auditon(2) to use legacy commands when the new
+  commands are not supported.
+- Add default for 'expire-after' in audit_control to expire trail files when
+  the audit directory is more than 10 megabytes ('10M').
+- Interface to convert between local and BSM fcntl(2) command values has been
+  added:  au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with 
+  definitions of constants in audit_fcntl.h.
+- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens
+  generated by audit_submit(3) were improperly encoded has been fixed.
+- Fix example in audit_submit(3) man page.  Also, make it clear that we want
+  the audit ID as the argument.
+- A new audit event class 'aa', for post-login authentication and
+  authorization events, has been added.
+
 OpenBSM 1.1 beta 1
 
 - The filesz parameter in audit_control(5) now accepts suffixes: 'B' for
@@ -431,4 +449,4 @@ OpenBSM 1.0 alpha 1
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $

Modified: user/thompsa/vaptq/contrib/openbsm/README
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/README	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/README	Sun Apr 26 02:44:41 2009	(r191506)
@@ -1,15 +1,22 @@
-OpenBSM 1.1 beta 1
+OpenBSM 1.1
 
   Introduction
 
-OpenBSM provides an open source implementation of Sun's BSM Audit API. 
-Originally created under contract to Apple Computer by McAfee Research, this
-implementation is now maintained by volunteers and the generous contribution
-of several organizations.  Coupled with a kernel audit implementation,
-OpenBSM can be used to maintain system audit streams, and is a foundation for
-an Audit-enabled system.  Portions of OpenBSM, including include files and
-token-building routines, are reusable in a kernel audit implementation, and
-may be found in the FreeBSD and Mac OS X kernels.
+OpenBSM is an open source implementation of Sun's BSM event auditing file
+format and API.  Originally created for Apple Computer by McAfee Research,
+OpenBSM is now maintained by volunteers and through the generous contribution
+of several organizations.
+
+OpenBSM includes several command line tools, including auditreduce(8) and
+praudit(8) for reducing and printing audit trails, as well as the libbsm(3)
+library to manage configuration files, generate audit records, and parse and
+print audit trils.
+
+Coupled with a kernel audit implementation, OpenBSM can be used to maintain
+system audit streams, and is a foundation for a full audit-enabled system.
+Portions of OpenBSM, including include files and token-building routines, are
+reusable in a kernel audit implementation, and may be found in the FreeBSD
+and Mac OS X kernels.
 
   Contents
 
@@ -17,7 +24,7 @@ OpenBSM consists of several directories:
 
     bin/           Audit-related command line tools
     bsm/           Library include files for BSM
-    compat/        Compatibility code to build on various OS's
+    compat/        Compatibility code to build on various operating systems
     etc/           Sample /etc/security configuration files
     libauditd      Common audit management functions for auditd and launchd
     libbsm/        Implementation of BSM library interfaces and man pages
@@ -44,7 +51,8 @@ Please see the file INSTALL for build an
 
 The TrustedBSD Project would appreciate the contribution of bug fixes, 
 enhancements, etc, under identically or substantially similar licenses to 
-those present on the remainder of the OpenBSM source code.
+those present on the remainder of the OpenBSM source code.  Please see the
+file CREDITS to learn more about who has contributed to the project.
 
   Location
 
@@ -56,4 +64,4 @@ Information on TrustedBSD may be found o
 
     http://www.TrustedBSD.org/
 
-$P4: //depot/projects/trustedbsd/openbsm/README#35 $
+$P4: //depot/projects/trustedbsd/openbsm/README#36 $

Modified: user/thompsa/vaptq/contrib/openbsm/TODO
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/TODO	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/TODO	Sun Apr 26 02:44:41 2009	(r191506)
@@ -16,11 +16,10 @@ OpenBSM TODO
   just at the beginning of a record.  This will make it easier to use
   praudit in test suites processing single-token files without header and
   trailer context.
-- Put hostname in trail file name.
 - Document audit_warn event arguments.
 - Allow the path /etc/security to be configured at configure-time so that
   alternative locations can be used.
 - NLS support for au_strerror(3), which provides error strings for BSM errors
   not available on the local OS platform.
 
-$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $
+$P4: //depot/projects/trustedbsd/openbsm/TODO#13 $

Modified: user/thompsa/vaptq/contrib/openbsm/VERSION
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/VERSION	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/VERSION	Sun Apr 26 02:44:41 2009	(r191506)
@@ -1 +1 @@
-OPENBSM_1_1_BETA_1
+OPENBSM_1_1

Modified: user/thompsa/vaptq/contrib/openbsm/aclocal.m4
==============================================================================
--- user/thompsa/vaptq/contrib/openbsm/aclocal.m4	Sun Apr 26 00:29:49 2009	(r191505)
+++ user/thompsa/vaptq/contrib/openbsm/aclocal.m4	Sun Apr 26 02:44:41 2009	(r191506)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,17 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.62],,
+[m4_warning([this file was generated for autoconf 2.62.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -614,7 +689,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -707,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -978,7 +1057,7 @@ else
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1303,7 +1382,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1824,6 +1903,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2323,7 +2409,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2759,7 +2845,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2816,6 +2902,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2925,7 +3012,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2938,7 +3025,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -3084,51 +3171,23 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
@@ -3379,7 +3438,7 @@ case $host_os in
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3814,7 +3873,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3939,6 +3999,11 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
@@ -3995,7 +4060,6 @@ solaris*)
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4080,7 +4144,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4257,6 +4321,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4319,7 +4384,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4556,6 +4621,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4905,7 +4974,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4962,7 +5031,8 @@ AC_MSG_CHECKING([for $compiler option to
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4999,7 +5069,7 @@ AC_MSG_CHECKING([for $compiler option to
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -5095,7 +5165,7 @@ AC_MSG_CHECKING([for $compiler option to
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5246,7 +5316,8 @@ AC_MSG_CHECKING([for $compiler option to
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5316,7 +5387,8 @@ AC_MSG_CHECKING([for $compiler option to
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5453,7 +5525,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5477,7 +5549,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5493,7 +5565,7 @@ AC_MSG_CHECKING([whether the $compiler l
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5512,6 +5584,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5542,12 +5615,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5597,7 +5672,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5816,7 +5891,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -5836,7 +5911,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -5996,11 +6071,10 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -6581,7 +6655,7 @@ AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6596,7 +6670,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6612,8 +6686,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6885,7 +6961,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6933,13 +7009,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

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