Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Oct 2007 20:54:00 GMT
From:      Xin LI <delphij@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 127319 for review
Message-ID:  <200710082054.l98Ks0fx073873@repoman.freebsd.org>

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

Change 127319 by delphij@tarsier on 2007/10/08 20:53:39

	IFC

Affected files ...

.. //depot/projects/delphij_fork/Makefile.inc1#4 integrate
.. //depot/projects/delphij_fork/ObsoleteFiles.inc#10 integrate
.. //depot/projects/delphij_fork/UPDATING#4 integrate
.. //depot/projects/delphij_fork/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/delphij_fork/bin/ps/print.c#2 integrate
.. //depot/projects/delphij_fork/bin/ps/ps.c#2 integrate
.. //depot/projects/delphij_fork/bin/sh/eval.c#2 integrate
.. //depot/projects/delphij_fork/bin/sh/sh.1#2 integrate
.. //depot/projects/delphij_fork/cddl/lib/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/delphij_fork/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/delphij_fork/contrib/gcc/opts.c#2 integrate
.. //depot/projects/delphij_fork/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/delphij_fork/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/delphij_fork/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/delphij_fork/contrib/less/NEWS#2 integrate
.. //depot/projects/delphij_fork/contrib/less/README#2 integrate
.. //depot/projects/delphij_fork/contrib/less/ch.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/charset.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/configure#2 integrate
.. //depot/projects/delphij_fork/contrib/less/configure.ac#2 integrate
.. //depot/projects/delphij_fork/contrib/less/filename.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/funcs.h#2 integrate
.. //depot/projects/delphij_fork/contrib/less/jump.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/less.h#2 integrate
.. //depot/projects/delphij_fork/contrib/less/less.man#2 integrate
.. //depot/projects/delphij_fork/contrib/less/less.nro#2 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.man#2 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.nro#2 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.man#2 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.nro#2 integrate
.. //depot/projects/delphij_fork/contrib/less/line.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/search.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/signal.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/version.c#2 integrate
.. //depot/projects/delphij_fork/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/delphij_fork/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/delphij_fork/crypto/openssl/ssl/ssl_lib.c#2 integrate
.. //depot/projects/delphij_fork/etc/defaults/rc.conf#4 integrate
.. //depot/projects/delphij_fork/etc/mtree/BSD.include.dist#4 integrate
.. //depot/projects/delphij_fork/etc/mtree/BSD.local.dist#2 integrate
.. //depot/projects/delphij_fork/etc/mtree/BSD.x11-4.dist#2 integrate
.. //depot/projects/delphij_fork/etc/mtree/README#2 integrate
.. //depot/projects/delphij_fork/etc/rc.d/Makefile#3 integrate
.. //depot/projects/delphij_fork/etc/rc.d/cached#2 delete
.. //depot/projects/delphij_fork/etc/rc.d/ftp-proxy#1 branch
.. //depot/projects/delphij_fork/etc/rc.d/nscd#3 integrate
.. //depot/projects/delphij_fork/etc/services#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_int/Makefile#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/delphij_fork/include/Makefile#4 integrate
.. //depot/projects/delphij_fork/lib/libarchive/archive_read.3#2 integrate
.. //depot/projects/delphij_fork/lib/libarchive/archive_write_disk.c#4 integrate
.. //depot/projects/delphij_fork/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/delphij_fork/lib/libc/Makefile#2 integrate
.. //depot/projects/delphij_fork/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/delphij_fork/lib/libc/net/getaddrinfo.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/net/sctp_connectx.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/net/sctp_opt_info.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/net/sctp_recvmsg.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/net/sctp_sendmsg.3#2 integrate
.. //depot/projects/delphij_fork/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/delphij_fork/lib/libc/stdlib/getenv.c#3 integrate
.. //depot/projects/delphij_fork/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/delphij_fork/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/delphij_fork/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/delphij_fork/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/delphij_fork/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/delphij_fork/lib/libdisk/open_disk.c#3 integrate
.. //depot/projects/delphij_fork/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/elf_update.c#2 integrate
.. //depot/projects/delphij_fork/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/delphij_fork/lib/libkse/Makefile#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/delphij_fork/lib/libkse/pthread.map#1 branch
.. //depot/projects/delphij_fork/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/Makefile#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/README#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/delphij_fork/lib/libkse/test/verify#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/delphij_fork/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/delphij_fork/lib/libpthread/Makefile#2 integrate
.. //depot/projects/delphij_fork/lib/libthr/Makefile#2 integrate
.. //depot/projects/delphij_fork/lib/libutil/expand_number.3#3 integrate
.. //depot/projects/delphij_fork/lib/libutil/flopen.3#3 integrate
.. //depot/projects/delphij_fork/lib/libutil/humanize_number.3#3 integrate
.. //depot/projects/delphij_fork/lib/libutil/kld.3#2 integrate
.. //depot/projects/delphij_fork/libexec/atrun/Makefile#2 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate
.. //depot/projects/delphij_fork/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/delphij_fork/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/delphij_fork/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/delphij_fork/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/delphij_fork/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/delphij_fork/sbin/geom/class/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/delphij_fork/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/delphij_fork/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/delphij_fork/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/delphij_fork/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/delphij_fork/sbin/ggate/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/delphij_fork/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/delphij_fork/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/delphij_fork/sbin/tunefs/tunefs.8#3 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/cvs-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/doc-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/gnats-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/ports-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/stable-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/standard-supfile#2 integrate
.. //depot/projects/delphij_fork/share/examples/cvsup/www-supfile#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/ata.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/gem.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/pci.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/ral.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/rum.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/sctp.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/ural.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/uscanner.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/wlan.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/zyd.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man5/Makefile#3 integrate
.. //depot/projects/delphij_fork/share/man/man5/ar.5#1 branch
.. //depot/projects/delphij_fork/share/man/man5/elf.5#2 integrate
.. //depot/projects/delphij_fork/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/Makefile#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/crypto.9#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/pci.9#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/delphij_fork/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/delphij_fork/share/misc/committers-src.dot#2 integrate
.. //depot/projects/delphij_fork/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/delphij_fork/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/delphij_fork/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/delphij_fork/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate
.. //depot/projects/delphij_fork/tools/make_libdeps.sh#2 integrate
.. //depot/projects/delphij_fork/tools/regression/bin/sh/builtins/case1.0#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/Makefile#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/main.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/main.h#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_acct.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_adjtime.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_control.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_getaudit.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_setaudit.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_audit_submit.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_clock_settime.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_cred.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_io.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_kenv_set.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_kenv_unset.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_msgbuf.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_netinet_raw.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_proc_setlogin.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_proc_setrlimit.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_sched_rtprio.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_sched_setpriority.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_settimeofday.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_sysctl_write.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_admin.c#2 delete
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chflags.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chmod.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chown.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_chroot.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhopen.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhstat.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_generation.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_getfh.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_read_write.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_setgid.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vfs_utimes.c#1 branch
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_madv_protect.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_mlock.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_vm_munlock.c#2 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/test_utimes.c#2 delete
.. //depot/projects/delphij_fork/tools/tools/crypto/ipsecstats.c#2 integrate
.. //depot/projects/delphij_fork/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/delphij_fork/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.bin/at/at.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.computer#2 integrate
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.dutch#2 integrate
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/calendar.holiday#3 integrate
.. //depot/projects/delphij_fork/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate
.. //depot/projects/delphij_fork/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/m4/gnum4.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/mklocale/yacc.y#2 integrate
.. //depot/projects/delphij_fork/usr.bin/netstat/sctp.c#4 integrate
.. //depot/projects/delphij_fork/usr.bin/systat/pigs.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/tar/bsdtar.c#3 integrate
.. //depot/projects/delphij_fork/usr.bin/top/machine.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/Makefile#4 integrate
.. //depot/projects/delphij_fork/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/cached/Makefile#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cached.8#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cached.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cached.conf.5#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/config.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/config.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/log.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/log.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/query.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/query.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/delphij_fork/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/delphij_fork/usr.sbin/config/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/cron/cron/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/Makefile#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agent.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/cachelib.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/cacheplcs.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/config.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/log.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/log.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_rs_query.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/mp_ws_query.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.8#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscd.conf.5#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/nscdcli.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/parser.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/protocol.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/query.c#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/query.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/nscd/singletons.h#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/periodic/periodic.8#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/pmcstat/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/wpa/hostapd/Makefile#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate
.. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/delphij_fork/Makefile.inc1#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1038,12 +1035,20 @@
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/delphij_fork/ObsoleteFiles.inc#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
@@ -3301,7 +3306,6 @@
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
-OLD_FILES+=usr/share/man/man5/ar.5.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz

