PERFORCE change 137433 for review

Peter Wemm peter at FreeBSD.org
Tue Mar 11 20:24:38 UTC 2008


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

Change 137433 by peter at peter_daintree on 2008/03/11 20:24:33

	IFC @137432

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#132 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#46 integrate
.. //depot/projects/hammer/UPDATING#113 integrate
.. //depot/projects/hammer/bin/chflags/chflags.1#14 integrate
.. //depot/projects/hammer/bin/chflags/chflags.c#8 integrate
.. //depot/projects/hammer/bin/cp/cp.1#11 integrate
.. //depot/projects/hammer/bin/cp/cp.c#15 integrate
.. //depot/projects/hammer/bin/cp/utils.c#11 integrate
.. //depot/projects/hammer/bin/realpath/realpath.1#5 integrate
.. //depot/projects/hammer/bin/realpath/realpath.c#4 integrate
.. //depot/projects/hammer/bin/uuidgen/Makefile#1 branch
.. //depot/projects/hammer/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/hammer/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#12 integrate
.. //depot/projects/hammer/etc/Makefile#61 integrate
.. //depot/projects/hammer/etc/ddb.conf#1 branch
.. //depot/projects/hammer/etc/defaults/rc.conf#83 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#59 integrate
.. //depot/projects/hammer/etc/rc.d/ddb#1 branch
.. //depot/projects/hammer/etc/rc.d/mountcritlocal#13 integrate
.. //depot/projects/hammer/etc/rc.d/mountlate#3 integrate
.. //depot/projects/hammer/etc/rc.d/root#14 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#77 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#8 integrate
.. //depot/projects/hammer/include/pthread_np.h#8 integrate
.. //depot/projects/hammer/include/unistd.h#21 integrate
.. //depot/projects/hammer/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.3#15 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read.3#26 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#17 integrate
.. //depot/projects/hammer/lib/libarchive/archive_util.3#8 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write.3#15 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_disk.3#2 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#11 integrate
.. //depot/projects/hammer/lib/libc/gen/sysconf.c#8 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac.c#8 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac_exec.c#3 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac_get.c#6 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac_set.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/fdopen.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/fopen.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/freopen.c#7 integrate
.. //depot/projects/hammer/lib/libc/stdlib/getenv.c#8 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#42 integrate
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#31 integrate
.. //depot/projects/hammer/lib/libc/sys/Symbol.map#6 integrate
.. //depot/projects/hammer/lib/libc/sys/fcntl.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/kldunload.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_close.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_getattr.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_notify.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_open.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_receive.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_send.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/mq_setattr.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/readlink.2#5 integrate
.. //depot/projects/hammer/lib/libelf/elf_update.c#3 integrate
.. //depot/projects/hammer/lib/libelf/gelf_rel.c#2 integrate
.. //depot/projects/hammer/lib/libelf/gelf_rela.c#2 integrate
.. //depot/projects/hammer/lib/libsdp/sdp.h#6 integrate
.. //depot/projects/hammer/lib/libthr/pthread.map#18 integrate
.. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#15 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#24 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#22 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#28 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#39 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#16 integrate
.. //depot/projects/hammer/lib/libutil/humanize_number.c#3 integrate
.. //depot/projects/hammer/lib/msun/Makefile#39 integrate
.. //depot/projects/hammer/lib/msun/Symbol.map#9 integrate
.. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#9 integrate
.. //depot/projects/hammer/lib/msun/amd64/e_sqrtl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/Makefile.inc#10 integrate
.. //depot/projects/hammer/lib/msun/i387/e_sqrtl.S#1 branch
.. //depot/projects/hammer/lib/msun/ld128/s_nanl.c#2 integrate
.. //depot/projects/hammer/lib/msun/man/sqrt.3#5 integrate
.. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#5 integrate
.. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#9 integrate
.. //depot/projects/hammer/lib/msun/src/e_sqrt.c#4 integrate
.. //depot/projects/hammer/lib/msun/src/e_sqrtl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/math.h#35 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#50 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#36 integrate
.. //depot/projects/hammer/sbin/ddb/ddb.8#2 integrate
.. //depot/projects/hammer/sbin/ddb/ddb.c#2 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/main.c#14 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#11 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#8 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/setup.c#14 integrate
.. //depot/projects/hammer/sbin/geom/Makefile#3 integrate
.. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#11 integrate
.. //depot/projects/hammer/sbin/geom/class/multipath/gmultipath.8#3 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.8#15 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.c#21 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#48 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#64 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#63 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#25 integrate
.. //depot/projects/hammer/sbin/newfs/mkfs.c#23 integrate
.. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#13 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#17 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#18 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#103 integrate
.. //depot/projects/hammer/share/man/man4/cmx.4#1 branch
.. //depot/projects/hammer/share/man/man4/ddb.4#13 integrate
.. //depot/projects/hammer/share/man/man4/fwohci.4#13 integrate
.. //depot/projects/hammer/share/man/man4/ng_nat.4#4 integrate
.. //depot/projects/hammer/share/man/man4/uchcom.4#1 branch
.. //depot/projects/hammer/share/man/man4/ucom.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ucycom.4#4 integrate
.. //depot/projects/hammer/share/man/man4/uscanner.4#19 integrate
.. //depot/projects/hammer/share/man/man4/uslcom.4#1 branch
.. //depot/projects/hammer/share/man/man4/vr.4#14 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#86 integrate
.. //depot/projects/hammer/share/man/man9/DEVICE_PROBE.9#9 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#79 integrate
.. //depot/projects/hammer/share/man/man9/bus_space.9#5 integrate
.. //depot/projects/hammer/share/man/man9/insmntque.9#1 branch
.. //depot/projects/hammer/share/man/man9/lock.9#13 integrate
.. //depot/projects/hammer/share/man/man9/vfs_mountedfrom.9#1 branch
.. //depot/projects/hammer/share/man/man9/vgone.9#5 integrate
.. //depot/projects/hammer/share/man/man9/vhold.9#5 integrate
.. //depot/projects/hammer/share/man/man9/vput.9#4 integrate
.. //depot/projects/hammer/share/man/man9/vref.9#7 integrate
.. //depot/projects/hammer/share/man/man9/vrefcnt.9#1 branch
.. //depot/projects/hammer/share/man/man9/vrele.9#5 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#42 integrate
.. //depot/projects/hammer/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/hammer/share/misc/committers-ports.dot#9 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#34 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#39 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#24 integrate
.. //depot/projects/hammer/share/mk/sys.mk#28 integrate
.. //depot/projects/hammer/share/zoneinfo/leapseconds#13 integrate
.. //depot/projects/hammer/share/zoneinfo/southamerica#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#59 integrate
.. //depot/projects/hammer/sys/amd64/amd64/legacy.c#23 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#130 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#174 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#105 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#66 integrate
.. //depot/projects/hammer/sys/amd64/include/smp.h#36 integrate
.. //depot/projects/hammer/sys/amd64/include/specialreg.h#28 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#50 integrate
.. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#5 integrate
.. //depot/projects/hammer/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/hammer/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/hammer/sys/arm/include/pmap.h#24 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#6 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#22 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#6 integrate
.. //depot/projects/hammer/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#15 integrate
.. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#6 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#8 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#11 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#12 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#38 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_futex.c#5 integrate
.. //depot/projects/hammer/sys/conf/NOTES#138 integrate
.. //depot/projects/hammer/sys/conf/files#174 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#29 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#67 integrate
.. //depot/projects/hammer/sys/conf/ldscript.powerpc#2 integrate
.. //depot/projects/hammer/sys/conf/options#123 integrate
.. //depot/projects/hammer/sys/conf/options.powerpc#10 integrate
.. //depot/projects/hammer/sys/ddb/db_command.c#22 integrate
.. //depot/projects/hammer/sys/ddb/db_examine.c#7 integrate
.. //depot/projects/hammer/sys/ddb/db_input.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#81 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#41 integrate
.. //depot/projects/hammer/sys/dev/agp/agp_nvidia.c#2 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#85 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#51 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#79 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#42 integrate
.. //depot/projects/hammer/sys/dev/cmx/cmx.c#1 branch
.. //depot/projects/hammer/sys/dev/cmx/cmx_pccard.c#1 branch
.. //depot/projects/hammer/sys/dev/cmx/cmxreg.h#1 branch
.. //depot/projects/hammer/sys/dev/cmx/cmxvar.h#1 branch
.. //depot/projects/hammer/sys/dev/cpufreq/ichss.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#16 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/hammer/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/hammer/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete
.. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/hammer/sys/dev/em/LICENSE#6 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82540.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82541.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82541.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82542.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82543.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82543.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82571.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_82575.c#4 delete
.. //depot/projects/hammer/sys/dev/em/e1000_82575.h#4 delete
.. //depot/projects/hammer/sys/dev/em/e1000_api.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_api.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_defines.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_hw.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_mac.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_manage.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_manage.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_nvm.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_osdep.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.c#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_phy.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/e1000_regs.h#4 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#72 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.h#36 integrate
.. //depot/projects/hammer/sys/dev/gem/if_gem.c#33 integrate
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate
.. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate
.. //depot/projects/hammer/sys/dev/hptrr/ldm.h#3 integrate
.. //depot/projects/hammer/sys/dev/hptrr/osm.h#3 integrate
.. //depot/projects/hammer/sys/dev/ic/quicc.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_82575.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_82575.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_api.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_api.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_defines.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_hw.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_mac.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_mac.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_manage.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_manage.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_nvm.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_nvm.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_osdep.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_phy.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_phy.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/e1000_regs.h#1 branch
.. //depot/projects/hammer/sys/dev/igb/if_igb.c#1 branch
.. //depot/projects/hammer/sys/dev/igb/if_igb.h#1 branch
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#37 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#65 integrate
.. //depot/projects/hammer/sys/dev/mii/brgphy.c#33 integrate
.. //depot/projects/hammer/sys/dev/mii/ciphy.c#7 integrate
.. //depot/projects/hammer/sys/dev/mii/miidevs#21 integrate
.. //depot/projects/hammer/sys/dev/mii/rgephy.c#9 integrate
.. //depot/projects/hammer/sys/dev/msk/if_msk.c#11 integrate
.. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#10 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#4 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfevar.h#5 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#50 integrate
.. //depot/projects/hammer/sys/dev/quicc/quicc_bfe.h#1 branch
.. //depot/projects/hammer/sys/dev/quicc/quicc_bfe_ocp.c#1 branch
.. //depot/projects/hammer/sys/dev/quicc/quicc_bus.h#1 branch
.. //depot/projects/hammer/sys/dev/quicc/quicc_core.c#1 branch
.. //depot/projects/hammer/sys/dev/re/if_re.c#57 integrate
.. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#5 integrate
.. //depot/projects/hammer/sys/dev/scc/scc_bfe_quicc.c#1 branch
.. //depot/projects/hammer/sys/dev/scc/scc_bus.h#2 integrate
.. //depot/projects/hammer/sys/dev/scc/scc_dev_quicc.c#1 branch
.. //depot/projects/hammer/sys/dev/tsec/if_tsec.c#1 branch
.. //depot/projects/hammer/sys/dev/tsec/if_tsec.h#1 branch
.. //depot/projects/hammer/sys/dev/tsec/if_tsecreg.h#1 branch
.. //depot/projects/hammer/sys/dev/uart/uart.h#7 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_ocp.c#1 branch
.. //depot/projects/hammer/sys/dev/uart/uart_bus_scc.c#2 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_powerpc.c#5 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_quicc.c#1 branch
.. //depot/projects/hammer/sys/dev/usb/ehci.c#32 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axe.c#38 integrate
.. //depot/projects/hammer/sys/dev/usb/ubsa.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#95 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#28 integrate
.. //depot/projects/hammer/sys/dev/usb/uslcom.c#1 branch
.. //depot/projects/hammer/sys/dev/vr/if_vr.c#1 branch
.. //depot/projects/hammer/sys/dev/vr/if_vrreg.h#1 branch
.. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#5 integrate
.. //depot/projects/hammer/sys/dev/wpi/if_wpireg.h#3 integrate
.. //depot/projects/hammer/sys/dev/wpi/if_wpivar.h#2 integrate
.. //depot/projects/hammer/sys/fs/coda/TODO#3 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#22 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#18 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_subr.c#8 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#8 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#25 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#27 integrate
.. //depot/projects/hammer/sys/gdb/gdb_main.c#8 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#1 branch
.. //depot/projects/hammer/sys/i386/conf/GENERIC#63 integrate
.. //depot/projects/hammer/sys/i386/cpufreq/est.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/i686_mem.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#42 integrate
.. //depot/projects/hammer/sys/i386/i386/legacy.c#15 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#72 integrate
.. //depot/projects/hammer/sys/i386/include/_types.h#11 integrate
.. //depot/projects/hammer/sys/i386/include/float.h#9 integrate
.. //depot/projects/hammer/sys/i386/include/smp.h#19 integrate
.. //depot/projects/hammer/sys/i386/include/specialreg.h#16 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#21 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#53 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#65 integrate
.. //depot/projects/hammer/sys/kern/kern_cpuset.c#1 branch
.. //depot/projects/hammer/sys/kern/kern_descrip.c#76 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#38 integrate
.. //depot/projects/hammer/sys/kern/kern_priv.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#51 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#87 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#65 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#104 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#57 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#92 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#58 integrate
.. //depot/projects/hammer/sys/kern/subr_smp.c#34 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#68 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#63 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#65 integrate
.. //depot/projects/hammer/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#85 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#125 integrate
.. //depot/projects/hammer/sys/kern/vnode_if.src#26 integrate
.. //depot/projects/hammer/sys/modules/Makefile#121 integrate
.. //depot/projects/hammer/sys/modules/cmx/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/cxgb/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/em/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/geom/Makefile#18 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_apple/Makefile#2 delete
.. //depot/projects/hammer/sys/modules/geom/geom_gpt/Makefile#2 delete
.. //depot/projects/hammer/sys/modules/geom/geom_part/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/igb/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ipfw_nat/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/uslcom/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/vr/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/zfs/Makefile#7 integrate
.. //depot/projects/hammer/sys/net/bpf_filter.c#9 integrate
.. //depot/projects/hammer/sys/net/if.c#72 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#70 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#29 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#7 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#55 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#24 integrate
.. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#14 integrate
.. //depot/projects/hammer/sys/netgraph/ng_nat.c#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_nat.h#3 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#28 integrate
.. //depot/projects/hammer/sys/netinet/in.h#27 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#53 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#47 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#32 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#92 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw_nat.c#1 branch
.. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#19 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias.c#5 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#6 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#6 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#6 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#5 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#7 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_smedia.c#5 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#82 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#49 integrate
.. //depot/projects/hammer/sys/netipsec/key.c#18 integrate
.. //depot/projects/hammer/sys/netipsec/key_debug.c#6 integrate
.. //depot/projects/hammer/sys/netncp/ncp_conn.h#4 integrate
.. //depot/projects/hammer/sys/netsmb/smb_conn.h#7 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_idmap.c#6 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#54 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#39 integrate
.. //depot/projects/hammer/sys/pc98/cbus/sio.c#13 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#49 integrate
.. //depot/projects/hammer/sys/pc98/pc98/machdep.c#22 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#59 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#31 integrate
.. //depot/projects/hammer/sys/pci/if_vr.c#47 delete
.. //depot/projects/hammer/sys/pci/if_vrreg.h#13 delete
.. //depot/projects/hammer/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/hammer/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/hammer/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/aim/trap_subr.S#2 integrate
.. //depot/projects/hammer/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/booke/clock.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/copyinout.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/interrupt.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/locore.S#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/pmap.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/support.S#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/swtch.S#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/trap.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/trap_subr.S#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/uio_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/booke/vm_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#1 branch
.. //depot/projects/hammer/sys/powerpc/conf/NOTES#9 integrate
.. //depot/projects/hammer/sys/powerpc/include/frame.h#7 integrate
.. //depot/projects/hammer/sys/powerpc/include/hid.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#12 integrate
.. //depot/projects/hammer/sys/powerpc/include/kdb.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/md_var.h#9 integrate
.. //depot/projects/hammer/sys/powerpc/include/mmuvar.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/ocpbus.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/openpicvar.h#8 integrate
.. //depot/projects/hammer/sys/powerpc/include/pcb.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/pcpu.h#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/pmap.h#13 integrate
.. //depot/projects/hammer/sys/powerpc/include/psl.h#4 integrate
.. //depot/projects/hammer/sys/powerpc/include/pte.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/sf_buf.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/spr.h#7 integrate
.. //depot/projects/hammer/sys/powerpc/include/tlb.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/trap.h#4 integrate
.. //depot/projects/hammer/sys/powerpc/include/trap_aim.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/trap_booke.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/vmparam.h#10 integrate
.. //depot/projects/hammer/sys/powerpc/mpc85xx/nexus.c#1 branch
.. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.c#1 branch
.. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.h#1 branch
.. //depot/projects/hammer/sys/powerpc/mpc85xx/opic.c#1 branch
.. //depot/projects/hammer/sys/powerpc/mpc85xx/pci_ocp.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/autoconf.c#8 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#9 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/gdb_machdep.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#14 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#16 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pic_if.m#6 integrate
.. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#9 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#15 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#10 integrate
.. //depot/projects/hammer/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#12 integrate
.. //depot/projects/hammer/sys/security/audit/audit_trigger.c#6 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#59 integrate
.. //depot/projects/hammer/sys/sparc64/include/tlb.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/cache.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/cheetah.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#23 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#22 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#51 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/spitfire.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/tlb.c#6 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/mp_machdep.c#5 integrate
.. //depot/projects/hammer/sys/sys/_types.h#17 integrate
.. //depot/projects/hammer/sys/sys/buf.h#35 integrate
.. //depot/projects/hammer/sys/sys/bufobj.h#10 integrate
.. //depot/projects/hammer/sys/sys/bus.h#26 integrate
.. //depot/projects/hammer/sys/sys/cpuset.h#1 branch
.. //depot/projects/hammer/sys/sys/fcntl.h#6 integrate
.. //depot/projects/hammer/sys/sys/lockmgr.h#18 integrate
.. //depot/projects/hammer/sys/sys/mount.h#52 integrate
.. //depot/projects/hammer/sys/sys/param.h#106 integrate
.. //depot/projects/hammer/sys/sys/pcpu.h#17 integrate
.. //depot/projects/hammer/sys/sys/proc.h#115 integrate
.. //depot/projects/hammer/sys/sys/sched.h#24 integrate
.. //depot/projects/hammer/sys/sys/smp.h#15 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#62 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#62 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#63 integrate
.. //depot/projects/hammer/sys/sys/types.h#25 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#76 integrate
.. //depot/projects/hammer/sys/sys/vtoc.h#1 branch
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#50 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#72 integrate
.. //depot/projects/hammer/sys/ufs/ufs/extattr.h#6 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#27 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#51 integrate
.. //depot/projects/hammer/sys/vm/vm_map.h#23 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#75 integrate
.. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate
.. //depot/projects/hammer/tools/regression/environ/envctl.c#3 integrate
.. //depot/projects/hammer/tools/regression/file/dup/dup.c#2 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-trig.c#2 integrate
.. //depot/projects/hammer/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/hammer/usr.bin/Makefile#59 integrate
.. //depot/projects/hammer/usr.bin/ar/ar.1#4 integrate
.. //depot/projects/hammer/usr.bin/ar/ar.c#5 integrate
.. //depot/projects/hammer/usr.bin/ar/ar.h#2 integrate
.. //depot/projects/hammer/usr.bin/ar/write.c#3 integrate
.. //depot/projects/hammer/usr.bin/awk/Makefile#7 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#61 integrate
.. //depot/projects/hammer/usr.bin/chat/chat.c#5 integrate
.. //depot/projects/hammer/usr.bin/cpuset/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#1 branch
.. //depot/projects/hammer/usr.bin/cpuset/cpuset.c#1 branch
.. //depot/projects/hammer/usr.bin/find/find.1#25 integrate
.. //depot/projects/hammer/usr.bin/find/main.c#3 integrate
.. //depot/projects/hammer/usr.bin/gzip/gzip.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/Makefile#23 integrate
.. //depot/projects/hammer/usr.bin/make/Makefile.dist#5 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#20 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#31 integrate
.. //depot/projects/hammer/usr.bin/make/main.c#43 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#32 integrate
.. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#9 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#86 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#13 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#6 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/gn.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/nap.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/panu.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#2 integrate
.. //depot/projects/hammer/usr.sbin/fifolog/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/Makefile.inc#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/flint.lnt#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog.h#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_create.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_int.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write.h#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/getdate.y#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/libfifolog.h#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch
.. //depot/projects/hammer/usr.sbin/fifolog/lib/miniobj.h#1 branch
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#15 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#14 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#23 integrate
.. //depot/projects/hammer/usr.sbin/moused/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.c#20 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#22 integrate

