Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Jan 2004 17:21:59 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 45755 for review
Message-ID:  <200401230121.i0N1LxAj098568@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45755

Change 45755 by peter@peter_daintree on 2004/01/22 17:21:50

	IFC @45754

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#35 integrate
.. //depot/projects/hammer/bin/Makefile#3 integrate
.. //depot/projects/hammer/bin/ls/print.c#8 integrate
.. //depot/projects/hammer/bin/ps/ps.1#9 integrate
.. //depot/projects/hammer/bin/sh/Makefile#4 integrate
.. //depot/projects/hammer/bin/sh/eval.c#5 integrate
.. //depot/projects/hammer/bin/sh/input.c#3 integrate
.. //depot/projects/hammer/bin/sh/parser.c#6 integrate
.. //depot/projects/hammer/bin/sh/redir.c#4 integrate
.. //depot/projects/hammer/bin/sh/redir.h#2 integrate
.. //depot/projects/hammer/contrib/cvs/src/modules.c#3 integrate
.. //depot/projects/hammer/contrib/cvs/src/server.c#4 integrate
.. //depot/projects/hammer/contrib/gdtoa/gethex.c#3 integrate
.. //depot/projects/hammer/contrib/gdtoa/strtod.c#3 integrate
.. //depot/projects/hammer/contrib/gdtoa/xsum0.out#3 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#4 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#6 integrate
.. //depot/projects/hammer/contrib/isc-dhcp/common/convert.c#2 delete
.. //depot/projects/hammer/contrib/isc-dhcp/common/errwarn.c#2 delete
.. //depot/projects/hammer/contrib/isc-dhcp/common/hash.c#2 delete
.. //depot/projects/hammer/contrib/isc-dhcp/common/inet_addr.c#2 delete
.. //depot/projects/hammer/contrib/isc-dhcp/includes/hash.h#2 delete
.. //depot/projects/hammer/contrib/isc-dhcp/includes/sysconf.h#2 delete
.. //depot/projects/hammer/contrib/libreadline/readline.h#4 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-isakmp.c#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#3 integrate
.. //depot/projects/hammer/contrib/tcpdump/print-radius.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate
.. //depot/projects/hammer/crypto/openssh/progressmeter.c#3 integrate
.. //depot/projects/hammer/crypto/openssh/servconf.c#5 integrate
.. //depot/projects/hammer/crypto/openssl/apps/openssl.cnf#3 integrate
.. //depot/projects/hammer/etc/Makefile#22 integrate
.. //depot/projects/hammer/etc/defaults/devfs.rules#3 integrate
.. //depot/projects/hammer/etc/isdn/Makefile#3 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#17 integrate
.. //depot/projects/hammer/etc/mtree/BSD.var.dist#5 integrate
.. //depot/projects/hammer/etc/rc.d/DAEMON#3 integrate
.. //depot/projects/hammer/etc/rc.d/LOGIN#3 integrate
.. //depot/projects/hammer/etc/rc.d/NETWORKING#6 integrate
.. //depot/projects/hammer/etc/rc.d/SERVERS#3 integrate
.. //depot/projects/hammer/etc/rc.d/accounting#4 integrate
.. //depot/projects/hammer/etc/rc.d/amd#5 integrate
.. //depot/projects/hammer/etc/rc.d/apmd#7 integrate
.. //depot/projects/hammer/etc/rc.d/bootparams#3 integrate
.. //depot/projects/hammer/etc/rc.d/ccd#2 integrate
.. //depot/projects/hammer/etc/rc.d/cleartmp#5 integrate
.. //depot/projects/hammer/etc/rc.d/cron#4 integrate
.. //depot/projects/hammer/etc/rc.d/dhclient#7 integrate
.. //depot/projects/hammer/etc/rc.d/fsck#4 integrate
.. //depot/projects/hammer/etc/rc.d/inetd#2 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#13 integrate
.. //depot/projects/hammer/etc/rc.d/ipfs#3 integrate
.. //depot/projects/hammer/etc/rc.d/ipmon#6 integrate
.. //depot/projects/hammer/etc/rc.d/ipnat#9 integrate
.. //depot/projects/hammer/etc/rc.d/ipsec#5 integrate
.. //depot/projects/hammer/etc/rc.d/isdnd#7 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#8 integrate
.. //depot/projects/hammer/etc/rc.d/local#4 integrate
.. //depot/projects/hammer/etc/rc.d/lpd#3 integrate
.. //depot/projects/hammer/etc/rc.d/motd#6 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritlocal#7 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritremote#6 integrate
.. //depot/projects/hammer/etc/rc.d/mountd#4 integrate
.. //depot/projects/hammer/etc/rc.d/moused#4 integrate
.. //depot/projects/hammer/etc/rc.d/mrouted#5 integrate
.. //depot/projects/hammer/etc/rc.d/named#5 integrate
.. //depot/projects/hammer/etc/rc.d/nfsd#5 integrate
.. //depot/projects/hammer/etc/rc.d/nfslocking#4 integrate
.. //depot/projects/hammer/etc/rc.d/ntpd#4 integrate
.. //depot/projects/hammer/etc/rc.d/ntpdate#4 integrate
.. //depot/projects/hammer/etc/rc.d/pwcheck#2 integrate
.. //depot/projects/hammer/etc/rc.d/rarpd#2 integrate
.. //depot/projects/hammer/etc/rc.d/root#6 integrate
.. //depot/projects/hammer/etc/rc.d/route6d#4 integrate
.. //depot/projects/hammer/etc/rc.d/routed#6 integrate
.. //depot/projects/hammer/etc/rc.d/rpcbind#3 integrate
.. //depot/projects/hammer/etc/rc.d/rtadvd#5 integrate
.. //depot/projects/hammer/etc/rc.d/rwho#2 integrate
.. //depot/projects/hammer/etc/rc.d/savecore#3 integrate
.. //depot/projects/hammer/etc/rc.d/securelevel#5 integrate
.. //depot/projects/hammer/etc/rc.d/sendmail#5 integrate
.. //depot/projects/hammer/etc/rc.d/sshd#3 integrate
.. //depot/projects/hammer/etc/rc.d/swap1#3 integrate
.. //depot/projects/hammer/etc/rc.d/sysctl#5 integrate
.. //depot/projects/hammer/etc/rc.d/syslogd#4 integrate
.. //depot/projects/hammer/etc/rc.d/timed#2 integrate
.. //depot/projects/hammer/etc/rc.d/ttys#4 integrate
.. //depot/projects/hammer/etc/rc.d/virecover#5 integrate
.. //depot/projects/hammer/etc/rc.d/ypbind#6 integrate
.. //depot/projects/hammer/etc/rc.d/yppasswdd#5 integrate
.. //depot/projects/hammer/etc/rc.d/ypserv#6 integrate
.. //depot/projects/hammer/etc/rc.subr#11 integrate
.. //depot/projects/hammer/etc/rc.suspend#3 integrate
.. //depot/projects/hammer/etc/sendmail/Makefile#7 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#17 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2#11 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#9 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#12 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#13 integrate
.. //depot/projects/hammer/include/netdb.h#4 integrate
.. //depot/projects/hammer/include/nss.h#2 integrate
.. //depot/projects/hammer/include/strings.h#3 integrate
.. //depot/projects/hammer/kerberos5/lib/libkafs5/Makefile#4 integrate
.. //depot/projects/hammer/lib/csu/i386-elf/Makefile#4 integrate
.. //depot/projects/hammer/lib/libalias/Makefile#6 integrate
.. //depot/projects/hammer/lib/libalias/alias.c#4 integrate
.. //depot/projects/hammer/lib/libalias/alias.h#4 integrate
.. //depot/projects/hammer/lib/libalias/alias_cuseeme.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_db.c#5 integrate
.. //depot/projects/hammer/lib/libalias/alias_ftp.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_irc.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_local.h#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_nbt.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_old.c#1 branch
.. //depot/projects/hammer/lib/libalias/alias_pptp.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_proxy.c#3 integrate
.. //depot/projects/hammer/lib/libalias/alias_skinny.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_smedia.c#2 integrate
.. //depot/projects/hammer/lib/libalias/alias_util.c#2 integrate
.. //depot/projects/hammer/lib/libalias/libalias.3#6 integrate
.. //depot/projects/hammer/lib/libbsnmp/Makefile#2 integrate
.. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libbsnmp/libbsnmp/Makefile#2 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#3 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#3 integrate
.. //depot/projects/hammer/lib/libc/Makefile#12 integrate
.. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#3 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpgetmask.c#3 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/fpsetmask.c#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#8 integrate
.. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_fsbase.c#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/sys/amd64_get_gsbase.c#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_fsbase.c#2 integrate
.. //depot/projects/hammer/lib/libc/amd64/sys/amd64_set_gsbase.c#2 integrate
.. //depot/projects/hammer/lib/libc/db/mpool/mpool.c#2 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/gdtoa/_hdtoa.c#1 branch
.. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#10 integrate
.. //depot/projects/hammer/lib/libc/gen/arc4random.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/getpwent.c#9 integrate
.. //depot/projects/hammer/lib/libc/gen/pw_scan.c#5 integrate
.. //depot/projects/hammer/lib/libc/gen/sem.c#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_destroy.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_getvalue.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_init.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_open.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_post.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/sem_wait.3#1 branch
.. //depot/projects/hammer/lib/libc/i386/_fpmath.h#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ioperm.c#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_get_ldt.c#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_set_ioperm.c#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_set_ldt.c#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.c#3 integrate
.. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#3 integrate
.. //depot/projects/hammer/lib/libc/include/fpmath.h#2 integrate
.. //depot/projects/hammer/lib/libc/net/nss_compat.c#2 integrate
.. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#4 integrate
.. //depot/projects/hammer/lib/libc/powerpc/gen/syncicache.c#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#3 integrate
.. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#4 integrate
.. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate
.. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_install.c#3 integrate
.. //depot/projects/hammer/lib/libc/sparc64/sys/__sparc_utrap_setup.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/floatio.h#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/printf.3#7 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#12 integrate
.. //depot/projects/hammer/lib/libc/stdlib/random.c#4 integrate
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/string/ffs.3#4 integrate
.. //depot/projects/hammer/lib/libc/string/ffs.c#3 integrate
.. //depot/projects/hammer/lib/libc/string/ffsl.c#1 branch
.. //depot/projects/hammer/lib/libc/string/fls.c#1 branch
.. //depot/projects/hammer/lib/libc/string/flsl.c#1 branch
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/ptrace.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/sem.c#4 delete
.. //depot/projects/hammer/lib/libc/sys/sigwait.2#1 branch
.. //depot/projects/hammer/lib/libc_r/Makefile#6 integrate
.. //depot/projects/hammer/lib/libc_r/man/Makefile.inc#5 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_attr.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_attr_get_np.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cancel.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cleanup_pop.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cleanup_push.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_broadcast.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_destroy.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_init.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_signal.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_timedwait.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_cond_wait.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_condattr.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_create.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_detach.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_equal.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_exit.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_getconcurrency.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_getspecific.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_join.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_key_create.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_key_delete.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_kill.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_main_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_multi_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_destroy.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_init.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_lock.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_trylock.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutex_unlock.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutexattr.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_once.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_resume_all_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_resume_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_destroy.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_init.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_rdlock.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_unlock.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlock_wrlock.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_destroy.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_getpshared.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_init.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_rwlockattr_setpshared.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_schedparam.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_self.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_set_name_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_setspecific.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_sigmask.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_suspend_all_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_suspend_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_switch_add_np.3#2 delete
.. //depot/projects/hammer/lib/libc_r/man/pthread_testcancel.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_destroy.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_getvalue.3#5 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_init.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_open.3#3 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_post.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/sem_wait.3#4 delete
.. //depot/projects/hammer/lib/libc_r/man/sigwait.3#4 delete
.. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#11 integrate
.. //depot/projects/hammer/lib/libio/alpha_sethae.c#2 integrate
.. //depot/projects/hammer/lib/libpam/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libpam/libpam/Makefile#9 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_ksu/Makefile#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_ssh/Makefile#3 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate
.. //depot/projects/hammer/lib/libpthread/man/Makefile.inc#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_attr_get_np.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cancel.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_pop.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_push.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_broadcast.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_destroy.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_init.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_signal.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_timedwait.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_cond_wait.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_condattr.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_create.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_detach.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_equal.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_exit.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_getspecific.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_join.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_key_create.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_key_delete.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_kill.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_destroy.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_init.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_lock.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_trylock.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_unlock.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_mutexattr.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_destroy.3#2 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_init.3#2 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_rdlock.3#2 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_unlock.3#2 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_wrlock.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_destroy.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_getpshared.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_init.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_setpshared.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_schedparam.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_self.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_setspecific.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_sigmask.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/pthread_testcancel.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_destroy.3#4 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_getvalue.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_init.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_open.3#2 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_post.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/sem_wait.3#3 delete
.. //depot/projects/hammer/lib/libpthread/man/sigwait.3#4 delete
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#13 integrate
.. //depot/projects/hammer/lib/libsdp/Makefile#2 integrate
.. //depot/projects/hammer/lib/libsdp/sdp-int.h#2 integrate
.. //depot/projects/hammer/lib/libsdp/sdp.3#2 integrate
.. //depot/projects/hammer/lib/libsdp/sdp.h#2 integrate
.. //depot/projects/hammer/lib/libsdp/search.c#2 integrate
.. //depot/projects/hammer/lib/libsdp/service.c#1 branch
.. //depot/projects/hammer/lib/libsdp/session.c#2 integrate
.. //depot/projects/hammer/lib/libsdp/util.c#3 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#8 integrate
.. //depot/projects/hammer/lib/libstand/bzipfs.c#2 integrate
.. //depot/projects/hammer/lib/libstand/dosfs.c#2 integrate
.. //depot/projects/hammer/lib/libstand/ext2fs.c#2 integrate
.. //depot/projects/hammer/lib/libstand/fstat.c#2 integrate
.. //depot/projects/hammer/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/hammer/lib/libstand/nfs.c#3 integrate
.. //depot/projects/hammer/lib/libstand/nullfs.c#2 integrate
.. //depot/projects/hammer/lib/libstand/read.c#2 integrate
.. //depot/projects/hammer/lib/libstand/splitfs.c#2 integrate
.. //depot/projects/hammer/lib/libstand/stand.h#5 integrate
.. //depot/projects/hammer/lib/libstand/ufs.c#3 integrate
.. //depot/projects/hammer/lib/libstand/zalloc_malloc.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#15 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#12 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/hammer/libexec/Makefile#19 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#11 integrate
.. //depot/projects/hammer/release/Makefile#42 integrate
.. //depot/projects/hammer/release/Makefile.inc.docports#6 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#54 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#7 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#10 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#12 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#6 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#12 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.ent#10 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#15 integrate
.. //depot/projects/hammer/release/scripts/proflibs-make.sh#2 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#13 integrate
.. //depot/projects/hammer/sbin/Makefile#21 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#9 integrate
.. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#4 integrate
.. //depot/projects/hammer/sbin/bsdlabel/Makefile#9 integrate
.. //depot/projects/hammer/sbin/camcontrol/modeedit.c#6 integrate
.. //depot/projects/hammer/sbin/devfs/devfs.c#2 integrate
.. //depot/projects/hammer/sbin/devfs/rule.c#2 integrate
.. //depot/projects/hammer/sbin/dump/dump.8#9 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/Makefile#3 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#5 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#17 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#10 integrate
.. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#9 integrate
.. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#7 integrate
.. //depot/projects/hammer/sbin/rtsol/Makefile#3 integrate
.. //depot/projects/hammer/sbin/sconfig/Makefile#3 integrate
.. //depot/projects/hammer/sbin/sconfig/sconfig.8#3 integrate
.. //depot/projects/hammer/secure/Makefile#4 integrate
.. //depot/projects/hammer/share/Makefile#4 integrate
.. //depot/projects/hammer/share/doc/papers/Makefile#3 integrate
.. //depot/projects/hammer/share/doc/psd/Makefile#2 integrate
.. //depot/projects/hammer/share/doc/smm/Makefile#2 integrate
.. //depot/projects/hammer/share/doc/usd/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/bootforth/frames.4th#2 integrate
.. //depot/projects/hammer/share/examples/cvsup/cvs-supfile#5 integrate
.. //depot/projects/hammer/share/examples/cvsup/ports-supfile#5 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#14 integrate
.. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#4 integrate
.. //depot/projects/hammer/share/examples/scsi_target/scsi_target.h#3 integrate
.. //depot/projects/hammer/share/man/man1/Makefile#2 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_attr.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_attr_get_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_attr_setcreatesuspend_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cancel.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_pop.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cleanup_push.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_broadcast.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_destroy.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_init.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_signal.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_timedwait.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_cond_wait.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_condattr.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_create.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_detach.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_equal.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_exit.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_getconcurrency.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_getspecific.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_join.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_key_create.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_key_delete.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_kill.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_main_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_multi_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutex_destroy.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutex_init.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutex_lock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/hammer/share/man/man3/pthread_mutex_trylock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutex_unlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_mutexattr_getkind_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_once.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_resume_all_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_resume_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_destroy.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_init.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_rdlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedrdlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_timedwrlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_unlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlock_wrlock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_destroy.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_getpshared.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_init.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_rwlockattr_setpshared.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_schedparam.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_self.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_set_name_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_setspecific.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_sigmask.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_spin_init.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_suspend_all_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_suspend_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_switch_add_np.3#1 branch
.. //depot/projects/hammer/share/man/man3/pthread_testcancel.3#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#33 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#17 integrate
.. //depot/projects/hammer/share/man/man4/aue.4#4 integrate
.. //depot/projects/hammer/share/man/man4/awi.4#5 integrate
.. //depot/projects/hammer/share/man/man4/crypto.4#4 integrate
.. //depot/projects/hammer/share/man/man4/gx.4#3 integrate
.. //depot/projects/hammer/share/man/man4/kue.4#4 integrate
.. //depot/projects/hammer/share/man/man4/lge.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#13 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/tx.4#3 delete
.. //depot/projects/hammer/share/man/man4/miibus.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ng_rfc1490.4#2 integrate
.. //depot/projects/hammer/share/man/man4/nge.4#2 integrate
.. //depot/projects/hammer/share/man/man4/polling.4#5 integrate
.. //depot/projects/hammer/share/man/man4/random.4#3 integrate
.. //depot/projects/hammer/share/man/man4/re.4#3 integrate
.. //depot/projects/hammer/share/man/man4/rue.4#4 integrate
.. //depot/projects/hammer/share/man/man4/sk.4#4 integrate
.. //depot/projects/hammer/share/man/man4/tdfx.4#2 integrate
.. //depot/projects/hammer/share/man/man4/tx.4#1 branch
.. //depot/projects/hammer/share/man/man4/uscanner.4#6 integrate
.. //depot/projects/hammer/share/man/man5/Makefile#7 integrate
.. //depot/projects/hammer/share/man/man5/hosts.lpd.5#2 integrate
.. //depot/projects/hammer/share/man/man6/intro.6#2 integrate
.. //depot/projects/hammer/share/man/man7/Makefile#6 integrate
.. //depot/projects/hammer/share/man/man8/Makefile#6 integrate
.. //depot/projects/hammer/share/man/man8/diskless.8#5 integrate
.. //depot/projects/hammer/share/man/man8/yp.8#5 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#24 integrate
.. //depot/projects/hammer/share/man/man9/ifnet.9#9 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#10 integrate
.. //depot/projects/hammer/share/man/man9/sbuf.9#4 integrate
.. //depot/projects/hammer/share/man/man9/vn_fullpath.9#1 branch
.. //depot/projects/hammer/share/misc/bsd-family-tree#11 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#10 integrate
.. //depot/projects/hammer/share/mk/bsd.dep.mk#7 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#11 integrate
.. //depot/projects/hammer/share/mk/bsd.obj.mk#4 integrate
.. //depot/projects/hammer/share/mk/bsd.sys.mk#10 integrate
.. //depot/projects/hammer/share/skel/Makefile#2 integrate
.. //depot/projects/hammer/share/syscons/fonts/Makefile#4 integrate
.. //depot/projects/hammer/share/syscons/keymaps/Makefile#8 integrate
.. //depot/projects/hammer/share/syscons/scrnmaps/Makefile#3 integrate
.. //depot/projects/hammer/sys/Makefile#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/support.s#5 integrate
.. //depot/projects/hammer/sys/alpha/include/sysarch.h#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#17 integrate
.. //depot/projects/hammer/sys/amd64/include/md_var.h#20 integrate
.. //depot/projects/hammer/sys/amd64/include/sysarch.h#10 integrate
.. //depot/projects/hammer/sys/boot/forth/beastie.4th#6 integrate
.. //depot/projects/hammer/sys/boot/forth/frames.4th#2 integrate
.. //depot/projects/hammer/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/libpc98/vidconsole.c#3 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#10 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#19 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_util.c#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/hal_var.h#2 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#4 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#4 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#3 integrate
.. //depot/projects/hammer/sys/compat/ndis/pe_var.h#3 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#4 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#10 integrate
.. //depot/projects/hammer/sys/conf/files#44 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#11 integrate
.. //depot/projects/hammer/sys/conf/files.i386#21 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#15 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#21 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#5 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#14 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#18 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#16 integrate
.. //depot/projects/hammer/sys/conf/majors#20 integrate
.. //depot/projects/hammer/sys/conf/newvers.sh#9 integrate
.. //depot/projects/hammer/sys/conf/options.i386#23 integrate
.. //depot/projects/hammer/sys/conf/options.powerpc#6 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#20 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#16 integrate
.. //depot/projects/hammer/sys/dev/amd/amd.c#8 integrate
.. //depot/projects/hammer/sys/dev/an/if_an.c#14 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#19 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#11 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-card.c#13 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#4 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#24 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#14 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#12 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-isa.c#7 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#8 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#15 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#14 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#16 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#7 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#8 integrate
.. //depot/projects/hammer/sys/dev/awi/am79c930.c#4 integrate
.. //depot/projects/hammer/sys/dev/awi/am79c930reg.h#2 integrate
.. //depot/projects/hammer/sys/dev/awi/am79c930var.h#2 integrate
.. //depot/projects/hammer/sys/dev/awi/awi.c#8 integrate
.. //depot/projects/hammer/sys/dev/awi/awi_wep.c#6 delete
.. //depot/projects/hammer/sys/dev/awi/awi_wicfg.c#4 delete
.. //depot/projects/hammer/sys/dev/awi/awireg.h#2 integrate
.. //depot/projects/hammer/sys/dev/awi/awivar.h#3 integrate
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#8 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#27 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#9 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#17 integrate
.. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#10 integrate
.. //depot/projects/hammer/sys/dev/fb/fbreg.h#11 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdev.c#9 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci.c#20 integrate
.. //depot/projects/hammer/sys/dev/gx/if_gx.c#8 integrate
.. //depot/projects/hammer/sys/dev/ida/ida.c#9 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_disk.c#6 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#6 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/ida/idaio.h#1 branch
.. //depot/projects/hammer/sys/dev/ida/idareg.h#3 integrate
.. //depot/projects/hammer/sys/dev/ida/idavar.h#3 integrate
.. //depot/projects/hammer/sys/dev/idt/idt.c#6 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/ips/ips.c#7 integrate
.. //depot/projects/hammer/sys/dev/ispfw/asm_12160.h#2 integrate
.. //depot/projects/hammer/sys/dev/ispfw/asm_2200.h#3 integrate
.. //depot/projects/hammer/sys/dev/ispfw/asm_2300.h#5 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#20 integrate
.. //depot/projects/hammer/sys/dev/mii/ukphy.c#5 integrate
.. //depot/projects/hammer/sys/dev/mly/mly.c#8 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#20 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#20 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_pci.c#8 integrate
.. //depot/projects/hammer/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/hammer/sys/dev/pci/pcib_private.h#4 integrate
.. //depot/projects/hammer/sys/dev/pdq/pdqvar.h#4 integrate
.. //depot/projects/hammer/sys/dev/ppbus/vpo.c#5 integrate
.. //depot/projects/hammer/sys/dev/sio/sio.c#26 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/neomagic-coeff.h#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#9 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.h#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#5 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#4 integrate
.. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/schistory.c#5 integrate
.. //depot/projects/hammer/sys/dev/syscons/scterm-dumb.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#3 integrate
.. //depot/projects/hammer/sys/dev/syscons/syscons.c#12 integrate
.. //depot/projects/hammer/sys/dev/trm/trm.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#15 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_subr.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#23 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#23 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#4 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#7 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#6 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#12 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#9 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#11 integrate
.. //depot/projects/hammer/sys/geom/geom_subr.c#21 integrate
.. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 integrate
.. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate
.. //depot/projects/hammer/sys/gnu/dev/sound/pci/emu10k1.h#3 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#1 branch
.. //depot/projects/hammer/sys/i386/conf/NOTES#27 integrate
.. //depot/projects/hammer/sys/i386/i386/p4tcc.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/pmap.c#27 integrate
.. //depot/projects/hammer/sys/i386/i386/swtch.s#8 integrate
.. //depot/projects/hammer/sys/i386/include/specialreg.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/sysarch.h#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#22 integrate
.. //depot/projects/hammer/sys/ia64/include/cpufunc.h#7 integrate
.. //depot/projects/hammer/sys/ia64/include/sysarch.h#3 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#9 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#30 integrate
.. //depot/projects/hammer/sys/kern/kern_tc.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_uuid.c#6 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#11 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#17 integrate
.. //depot/projects/hammer/sys/kern/uipc_cow.c#10 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#6 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#16 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#15 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#20 integrate
.. //depot/projects/hammer/sys/libkern/ffs.c#4 integrate
.. //depot/projects/hammer/sys/libkern/ffsl.c#1 branch
.. //depot/projects/hammer/sys/libkern/fls.c#1 branch
.. //depot/projects/hammer/sys/libkern/flsl.c#1 branch
.. //depot/projects/hammer/sys/modules/Makefile#34 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile#12 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/modules/acpi/acpi_toshiba/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/awi/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/cx/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/drm/mga/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/drm/r128/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/drm/radeon/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/drm/sis/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/drm/tdfx/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/firewire/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/ida/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/if_ef/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ncp/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ndis/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/netgraph/fec/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/nwfs/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/smbfs/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/sound/driver/emu10k1/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/syscons/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ubsa/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/ucom/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/udf/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/ufm/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/uftdi/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/umct/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/uplcom/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/uvisor/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/uvscom/Makefile#3 integrate
.. //depot/projects/hammer/sys/net/if_atmsubr.c#13 integrate
.. //depot/projects/hammer/sys/net/if_media.h#7 integrate
.. //depot/projects/hammer/sys/net/if_ppp.c#11 integrate
.. //depot/projects/hammer/sys/net/if_spppsubr.c#8 integrate
.. //depot/projects/hammer/sys/net/if_vlan_var.h#6 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#8 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#10 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_cisco.c#4 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ether.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/ng_rfc1490.h#3 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/hammer/sys/netinet/tcp.h#4 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#21 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#11 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#11 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#7 integrate
.. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#7 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/hammer/sys/netinet6/ipsec.c#9 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_output.c#7 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipip.c#4 integrate
.. //depot/projects/hammer/sys/netkey/key.c#14 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#16 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#25 integrate
.. //depot/projects/hammer/sys/pc98/pc98/sio.c#15 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#27 integrate
.. //depot/projects/hammer/sys/pci/if_sk.c#19 integrate
.. //depot/projects/hammer/sys/pci/ncr.c#9 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/hammer/sys/powerpc/include/float.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/nexusvar.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/include/sc_machdep.h#1 branch
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#1 branch
.. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.h#1 branch
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#23 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/sc_machdep.c#1 branch
.. //depot/projects/hammer/sys/powerpc/powerpc/trap_subr.S#4 integrate
.. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#1 branch
.. //depot/projects/hammer/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/hammer/sys/sys/filedesc.h#6 integrate
.. //depot/projects/hammer/sys/sys/libkern.h#5 integrate
.. //depot/projects/hammer/sys/sys/proc.h#42 integrate
.. //depot/projects/hammer/sys/sys/systm.h#14 integrate
.. //depot/projects/hammer/sys/sys/user.h#8 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#17 integrate
.. //depot/projects/hammer/sys/vm/uma_int.h#9 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#12 integrate
.. //depot/projects/hammer/sys/vm/vm_extern.h#7 integrate
.. //depot/projects/hammer/sys/vm/vm_kern.c#13 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#34 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#5 integrate
.. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate
.. //depot/projects/hammer/tools/tools/crypto/Makefile#5 integrate
.. //depot/projects/hammer/tools/tools/crypto/cryptotest.c#3 delete
.. //depot/projects/hammer/tools/tools/tinderbox/www/Makefile#4 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/www/daemon.png#2 delete
.. //depot/projects/hammer/tools/tools/tinderbox/www/daemon.png.uu#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/www/valid-css.png#2 delete
.. //depot/projects/hammer/tools/tools/tinderbox/www/valid-css.png.uu#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/www/valid-xhtml10.png#2 delete
.. //depot/projects/hammer/tools/tools/tinderbox/www/valid-xhtml10.png.uu#1 branch
.. //depot/projects/hammer/usr.bin/Makefile#23 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#14 integrate
.. //depot/projects/hammer/usr.bin/chkey/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/chpass/chpass.c#5 integrate
.. //depot/projects/hammer/usr.bin/chpass/chpass.h#2 integrate
.. //depot/projects/hammer/usr.bin/chpass/field.c#3 integrate
.. //depot/projects/hammer/usr.bin/chpass/util.c#2 integrate
.. //depot/projects/hammer/usr.bin/find/ls.c#3 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.1#3 integrate
.. //depot/projects/hammer/usr.bin/killall/killall.c#7 integrate
.. //depot/projects/hammer/usr.bin/locale/locale.c#5 integrate
.. //depot/projects/hammer/usr.bin/lock/lock.c#5 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#8 integrate
.. //depot/projects/hammer/usr.bin/make/str.c#5 integrate
.. //depot/projects/hammer/usr.bin/make/var.c#10 integrate
.. //depot/projects/hammer/usr.bin/newkey/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/script/script.1#3 integrate
.. //depot/projects/hammer/usr.bin/script/script.c#3 integrate
.. //depot/projects/hammer/usr.bin/uac/uac.c#2 integrate
.. //depot/projects/hammer/usr.bin/uuencode/uuencode.c#4 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#39 integrate
.. //depot/projects/hammer/usr.sbin/acpi/iasl/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/apm/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/apm/apm.8#6 integrate
.. //depot/projects/hammer/usr.sbin/apmd/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/apmd/apmd.8#5 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/search.c#2 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/bgd.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/dun.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ftrn.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/irmc.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/irmc_command.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/lan.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/log.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/log.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/main.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/opush.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/provider.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/provider.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sar.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/scr.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sd.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sdpd.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sp.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/srr.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ssar.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/ssr.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sur.c#1 branch
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.5#3 integrate
.. //depot/projects/hammer/usr.sbin/edquota/edquota.c#4 integrate
.. //depot/projects/hammer/usr.sbin/faithd/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/getfmac/getfmac.c#2 integrate
.. //depot/projects/hammer/usr.sbin/getpmac/getpmac.c#2 integrate
.. //depot/projects/hammer/usr.sbin/i4b/isdnd/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/i4b/isdnmonitor/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/keyserv/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/mixer/mixer.c#6 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.c#6 integrate
.. //depot/projects/hammer/usr.sbin/mtree/compare.c#8 integrate
.. //depot/projects/hammer/usr.sbin/mtree/create.c#8 integrate
.. //depot/projects/hammer/usr.sbin/mtree/extern.h#5 integrate
.. //depot/projects/hammer/usr.sbin/mtree/misc.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mtree/mtree.8#6 integrate
.. //depot/projects/hammer/usr.sbin/mtree/mtree.c#6 integrate
.. //depot/projects/hammer/usr.sbin/mtree/verify.c#6 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf-token.l#3 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#3 integrate
.. //depot/projects/hammer/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/dot.c#1 branch
.. //depot/projects/hammer/usr.sbin/ngctl/main.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/ngctl.8#3 integrate
.. //depot/projects/hammer/usr.sbin/ngctl/ngctl.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ofwdump/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ofwdump/ofwdump.8#3 integrate
.. //depot/projects/hammer/usr.sbin/pccard/pccardd/pccardd.8#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile.inc#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ppp/arp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#7 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw.8#4 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw_group.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pw/pw_user.c#3 integrate
.. //depot/projects/hammer/usr.sbin/quotaon/quotaon.c#3 integrate
.. //depot/projects/hammer/usr.sbin/repquota/repquota.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/dump.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/if.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/probe.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsock.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsol.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsold.8#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsold.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsold.h#3 integrate
.. //depot/projects/hammer/usr.sbin/sa/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/user.c#2 integrate
.. //depot/projects/hammer/usr.sbin/watch/watch.c#5 integrate
.. //depot/projects/hammer/usr.sbin/wlconfig/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wlconfig/wlconfig.8#2 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.398 2003/12/09 00:42:44 gad Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.402 2004/01/22 08:18:36 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -93,7 +93,7 @@
 SUBDIR+= usr.sbin
 .endif
 