==== //depot/projects/delphij_fork/UPDATING#4 (text+ko) ====

@@ -21,6 +21,20 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/delphij_fork/bin/getfacl/getfacl.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,6 +41,8 @@
 
 #include <err.h>
 #include <errno.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,6 +57,32 @@
 	fprintf(stderr, "getfacl [-dhq] [file ...]\n");
 }
 
+static char *
+getuname(uid_t uid)
+{
+	struct passwd *pw;
+	static char uids[10];
+
+	if ((pw = getpwuid(uid)) == NULL) {
+		(void)snprintf(uids, sizeof(uids), "%u", uid);
+		return (uids);
+	} else
+		return (pw->pw_name);
+}
+
+static char *
+getgname(gid_t gid)
+{
+	struct group *gr;
+	static char gids[10];
+
+	if ((gr = getgrgid(gid)) == NULL) {
+		(void)snprintf(gids, sizeof(gids), "%u", gid);
+		return (gids);
+	} else
+		return (gr->gr_name);
+}
+
 /*
  * return an ACL corresponding to the permissions
  * contained in struct stat
@@ -169,8 +197,8 @@
 		more_than_one++;
 
 	if (!qflag)
-		printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
-		    sb.st_gid);
+		printf("# file: %s\n# owner: %s\n# group: %s\n", path,
+		    getuname(sb.st_uid), getgname(sb.st_gid));
 
 	if (hflag)
 		acl = acl_get_link_np(path, type);

==== //depot/projects/delphij_fork/bin/ps/print.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -197,14 +197,13 @@
 void
 state(KINFO *k, VARENT *ve)
 {
-	int flag, sflag, tdflags;
+	int flag, tdflags;
 	char *cp;
 	VAR *v;
 	char buf[16];
 
 	v = ve->var;
 	flag = k->ki_p->ki_flag;
-	sflag = k->ki_p->ki_sflag;
 	tdflags = k->ki_p->ki_tdflags;	/* XXXKSE */
 	cp = buf;
 