Differences ...

==== //depot/projects/hammer/Makefile.inc1#132 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -203,6 +203,9 @@
 		GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
+.if ${OSRELDATE} < 700044
+CROSSENV+=	AR=gnu-ar RANLIB=gnu-ranlib
+.endif
 
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -227,7 +230,7 @@
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-DWITHOUT_FORTRAN -DWITHOUT_GDB
+		-DWITHOUT_GDB
 
 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -313,8 +316,9 @@
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
-#	XXX - These two can depend on any header file.
+#	XXX - These three can depend on any header file.
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
+	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
@@ -853,8 +857,8 @@
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 503000
-	@echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \
+.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -883,23 +887,11 @@
 .endif
 .endif
 
-.if ${BOOTSTRAPPING} < 600029
-_texinfo=	gnu/usr.bin/texinfo
+.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+_ar=		usr.bin/ar
 .endif
 
-.if ${BOOTSTRAPPING} < 600015
-_cap_mkdb=	usr.bin/cap_mkdb
-.endif
-
-.if ${BOOTSTRAPPING} < 600018
-_colldef=	usr.bin/colldef
-.endif
-
-.if ${BOOTSTRAPPING} < 600017
-_gencat=	usr.bin/gencat
-.endif
-
-.if ${BOOTSTRAPPING} < 600016
+.if ${BOOTSTRAPPING} < 800013
 _mklocale=	usr.bin/mklocale
 .endif
 
