PERFORCE change 87392 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 28 23:22:54 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=87392
Change 87392 by peter at peter_daintree on 2005/11/28 23:22:13
IFC @87383
Affected files ...
.. //depot/projects/hammer/Makefile#36 integrate
.. //depot/projects/hammer/Makefile.inc1#108 integrate
.. //depot/projects/hammer/bin/date/date.1#14 integrate
.. //depot/projects/hammer/bin/kenv/kenv.1#5 integrate
.. //depot/projects/hammer/bin/ls/ls.1#24 integrate
.. //depot/projects/hammer/bin/ls/ls.c#16 integrate
.. //depot/projects/hammer/bin/ls/util.c#10 integrate
.. //depot/projects/hammer/bin/rm/rm.1#13 integrate
.. //depot/projects/hammer/bin/sh/sh.1#22 integrate
.. //depot/projects/hammer/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete
.. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mntopts.h#2 delete
.. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 integrate
.. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#6 integrate
.. //depot/projects/hammer/etc/Makefile#44 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#63 integrate
.. //depot/projects/hammer/etc/network.subr#14 integrate
.. //depot/projects/hammer/etc/periodic/daily/470.status-named#5 integrate
.. //depot/projects/hammer/etc/rc.d/hcsecd#2 integrate
.. //depot/projects/hammer/etc/rc.d/netif#14 integrate
.. //depot/projects/hammer/etc/rc.d/sdpd#2 integrate
.. //depot/projects/hammer/etc/rc.firewall#4 integrate
.. //depot/projects/hammer/etc/rc.subr#29 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#53 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#24 integrate
.. //depot/projects/hammer/gnu/usr.bin/man/apropos/apropos.man#5 integrate
.. //depot/projects/hammer/include/Makefile#50 integrate
.. //depot/projects/hammer/include/kenv.h#2 integrate
.. //depot/projects/hammer/include/mqueue.h#1 branch
.. //depot/projects/hammer/include/string.h#9 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.3#10 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read.3#18 integrate
.. //depot/projects/hammer/lib/libarchive/archive_util.3#4 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write.3#10 integrate
.. //depot/projects/hammer/lib/libarchive/configure.ac.in#9 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#9 integrate
.. //depot/projects/hammer/lib/libc/gen/ftw.3#3 integrate
.. //depot/projects/hammer/lib/libc/gen/getcap.3#5 integrate
.. //depot/projects/hammer/lib/libc/gen/pwcache.3#2 integrate
.. //depot/projects/hammer/lib/libc/gmon/moncontrol.3#4 integrate
.. //depot/projects/hammer/lib/libc/locale/isalnum.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isalpha.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isblank.3#8 integrate
.. //depot/projects/hammer/lib/libc/locale/iscntrl.3#7 integrate
.. //depot/projects/hammer/lib/libc/locale/isdigit.3#7 integrate
.. //depot/projects/hammer/lib/libc/locale/isgraph.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/islower.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isprint.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/ispunct.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isspace.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isupper.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/isxdigit.3#8 integrate
.. //depot/projects/hammer/lib/libc/locale/tolower.3#5 integrate
.. //depot/projects/hammer/lib/libc/locale/toupper.3#5 integrate
.. //depot/projects/hammer/lib/libc/net/if_indextoname.3#3 integrate
.. //depot/projects/hammer/lib/libc/net/inet6_opt_init.3#6 integrate
.. //depot/projects/hammer/lib/libc/net/name6.c#19 integrate
.. //depot/projects/hammer/lib/libc/posix1e/acl_get_entry.3#5 integrate
.. //depot/projects/hammer/lib/libc/posix1e/posix1e.3#5 integrate
.. //depot/projects/hammer/lib/libc/rpc/publickey.3#3 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_clnt_create.3#6 integrate
.. //depot/projects/hammer/lib/libc/rpc/rpc_svc_calls.3#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/getc.3#6 integrate
.. //depot/projects/hammer/lib/libc/stdio/getwc.3#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.3#6 integrate
.. //depot/projects/hammer/lib/libc/string/memmem.3#2 integrate
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#18 integrate
.. //depot/projects/hammer/lib/libc/sys/clock_gettime.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/intro.2#11 integrate
.. //depot/projects/hammer/lib/libc/sys/kse.2#9 integrate
.. //depot/projects/hammer/lib/libc/sys/mmap.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/mq.c#1 branch
.. //depot/projects/hammer/lib/libc/sys/nfssvc.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/read.2#13 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#10 integrate
.. //depot/projects/hammer/lib/libc/sys/sendfile.2#13 integrate
.. //depot/projects/hammer/lib/libc/sys/sigqueue.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/sigwait.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/timer_create.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/timer_delete.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/timer_settime.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/wait.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/write.2#10 integrate
.. //depot/projects/hammer/lib/libc/uuid/uuid.3#5 integrate
.. //depot/projects/hammer/lib/libc/xdr/xdr.3#3 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.3#10 integrate
.. //depot/projects/hammer/lib/libedit/editline.3#9 integrate
.. //depot/projects/hammer/lib/libedit/editrc.5#5 integrate
.. //depot/projects/hammer/lib/libgeom/libgeom.3#5 integrate
.. //depot/projects/hammer/lib/libmd/sha256.3#4 integrate
.. //depot/projects/hammer/lib/libmemstat/libmemstat.3#6 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.3#7 integrate
.. //depot/projects/hammer/lib/libpmc/pmclog.3#4 integrate
.. //depot/projects/hammer/lib/libpthread/test/guard_b.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/test/mutex_d.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#3 integrate
.. //depot/projects/hammer/lib/libstand/libstand.3#9 integrate
.. //depot/projects/hammer/lib/libusbhid/usbhid.3#7 integrate
.. //depot/projects/hammer/lib/libutil/login_cap.3#7 integrate
.. //depot/projects/hammer/lib/libutil/pidfile.3#3 integrate
.. //depot/projects/hammer/lib/libutil/property.c#5 integrate
.. //depot/projects/hammer/lib/msun/bsdsrc/mathimpl.h#5 integrate
.. //depot/projects/hammer/lib/msun/man/fma.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/ieee_test.3#4 integrate
.. //depot/projects/hammer/lib/msun/man/ilogb.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/math.3#14 integrate
.. //depot/projects/hammer/lib/msun/man/remainder.3#4 integrate
.. //depot/projects/hammer/lib/msun/man/scalbn.3#3 integrate
.. //depot/projects/hammer/lib/msun/src/e_lgammaf_r.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#6 integrate
.. //depot/projects/hammer/lib/msun/src/k_cosf.c#6 integrate
.. //depot/projects/hammer/lib/msun/src/k_sinf.c#5 integrate
.. //depot/projects/hammer/lib/msun/src/k_tanf.c#5 integrate
.. //depot/projects/hammer/lib/msun/src/math_private.h#7 integrate
.. //depot/projects/hammer/lib/msun/src/s_cosf.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_sinf.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_tanf.c#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#82 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#34 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.dsl#5 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#8 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#11 integrate
.. //depot/projects/hammer/sbin/devd/devd.8#12 integrate
.. //depot/projects/hammer/sbin/devd/devd.cc#18 integrate
.. //depot/projects/hammer/sbin/geom/class/eli/geli.8#4 integrate
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.8#5 integrate
.. //depot/projects/hammer/sbin/gpt/gpt.8#12 integrate
.. //depot/projects/hammer/sbin/gvinum/Makefile#4 integrate
.. //depot/projects/hammer/sbin/gvinum/gvinum.8#1 branch
.. //depot/projects/hammer/sbin/gvinum/gvinum.c#5 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#31 integrate
.. //depot/projects/hammer/sbin/init/init.8#15 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#48 integrate
.. //depot/projects/hammer/sbin/kldload/kldload.8#6 integrate
.. //depot/projects/hammer/sbin/kldstat/kldstat.8#5 integrate
.. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#6 integrate
.. //depot/projects/hammer/sbin/mount/Makefile#7 integrate
.. //depot/projects/hammer/sbin/mount/extern.h#4 integrate
.. //depot/projects/hammer/sbin/mount/getmntopts.3#4 integrate
.. //depot/projects/hammer/sbin/mount/mount.c#20 integrate
.. //depot/projects/hammer/sbin/mount/mount_ufs.c#7 delete
.. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.8#11 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#12 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#11 integrate
.. //depot/projects/hammer/sbin/mount_nullfs/Makefile#3 integrate
.. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.c#7 integrate
.. //depot/projects/hammer/sbin/mount_std/Makefile#3 integrate
.. //depot/projects/hammer/sbin/mount_ufs/Makefile#3 delete
.. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#5 delete
.. //depot/projects/hammer/sbin/ping/ping.8#9 integrate
.. //depot/projects/hammer/sbin/reboot/Makefile#5 integrate
.. //depot/projects/hammer/sbin/reboot/boot_i386.8#16 integrate
.. //depot/projects/hammer/sbin/sysctl/sysctl.8#12 integrate
.. //depot/projects/hammer/secure/lib/libssl/Makefile#11 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#43 integrate
.. //depot/projects/hammer/share/man/man3/pthread_barrier_destroy.3#5 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#79 integrate
.. //depot/projects/hammer/share/man/man4/ataraid.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ath.4#29 integrate
.. //depot/projects/hammer/share/man/man4/bge.4#18 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#11 integrate
.. //depot/projects/hammer/share/man/man4/cardbus.4#4 integrate
.. //depot/projects/hammer/share/man/man4/dcons.4#6 integrate
.. //depot/projects/hammer/share/man/man4/de.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ed.4#13 integrate
.. //depot/projects/hammer/share/man/man4/em.4#13 integrate
.. //depot/projects/hammer/share/man/man4/fwip.4#6 integrate
.. //depot/projects/hammer/share/man/man4/geom.4#9 integrate
.. //depot/projects/hammer/share/man/man4/hptmv.4#5 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#10 integrate
.. //depot/projects/hammer/share/man/man4/icmp.4#8 integrate
.. //depot/projects/hammer/share/man/man4/if_bridge.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ip.4#18 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#6 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#7 integrate
.. //depot/projects/hammer/share/man/man4/kbdmux.4#3 integrate
.. //depot/projects/hammer/share/man/man4/lmc.4#5 integrate
.. //depot/projects/hammer/share/man/man4/mac_seeotheruids.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_ibm.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_sony.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#15 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#17 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ex.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#13 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/linux.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#9 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/perfmon.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ray.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/vx.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ng_iface.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#10 integrate
.. //depot/projects/hammer/share/man/man4/nve.4#6 integrate
.. //depot/projects/hammer/share/man/man4/pccard.4#5 integrate
.. //depot/projects/hammer/share/man/man4/pccbb.4#8 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#15 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_ad1816.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_als4000.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_atiixp.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_cmi.4#6 integrate
.. //depot/projects/hammer/share/man/man4/snd_cs4281.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_ds1.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#7 integrate
.. //depot/projects/hammer/share/man/man4/snd_es137x.4#7 integrate
.. //depot/projects/hammer/share/man/man4/snd_ess.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_fm801.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_mss.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_neomagic.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_solo.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_t4dwave.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_via8233.4#3 integrate
.. //depot/projects/hammer/share/man/man4/snd_via82c686.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_vibes.4#2 integrate
.. //depot/projects/hammer/share/man/man4/txp.4#10 integrate
.. //depot/projects/hammer/share/man/man4/ural.4#6 integrate
.. //depot/projects/hammer/share/man/man4/wi.4#25 integrate
.. //depot/projects/hammer/share/man/man4/wlan.4#8 integrate
.. //depot/projects/hammer/share/man/man4/xe.4#10 integrate
.. //depot/projects/hammer/share/man/man5/disktab.5#7 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#41 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#65 integrate
.. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#2 integrate
.. //depot/projects/hammer/share/man/man7/build.7#12 integrate
.. //depot/projects/hammer/share/man/man8/diskless.8#12 integrate
.. //depot/projects/hammer/share/man/man9/VFS_LOCK_GIANT.9#2 integrate
.. //depot/projects/hammer/share/man/man9/alloc_unr.9#3 integrate
.. //depot/projects/hammer/share/man/man9/atomic.9#4 integrate
.. //depot/projects/hammer/share/man/man9/bios.9#5 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#20 integrate
.. //depot/projects/hammer/share/man/man9/device_add_child.9#8 integrate
.. //depot/projects/hammer/share/man/man9/device_get_softc.9#7 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#24 integrate
.. //depot/projects/hammer/share/man/man9/namei.9#7 integrate
.. //depot/projects/hammer/share/man/man9/timeout.9#12 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#25 integrate
.. //depot/projects/hammer/share/mk/bsd.prog.mk#15 integrate
.. //depot/projects/hammer/share/monetdef/he_IL.UTF-8.src#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/clock.c#10 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#48 integrate
.. //depot/projects/hammer/sys/alpha/conf/DEFAULTS#1 branch
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#32 integrate
.. //depot/projects/hammer/sys/alpha/conf/NOTES#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#33 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#35 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#46 integrate
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#41 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#44 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#147 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#110 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#130 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#81 integrate
.. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#84 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#89 integrate
.. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#4 integrate
.. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/hammer/sys/arm/arm/identcpu.c#5 integrate
.. //depot/projects/hammer/sys/arm/arm/machdep.c#16 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#28 integrate
.. //depot/projects/hammer/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/hammer/sys/arm/include/elf.h#4 integrate
.. //depot/projects/hammer/sys/arm/include/pmap.h#14 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#28 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf.5#8 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#21 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#29 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#38 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#39 integrate
.. //depot/projects/hammer/sys/conf/Makefile.alpha#12 integrate
.. //depot/projects/hammer/sys/conf/Makefile.amd64#21 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#14 integrate
.. //depot/projects/hammer/sys/conf/Makefile.i386#10 integrate
.. //depot/projects/hammer/sys/conf/Makefile.ia64#12 integrate
.. //depot/projects/hammer/sys/conf/Makefile.pc98#10 integrate
.. //depot/projects/hammer/sys/conf/Makefile.powerpc#16 integrate
.. //depot/projects/hammer/sys/conf/Makefile.sparc64#11 integrate
.. //depot/projects/hammer/sys/conf/files#131 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#23 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#80 integrate
.. //depot/projects/hammer/sys/conf/files.i386#67 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#33 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#50 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#15 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#33 integrate
.. //depot/projects/hammer/sys/conf/ldscript.arm#3 integrate
.. //depot/projects/hammer/sys/conf/options#88 integrate
.. //depot/projects/hammer/sys/conf/options.i386#42 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#38 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#15 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#24 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#31 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#2 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#9 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#26 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#55 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#34 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#32 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#5 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#39 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#9 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athvar.h#20 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#56 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#27 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#53 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.h#27 integrate
.. //depot/projects/hammer/sys/dev/em/if_em_hw.c#15 integrate
.. //depot/projects/hammer/sys/dev/em/if_em_hw.h#16 integrate
.. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#17 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#31 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#4 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#12 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#13 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#6 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#7 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#30 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lgereg.h#6 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.h#6 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/hammer/sys/dev/nve/if_nve.c#13 integrate
.. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#4 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_bus_if.m#3 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.c#1 branch
.. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.h#1 branch
.. //depot/projects/hammer/sys/dev/ofw/openfirm.c#8 integrate
.. //depot/projects/hammer/sys/dev/owi/if_ieee80211.h#2 delete
.. //depot/projects/hammer/sys/dev/owi/if_owi.c#13 delete
.. //depot/projects/hammer/sys/dev/owi/if_owi_pccard.c#8 delete
.. //depot/projects/hammer/sys/dev/owi/if_wireg.h#3 delete
.. //depot/projects/hammer/sys/dev/owi/if_wivar.h#5 delete
.. //depot/projects/hammer/sys/dev/puc/puc.c#19 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral.c#11 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#37 integrate
.. //depot/projects/hammer/sys/dev/sound/driver.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#1 branch
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.h#1 branch
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#24 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#18 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#16 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/if_ural.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci.c#22 integrate
.. //depot/projects/hammer/sys/dev/usb/ohcivar.h#9 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#33 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#37 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#10 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#21 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#34 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.h#4 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#20 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#34 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#14 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#8 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#15 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_move.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rename.c#1 branch
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#8 integrate
.. //depot/projects/hammer/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#42 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#81 integrate
.. //depot/projects/hammer/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/hammer/sys/i386/i386/apic_vector.s#15 integrate
.. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#27 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#28 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#18 integrate
.. //depot/projects/hammer/sys/i386/i386/io_apic.c#18 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#66 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#51 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#77 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#44 integrate
.. //depot/projects/hammer/sys/i386/include/smp.h#12 integrate
.. //depot/projects/hammer/sys/i386/include/smptests.h#7 delete
.. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#1 branch
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#23 integrate
.. //depot/projects/hammer/sys/ia64/conf/NOTES#6 integrate
.. //depot/projects/hammer/sys/ia64/conf/SKI#14 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#51 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#51 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#51 integrate
.. //depot/projects/hammer/sys/kern/kern_time.c#21 integrate
.. //depot/projects/hammer/sys/kern/subr_rman.c#19 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#49 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#49 integrate
.. //depot/projects/hammer/sys/kern/uipc_mqueue.c#1 branch
.. //depot/projects/hammer/sys/kern/uipc_socket.c#61 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#39 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#61 integrate
.. //depot/projects/hammer/sys/modules/Makefile#92 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_vinum/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/i2c/controllers/pcf/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/iwi/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/mqueue/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/oldcard/Makefile#4 delete
.. //depot/projects/hammer/sys/modules/owi/Makefile#4 delete
.. //depot/projects/hammer/sys/modules/sound/driver/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/sound/driver/atiixp/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if_clone.c#9 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#51 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#34 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.c#18 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#19 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#12 integrate
.. //depot/projects/hammer/sys/netgraph/netgraph.h#25 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#40 integrate
.. //depot/projects/hammer/sys/netinet/igmp.c#12 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.c#18 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#25 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#26 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#55 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#30 integrate
.. //depot/projects/hammer/sys/netinet/ip_options.c#1 branch
.. //depot/projects/hammer/sys/netinet/ip_options.h#1 branch
.. //depot/projects/hammer/sys/netinet/ip_output.c#54 integrate
.. //depot/projects/hammer/sys/netinet/ip_var.h#25 integrate
.. //depot/projects/hammer/sys/netinet/libalias/libalias.3#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#57 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#33 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#22 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#31 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#36 integrate
.. //depot/projects/hammer/sys/netinet6/mld6.c#16 integrate
.. //depot/projects/hammer/sys/netipx/ipx_ip.c#11 integrate
.. //depot/projects/hammer/sys/netsmb/smb_dev.c#13 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#37 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#32 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#24 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#44 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsm_subs.h#6 integrate
.. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#37 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#54 integrate
.. //depot/projects/hammer/sys/pc98/include/smptests.h#2 delete
.. //depot/projects/hammer/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/hammer/sys/pci/if_de.c#30 integrate
.. //depot/projects/hammer/sys/pci/if_devar.h#11 integrate
.. //depot/projects/hammer/sys/posix4/mqueue.h#3 delete
.. //depot/projects/hammer/sys/powerpc/conf/DEFAULTS#1 branch
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#24 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/central/central.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/conf/DEFAULTS#1 branch
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#43 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#18 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#17 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhcvar.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#24 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#10 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#2 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#19 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#38 integrate
.. //depot/projects/hammer/sys/sys/_types.h#14 integrate
.. //depot/projects/hammer/sys/sys/bio.h#18 integrate
.. //depot/projects/hammer/sys/sys/event.h#13 integrate
.. //depot/projects/hammer/sys/sys/file.h#14 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#47 integrate
.. //depot/projects/hammer/sys/sys/mqueue.h#1 branch
.. //depot/projects/hammer/sys/sys/queue.h#8 integrate
.. //depot/projects/hammer/sys/sys/resource.h#11 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#48 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#48 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#48 integrate
.. //depot/projects/hammer/sys/sys/time.h#10 integrate
.. //depot/projects/hammer/sys/sys/types.h#22 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#55 integrate
.. //depot/projects/hammer/sys/vm/pmap.h#23 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#51 integrate
.. //depot/projects/hammer/tools/regression/mqueue/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest1/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest1/mqtest1.c#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest2/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest2/mqtest2.c#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest3/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest3/mqtest3.c#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest4/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest4/mqtest4.c#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest5/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mqueue/mqtest5/mqtest5.c#1 branch
.. //depot/projects/hammer/tools/sched/schedgraph.py#4 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/FlashDevice.sub#2 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#7 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#6 integrate
.. //depot/projects/hammer/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/hammer/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/hammer/usr.bin/cmp/cmp.1#4 integrate
.. //depot/projects/hammer/usr.bin/compress/compress.1#6 integrate
.. //depot/projects/hammer/usr.bin/indent/lexi.c#5 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.1#10 integrate
.. //depot/projects/hammer/usr.bin/mt/mt.1#10 integrate
.. //depot/projects/hammer/usr.bin/netstat/mbuf.c#12 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.1#13 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.1#8 integrate
.. //depot/projects/hammer/usr.bin/pkill/pkill.c#9 integrate
.. //depot/projects/hammer/usr.bin/split/split.1#6 integrate
.. //depot/projects/hammer/usr.bin/tar/configure.ac.in#7 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.4#8 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#3 integrate
.. //depot/projects/hammer/usr.sbin/config/config.h#9 integrate
.. //depot/projects/hammer/usr.sbin/config/config.y#11 integrate
.. //depot/projects/hammer/usr.sbin/config/configvers.h#10 integrate
.. //depot/projects/hammer/usr.sbin/config/mkheaders.c#7 integrate
.. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#10 integrate
.. //depot/projects/hammer/usr.sbin/devinfo/devinfo.8#3 integrate
.. //depot/projects/hammer/usr.sbin/lmcconfig/lmcconfig.8#2 integrate
.. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.8#15 integrate
.. //depot/projects/hammer/usr.sbin/ndp/ndp.8#10 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#12 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#12 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/make_index/make_index.c#3 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.8#7 integrate
.. //depot/projects/hammer/usr.sbin/pstat/pstat.c#14 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/kern.c#8 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/config.c#9 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#13 integrate
Differences ...
==== //depot/projects/hammer/Makefile#36 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.323 2005/07/29 21:51:33 netchild Exp $
+# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $
#
# The user-driven targets are:
#
@@ -269,7 +269,8 @@
.for arch in ${target:C/:.*$//}
.for mach in ${target:C/^.*://}
KERNCONFS!= cd ${.CURDIR}/sys/${mach}/conf && \
- find [A-Z]*[A-Z] -type f -maxdepth 0
+ find [A-Z]*[A-Z] -type f -maxdepth 0 \
+ ! -name DEFAULTS ! -name LINT
KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${mach}
.ORDER: universe_prologue universe_${mach} universe_epilogue
==== //depot/projects/hammer/Makefile.inc1#108 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -237,7 +237,7 @@
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
-LIB32IMAKE= ${LIB32MAKE:NINSTALL=*}
+LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS
.endif
# install stage
@@ -252,6 +252,7 @@
# kernel stage
KMAKEENV= ${WMAKEENV}
+KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME}
#
# buildworld
@@ -488,16 +489,18 @@
kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
#
-# Use this to add checks to installworld/installkernel targets.
+# installcheck
+#
+# Checks to be sure system is ready for installworld/installkernel.
#
-SPECIAL_INSTALLCHECKS=
+installcheck:
#
# Require DESTDIR to be set if installing for a different architecture.
#
.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
.if !make(distributeworld)
-SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR
+installcheck: installcheck_DESTDIR
installcheck_DESTDIR:
.if !defined(DESTDIR) || empty(DESTDIR)
@echo "ERROR: Please set DESTDIR!"; \
@@ -507,9 +510,7 @@
.endif
#
-# installcheck
-#
-# Checks to be sure system is ready for installworld
+# Check for missing UIDs/GIDs.
#
CHECK_UIDS=
CHECK_GIDS=
@@ -521,7 +522,8 @@
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
-installcheck: ${SPECIAL_INSTALLCHECKS}
+installcheck: installcheck_UGID
+installcheck_UGID:
.for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} >/dev/null 2>&1`; then \
echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@@ -562,7 +564,7 @@
# and do a 'make reinstall' on the *client* to install new binaries from the
# most recent server build.
#
-reinstall: ${SPECIAL_INSTALLCHECKS}
+reinstall:
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
@@ -664,15 +666,13 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} ${CLEANDIR}
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.2: rebuilding the object tree"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.3: build tools"
@@ -693,15 +693,13 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 3.1: making dependencies"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ
.endif
@echo
@echo "--------------------------------------------------------------"
@echo ">>> stage 3.2: building everything"
@echo "--------------------------------------------------------------"
- cd ${KRNLOBJDIR}/${_kernel}; \
- ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ
+ cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
@echo "--------------------------------------------------------------"
@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
@echo "--------------------------------------------------------------"
@@ -713,18 +711,12 @@
# Install the kernel defined by INSTALLKERNEL
#
installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
+reinstallkernel reinstallkernel.debug: installcheck
.if empty(INSTALLKERNEL)
@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
false
.endif
@echo "--------------------------------------------------------------"
- @echo ">>> Making hierarchy"
- @echo "--------------------------------------------------------------"
- cd ${.CURDIR}; \
- ${CROSSENV} PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 hierarchy
- @echo
- @echo "--------------------------------------------------------------"
@echo ">>> Installing kernel"
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
==== //depot/projects/hammer/bin/date/date.1#14 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.73 2005/11/01 19:31:25 trhodes Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.74 2005/11/17 12:15:22 ru Exp $
.\"
.Dd November 1, 2005
.Dt DATE 1
@@ -421,12 +421,7 @@
utility is expected to be compatible with
.St -p1003.2 .
The
-.Fl d ,
-.Fl f ,
-.Fl j ,
-.Fl n ,
-.Fl r ,
-.Fl t ,
+.Fl d , f , j , n , r , t ,
and
.Fl v
options are all extensions to the standard.
==== //depot/projects/hammer/bin/kenv/kenv.1#5 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.12 2005/09/13 19:01:53 rwatson Exp $
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $
.\"
-.Dd July 8, 2000
+.Dd September 13, 2005
.Dt KENV 1
.Os
.Sh NAME
==== //depot/projects/hammer/bin/ls/ls.1#24 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.95 2005/11/17 12:15:23 ru Exp $
.\"
-.Dd November 10, 2005
+.Dd November 16, 2005
.Dt LS 1
.Os
.Sh NAME
@@ -72,9 +72,9 @@
.Pa \&.
and
.Pa .. .
-Always set for the super-user.
+Automatically set for the super-user unless
.Fl I
-cancel this option.
+is specified.
.It Fl B
Force printing of non-printable characters (as defined by
.Xr ctype 3
@@ -120,11 +120,9 @@
.Fl l
options are specified.
.It Fl I
-This option cancels the
+Prevent
.Fl A
-option. Usually used by super-user when
-.Fl A
-is not necessary.
+from being automatically set for the super-user.
.It Fl L
If argument is a symbolic link, list the file or directory the link references
rather than the link itself.
@@ -652,9 +650,7 @@
.Xr sticky 8
.Sh STANDARDS
With the exception of options
-.Fl I ,
-.Fl g ,
-.Fl n
+.Fl I , g , n
and
.Fl o ,
the
==== //depot/projects/hammer/bin/ls/ls.c#16 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.81 2005/11/10 00:02:32 mux Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.82 2005/11/16 07:13:37 ru Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -110,8 +110,7 @@
static int f_kblocks; /* print size in kilobytes */
static int f_listdir; /* list actual directory, not contents */
static int f_listdot; /* list files beginning with . */
-static int f_nolistdot; /* don't list files beginning with . */
-static int f_forcelistdot; /* force list files beginning with . */
+static int f_noautodot; /* do not automatically enable -A for root */
int f_longform; /* long listing format */
int f_nonprint; /* show unprintables as ? */
static int f_nosort; /* don't sort output */
@@ -241,13 +240,12 @@
break;
case 'a':
fts_options |= FTS_SEEDOT;
- f_forcelistdot = 1;
- break;
+ /* FALLTHROUGH */
case 'A':
f_listdot = 1;
break;
case 'I':
- f_nolistdot = 1;
+ f_noautodot = 1;
break;
/* The -d option turns off the -R option. */
case 'd':
@@ -328,8 +326,8 @@
argc -= optind;
argv += optind;
- /* Root is -A automatically. */
- if (!getuid() && !f_nolistdot)
+ /* Root is -A automatically unless -I. */
+ if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot)
f_listdot = 1;
/* Enabling of colours is conditional on the environment. */
@@ -496,8 +494,7 @@
break;
case FTS_D:
if (p->fts_level != FTS_ROOTLEVEL &&
- p->fts_name[0] == '.' && ((!f_listdot ||
- f_nolistdot) && !f_forcelistdot))
+ p->fts_name[0] == '.' && !f_listdot)
break;
/*
@@ -657,8 +654,7 @@
}
} else {
/* Only display dot file if -a/-A set. */
- if (cur->fts_name[0] == '.' && ((!f_listdot ||
- f_nolistdot) && !f_forcelistdot)) {
+ if (cur->fts_name[0] == '.' && !f_listdot) {
cur->fts_number = NO_PRINT;
continue;
}
==== //depot/projects/hammer/bin/ls/util.c#10 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.38 2005/06/03 11:05:58 dd Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.39 2005/11/16 07:13:37 ru Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -222,9 +222,9 @@
{
(void)fprintf(stderr,
#ifdef COLORLS
- "usage: ls [-ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1]"
+ "usage: ls [-ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1]"
#else
- "usage: ls [-ABCFHLPRSTWZabcdfghiklmnopqrstuwx1]"
+ "usage: ls [-ABCFHILPRSTWZabcdfghiklmnopqrstuwx1]"
#endif
" [file ...]\n");
exit(1);
==== //depot/projects/hammer/bin/rm/rm.1#13 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
-.\" $FreeBSD: src/bin/rm/rm.1,v 1.38 2005/09/30 02:12:15 dougb Exp $
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $
.\"
.Dd September 29, 2005
.Dt RM 1
@@ -91,7 +91,7 @@
Specifying this flag for a read only file will cause
.Nm
to generate an error message and exit.
-The file wil not be removed or overwritten.
+The file will not be removed or overwritten.
.It Fl R
Attempt to remove the file hierarchy rooted in each file argument.
The
==== //depot/projects/hammer/bin/sh/sh.1#22 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.113 2005/11/03 00:15:19 jcamou Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.114 2005/11/17 12:15:23 ru Exp $
.\"
.Dd October 29, 2005
.Dt SH 1
@@ -209,7 +209,11 @@
Exit immediately if any untested command fails in non-interactive mode.
The exit status of a command is considered to be
explicitly tested if the command is part of the list used to control
-an if, elif, while, or until; if the command is the left
+an
+.Ic if , elif , while ,
+or
+.Ic until ;
+if the command is the left
hand operand of an
.Dq Li &&
or
@@ -431,7 +435,7 @@
.Pp
An alias name may be escaped in a command line, so that it is not
replaced by its alias value, by using quoting characters within or
-adjacent to the alias name.
+adjacent to the alias name.
This is most often done by prefixing
an alias name with a backslash to execute a function, built-in, or
normal program with the same name.
@@ -893,7 +897,7 @@
.Bd -ragged -offset indent
.Ic local
.Op Ar variable ...
-.Op Ar -
+.Op Fl
.Ed
.Pp
The
@@ -1478,7 +1482,7 @@
.Pp
If the
.Fl v
-option is specified,
+option is specified,
.Ar utility
is not executed but a description of its interpretation by the shell is
printed.
@@ -1497,20 +1501,14 @@
where
.Ar description
is either
-.Bl -item -offset indent
-.It
the path name to
.Ar utility ,
-.It
-.Ic a shell builtin ,
-.It
-.Ic a shell function ,
-.It
-.Ic a shell keyword
+a shell builtin,
+a shell function,
+a shell keyword
or
-.It
-.Ic an alias for Ar value .
-.El
+an alias for
+. Ar value .
.It Ic echo Oo Fl e | n Oc Op Ar string
Print
.Ar string
@@ -1780,7 +1778,7 @@
If the
.Fl s
option is specified, only the PIDs of the jobs are printed, one per line.
-.It Ic local Oo Ar variable ... Oc Op Ar -
+.It Ic local Oo Ar variable ... Oc Op Fl
See the
.Sx Functions
subsection.
==== //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 (text+ko) ====
@@ -1,5 +1,5 @@
.\" $Id: mount_smbfs.8,v 1.10 2002/04/16 02:47:41 bp Exp $
-.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.4 2005/11/01 21:16:39 trhodes Exp $
+.\" $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.8,v 1.5 2005/11/18 10:56:28 ru Exp $
.Dd March 10, 2000
.Dt MOUNT_SMBFS 8
.Os
@@ -157,8 +157,8 @@
for smbfs mounts:
.Pp
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list