PERFORCE change 127212 for review

John Birrell jb at FreeBSD.org
Thu Oct 4 19:10:04 PDT 2007 

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

Change 127212 by jb at jb_freebsd1 on 2007/10/05 02:09:26

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#17 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#9 integrate
.. //depot/projects/dtrace/ports/LEGAL#21 integrate
.. //depot/projects/dtrace/ports/MOVED#42 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#12 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#17 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.xorg.mk#2 integrate
.. //depot/projects/dtrace/ports/UPDATING#34 integrate
.. //depot/projects/dtrace/src/bin/sh/eval.c#5 integrate
.. //depot/projects/dtrace/src/bin/sh/sh.1#8 integrate
.. //depot/projects/dtrace/src/contrib/gcc/opts.c#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/doc-common#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/doc-syms#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/groff_mdoc.man#5 integrate
.. //depot/projects/dtrace/src/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_lib.c#7 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#9 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#7 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.x11-4.dist#4 integrate
.. //depot/projects/dtrace/src/etc/mtree/README#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/cached#4 delete
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate
.. //depot/projects/dtrace/src/lib/libkse/Makefile#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/pthread.map#1 branch
.. //depot/projects/dtrace/src/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/Makefile#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/README#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/verify#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/common/module.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/case1.0#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#6 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/Makefile.inc#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.8#5 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.conf.5#5 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/config.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/config.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/hashtable.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/log.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/log.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/query.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.8#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#17 integrate
.. //depot/projects/dtrace/www/en/projects/newbies.sgml#6 integrate
.. //depot/projects/dtrace/www/en/where.sgml#10 integrate
.. //depot/projects/dtrace/www/share/sgml/advisories.xml#13 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#21 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/header.l10n.ent#5 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/libcommon.xsl#6 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/navibar.l10n.ent#4 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/news.xml#7 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/press.xml#6 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.314 2007/09/03 16:39:51 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.315 2007/10/03 20:35:35 danger Exp $
 -->
 
 <chapter id="security">
@@ -4220,12 +4220,13 @@
         <filename>~/.ssh/id_dsa</filename> or
         <filename>~/.ssh/id_rsa</filename>, whereas the public key is
         stored in <filename>~/.ssh/id_dsa.pub</filename> or
-        <filename>~/.ssh/id_rsa.pub</filename>, respectively for DSA and
-        RSA key types.  The public key must be placed in
-        <filename>~/.ssh/authorized_keys</filename> of the remote
-        machine in order for the setup to work.  Similarly, RSA version
-        1 public keys should be placed in
-        <filename>~/.ssh/authorized_keys</filename>.</para>
+	<filename>~/.ssh/id_rsa.pub</filename>, respectively for
+	<acronym>DSA</acronym> and <acronym>RSA</acronym> key types.
+	The public key must be placed in the
+	<filename>~/.ssh/authorized_keys</filename> file of the	remote
+	machine for both <acronym>RSA</acronym> or
+	<acronym>DSA</acronym> keys in order for the setup to
+	work.</para>
 
       <para>This will allow connection to the remote machine based upon
         SSH keys instead of passwords.</para>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#17 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.825
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.26 2007/04/23 06:34:27 delphij Exp $
+     Original Revision: 1.872
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.27 2007/10/02 02:56:37 loader Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -335,6 +335,12 @@
 	  µÚÈý²½ÒÔºó£¬ ¼ì²éÊÇ·ñËùÓÐн¨µÄĿ¼¶¼±»Õýȷɾ³ýÁË¡£
 	  ÔÚµÚËIJ½ÒÔºó£¬ ÊÔ×ÅÔËÐÐÒ»ÏÂËù×°µÄÈí¼þ£¬
 	  È·±£µ±ËüÒÔ package ·½Ê½°²×°µÄʱºòÒ²ÄÜÕý³£¹¤×÷¡£</para>
+
+	<para>×Ô¶¯»¯ÕâЩ²½Öè×î¼òµ¥µÄ·½·¨ÊÇͨ¹ý <application>ports tinderbox</application>
+	  À´½øÐвâÊÔ¡£ Ëü¿ÉÒÔά»¤ <literal>jails</literal> ²¢ÔÚÆäÖÐÍê³ÉÈ«²¿²âÊÔ¹¤×÷£¬
+	  ¶ø²»»áÆÆ»µÕýÔÚÔËÐеÄϵͳµÄ״̬¡£ Çë²Î¼û
+	  <filename>ports/ports-mgmt/tinderbox</filename>
+	  ÒÔÁ˽â¸ü¶àµÄÐÅÏ¢¡£</para>
       </sect1>
 
       <sect1 id="porting-portlint">
@@ -1013,6 +1019,25 @@
 	  <makevar>PORTNAME</makevar> ÖС£</para>
       </sect2>
 
+      <sect2>
+	<title><makevar>LATEST_LINK</makevar></title>
+
+	<para>ÓÐʱ£¬ ÔÚ ports Ì×¼þÖпÉÄÜ»á´æÔÚͬһ³ÌÐòµÄ¶à¸ö°æ±¾¡£
+	  Ë÷ÒýºÍÔ¤±àÒë°üµÄÁª±àϵͳ¶¼ÐèÒªÄܹ»½«ËüÃÇÊÓΪ²»Í¬µÄÈí¼þ°ü£¬ ¾¡¹ÜÆä
+	  <makevar>PORTNAME</makevar>¡¢ <makevar>PKGNAMEPREFIX</makevar>£¬ ÒÔ¼°
+	  even <makevar>PKGNAMESUFFIX</makevar> ¿ÉÄÜÊÇһģһÑùµÄ¡£ Óöµ½ÕâÖÖÇé¿öʱ£¬
+	  ¾ÍÐèÒª½«³ýÁË <quote>Ö÷</quote> port Ö®ÍâµÄÆäËû port
+	  ÖÐµÄ <makevar>LATEST_LINK</makevar> ±äÁ¿ÉèΪ²»Í¬µÄÖµ
+	  &mdash; Çë²Î¼û <filename>editors/vim5</filename> ºÍ
+	  <filename>editors/vim</filename> port£¬ ÒÔ¼°
+	  <filename>www/apache*</filename> ϵÁУ¬ ÒÔÁ˽âËüµÄÓ÷¨¡£
+	  ÐèҪעÒâµÄÊÇ£¬ ÈçºÎÈ·¶¨ <quote>Ö÷</quote> °æ±¾ &mdash;
+	  <quote>×îÁ÷ÐÐ</quote>¡¢ <quote>ÊÜÖ§³Ö×îºÃ</quote>£¬
+	  <quote>±ä¶¯×îÉÙ</quote>£¬ µÈµÈ &mdash; ÒѾ­³¬¹ýÁ˱¾ÊéÄܹ»¸ø³öµÄ½¨Ò鷶Χ£»
+	  ÕâÀïÖ»ÊÇÏòÄú½éÉÜÔÚÑ¡¶¨ÁËÒ»¸ö
+	  <quote>Ö÷</quote> port Ö®ºóÈçºÎÖ¸¶¨ÆäËû port µÄ°æ±¾¡£</para>
+      </sect2>
+
     <sect2 id="porting-pkgname">
       <title>°üÃüÃû¹æÔò</title>
 