@@ -912,19 +904,12 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} < 600020
-_pwd_mkdb=	usr.sbin/pwd_mkdb
-.endif
-
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
-    ${_texinfo} \
-    ${_cap_mkdb} \
-    ${_colldef} \
-    ${_gencat} \
+    ${_ar} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     ${_mklocale} \
@@ -932,8 +917,7 @@
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
-    ${_crunchgen} \
-    ${_pwd_mkdb}
+    ${_crunchgen}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \

==== //depot/projects/hammer/ObsoleteFiles.inc#46 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -32,6 +32,11 @@
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libkse.a
+OLD_FILES+=usr/lib32/libkse_p.a
+OLD_FILES+=usr/lib32/libkse_pic.a
+.endif
 .endif
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
@@ -134,6 +139,12 @@
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libatm.a
+OLD_FILES+=usr/lib32/libatm.so
+OLD_LIBS+=usr/lib32/libatm.so.5
+OLD_FILES+=usr/lib32/libatm_p.a
+.endif
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
@@ -224,6 +235,42 @@
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libalias.so.5
+OLD_LIBS+=usr/lib32/libbsnmp.so.3
+OLD_LIBS+=usr/lib32/libdialog.so.5
+OLD_LIBS+=usr/lib32/libgnuregex.so.3
+OLD_LIBS+=usr/lib32/libhistory.so.6
+OLD_LIBS+=usr/lib32/libncurses.so.6
+OLD_LIBS+=usr/lib32/libncursesw.so.6
+OLD_LIBS+=usr/lib32/libpam.so.3
+OLD_LIBS+=usr/lib32/libreadline.so.6
+OLD_LIBS+=usr/lib32/libssh.so.3
+OLD_LIBS+=usr/lib32/pam_chroot.so.3
+OLD_LIBS+=usr/lib32/pam_deny.so.3
+OLD_LIBS+=usr/lib32/pam_echo.so.3
+OLD_LIBS+=usr/lib32/pam_exec.so.3
+OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
+OLD_LIBS+=usr/lib32/pam_group.so.3
+OLD_LIBS+=usr/lib32/pam_guest.so.3
+OLD_LIBS+=usr/lib32/pam_krb5.so.3
+OLD_LIBS+=usr/lib32/pam_ksu.so.3
+OLD_LIBS+=usr/lib32/pam_lastlog.so.3
+OLD_LIBS+=usr/lib32/pam_login_access.so.3
+OLD_LIBS+=usr/lib32/pam_nologin.so.3
+OLD_LIBS+=usr/lib32/pam_opie.so.3
+OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
+OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
+OLD_LIBS+=usr/lib32/pam_permit.so.3
+OLD_LIBS+=usr/lib32/pam_radius.so.3
+OLD_LIBS+=usr/lib32/pam_rhosts.so.3
+OLD_LIBS+=usr/lib32/pam_rootok.so.3
+OLD_LIBS+=usr/lib32/pam_securetty.so.3
+OLD_LIBS+=usr/lib32/pam_self.so.3
+OLD_LIBS+=usr/lib32/pam_ssh.so.3
+OLD_LIBS+=usr/lib32/pam_tacplus.so.3
+OLD_LIBS+=usr/lib32/pam_unix.so.3
+.endif
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
@@ -603,6 +650,9 @@
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libarchive.so.3
+.endif
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz

==== //depot/projects/hammer/UPDATING#113 (text+ko) ====

@@ -22,6 +22,20 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080301:
+	The layout of struct vmspace has changed. This affects libkvm
+	and any executables that link against libkvm and use the
+	kvm_getprocs() function. In particular, but not exclusively,
+	it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1).
+	The effects are minimal, but it's advisable to upgrade world
+	nonetheless.
+
+20080229:
+	The latest em driver no longer has support in it for the
+	82575 adapter, this is now moved to the igb driver. The
+	split was done to make new features that are incompatible
+	with older hardware easier to do.
+
 20080220:
 	The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4),
 	likewise the kernel option is now GEOM_LINUX_LVM.
@@ -983,4 +997,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $

==== //depot/projects/hammer/bin/chflags/chflags.1#14 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
@@ -40,7 +40,7 @@
 .Nd change file flags
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl fhv
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -57,6 +57,12 @@
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the flags for
+.Va file ,
+nor modify the exit status to reflect such failures.
 .It Fl H
 If the
 .Fl R
@@ -79,6 +85,14 @@
 .It Fl R
 Change the file flags for the file hierarchies rooted
 in the files instead of just the files themselves.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing filenames as the flags are modified.
+If the
+.Fl v
+option is specified more than once, the old and new flags of the file
+will also be printed, in octal notation.
 .El
 .Pp
 The flags are specified as an octal number or a comma separated list

