PERFORCE change 138104 for review

Sam Leffler sam at FreeBSD.org
Wed Mar 19 16:07:52 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=138104

Change 138104 by sam at sam_ebb on 2008/03/19 16:07:42

	IFC @ 138102

Affected files ...

.. //depot/projects/vap/ObsoleteFiles.inc#7 integrate
.. //depot/projects/vap/bin/Makefile#3 integrate
.. //depot/projects/vap/bin/uuidgen/Makefile#2 integrate
.. //depot/projects/vap/contrib/cvs/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/cvs/FAQ#4 integrate
.. //depot/projects/vap/contrib/cvs/HACKING#4 integrate
.. //depot/projects/vap/contrib/cvs/INSTALL#4 integrate
.. //depot/projects/vap/contrib/cvs/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/NEWS#4 integrate
.. //depot/projects/vap/contrib/cvs/README#4 integrate
.. //depot/projects/vap/contrib/cvs/TODO#4 integrate
.. //depot/projects/vap/contrib/cvs/aclocal.m4#4 integrate
.. //depot/projects/vap/contrib/cvs/compile#3 integrate
.. //depot/projects/vap/contrib/cvs/config.h.in#4 integrate
.. //depot/projects/vap/contrib/cvs/configure#4 integrate
.. //depot/projects/vap/contrib/cvs/configure.in#4 integrate
.. //depot/projects/vap/contrib/cvs/contrib/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/depcomp#3 integrate
.. //depot/projects/vap/contrib/cvs/diff/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/HACKING.DOCS#1 branch
.. //depot/projects/vap/contrib/cvs/doc/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/cvs.1#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/cvs.texinfo#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/cvsclient.texi#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/mdate-sh#3 integrate
.. //depot/projects/vap/contrib/cvs/doc/mkman.pl#2 integrate
.. //depot/projects/vap/contrib/cvs/doc/stamp-1#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/stamp-vti#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/version-client.texi#4 integrate
.. //depot/projects/vap/contrib/cvs/doc/version.texi#4 integrate
.. //depot/projects/vap/contrib/cvs/install-sh#3 integrate
.. //depot/projects/vap/contrib/cvs/lib/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/cvs/lib/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/lib/getdate#2 delete
.. //depot/projects/vap/contrib/cvs/lib/xsize.h#3 integrate
.. //depot/projects/vap/contrib/cvs/man/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/missing#3 integrate
.. //depot/projects/vap/contrib/cvs/mkinstalldirs#3 integrate
.. //depot/projects/vap/contrib/cvs/src/ChangeLog#4 integrate
.. //depot/projects/vap/contrib/cvs/src/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/cvs/src/add.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/classify.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/client.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/client.h#4 integrate
.. //depot/projects/vap/contrib/cvs/src/cvs.h#4 integrate
.. //depot/projects/vap/contrib/cvs/src/edit.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/edit.h#3 integrate
.. //depot/projects/vap/contrib/cvs/src/hash.h#4 integrate
.. //depot/projects/vap/contrib/cvs/src/import.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/lock.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/log.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/login.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/main.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/mkmodules.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/modules.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/parseinfo.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/rcs.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/recurse.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/root.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/root.h#4 integrate
.. //depot/projects/vap/contrib/cvs/src/sanity.sh#4 integrate
.. //depot/projects/vap/contrib/cvs/src/server.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/update.c#4 integrate
.. //depot/projects/vap/contrib/cvs/src/vers_ts.c#4 integrate
.. //depot/projects/vap/contrib/cvs/tools/Makefile.in#4 integrate
.. //depot/projects/vap/contrib/tcsh/sh.lex.c#3 integrate
.. //depot/projects/vap/etc/rc.d/zfs#3 integrate
.. //depot/projects/vap/gnu/usr.bin/Makefile#4 integrate
.. //depot/projects/vap/gnu/usr.bin/cvs/lib/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cvs/lib/config.h.proto#3 integrate
.. //depot/projects/vap/lib/libarchive/Makefile#5 integrate
.. //depot/projects/vap/lib/libarchive/archive.h.in#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.3#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.c#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.h#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_private.h#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_ar.c#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_tar.c#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_string.h#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_string_sprintf.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_util.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_write.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_disk.c#7 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_private.h#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_compression_compress.c#1 branch
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#5 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_cpio.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_cpio_newc.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_shar.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_ustar.c#4 integrate
.. //depot/projects/vap/lib/libarchive/config_freebsd.h#4 integrate
.. //depot/projects/vap/lib/libarchive/test/.cvsignore#1 branch
.. //depot/projects/vap/lib/libarchive/test/Makefile#7 integrate
.. //depot/projects/vap/lib/libarchive/test/test_archive_api_feature.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_empty_write.c#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_entry.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.c#1 branch
.. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch
.. //depot/projects/vap/lib/libarchive/test/test_read_format_ar.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_compress.c#1 branch
.. //depot/projects/vap/lib/libarchive/test/test_write_format_ar.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/scandir.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/sem_timedwait.3#2 integrate
.. //depot/projects/vap/lib/libc/gen/sem_wait.3#3 integrate
.. //depot/projects/vap/lib/libc/locale/wctype.c#3 integrate
.. //depot/projects/vap/lib/libc/sys/kldunload.2#4 integrate
.. //depot/projects/vap/lib/libelf/elf_update.3#3 integrate
.. //depot/projects/vap/lib/libelf/elf_update.c#4 integrate
.. //depot/projects/vap/lib/libpmc/pmc.3#5 integrate
.. //depot/projects/vap/lib/libsdp/sdp.h#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_create.c#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_exit.c#5 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_sig.c#4 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate
.. //depot/projects/vap/sbin/atacontrol/atacontrol.8#3 integrate
.. //depot/projects/vap/sbin/atacontrol/atacontrol.c#4 integrate
.. //depot/projects/vap/sbin/geom/class/multipath/gmultipath.8#4 integrate
.. //depot/projects/vap/share/examples/cvsup/cvs-supfile#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/ar.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/linux.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/pnp.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/scd.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/streams.4#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/svr4.4#3 integrate
.. //depot/projects/vap/share/man/man9/Makefile#7 integrate
.. //depot/projects/vap/share/man/man9/atomic.9#3 integrate
.. //depot/projects/vap/share/man/man9/ieee80211_radiotap.9#3 integrate
.. //depot/projects/vap/share/man/man9/rwlock.9#3 integrate
.. //depot/projects/vap/share/man/man9/stack.9#4 integrate
.. //depot/projects/vap/share/mk/bsd.cpu.mk#5 integrate
.. //depot/projects/vap/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/vap/sys/amd64/acpica/madt.c#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/amd64_mem.c#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/legacy.c#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/local_apic.c#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/vap/sys/amd64/amd64/mem.c#3 integrate
.. //depot/projects/vap/sys/amd64/amd64/mptable.c#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/nexus.c#6 integrate
.. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#5 integrate
.. //depot/projects/vap/sys/amd64/include/atomic.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/intr_machdep.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/nexusvar.h#1 branch
.. //depot/projects/vap/sys/amd64/include/specialreg.h#8 integrate
.. //depot/projects/vap/sys/amd64/isa/atpic.c#6 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#6 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#6 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#6 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/vap/sys/amd64/linux32/syscalls.master#6 integrate
.. //depot/projects/vap/sys/arm/arm/intr.c#5 integrate
.. //depot/projects/vap/sys/arm/arm/machdep.c#6 integrate
.. //depot/projects/vap/sys/arm/arm/vm_machdep.c#6 integrate
.. //depot/projects/vap/sys/boot/uboot/Makefile#2 integrate
.. //depot/projects/vap/sys/boot/uboot/common/main.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/Makefile#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/api_public.h#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/copy.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/devicename.c#2 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/disk.c#2 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/elf_freebsd.c#2 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/glue.c#4 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/glue.h#2 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/libuboot.h#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/module.c#2 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/vap/sys/boot/uboot/lib/reboot.c#2 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#7 integrate
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#8 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_fcntl.c#7 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#6 integrate
.. //depot/projects/vap/sys/conf/files#25 integrate
.. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/callb.c#3 integrate
.. //depot/projects/vap/sys/contrib/opensolaris/uts/common/os/taskq.c#3 integrate
.. //depot/projects/vap/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi.c#9 integrate
.. //depot/projects/vap/sys/dev/acpica/acpivar.h#6 integrate
.. //depot/projects/vap/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/vap/sys/dev/ata/ata-all.h#7 integrate
.. //depot/projects/vap/sys/dev/ata/ata-disk.c#7 integrate
.. //depot/projects/vap/sys/dev/ata/ata-disk.h#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_version.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_ioctl.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#6 integrate
.. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/vap/sys/dev/ofw/ofw_console.c#6 integrate
.. //depot/projects/vap/sys/dev/syscons/sysmouse.c#6 integrate
.. //depot/projects/vap/sys/dev/tdfx/tdfx_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#14 integrate
.. //depot/projects/vap/sys/dev/usb/ums.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#12 integrate
.. //depot/projects/vap/sys/gdb/gdb_cons.c#3 integrate
.. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/vap/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/vap/sys/i386/acpica/acpi_wakeup.c#6 integrate
.. //depot/projects/vap/sys/i386/acpica/madt.c#7 integrate
.. //depot/projects/vap/sys/i386/cpufreq/est.c#8 integrate
.. //depot/projects/vap/sys/i386/cpufreq/p4tcc.c#5 integrate
.. //depot/projects/vap/sys/i386/i386/i686_mem.c#4 integrate
.. //depot/projects/vap/sys/i386/i386/intr_machdep.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/k6_mem.c#4 integrate
.. //depot/projects/vap/sys/i386/i386/legacy.c#7 integrate
.. //depot/projects/vap/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/vap/sys/i386/i386/mp_machdep.c#8 integrate
.. //depot/projects/vap/sys/i386/i386/mptable.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/nexus.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/vm_machdep.c#7 integrate
.. //depot/projects/vap/sys/i386/include/atomic.h#6 integrate
.. //depot/projects/vap/sys/i386/include/intr_machdep.h#5 integrate
.. //depot/projects/vap/sys/i386/include/nexusvar.h#1 branch
.. //depot/projects/vap/sys/i386/include/specialreg.h#6 integrate
.. //depot/projects/vap/sys/i386/isa/atpic.c#5 integrate
.. //depot/projects/vap/sys/i386/linux/linux_proto.h#6 integrate
.. //depot/projects/vap/sys/i386/linux/linux_syscall.h#6 integrate
.. //depot/projects/vap/sys/i386/linux/linux_sysent.c#6 integrate
.. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/vap/sys/i386/linux/syscalls.master#6 integrate
.. //depot/projects/vap/sys/i386/svr4/svr4_machdep.c#5 integrate
.. //depot/projects/vap/sys/i386/xbox/xbox.c#3 integrate
.. //depot/projects/vap/sys/ia64/ia64/interrupt.c#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/machdep.c#10 integrate
.. //depot/projects/vap/sys/ia64/ia64/nexus.c#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/sscdisk.c#5 integrate
.. //depot/projects/vap/sys/ia64/include/atomic.h#5 integrate
.. //depot/projects/vap/sys/ia64/isa/isa_dma.c#6 integrate
.. //depot/projects/vap/sys/kern/init_main.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_alq.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_clock.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_conf.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/vap/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_event.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_exit.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_idle.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_kthread.c#5 integrate
.. //depot/projects/vap/sys/kern/kern_linker.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_lockf.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_malloc.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_mbuf.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_module.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_ntptime.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_poll.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_proc.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_resource.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_shutdown.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_sig.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_switch.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_synch.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_tc.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_thr.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_thread.c#9 integrate
.. //depot/projects/vap/sys/kern/link_elf.c#6 integrate
.. //depot/projects/vap/sys/kern/link_elf_obj.c#6 integrate
.. //depot/projects/vap/sys/kern/sched_4bsd.c#9 integrate
.. //depot/projects/vap/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/vap/sys/kern/subr_autoconf.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_eventhandler.c#4 integrate
.. //depot/projects/vap/sys/kern/subr_log.c#4 integrate
.. //depot/projects/vap/sys/kern/subr_prof.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_witness.c#9 integrate
.. //depot/projects/vap/sys/kern/sys_generic.c#7 integrate
.. //depot/projects/vap/sys/kern/sys_process.c#7 integrate
.. //depot/projects/vap/sys/kern/tty.c#7 integrate
.. //depot/projects/vap/sys/kern/tty_cons.c#7 integrate
.. //depot/projects/vap/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/vap/sys/kern/tty_pty.c#7 integrate
.. //depot/projects/vap/sys/kern/tty_subr.c#3 integrate
.. //depot/projects/vap/sys/kern/tty_tty.c#6 integrate
.. //depot/projects/vap/sys/kern/uipc_domain.c#5 integrate
.. //depot/projects/vap/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/vap/sys/kern/vfs_bio.c#10 integrate
.. //depot/projects/vap/sys/kern/vfs_cache.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_hash.c#5 integrate
.. //depot/projects/vap/sys/kern/vfs_lookup.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/vap/sys/net/bpf.c#8 integrate
.. //depot/projects/vap/sys/net/ieee8023ad_lacp.c#4 integrate
.. //depot/projects/vap/sys/net/ieee8023ad_lacp.h#4 integrate
.. //depot/projects/vap/sys/net/if.c#9 integrate
.. //depot/projects/vap/sys/net/if_lagg.c#4 integrate
.. //depot/projects/vap/sys/net/netisr.c#5 integrate
.. //depot/projects/vap/sys/net/rtsock.c#6 integrate
.. //depot/projects/vap/sys/netatm/ipatm/ipatm_load.c#6 integrate
.. //depot/projects/vap/sys/netatm/sigpvc/sigpvc_if.c#3 integrate
.. //depot/projects/vap/sys/netatm/spans/spans_if.c#3 integrate
.. //depot/projects/vap/sys/netatm/uni/uni_load.c#3 integrate
.. //depot/projects/vap/sys/netgraph/ng_base.c#13 integrate
.. //depot/projects/vap/sys/netgraph/ng_l2tp.c#7 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/vap/sys/netinet/ip_fw2.c#10 integrate
.. //depot/projects/vap/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/vap/sys/netinet/libalias/alias_irc.c#6 integrate
.. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/vap/sys/netinet6/ip6_ipsec.h#4 integrate
.. //depot/projects/vap/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/vap/sys/netipsec/ipsec.c#7 integrate
.. //depot/projects/vap/sys/netipsec/ipsec_output.c#5 integrate
.. //depot/projects/vap/sys/netipsec/key.c#6 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_diskless.c#7 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#6 integrate
.. //depot/projects/vap/sys/pc98/include/nexusvar.h#1 branch
.. //depot/projects/vap/sys/pc98/pc98/machdep.c#6 integrate
.. //depot/projects/vap/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/vap/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/vap/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/vap/sys/powerpc/include/atomic.h#6 integrate
.. //depot/projects/vap/sys/powerpc/include/gdb_machdep.h#3 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/gdb_machdep.c#4 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#8 integrate
.. //depot/projects/vap/sys/security/audit/audit.c#7 integrate
.. //depot/projects/vap/sys/sparc64/include/atomic.h#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#6 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/vm_machdep.c#6 integrate
.. //depot/projects/vap/sys/sun4v/include/atomic.h#3 integrate
.. //depot/projects/vap/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/vap/sys/sys/ata.h#7 integrate
.. //depot/projects/vap/sys/sys/bus_dma.h#5 integrate
.. //depot/projects/vap/sys/sys/conf.h#8 integrate
.. //depot/projects/vap/sys/sys/cpuset.h#2 integrate
.. //depot/projects/vap/sys/sys/eventhandler.h#5 integrate
.. //depot/projects/vap/sys/sys/interrupt.h#5 integrate
.. //depot/projects/vap/sys/sys/kernel.h#7 integrate
.. //depot/projects/vap/sys/sys/module.h#6 integrate
.. //depot/projects/vap/sys/sys/proc.h#11 integrate
.. //depot/projects/vap/sys/sys/resourcevar.h#5 integrate
.. //depot/projects/vap/sys/sys/rwlock.h#4 integrate
.. //depot/projects/vap/sys/sys/taskqueue.h#6 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#8 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#9 integrate
.. //depot/projects/vap/sys/vm/vm_fault.c#8 integrate
.. //depot/projects/vap/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/vap/sys/vm/vm_init.c#4 integrate
.. //depot/projects/vap/sys/vm/vm_meter.c#7 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#7 integrate
.. //depot/projects/vap/sys/vm/vm_page.c#7 integrate
.. //depot/projects/vap/sys/vm/vm_page.h#5 integrate
.. //depot/projects/vap/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/vap/sys/vm/vm_pageq.c#6 delete
.. //depot/projects/vap/sys/vm/vm_zeroidle.c#6 integrate
.. //depot/projects/vap/tools/tools/editing/freebsd.vim#1 branch
.. //depot/projects/vap/tools/tools/mctest/mctest.cc#1 branch
.. //depot/projects/vap/tools/tools/mctest/mctest.h#1 branch
.. //depot/projects/vap/usr.bin/Makefile#6 integrate
.. //depot/projects/vap/usr.bin/cpuset/cpuset.1#3 integrate
.. //depot/projects/vap/usr.bin/cpuset/cpuset.c#2 integrate
.. //depot/projects/vap/usr.bin/netstat/inet6.c#4 integrate
.. //depot/projects/vap/usr.bin/ruptime/ruptime.c#3 integrate
.. //depot/projects/vap/usr.bin/split/split.1#3 integrate
.. //depot/projects/vap/usr.bin/split/split.c#3 integrate
.. //depot/projects/vap/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.1#5 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.c#5 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.h#4 integrate
.. //depot/projects/vap/usr.bin/tar/config_freebsd.h#4 integrate
.. //depot/projects/vap/usr.bin/tar/matching.c#3 integrate
.. //depot/projects/vap/usr.bin/tar/read.c#4 integrate
.. //depot/projects/vap/usr.bin/tar/write.c#4 integrate
.. //depot/projects/vap/usr.bin/uuidgen/Makefile#3 delete
.. //depot/projects/vap/usr.bin/uuidgen/uuidgen.1#3 delete
.. //depot/projects/vap/usr.bin/uuidgen/uuidgen.c#3 delete
.. //depot/projects/vap/usr.sbin/adduser/adduser.8#4 integrate
.. //depot/projects/vap/usr.sbin/arp/arp.8#3 integrate
.. //depot/projects/vap/usr.sbin/arp/arp.c#4 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#4 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/gn.c#2 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/lan.c#3 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/nap.c#2 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/panu.c#2 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.c#4 integrate
.. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.h#4 integrate
.. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate
.. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_write_poll.c#2 integrate
.. //depot/projects/vap/usr.sbin/fifolog/lib/miniobj.h#2 integrate
.. //depot/projects/vap/usr.sbin/mixer/Makefile#3 integrate
.. //depot/projects/vap/usr.sbin/mixer/mixer.8#3 integrate
.. //depot/projects/vap/usr.sbin/mixer/mixer.c#3 integrate