@@ -1051,16 +1076,28 @@
 
 	<listitem>
 	  <para><filename>name</filename> ²¿·ÖµÄÊ××ÖĸӦ¸Ã
-	    Сд¡£ (ÓàϵIJ¿·ÖÄÜ°üº¬´óд×Öĸ£¬ ËùÒÔµ±Äú
+	    Сд¡£ (ÓàϵIJ¿·Ö¿ÉÒÔ°üº¬´óд×Öĸ£¬ ËùÒÔµ±Äú
 	    Ҫת»»Ò»¸ö°üº¬´óд×ÖĸÈí¼þµÄÃû×Öʱ£¬ ÄúÐèÒª
-	    ×Ô¼º×ö³öÅжϡ£) ¶ÔÓÚ<literal>perl 5</literal>
+	    ×Ô¼º×ö³öÅжϡ£) ¶ÔÓÚ <literal>Perl 5</literal>
 	    Ä£¿éµÄÃüÃû£¬ Óиö´«Í³µÄ¹æÔòÊÇ£¬ ÔÚÇ°Ãæ
 	    ¼ÓÉÏ <literal>p5-</literal>
 	    ²¢°ÑÁ½¸öðºÅµÄ²¿·Ö¸ÄΪÁ¬×ֺţ¬ È磺
-	    <literal>Data::Dumper</literal> Ä£¿é±ä³É
-	    <literal>p5-Data-Dumper</literal>¡£
-	    Èç¹ûÈí¼þµÄÃû×ÖÀﻹÓÐÊý×Ö¡¢ Á¬×ֺš¢ Ï»®Ïߣ¬
-	    ÄúÒ²¿ÉÒÔ°ÑÕâЩ°üÀ¨½øÀ´ (ÀýÈç <literal>kinput2</literal>)¡£</para>
+	    <literal>Data::Dumper</literal> Ä£¿é¶ÔÓ¦µÄÃû×Ö£¬ ¾ÍÓ¦¸ÃÊÇ
+	    <literal>p5-Data-Dumper</literal>¡£</para>
+	</listitem>
+	
+	<listitem>
+	  <para>È·ÈÏ port µÄÃû×ֺͰ汾֮¼äÓÐÇåÎúµÄ·Ö¸ô£¬ ²¢·ÅÈë <makevar>PORTNAME</makevar> ºÍ
+	    <makevar>PORTVERSION</makevar> ±äÁ¿¡£ ÔÚ
+	    <makevar>PORTNAME</makevar> Öаüº¬°æ±¾²¿·ÖµÄΨһÀíÓÉÊÇÉÏÓÎÈí¼þ°üÕæµÄ²ÉÓÃÕâÑùµÄÃüÃû·½Ê½£¬
+	    ÀàËÆ <filename>textproc/libxml2</filename> »ò
+	    <filename>japanese/kinput2-freewnn</filename> port ÕâÑù¡£ ·ñÔò£¬
+	    ÔÚ <makevar>PORTNAME</makevar> ÖоͲ»Ó¦°üº¬Èκΰ汾ÐÅÏ¢¡£
+	    Ðí¶à port ²ÉÓÃͬÑùµÄ <makevar>PORTNAME</makevar> Ãû×ÖÊǺÜÕý³£µÄ£¬
+	    <filename>www/apache*</filename> port ±ãÊÇÈç´Ë£» ÔÚÕâÖÖÇé¿öÏ£¬
+	    ²»Í¬µÄ°æ±¾ (ÒÔ¼°²»Í¬µÄË÷ÒýÏî) ÊÇÓÉ <makevar>PKGNAMEPREFIX</makevar>¡¢
+	    <makevar>PKGNAMESUFFIX</makevar>£¬ ÒÔ¼°
+	    <makevar>LATEST_LINK</makevar> µÄÖµµÄ²»Í¬¶øÓÐËùÇø±ðµÄ¡£</para>
 	</listitem>
 
 	<listitem>
@@ -1539,6 +1576,12 @@
 	      </row>
 
 	      <row>
+		<entry><filename>kld*</filename></entry>
+		<entry>¿É¼ÓÔØÄÚºËÄ£¿é¡£</entry>
+		<entry></entry>
+	      </row>
+
+	      <row>
 		<entry><filename>korean</filename></entry>
 		<entry>º«ÓïÓïÑÔÖ§³Ö¡£</entry>
 		<entry></entry>
@@ -1861,6 +1904,12 @@
 	      </row>
 
 	      <row>
+		<entry><filename>x11-drivers</filename></entry>
+		<entry>X11 Çý¶¯³ÌÐò¡£</entry>
+		<entry></entry>
+	      </row>
+
+	      <row>
 		<entry><filename>x11-fm</filename></entry>
 		<entry>X11 ϵÄÎļþ¹ÜÀíÆ÷¡£</entry>
 		<entry></entry>
@@ -1965,6 +2014,12 @@
 	    </para>
 	  </listitem>
 
+          <listitem>
+	    <para>ÐèÒª°²×°¿É¼ÓÔØÄÚºËÄ£¿éµÄ port Ó¦ÔÚÆä <makevar>CATEGORIES</makevar>
+	      ÖйéÈëÐéÄâ·ÖÀà <filename>kld</filename>¡£
+	    </para>
+	  </listitem>
+
 	  <listitem>
 	    <para><filename>misc</filename>
 	      ·ÖÀàµÄ port ²»ÄÜÓÐÆäËü·ÇÐéÄâµÄ·ÖÀà¡£