==== //depot/projects/hammer/bin/chflags/chflags.c#8 (text+ko) ====

@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $");
+__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -60,14 +60,15 @@
 {
 	FTS *ftsp;
 	FTSENT *p;
-	u_long clear, set;
+	u_long clear, newflags, set;
 	long val;
-	int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval;
+	int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+	int ch, fts_options, oct, rval;
 	char *flags, *ep;
 	int (*change_flags)(const char *, unsigned long);
 
-	Hflag = Lflag = Rflag = hflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRh")) != -1)
+	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -83,9 +84,15 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'f':
+			fflag = 1;
+			break;
 		case 'h':
 			hflag = 1;
 			break;
+		case 'v':
+			vflag++;
+			break;
 		case '?':
 		default:
 			usage();
@@ -166,18 +173,23 @@
 		default:
 			break;
 		}
-		if (oct) {
-			if (!(*change_flags)(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!(*change_flags)(p->fts_accpath,
-				    (u_long)p->fts_statp->st_flags))
-				continue;
+		if (oct)
+			newflags = set;
+		else
+			newflags = (p->fts_statp->st_flags | set) & clear;
+		if (newflags == p->fts_statp->st_flags)
+			continue;
+		if ((*change_flags)(p->fts_accpath, newflags) && !fflag) {
+			warn("%s", p->fts_path);
+			rval = 1;
+		} else if (vflag) {
+			(void)printf("%s", p->fts_path);
+			if (vflag > 1)
+				(void)printf(": 0%lo -> 0%lo",
+				    (u_long)p->fts_statp->st_flags,
+				    newflags);
+			(void)printf("\n");
 		}
-		warn("%s", p->fts_path);
-		rval = 1;
 	}
 	if (errno)
 		err(1, "fts_read");
@@ -188,6 +200,6 @@
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n");
+	    "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n");
 	exit(1);
 }

==== //depot/projects/hammer/bin/cp/cp.1#11 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $
 .\"
 .Dd October 27, 2006
 .Dt CP 1
@@ -45,7 +45,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl lpv
+.Op Fl alpv
 .Ar source_file target_file
 .Nm
 .Oo
@@ -53,7 +53,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i | n
-.Op Fl lpv
+.Op Fl alpv
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
@@ -116,6 +116,10 @@
 or
 .Xr pax 1
 instead.
+.It Fl a
+Archive mode.
+Same as
+.Fl RpP .
 .It Fl f
 For each existing destination pathname, remove it and
 create a new file, without prompting for confirmation

==== //depot/projects/hammer/bin/cp/cp.c#15 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $");
 
 /*
  * Cp copies source files to target files.
@@ -102,7 +102,7 @@
 	char *target;
 
 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1)
+	while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -119,6 +119,12 @@
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'a':
+			Pflag = 1;
+			pflag = 1;
+			Rflag = 1;
+			Hflag = Lflag = 0;
+			break;
 		case 'f':

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


More information about the p4-projects mailing list