-# etc must be last for "distribute" to work
+# etc must be last for install/distribute to work
 .if exists(${.CURDIR}/etc)
 SUBDIR+= etc
 .endif
@@ -272,7 +272,7 @@
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
-    usr/bin usr/games usr/include/sys usr/lib \
+    usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \
     usr/libexec usr/sbin usr/share/dict \
     usr/share/groff_font/devX100 \
     usr/share/groff_font/devX100-12 \
@@ -348,8 +348,9 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \
-		libraries
+	cd ${.CURDIR}; \
+	    ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \
+	    libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -431,13 +432,6 @@
 	@echo ">>> Installing everything.."
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding man page indices"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/share/man; ${MAKE} makedb
-.endif
 
 redistribute:
 	@echo "--------------------------------------------------------------"
@@ -629,6 +623,10 @@
 .endif
 .endif
 
+.if ${BOOTSTRAPPING} < 502102
+_lex=		usr.bin/lex
+.endif
+
 .if ${BOOTSTRAPPING} < 450005 || \
     ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034
 _uudecode=	usr.bin/uudecode
@@ -660,6 +658,7 @@
     ${_groff} \
     gnu/usr.bin/texinfo \
     usr.bin/colldef \
+    ${_lex} \
     usr.bin/makewhatis \
     usr.bin/rpcgen \
     ${_uudecode} \

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

@@ -1,11 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.23 2003/02/18 19:51:58 obrien Exp $
+# $FreeBSD: src/bin/Makefile,v 1.24 2004/01/16 15:23:18 ru Exp $
 
 SUBDIR= cat \
 	chflags \
 	chio \
 	chmod \
 	cp \
+	${_csh} \
 	date \
 	dd \
 	df \
@@ -24,8 +25,10 @@
 	pax \
 	ps \
 	pwd \
+	${_rcp} \
 	realpath \
 	rm \
+	${_rmail} \
 	rmdir \
 	setfacl \
 	sh \
@@ -35,15 +38,15 @@
 	test
 
 .if !defined(NO_RCMNDS)
-SUBDIR+=rcp
+_rcp=	rcp
 .endif
 
-.if !defined(NO_TCSH)

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



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