@@ -3495,10 +3550,21 @@
     <sect1 id="makefile-info">
       <title>Info Îļþ</title>
 
-      <para>Èç¹ûÈí¼þ°üÐèÒª°²×° GNU Îļþ£¬
-	ÔòÐèÒªÔÚ <makevar>INFO</makevar> ±äÁ¿ÖÐÁгö (²»ÐèÒªÖ¸¶¨
-	<literal>.info</literal> ºó׺)£¬ ÕâÑù°²×°/жÔØ´úÂë¾Í»á×Ô¶¯µØÔÚ×¢²á°üʱ½«ËüÃǼÓÈëµ½
-	<filename>pkg-plist</filename> ÁË¡£</para>
+      <para>Èç¹ûÈí¼þ°üÐèÒª°²×° GNU info Îļþ£¬
+	ÔòÐèÒªÔÚ <makevar>INFO</makevar> ±äÁ¿ÖÐÒ»Ò»Áгö (²»ÐèÒªÖ¸¶¨
+	<literal>.info</literal> ºó׺)¡£ ϵͳ¼Ù¶¨ÕâЩÎļþ¾ù»á°²×°µ½
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar></filename> Ŀ¼ÖС£
+	Èç¹ûÈí¼þ°üÓÐÐèÒª£¬ Ò²¿ÉÒÔͨ¹ýÐÞ¸Ä <makevar>INFO_PATH</makevar> À´Ö¸¶¨²»Í¬µÄλÖá£
+	²»¹ý£¬ ²¢²»ÍƼöÕâÑù×ö¡£ ËùÓÐÁгöµÄÏîÄ¿¾ùÊÇÏà¶ÔÓÚ
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar></filename> µÄÎļþ·¾¶¡£
+	ÀýÈ磬 <filename role="package">lang/gcc33</filename> ±íʾ½«
+	info Îļþ°²×°µ½
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar>/gcc33</filename>£¬
+	Òò´Ë <makevar>INFO</makevar> Ӧд³ÉÀàËÆÕâÑù£º
+	<programlisting>INFO= gcc33/cpp gcc33/cppinternals gcc33/g77 ...
+</programlisting>
+	 ÕâÑù°²×°/жÔØ´úÂë¾Í»á×Ô¶¯µØÔÚ×¢²á°ü֮ǰ½«ËüÃǼÓÈëµ½ÁÙʱµÄ
+	<filename>pkg-plist</filename> ÖÐÁË¡£</para>
     </sect1>
 
       <sect1 id="makefile-options">
@@ -3512,7 +3578,7 @@
 	Ö§³ÖÕâЩÌØÐÔ¿ÉÒÔÈÃÓû§ÌåÑé¸üºÃ£¬ ²¢´ïµ½Ê°빦±¶µÄЧ¹û¡£</para>
 
       <sect2>
-          <title>¿ª¹Ø (<makevar>KNOBS</makevar>)</title>
+          <title>¿ª¹Ø (Knobs)</title>
 
 	<sect3>
 	  <title><makevar>WITH_<replaceable>*</replaceable></makevar> ºÍ
@@ -3680,6 +3746,7 @@
 	      ¶ø <makevar>WITH_*</makevar> ºÍ <makevar>WITHOUT_*</makevar>
 	      Ö»ÓÐÔÚÒýÓÃÁË
 	      <filename>bsd.port.pre.mk</filename> Ö®ºó²ÅÄÜ¿ªÊ¼¼ì²â¡£</para>
+	</sect3>
 
 	<sect3>
 	  <title>Àý×Ó</title>
@@ -3702,6 +3769,7 @@
 
 .include &lt;bsd.port.post.mk&gt;</programlisting></para>
 	  </example>
+	</sect3>
 
       </sect2>
 
@@ -3939,20 +4007,37 @@
 	  </listitem>
 
 	  <listitem>
+	    <para><makevar>DATADIR_REL</makevar> »áÕ¹¿ª³É
+	      <filename>share/<makevar>PORTNAME</makevar></filename>¡£</para>
+	  </listitem>
+
+	  <listitem>
 	    <para><makevar>DOCSDIR</makevar> »áÕ¹¿ª³É
 	      <filename><makevar>PREFIX</makevar>/share/doc/<makevar>PORTNAME</makevar></filename>¡£</para>
 	  </listitem>
 
 	  <listitem>
+	    <para><makevar>DOCSDIR_REL</makevar> »áÕ¹¿ª³É
+	      <filename>share/doc/<makevar>PORTNAME</makevar></filename>¡£</para>
+	  </listitem>
+
+	  <listitem>
 	    <para><makevar>EXAMPLESDIR</makevar> »áÕ¹¿ª³É
 	      <filename><makevar>PREFIX</makevar>/share/examples/<makevar>PORTNAME</makevar></filename>¡£</para>
 	  </listitem>
+
+	  <listitem>
+	    <para><makevar>EXAMPLESDIR_REL</makevar> »áÕ¹¿ª³É
+	      <filename>share/examples/<makevar>PORTNAME</makevar></filename>¡£</para>
+	  </listitem>
 	</itemizedlist>
 
 	<note>
-	  <para><makevar>NOPORTDOCS</makevar> Ö»¿ØÖƽ«Òª×°µ½ <makevar>DOCSDIR</makevar>
-	    µÄÄÇЩÎĵµ£¬ ¶ø²»Ó¦Ó°Ïì±ê×¼µÄÁª»úÊֲᡢ info Êֲᣬ ÒÔ¼°Ó¦×°µ½
-	    <makevar>DATADIR</makevar>¡¢ <makevar>EXAMPLESDIR</makevar> µÄÎļþ¡£</para>
+	  <para><makevar>NOPORTDOCS</makevar> Ö»¿ØÖƽ«Òª°²×°µ½ <makevar>DOCSDIR</makevar>
+	    µÄÄÇЩÎĵµ£¬ ¶ø²»Ó¦Ó°Ïì±ê×¼µÄÁª»úÊÖ²áÒÔ¼° info ÊÖ²áµÄ°²×°¡£ °²×°µ½
+	    <makevar>DATADIR</makevar> ºÍ <makevar>EXAMPLESDIR</makevar>
+	    µÄÎļþÔòÏàÓ¦µØÊÜ <makevar>NOPORTDATA</makevar> ºÍ
+	    <makevar>NOPORTEXAMPLES</makevar> ¿ØÖÆ¡£</para>
 	</note>
 
 	<para>ÕâЩ±äÁ¿Ò²»á±»µ¼³öµ½ <makevar>PLIST_SUB</makevar> ÖС£