Differences ...

==== //depot/projects/vap/ObsoleteFiles.inc#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -27,6 +27,8 @@
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
+# 20071201: Removal of XRPU driver
+OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
 OLD_FILES+=usr/lib/libkse.a

==== //depot/projects/vap/bin/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $
+# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $
 
 .include <bsd.own.mk>
 
@@ -37,7 +37,8 @@
 	sleep \
 	stty \
 	sync \
-	test
+	test \
+	uuidgen
 
 .if ${MK_RCMDS} != "no"
 _rcp=	rcp

==== //depot/projects/vap/bin/uuidgen/Makefile#2 (text+ko) ====

@@ -1,6 +1,4 @@
-# $FreeBSD: src/bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $
-
-BINDIR=	/bin
+# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $
 
 PROG=	uuidgen
 WARNS?=	6

==== //depot/projects/vap/contrib/cvs/ChangeLog#4 (text+ko) ====

@@ -1,3 +1,96 @@
+2008-03-10  Mark D. Baushke  <mdb at gnu.org>
+
+	* NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option.
+
+2008-01-30  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note improved join of removals.
+
+2008-01-27  Mark D. Baushke  <mdb at gnu.org>
+
+	* configure.in: Look for lshc rather than lsh to avoid problems
+	under Debian GNU/Linux.
+	* configure: Regenerated.
+
+	* configure.in: Add support for --with-ssh and CVS_SSH.
+	* NEWS: Note that :extssh: looks to CVS_SSH rather tha CVS_RSH.
+	* Makefile.in, config.h.in, configure: Regenerated.
+
+2008-01-24  Mark D. Baushke  <mdb at gnu.org>
+
+	* NEWS: Note that :extssh: method was fixed. New `cvs blame' as an
+	alias for `cvs annotate' command. New `cvs log -n' switch to undo
+	a `log -N' entry in a .cvsrc file.
+
+2007-12-14  Larry Jones  <lawrence.jones at siemens.com>
+
+	* configure.in: Add --disable-mmap.
+	* configure: Regenerated.
+
+2007-10-19  Derek Price  <derek at ximbiot.com>
+
+	* cvs.texinfo: Update Ximbiot's address and Copyright dates.
+
+2007-08-22  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note `cvs server' accepts `--allow-root=PATH'.  Note further
+	`cvs add' stops for `CVS' dirs.
+
+	* HACKING, NEWS: Note new Autotool versions.
+
+2007-08-16  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note backport of `cvs --allow-root=PATH server'.
+
+2007-06-18  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note import now keeps metadata to itself.
+
+2007-06-15  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note `cvs import CVS-/CVS' fix.
+
+2007-05-07  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note removal of remote `cvs init'.
+
+2006-09-06  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note apply_rcs_diff speedup.
+
+2006-08-28  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note strstr ("/./") assertion fix.
+
+2006-08-25  Derek Price  <derek at ximbiot.com>
+
+	* TODO (216): Removed.
+
+2006-08-24  Derek Price  <derek at ximbiot.com>
+
+	[bug #17032]
+	* NEWS: Note patch w/Name keyword fix.
+
+2006-07-17  Derek Price  <derek at ximbiot.com>
+
+	* FAQ, INSTALL, README: Update Copyright notice.
+	* HACKING: Ditto. Update Savannah URLs.
+
+2006-06-29  Derek Price  <derek at ximbiot.com>
+
+	* NEWS: Note trailing slash fix.
+
+2006-06-28  Larry Jones  <lawrence.jones at ugs.com>
+
+	* HACKING, NEWS: Note new Autoconf version.
+	* configure.in (AC_PREREQ): Require Autoconf 2.60.
+	* config.h.in, configure, **/Makefile.in: Regenerated.
+
+2006-06-28  Derek Price  <derek at ximbiot.com>
+
+	[bug #16961]
+	* NEWS: Note double-free fix.
+
 2006-06-09  Derek Price  <derek at ximbiot.com>
 
 	* NEWS: Note client/server conflict fix.

==== //depot/projects/vap/contrib/cvs/FAQ#4 (text+ko) ====

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------------------
 
-   CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+   CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
    CVS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

==== //depot/projects/vap/contrib/cvs/HACKING#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
 * License of CVS
 
-    CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+    CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,10 @@
 
 Patches against the development version of CVS are most likely to be accepted:
 
-    $ CVS_RSH=ssh cvs -d:ext:anoncvs at savannah.nongnu.org:/cvsroot/cvs co ccvs
+	$ cvs -z3 -d:pserver:anonymous at cvs.sv.nongnu.org:/sources/cvs co ccvs
+
+See the Savannah sources page <http://savannah.nongnu.org/cvs/?group=cvs> for
+more information.
 
 * Compiler options
 
@@ -145,8 +148,8 @@
 automatically aren't included in the generated Makefiles unless you run
 configure with the --enable-maintainer-mode option.
 
-The CVS Makefiles and configure script were built using Automake 1.9.6 and
-Autoconf 2.59, respectively.
+The CVS Makefiles and configure script were built using Automake 1.10 and
+Autoconf 2.61, respectively.
 
 There is a known bug in Autoconf 2.57 that will prevent the configure
 scripts it generates from working on some platforms.  Other combinations of

==== //depot/projects/vap/contrib/cvs/INSTALL#4 (text+ko) ====

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------------------
 
-CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
 
 CVS is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

==== //depot/projects/vap/contrib/cvs/Makefile.in#4 (text+ko) ====

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -28,15 +28,11 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -62,7 +58,7 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
@@ -70,10 +66,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -89,8 +88,6 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -111,6 +108,8 @@
 EDITOR = @EDITOR@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -122,11 +121,8 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
-MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
+MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -148,12 +144,13 @@
 TEXI2DVI = @TEXI2DVI@
 VERSION = @VERSION@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 ac_prefix_program = @ac_prefix_program@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -161,26 +158,38 @@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 includeopt = @includeopt@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 
 # Unix source subdirs, where we'll want to run lint and etags:
 # This is a legacy variable from b4 Automake
@@ -250,7 +259,7 @@
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -271,7 +280,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -304,8 +312,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -407,24 +414,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -438,7 +443,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -446,6 +451,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -453,7 +460,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -528,7 +535,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -597,12 +604,20 @@
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -623,24 +638,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-recursive distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr 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 install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 .PHONY: localcheck remotecheck

==== //depot/projects/vap/contrib/cvs/NEWS#4 (text+ko) ====

@@ -1,6 +1,68 @@
-Changes since 1.11.21:
+Changes since 1.11.22:
 **********************
 
+NEW FEATURES
+
+* A new log option -n reverts the -N option which may be in a .cvsrc
+  file.
+
+* The `cvs blame' command is now a synonym for the `cvs annotate' command.
+
+* The :extssh: method will use $CVS_SSH if set, or fall back on "ssh"
+  by default (but may be explicitly set using the --with-ssh flag to
+  configure).
+
+* There is a new IgnoreUnknownConfigKeys option available for
+  CVSROOT/config to aid in the transition to newer versions of CVS.
+
+BUG FIXES
+
+* Merges of file removals using -j options are a little smarter.
+
+* `cvs add' checks more thoroughly for `CVS' directories in the argument list.
+
+* `cvs server' now accepts `--allow-root=PATH' options.
+
+* `cvs import' no longer attempts to send CVS metadata to the server.
+
+* `cvs import' makes more of an effort not to import paths containing files
+  and directories named `CVS'.
+
+* The CVS server will no longer allow clients to run `cvs init'.
+
+* Applying diffs when checking out very old revisions has been reduced from an
+  O(n^2) operation to an O(n) thanks to a patch from Michael J. Smith
+  <msmith at ideorlando.org> and additional touch-up work from the CVS team.
+
+* Thanks to report from Paul Eggert <eggert at CS.UCLA.EDU>, an assertion failure
+  that could occur when "." was in the path (e.g. `cvs co /cvsroot/./module')
+  has been removed.
+
+* Thanks to a report from Peter Toft <pto at linuxbog.dk>, CVS server now sends
+  correct patch files more often when the RCS `Name' keyword is present in
+  a working file (bug #17302).
+
+* Thanks to a report from Dan Peterson <dbpete at aol.com>, clients now send the
+  right set of commands to the server when asked to update directories with
+  trailing slashes on their name.
+
+* Thanks to a report and patch from <mbarabas at redhat.com>, potential stack
+  corruption during pserver login is avoided (bug #16961).
+
+* The :extssh: method is now properly recognized as an alias for :ext:.
+
+DEVELOPER ISSUES
+
+* We've standardized on Autoconf version 2.61 to get a bug fix that notes
+  that the AIX C compiler's default mode isn't quite C89 and sets the
+  correct mode instead.
+
+* We've standardized on Autoconf version 1.10 because it lets us simplify our
+  sources.
+
+Changes from 1.11.21 to 1.11.22:
+********************************
+
 BUG FIXES
 
 * The CVS client again correctly reports files with conflicts when using

==== //depot/projects/vap/contrib/cvs/README#4 (text+ko) ====

@@ -1,8 +1,8 @@
 				CVS Kit

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


More information about the p4-projects mailing list