@@ -242,7 +241,7 @@
 		*cp = '?';
 	}
 	cp++;
-	if (!(sflag & PS_INMEM))
+	if (!(flag & P_INMEM))
 		*cp++ = 'W';
 	if (k->ki_p->ki_nice < NZERO)
 		*cp++ = '<';
@@ -591,7 +590,7 @@
 #define	fxtofl(fixpt)	((double)(fixpt) / fscale)
 
 	/* XXX - I don't like this */
-	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	if (rawcpu)
 		return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@@ -619,7 +618,7 @@
 	if (failure)
 		return (0.0);
 
-	if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if ((k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	/* XXX want pmap ptpages, segtab, etc. (per architecture) */
 	/* XXX don't have info about shared */

==== //depot/projects/delphij_fork/bin/ps/ps.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -994,13 +994,13 @@
 	return (s);
 }
 
-#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
+#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_flag & P_INMEM))
 
 static void
 saveuser(KINFO *ki)
 {
 
-	if (ki->ki_p->ki_sflag & PS_INMEM) {
+	if (ki->ki_p->ki_flag & P_INMEM) {
 		/*
 		 * The u-area might be swapped out, and we can't get
 		 * at it because we have a crashdump and no swap.

==== //depot/projects/delphij_fork/bin/sh/eval.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -367,6 +367,7 @@
 	setstackmark(&smark);
 	arglist.lastp = &arglist.list;
 	oexitstatus = exitstatus;
+	exitstatus = 0;
 	expandarg(n->ncase.expr, &arglist, EXP_TILDE);
 	for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
 		for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {

==== //depot/projects/delphij_fork/bin/sh/sh.1#2 (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.124 2006/10/07 16:51:16 stefanf Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $
 .\"
 .Dd October 7, 2006
 .Dt SH 1
@@ -861,6 +861,10 @@
 separated by
 .Dq Li \&|
 characters.
+The exit code of the
+.Ic case
+command is the exit code of the last command executed in the list or
+zero if no patterns were matched.
 .Ss Grouping Commands Together
 Commands may be grouped by writing either
 .Bd -literal -offset indent

==== //depot/projects/delphij_fork/cddl/lib/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/delphij_fork/cddl/sbin/zfs/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/delphij_fork/cddl/sbin/zpool/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/delphij_fork/cddl/usr.bin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/delphij_fork/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/delphij_fork/cddl/usr.sbin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/delphij_fork/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/delphij_fork/contrib/gcc/opts.c#2 (text+ko) ====

@@ -20,7 +20,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
@@ -501,7 +501,10 @@
       flag_reorder_functions = 1;
       flag_tree_store_ccp = 1;
       flag_tree_store_copy_prop = 1;
-      flag_tree_vrp = 1;
+      /* XXX: some issues with ports have been traced to -ftree-vrp.
+         So remove it from -O2 and above.  Note that jdk1{5,6} are affected
+         and they build with w/-O3 - so we cannot just move it to -O3. */
+      // flag_tree_vrp = 1;
 
       if (!optimize_size)
 	{

==== //depot/projects/delphij_fork/contrib/groff/tmac/doc-common#2 (text+ko) ====

@@ -485,6 +485,7 @@
 .ds doc-operating-system-FreeBSD-5.5     5.5
 .ds doc-operating-system-FreeBSD-6.0     6.0
 .ds doc-operating-system-FreeBSD-6.1     6.1
+.ds doc-operating-system-FreeBSD-6.2     6.2
 .ds doc-operating-system-FreeBSD-7.0     7.0
 .
 .ds doc-operating-system-Darwin-8.0.0 8.0.0

==== //depot/projects/delphij_fork/contrib/groff/tmac/doc-syms#2 (text+ko) ====

@@ -204,13 +204,13 @@
 .as doc-str-At-v7  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
 .ds doc-str-At-V   \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V
 .as doc-str-At-V   " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1
+.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1
 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2
+.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2
 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3
+.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3
 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4
+.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4
 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
 .
 .de At

==== //depot/projects/delphij_fork/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ====

@@ -813,9 +813,9 @@
 Local, OS-specific additions might be found in the file
 .Pa mdoc.local ;
 look for strings named
-.Ql volume-ds-XXX
+.Ql volume\-ds\-XXX
 (for the former type) and
-.Ql volume-as-XXX
+.Ql volume\-as\-XXX

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



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