@@ -3963,7 +4048,7 @@
 	  (¸ü¶àµÄ <filename>pkg-plist</filename> ´ú»»¿ÉÒÔÔÚ
 	  <link linkend="plist-sub">ÕâÀï</link> ÕÒµ½¡£)</para>
 
-	<para>ËùÓеݲװµÄÎĵµÎļþºÍĿ¼£¬
+	<para>ËùÓзÇÎÞÌõ¼þ°²×°µÄÎĵµÎļþºÍĿ¼£¬
 	  ¶¼Ó¦ÔÚ <filename>pkg-plist</filename> ³öÏÖ£¬ ²¢ÇÒʹÓÃ
 	  <literal>%%PORTDOCS%%</literal> ǰ׺£¬ ÀýÈ磺</para>
 
@@ -3988,6 +4073,11 @@
         <programlisting>PORTDOCS=       README.* ChangeLog docs/*</programlisting>
 
 	<note>
+	  <para>Óë <makevar>PORTDOCS</makevar> ÀàËÆ£¬
+	  ¶ÔÓ¦ÓÚ <makevar>DATADIR</makevar> ºÍ
+	  <makevar>EXAMPLESDIR</makevar> µÄ±äÁ¿·Ö±ðÊÇ <makevar>PORTDATA</makevar>
+	  ºÍ <makevar>PORTEXAMPLES</makevar>¡£</para>
+ 
 	  <para>ÄúÒ²¿ÉÒÔʹÓà <filename>pkg-message</filename> Õâ¸öÎļþ£¬
 	    À´ÔÚ°²×°Ê±ÏÔʾһЩÐÅÏ¢¡£ ²Î¼û <link
 	    linkend="porting-message">¹ØÓÚʹÓÃ
@@ -4253,6 +4343,8 @@
 	  <literal>GNU_CONFIGURE=yes</literal>¡£
 	  Èç¹ûÏ£Íû´«¶îÍâµÄ²ÎÊý¸ø <command>configure</command> ½Å±¾
 	  (ĬÈϲÎÊýΪ <literal>--prefix=&dollar;{PREFIX}
+	  --infodir=&dollar;{PREFIX}/&dollar;{INFO_PATH}
+	  --mandir=&dollar;{MANPREFIX}/man
 	  &dollar;{CONFIGURE_TARGET}</literal>)£¬
 	  Ӧͨ¹ý <makevar>CONFIGURE_ARGS</makevar> À´Ö¸¶¨ÕâЩ²ÎÊý¡£
 	  ÀàËƵأ¬ ¿ÉÒÔͨ¹ý
@@ -4410,12 +4502,10 @@
 	  <para>¿ÉÒÔͬʱָ¶¨¶à¸ö²»Í¬µÄ¹¤¾ß£¬ ¿ÉÒÔÔÚÒ»ÐÐÖÐÖ¸¶¨£¬ Ò²¿ÉÒÔÓÃ
 	    Makefile µÄ <literal>+=</literal> ½á¹¹¡£</para>
 
-	  <para>ÔÚ¿ªÊ¼½éÉÜÆäËü¹¤¾ß֮ǰ£¬ ÐèҪǿµ÷µÄÊÇ£¬ ÕâЩ½á¹¹Ö»ÄÜÓÃÓÚ¹¹½¨ port¡£
-	    Èç¹ûÏ£Íû½øÐпçƽ̨µÄ¿ª·¢£¬ ÀýÈçÔÚ IDE ÖУ¬ ÔòӦʹÓÃ
-	    <literal>devel/gnu-{automake,autoconf,libtool}</literal> ÕâЩ port¡£ <filename
-	    role="package">devel/anjuta</filename> ÒÔ¼° <filename
-	    role="package">devel/kdevelop</filename> (·Ö±ð¶ÔÓ¦ÓÚ GNOME ºÍ KDE)
-	    ÊǹØÓÚÈçºÎ×öµ½ÕâÒ»µãµÄÁ¼ºÃ·¶Àý¡£</para>
+          <para>×îºó£¬ ¿ÉÒÔʹÓÃÒ»¸öÌØÊâµÄÃûΪ
+	    <literal>autotools</literal> µÄ¹¤¾ß£¬
+	    Ëü»á°²×°È«²¿¿ÉÓÃµÄ autotools °æ±¾£¬
+	    ÒÔÊÊÓ¦¿çƽ̨¿ª·¢µÄÐèÒª¡£ Äú¿ÉÒÔͨ¹ý°²×° <literal>devel/autotools</literal> port À´´ïµ½ÕâһĿµÄ¡£</para>
 
 	</sect2>
 
@@ -4442,39 +4532,6 @@
 	  <para>Èç¹ûÖ¸¶¨ÁË <literal>:env</literal> ²Ù×÷·û£¬ Ôò±íʾֻÉèÖû·¾³£¬
 	    ¶øÌø¹ýÆäËûµÄ²Ù×÷¡£</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ÏÈÇ°µÄд·¨</entry>
-
-		  <entry>Ð嵀 <makevar>USE_AUTOTOOLS</makevar> ½á¹¹</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_LIBTOOL_VER=15</literal></entry>
-
-		  <entry><literal>libtool:15</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_INC_LIBTOOL_VER=15</literal></entry>
-
-		  <entry>ÒѲ»ÔÙʹÓÃ</entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_LIBTOOL_VER=15</literal></entry>
-
-		  <entry><literal>libtool:15:env</literal></entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	  <para>×îºó£¬ <makevar>LIBTOOLFLAGS</makevar> ºÍ
 	    <makevar>LIBTOOLFILES</makevar> ¿ÉÒÔÓÃÀ´Ìæ»»×î³£Ð޸ĵIJÎÊý£¬ ÒÔ¼°½«±»
 	    <command>libtool</command> ÐÞ²¹µÄÎļþ¡£ ¶àÊý port ²»ÐèÒªÕâÑù×ö¡£
@@ -4498,27 +4555,6 @@
 	    ЭÖú¿ª·¢ÈËÔ±Ïû³ýÔÚ <makevar>USE_AUTOTOOLS</makevar> ¿ò¼ÜÒÔÍâµÄ£¬
 	    ¶ÔÓÚ autotools port µÄÒÀÀµ¡£ Õâ¸ö¹¤¾ß²¢²»ÌṩÆäËüµÄ²Ù×÷·û¡£</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ÏÈÇ°µÄд·¨</entry>
-
-		  <entry>Ð嵀 <makevar>USE_AUTOTOOLS</makevar> ½á¹¹</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_LIBLTDL=YES</literal></entry>
-
-		  <entry><literal>libltdl:15</literal></entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	</sect2>
 
 	<sect2 id="using-autoconf">
@@ -4546,40 +4582,6 @@
 	    Ôò±íʾֻÉèÖÃÓÃÓÚºóÐø¹¤×÷µÄ»·¾³¡£ Èç¹û²»Ö¸¶¨£¬
 	    Ôò»á¶Ô port ½øÐÐÏàÓ¦µÄÐÞ²¹ºÍÖØÐÂÅäÖá£</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ÏÈÇ°µÄд·¨</entry>
-
-		  <entry>Ð嵀 <makevar>USE_AUTOTOOLS</makevar> ½á¹¹</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_AUTOCONF_VER=213</literal></entry>
-
-		  <entry><literal>autoconf:213</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_AUTOCONF_VER=259</literal></entry>
-
-		  <entry><literal>autoconf:259:env</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_AUTOHEADER_VER=253</literal></entry>
-
-		  <entry><literal>autoheader:253</literal> (implies
-		    <literal>autoconf:253</literal>)</entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	  <para>ÆäËüµÄ¿ÉÑ¡±äÁ¿£¬ Èç
 	    <makevar>AUTOCONF_ARGS</makevar> ºÍ
 	    <makevar>AUTOHEADER_ARGS</makevar> ¿ÉÒÔͨ¹ý port µÄ
@@ -4625,42 +4627,8 @@
 	    <literal>:env</literal> ²Ù×÷·û±íʾ½ö½öÉèÖÃÓÃÓÚºóÐøʹÓõĻ·¾³£¬
 	    Èç¹û²»ÉèÖ㬠Ôò»á¶Ô port ½øÐÐÖØÐÂÅäÖá£</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ÏÈÇ°µÄд·¨</entry>
-
-		  <entry><makevar>USE_AUTOTOOLS</makevar> construct</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_AUTOMAKE_VER=14</literal></entry>
-
-		  <entry><literal>automake:14</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_AUTOMAKE_VER=15</literal></entry>
-
-		  <entry><literal>automake:15:env</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_ACLOCAL_VER=19</literal></entry>
-
-		  <entry><literal>aclocal:19</literal> (implies
-		    <literal>automake:19</literal>)</entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
-	  <para>As with
-	    <command>autoconf</command> ºÍ <command>autoheader</command>¡¢
+	  <para>¶ÔÓÚ
+	    <command>autoconf</command> ºÍ <command>autoheader</command> ¶øÑÔ£¬
 	    <command>automake</command> ºÍ <command>aclocal</command>
 	    ÌṩÁ˶ÔÓ¦µÄ¿ÉÑ¡²ÎÊý±äÁ¿ <makevar>AUTOMAKE_ARGS</makevar> ºÍ
 	    <makevar>ACLOCAL_ARGS</makevar>£¬ Èç¹ûÐèÒªµÄ»°£¬
@@ -4779,6 +4747,15 @@
       <para>ÒÔÉϹæÔòÓÐÒ»¸öÀýÍ⣬ ¼´¶ÔӦĿ¼²»´æÔÚ»òÔ´Âë°ü²»ÔÚÄǸöĿ¼ÖÐʱ£¬ ÔÊÐíʹÓÃ×÷ÕßµÄ id ×÷Ϊ
 	<makevar>MASTER_SITE_SUBDIR</makevar>¡£</para>
 
+      <para>ËùÓÐÕâЩѡÏî¾ùͬʱ½ÓÊÜ <literal>YES</literal>
+	ºÍ°æ±¾´®£¬ ÀàËÆ <literal>5.8.0+</literal> ÕâÑùµÄд·¨¡£ ʹÓÃ
+	<literal>YES</literal> ±íʾ port Äܹ»ÅäºÏËùÓÐÊÜÖ§³ÖµÄ <application>Perl</application> °æ±¾À´Ê¹Óá£
+	Èç¹û port Ö»ÄÜÅäºÏÌض¨°æ±¾µÄ <application>Perl</application> À´Ê¹Óã¬
+	Ôò¿ÉÒÔÓð汾´®À´±íʾ£¬ ÀýÈç×îµÍ°æ±¾
+	(Èç <literal>5.7.3+</literal>)¡¢ ×î¸ß°æ±¾ (Èç
+	<literal>5.8.0-</literal>) »òij¸ö¾ßÌåµÄ°æ±¾ (Èç
+	<literal>5.8.3</literal>)¡£</para>
+
       <table frame="none">
 	<title>ÓÃÓÚÓõ½ <literal>perl</literal> µÄ port µÄ±äÁ¿</title>
 
@@ -4903,7 +4880,44 @@
       <title>ʹÓà X11</title>
 
       <sect2 id="x11-variables">
-	<title>±äÁ¿¶¨Òå</title>
+	<title>X.Org ×é¼þ</title>
+
+	<para>ÔÚ Ports Ì×¼þÖÐÌṩµÄ X11 ʵÏÖÊÇ X.Org¡£
+	  Èç¹ûÄúµÄÓ¦ÓóÌÐòÓõ½ÁË X ×é¼þ£¬ ÔòÓ¦½«
+	  <makevar>USE_XORG</makevar> ÉèΪËùÐèÒªµÄÄÇЩ×é¼þ¡£
+	  Ä¿Ç°¿ÉÓõÄ×é¼þ°üÀ¨£º</para>
+
+	<para><literal>bigreqsproto compositeproto damageproto dmx dmxproto
+	  evieproto fixesproto fontcacheproto fontenc fontsproto fontutil
+	  glproto ice inputproto kbproto libfs oldx printproto randrproto
+	  recordproto renderproto resourceproto scrnsaverproto sm trapproto
+	  videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
+	  xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto
+	  xf86dgaproto xf86driproto xf86miscproto xf86rushproto
+	  xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama
+	  xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil
+	  xprintutil xpr oto xproxymngproto xrandr xrender xres xscrnsaver xt
+	  xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
+
+	<para>×îеÄÁÐ±í£¬ ¿ÉÒÔÔÚ
+	  <filename>/usr/ports/Mk/bsd.xorg.mk</filename> ÖÐÕÒµ½¡£</para>
+
+	<para>The Mesa Project ÊÇÒ»¸öÖÂÁ¦ÓÚ×ÔÓÉµÄ OpenGL
+	  ʵÏֵļƻ®¡£ Äú¿ÉÒÔʹÓà <makevar>USE_GL</makevar> ±äÁ¿À´Èà port ÒÀÀµÆ䲻ͬµÄ×é¼þ¡£
+	  ¿ÉÓõÄÑ¡Ïî°üÀ¨£º <literal>glut, glu, glw, gl</literal> ºÍ
+	  <literal>linux</literal>¡£ ΪÁËʵÏÖÏòÇ°¼æÈÝ£¬
+	  µ±Ê¹Óà <literal>yes</literal> ʱϵͳ»á×Ô¶¯½«ÆäÓ³ÉäΪ <literal>glu</literal>¡£</para>
+
+	<example id="use-xorg-example">
+	  <title>ʹÓà USE_XORG µÄÀý×Ó</title>
+	  <programlisting>USE_XORG=   xrender xft xkbfile xt xaw
+USE_GL=     glu</programlisting>
+	</example>
+
+	<para>Ðí¶à ports »á¶¨Òå <makevar>USE_XLIB</makevar>£¬
+	  Õâ»áµ¼Ö port ÒÀÀµ 50 ¶à¸ö¶¯Ì¬Á¬½Ó¿â¡£ ÓÉÓÚËü³öÏÖÓÚ X.org
+	  Ä£¿é»¯Ö®Ç°£¬ Òò´ËÕâ¸ö±äÁ¿½öΪÏòÇ°¼æÈݵÄÔ­ÒòÌṩ£¬
+	  Ð嵀 port ²»Ó¦ÔÙʹÓÃËü¡£</para>
 
       <table frame="none">
 	<title>Óõ½ X µÄ port ¿ÉÒÔʹÓõıäÁ¿</title>
@@ -4911,29 +4925,23 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><makevar>USE_X_PREFIX</makevar></entry>
-
-	      <entry>´Ë port ½«Îļþ°²×°µ½ <makevar>X11BASE_REL</makevar> ¶ø·Çͨ³£µÄ
-		<makevar>PREFIX</makevar>¡£</entry>
-	    </row>
-
-	    <row>
 	      <entry><makevar>USE_XLIB</makevar></entry>
 
-	      <entry>´Ë port Óõ½ÁË X ¿â¡£</entry>
+	      <entry>´Ë port Óõ½ÁË X ¿â¡£ Òѹýʱ - ÄúӦʹÓà <makevar>USE_XORG</makevar> ±äÁ¿ÁгöÓõ½µÄ
+		X.Org ×é¼þ£¬ ¶ø²»ÊÇʹÓÃÕâ¸ö±äÁ¿¡£</entry>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_MOTIF</makevar></entry>
+	      <entry><makevar>USE_IMAKE</makevar></entry>
 
-	      <entry>´Ë port ʹÓà Motif ¹¤¾ß°ü¡£</entry>
+	      <entry>´Ë port Óõ½ÁË <command>imake</command>¡£</entry>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_IMAKE</makevar></entry>
+	      <entry><makevar>USE_X_PREFIX</makevar></entry>
 
-	      <entry>´Ë port Óõ½ÁË <command>imake</command>¡£ ÕâÒ»±äÁ¿Ò²»á×Ô¶¯ÉèÖÃ
-		<makevar>USE_X_PREFIX</makevar>¡£</entry>
+	      <entry>Òѹýʱ¡£ Ä¿Ç°Æä×÷ÓÃÓë
+		<makevar>USE_XLIB</makevar> Ïàͬ£¬ ²¢¿ÉÒÔÖ±½ÓÓúóÕßÌæ»»¡£</entry>
 	    </row>
 
 	    <row>
@@ -5121,10 +5129,7 @@
 	  ͨ¹ýÏÂÃæµÄ¹Ù·½ hack£¬ Ô¤±àÒë°ü¹¹½¨¼¯Èº½«Æô¶¯²ÉÓÃÐéÄâÖ¡»º´æµÄ
 	  X server¡£ ÕâÑù£¬ ±àÒë¹ý³Ì½«ÓпÉÓÃµÄ <envar>DISPLAY</envar>¡£</para>
 
-	<programlisting>.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
-                ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif</programlisting>
+	<programlisting>USE_DISPLAY=  yes</programlisting>
 
       </sect2>
 
@@ -5328,11 +5333,17 @@
       <sect2 id="qt4-components">
 	<title>×é¼þµÄÑ¡Ôñ (½öÏÞ Qt 4.x)</title>
 
-	<para>µ± <makevar>USE_QT_VER</makevar> ÉèΪ 4 ʱ£¬ ¿ÉÒÔͨ¹ý
-	  <makevar>QT_COMPONENTS</makevar> ±äÁ¿À´Ö¸¶¨
-	  Qt4 ¹¤¾ßºÍº¯Êý¿â¡£ ϱíÖÐÁгöÁË×îÖØÒªµÄһЩ×é¼þ (È«²¿×é¼þ¿ÉÒÔÔÚ
-	  <filename>/usr/ports/Mk/bsd.kde.mk</filename> ÖеÄ
-	  <makevar>_QT_COMPONENTS_ALL</makevar> ±äÁ¿ÖÐÕÒµ½)£º</para>
+	<para>µ±°Ñ <makevar>USE_QT_VER</makevar> ÉèΪ 4 ʱ£¬ ¾Í¿ÉÒÔͨ¹ý
+	  <makevar>QT_COMPONENTS</makevar> ±äÁ¿À´Ö¸¶¨¶Ô
+	  Qt4 ¹¤¾ßºÍº¯Êý¿âµÄÒÀÀµÁË¡£ ͨ¹ýÔÚ×é¼þµÄÃû³ÆºóÃæÌí¼Ó <literal>_build</literal> »ò <literal>_run</literal>
+	  ÕâÑùµÄºó׺£¬ Ôò¿ÉÏàÓ¦µØ½«ÕâÒÀÀµ¹ØϵÏÞÓÚÁª±à»òÔËÐÐʱ¿Ì¡£
+	  ÔÚûÓÐÖ¸¶¨ºó׺ʱ£¬ ϵͳĬÈÏÔÚÁª±àºÍÔËÐÐʱ¿Ì¾ùÒÀÀµ¸Ã×é¼þ¡£
+	  ͨ³£Çé¿öÏÂÔÚÖ¸Ã÷º¯Êý¿âÒ»ÀàµÄ×é¼þʱӦ²»Ê¹Óúó׺£¬
+	  Áª±à¹¤¾ßÀà×é¼þӦʹÓà <literal>_build</literal> ºó׺£¬
+	  ¶ø²å¼þÀà×é¼þ£¬ ÔòӦʹÓà <literal>_run</literal> ºó׺¡£
+	  ϱíÖÐÁгöÁËһЩ×î³£ÓõÄ×é¼þ (È«²¿¿ÉÓõÄ×é¼þ£¬ ÔòÔÚ
+	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>
+	  ÖÐµÄ <makevar>_QT_COMPONENTS_ALL</makevar> Áгö)£º</para>
 
 	<table frame="none">
 	  <title>¿ÉÓÃµÄ Qt4 º¯Êý¿â×é¼þ</title>
@@ -5377,6 +5388,11 @@
 	      </row>
 
 	      <row>
+		<entry><literal>script</literal></entry>
+		<entry>½Å±¾º¯Êý¿â</entry>
+	      </row>
+
+	      <row>
 		<entry><literal>sql</literal></entry>
 		<entry>SQL º¯Êý¿â</entry>
 	      </row>
@@ -5407,24 +5423,26 @@
 	    <tbody>
 	      <row>
 		<entry><literal>moc</literal></entry>
-		<entry>Ôª¶ÔÏó±àÒëÆ÷ (¼¸ºõËùÓÐµÄ Qt Ó¦ÓóÌÐò¶¼ÐèÒªÕâ¸ö)</entry>
+		<entry>Ôª¶ÔÏó±àÒëÆ÷ (¼¸ºõËùÓÐµÄ Qt Ó¦ÓóÌÐòÔÚÁª±à¹ý³ÌÖж¼ÐèÒªËü)</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>qmake</literal></entry>
-		<entry>ÓÃÓÚ Qt ¹¤³ÌµÄÁª±à¹¤¾ß</entry>
+		<entry>Makefile Éú³ÉÆ÷ / Áª±à¹¤¾ß</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>rcc</literal></entry>
 		<entry>×ÊÔ´±àÒëÆ÷ (Èç¹ûÓ¦ÓóÌÐòÖаüº¬
 		  <filename>*.rc</filename> »ò <filename>*.qrc</filename>
-		  Îļþ)</entry>
+		  Îļþ£¬ ¾ÍÐèÒªËü)</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>uic</literal></entry>
-		<entry>Óû§½çÃæ±àÒëÆ÷ (Èç¹ûÓ¦ÓóÌÐòÓõ½ÁË GUI)</entry>
+		<entry>Óû§½çÃæ±àÒëÆ÷ (Èç¹ûÓ¦ÓóÌÐòÖаüº¬Ê¹Óà Qt Designer
+		  ´´½¨µÄ <filename>*.ui</filename> Îļþʱ¾ÍÐèÒªËü
+		  - Ò»°ã˵À´ Qt Ó¦ÓóÌÐò¶¼»áʹÓà GUI µÄ)</entry>
 	      </row>
 
 	    </tbody>
@@ -5461,12 +5479,17 @@
 	<example id="qt4-components-example">
 	  <title>Ñ¡Ôñ Qt4 ×é¼þ</title>
 
-	  <para>ÏÂÃæÊÇ port
-	    <filename role="package">editors/texmaker</filename> ÖеÄÒ»¸öƬ¶Î£¬
-	    ËüÓõ½ÁË Qt4 ͼÐÎÓû§½çÃ溯Êý¿â (Õâʱ»áĬÈÏʹÓúËÐĺ¯Êý¿â) ¼°Áª±à¹¤¾ß£º</para>
+	  <para>ÔÚÕâ¸öÀý×ÓÖУ¬ ÎÒÃǽ«ÒªÒÆÖ²µÄÓ¦ÓóÌÐòÓõ½ÁË
+	    Qt4 ͼÐÎÓû§½çÃ溯Êý¿â¡¢ Qt4 ºËÐÄ (core) º¯Êý¿â¡¢
+	    ËùÓÐ Qt4 ´úÂëÉú³É¹¤¾ßÒÔ¼° Qt4 µÄ
+	    Makefile Éú³ÉÆ÷¡£ ÓÉÓÚ gui º¯Êý¿â»á×Ô¶¯¸½´ø¶ÔºËÐĺ¯Êý¿âµÄÒÀÀµ£¬
+	    Òò´Ë²¢²»ÐèÒªÃ÷È·Ö¸³öÐèÒª corelib µÄÒÀÀµ¹Øϵ¡£ Qt4 ´úÂëÉú³É¹¤¾ß moc¡¢
+	    uic ºÍ rcc ÒÔ¼° Makefile Éú³ÉÆ÷
+	    qmake Ö»ÔÚÁª±à¹ý³ÌÖвŻáÓõ½£¬
+	    Òò´Ë¿ÉÒÔÖ¸¶¨ <literal>_build</literal> ºó׺£º</para>
 
 	  <programlisting>USE_QT_VER=    4
-QT_COMPONENTS= gui moc qmake rcc uic</programlisting>
+QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
 	</example>
       </sect2>
 
@@ -5515,21 +5538,6 @@
 	  </listitem>
 	</itemizedlist>
 
-	<note>
-	  <para>Ä¿Ç°£¬ <filename>bsd.kde.mk</filename> »¹²»Ö§³Ö pre/postmk£¬
-	    Ò²¾ÍÊÇ˵£¬ ÔÚʹÓÃÁË <filename>bsd.port.pre.mk</filename> Ö®ºó£¬ ¾Í²»ÄÜÔÙÖ¸¶¨
-	    <makevar>USE_QT_VER</makevar> ºÍ <makevar>QT_COMPONENTS</makevar>
-	    ÁË¡£ Èç¹ûÄúµÄ port ÐèÒªÕâÑù×ö£¬ ÇëÒÔ´«Í³·½Ê½±àдÒÀÀµ¹Øϵ£¬ ÀýÈ磺</para>
-
-	  <programlisting>.include &lt;bsd.port.pre.mk&gt;
-
-.if defined(WITH_QT)
-BUILD_DEPENDS+=	moc4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+=	QtCore:${PORTSDIR}/devel/qt4-corelib
-.endif
-
-.include &lt;bsd.port.post.mk&gt;</programlisting>
-	</note>
       </sect2>
 
     </sect1>
@@ -6022,7 +6030,10 @@
 	  <filename><makevar>PREFIX</makevar>/www/<replaceable>Ó¦ÓóÌÐòµÄÃû×Ö</replaceable></filename>¡£
 	  Ϊ·½±ãÆð¼û£¬ Õâ¸ö·¾¶ÔÚ
 	  <filename>Makefile</filename> ºÍ <filename>pkg-plist</filename>
-	  ¾ùÒÔ <makevar>WWWDIR</makevar> ±äÁ¿µÄÐÎʽÌṩ¡£</para>
+	  ¾ùÒÔ <makevar>WWWDIR</makevar> ±äÁ¿µÄÐÎʽÌṩ¡£ ÔÚ
+	  <filename>Makefile</filename> ÖпÉÒÔʹÓÃ
+	  <makevar>WWWDIR_REL</makevar> À´±íʾ°üº¬ÁË
+	  <makevar>PREFIX</makevar> µÄ¸Ã±äÁ¿Öµ¡£</para>
 
 	<para>web ·þÎñÆ÷½ø³ÌËùÓõÄÓû§ºÍÓû§×飬 ·Ö±ðÒÔ
 	  <makevar>WWWOWN</makevar> ºÍ <makevar>WWWGRP</makevar> ±äÁ¿µÄÐÎʽÌṩ£¬
@@ -6704,6 +6715,7 @@
 	    </tbody>
 	  </tgroup>
 	</table>
+      </sect2>
 
       <sect2 id="wx-components">
 	<title>Ñ¡Ôñ×é¼þ</title>
@@ -7805,6 +7817,10 @@
 	<filename>Makefile</filename> ÖÐʹÓᣠ×îа汾µÄ &os; ²¢²»Îª½Å±¾ÃûÔö¼ÓÈκκó׺£¬
 	µ«½ÏÔçµÄ°æ±¾ÔòÔøʹÓùý
 	<filename>.sh</filename> ºó׺¡£</para>
+      <note>
+	<para>ÐÂÔöµÄ½Å±¾¾ù²»Ó¦Ê¹Óà <filename>.sh</filename>
+	  ºó׺¡£ δÀ´£¬ ÈÔÈ»°üº¬ÕâÒ»ºó׺µÄ½Å±¾½«±»ÅúÁ¿¸ÄÃû¡£</para>
+      </note>
 
       <sect2>
 	<title>жÔØʱֹͣ·þÎñ</title>
@@ -8377,15 +8393,17 @@
 	  ʵ¼ÊÉÏ£¬ port »á°²×°µ½
 	  <makevar>DESTDIR</makevar>/<makevar>PREFIX</makevar>£¬
 	  ²¢×¢²áµ½Î»ÓÚ <makevar>DESTDIR</makevar>/var/db/pkg
-	  µÄÔ¤±àÒë°üÊý¾Ý¿âÖС£ ÔÚ׫д port ʱ£¬ ×ñÑ­
-	  <makevar>DESTDIR</makevar> µÄÅäÖÃÊ®·ÖÖØÒª¡£</para>
+	  µÄÔ¤±àÒë°üÊý¾Ý¿âÖС£ ÓÉÓÚ <makevar>DESTDIR</makevar> ÊÇÓÉ
+	  ports ¿ò¼Ü½åÓÉ &man.chroot.8; À´ÊµÏֵģ¬ ÄúÔÚ׫д·ûºÏ
+	  <makevar>DESTDIR</makevar> ¹æ·¶µÄ ports ʱ²¢²»ÐèҪʲô¶îÍâµÄ¹¤×÷¡£</para>
 
 	<para>Ò»°ã¶øÑÔ <makevar>PREFIX</makevar> »áÉèΪ
 	  <makevar>LOCALBASE_REL</makevar> (ĬÈÏÊÇ
 	  <filename>/usr/local</filename>)¡£ Èç¹ûÉèÖÃÁË
 	  <makevar>USE_X_PREFIX</makevar> »ò <makevar>USE_IMAKE</makevar>£¬
-	  Ôò <makevar>PREFIX</makevar> »áÉèΪ <makevar>X11BASE_REL</makevar> (ĬÈÏÊÇ
-	  <filename>/usr/X11R6</filename>)¡£ Èç¹ûÉèÖÃÁË
+	  Ôò <makevar>PREFIX</makevar> »áÉèΪ <makevar>X11BASE</makevar>
+	  (ΪÁËÏòÇ°¼æÈÝ£¬ Õâ¸ö±äÁ¿µÄĬÈÏÖµÊÇ <makevar>LOCALBASE</makevar>£¬
+	  δÀ´Ëü½«±»É¾³ý)¡£ Èç¹ûÉèÖÃÁË
 	  <makevar>USE_LINUX_PREFIX</makevar>£¬ Ôò <makevar>PREFIX</makevar>
 	  »áÉèΪ <makevar>LINUXBASE_REL</makevar> (ĬÈÏÊÇ
 	  <filename>/compat/linux</filename>)¡£</para>
@@ -8435,47 +8453,6 @@

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

More information about the p4-projects mailing list