PERFORCE change 111115 for review

[John Birrell]

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

Change 111115 by jb at jb_freebsd8 on 2006/12/05 05:43:09

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#6 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#14 integrate
.. //depot/projects/dtrace/src/sys/boot/sparc64/loader/hcall.S#4 delete
.. //depot/projects/dtrace/src/sys/powerpc/include/pmap.h#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#6 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#9 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/uio_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#9 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#13 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#10 integrate

Differences ...

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml#4 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Chinese (Simplified) Project
 
      Original Revision: 1.65
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml,v 1.4 2006/06/03 15:34:22 delphij Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/boot/chapter.sgml,v 1.5 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <chapter id="boot"> <title>FreeBSD Òýµ¼¹ý³Ì</title>
@@ -614,12 +614,12 @@
       Õâ¸ö±äÁ¿ÊÇÔÚ <command>loader</command> ÀïÃæÉèÖõġ£</para>
 
     <sect2 id="boot-autoreboot">
-      <title>×Ô¶¯ÖØÆô¶ÓÁÐ</title>
+      <title>×Ô¶¯ÖØÆô¹ý³Ì</title>
 
-      <para>×Ô¶¯ÖØÆô¶ÓÁб£Ö¤ÁË¿ÉÓõÄÎļþϵͳÊÇÎȶ¨µÄ¡£
-	Èç¹û²»ÊÇ£¬ÇÒ &man.fsck.8; ²»ÄÜÐÞ¸´ÕâЩ´íÎó£¬
-	&man.init.8; »á½øÈë<link linkend="boot-singleuser">µ¥Óû§Ä£Ê½</link>
-	ÒÔ±ãϵͳ¹ÜÀíÔ±Ö±½Ó½â¾öÎÊÌâ¡£</para>
+      <para>×Ô¶¯ÖØÆô¹ý³Ì»áÈ·ÈÏϵͳÖпÉÓõÄÎļþϵͳ´¦ÓÚ½¡¿µµÄ״̬¡£
+	Èç¹û²»ÊÇ£¬ ¶øÇÒʹÓà &man.fsck.8; Ò²ÎÞ·¨ÐÞ¸´ÕâЩÎÊÌ⣬
+	&man.init.8; »á½øÈë <link linkend="boot-singleuser">µ¥Óû§Ä£Ê½</link>
+	ÒÔ±ãϵͳ¹ÜÀíÔ±Ö±½ÓÐÞÕýÕâЩÎÊÌâ¡£</para>
     </sect2>
 
     <sect2 id="boot-singleuser">
@@ -628,12 +628,12 @@
       <indexterm><primary>¿ØÖÆ̨</primary></indexterm>
 
       <para>´Ëģʽ¿ÉÒÔͨ¹ý
-	<link linkend="boot-autoreboot"> ×Ô¶¯ÖØÆô¶ÓÁÐ</link>»òÕßͨ¹ý´øÓÐ
+	<link linkend="boot-autoreboot">×Ô¶¯ÖØÆô¹ý³Ì</link> »òÕßͨ¹ý´øÓÐ
 	<option>-s</option> Ñ¡ÏîµÄÓû§Òýµ¼»òͨ¹ýÔÚ <command>loader</command>
 	ÀïÉèÖà <envar>boot_single</envar> ±äÁ¿µÈ¶àÖÖ·½Ê½À´´ïµ½¡£</para>
 
-      <para>Ò²¿ÉÒÔÔÚ¶àÓû§Ä£Ê½Ïµ÷¶¯ÎÞ reboot(<option>-r</option>)Ñ¡ÏîºÍ
-	halt (<option>-h</option>) Ñ¡ÏîµÄ &man.shutdown.8;
+      <para>Ò²¿ÉÒÔÔÚ¶àÓû§Ä£Ê½Ïµ÷¶¯ÎÞÖØÆô (<option>-r</option>) Ñ¡ÏîºÍÍ£»ú
+	(<option>-h</option>) Ñ¡ÏîµÄ &man.shutdown.8;
 	ÃüÁîÀ´½øÈëµ¥Óû§Ä£Ê½¡£</para>
 
       <para>Èç¹ûϵͳ <literal>¿ØÖÆ̨</literal> ÔÚÎļþ
@@ -683,19 +683,19 @@
   </sect1>
 
   <sect1 id="boot-shutdown">
-    <title>shutdown ¶ÓÁÐ</title>
+    <title>¹Ø»ú (shutdown) ¹ý³Ì</title>
     <indexterm>
       <primary><command>shutdown</command></primary>
     </indexterm>
 
-    <para>ÓÉÃüÁî &man.shutdown.8; µÄ¿ØÖÆ£¬
+    <para>ÓÉÃüÁî &man.shutdown.8; µÄ·¢ÆðµÄ¹Ø»ú¹ý³ÌÖУ¬
       &man.init.8; »áÊÔ×ÅÔËÐÐ <filename>/etc/rc.shutdown</filename> ½Å±¾£¬
-      ¸øËùÓнø³Ì·¢ËÍ <literal>TERM</literal> Ðźţ¬È»ºó¸ø²»°´Ê±Í£Ö¹µÄ½ø³Ì·¢ËÍ
-      <literal>KILL</literal>Ðźš£</para>
+      ¸øËùÓнø³Ì·¢ËÍ <literal>TERM</literal> Ðźţ¬ ×îºó¸ø²»°´Ê±Í£Ö¹µÄ½ø³Ì·¢ËÍ
+      <literal>KILL</literal> Ðźš£</para>
 
-    <para>ÔÚÖ§³ÖµçÔ´¹ÜÀíµÄÌåϵÉÏ¹Ø±Õ FreeBSD ϵͳµÄµçÔ´£¬Ö»Òª¼òµ¥µÄʹÓÃÃüÁî
-      <command>shutdown -p now</command> Á¢¼´¹Ø±ÕµçÔ´¡£Ê¹ÓÃÃüÁî
-      <command>shutdown -r now</command> ÖØÆô FreeBSD¡£ÒªÖ´ÐÐ &man.shutdown.8;
+    <para>ÔÚÖ§³ÖµçÔ´¹ÜÀíµÄƽ̨ÉÏ¹Ø±Õ FreeBSD ϵͳµÄµçÔ´£¬ Ö»Òª¼òµ¥µØʹÓÃÃüÁî
+      <command>shutdown -p now</command> ¼´¿É¡£ ´ËÍ⣬ ¿ÉÒÔÓÃÃüÁî
+      <command>shutdown -r now</command> À´ÖØÆô FreeBSD¡£ ÒªÖ´ÐÐ &man.shutdown.8;
       Äú±ØÐëÊÇ <username>root</username> Óû§»ò <groupname>operator</groupname> ×éµÄ³ÉÔ±¡£
       Ò²¿ÉÒÔʹÓà &man.halt.8; ºÍ &man.reboot.8; ÃüÁîÀ´¹Ø±Õϵͳ£¬
       Çë²Î¿´ËüÃǵÄÁª»úÊÖ²áÒÔ»ñµÃ¸ü¶àµÄÐÅÏ¢¡£</para>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#9 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.223
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.11 2006/10/27 06:37:47 delphij Exp $
+     Original Revision: 1.225
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/config/chapter.sgml,v 1.12 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <chapter id="config-tuning">
@@ -1499,18 +1499,21 @@
       <indexterm><primary>sysctl.conf</primary></indexterm>
       <indexterm><primary>sysctl</primary></indexterm>
 
-      <para><filename>sysctl.conf</filename> ¿´ÆðÀ´ºÜÏñ
-	<filename>rc.conf</filename>¡£ËüÓà <literal>variable=value</literal>
-	µÄÐÎʽÀ´É趨ֵ¡£Ö¸¶¨µÄÖµÔÚϵͳ½øÈë¶àÓû§Ä£Ê½Ö®ºó±»É趨¡£
-	²¢²»ÊÇËùÓеıäÁ¿¶¼¿ÉÒÔÔÚÕâ¸öģʽÏÂÉ趨¡£</para>
+      <para><filename>sysctl.conf</filename> ºÍ
+	<filename>rc.conf</filename> ÕâÁ½¸öÎļþµÄ·ç¸ñºÜ½Ó½ü¡£ ÆäÖеÄÅäÖþùΪ
+	<literal>±äÁ¿=Öµ</literal>
+	ÕâÑùµÄÐÎʽ¡£ ÔÚÕâ¸öÎļþÖÐÅäÖõÄÖµ£¬ ¾ù»áÔÚϵͳ½øÈë¶àÓû§Ä£Ê½Ö®ºó½øÐÐʵ¼ÊµÄÐ޸IJÙ×÷¡£
+	ÐèҪעÒâµÄÊÇ£¬ ²¢²»ÊÇËùÓеıäÁ¿¶¼Äܹ»ÔÚ¶àÓû§Ä£Ê½ÏÂÐ޸ġ£</para>
+
+      <para>Èç¹ûÏ£Íû¹Ø±Õ¶ÔÊÕµ½ÖÂÃüµÄÐźÅÍ˳öµÄ½ø³Ì½øÐмǼ£¬
+	²¢×èÖ¹ÆÕͨÓû§¿´µ½ÆäËûÓû§µÄ½ø³Ì£¬ ¿ÉÒÔÔÚ <filename>sysctl.conf</filename>
+	ÖнøÐÐÏÂÁÐÅäÖãº</para>
 
-      <para> Ò»¸ö¼òµ¥µÄÀý×Ó¾ÙÃ÷ÁËÔÚ <filename>sysctl.conf</filename>
-	ÖйرÕÁËÖØÒªµÄÍ˳öÐźŵÄÈÕÖ¾²¢ÇÒÈà Linux ³ÌÐòÖªµÀËûÃÇÆäʵÔËÐÐÔÚ
-	&os; ÏÂÃ棺</para>
+      <programlisting># ²»¼Ç¼ÓÉÓÚÖÂÃüÐźŵ¼ÖµĽø³ÌÍ˳ö (ÀýÈçÐźŠ11£¬·ÃÎÊÔ½½ç)
+kern.logsigexit=0
 
-      <programlisting>kern.logsigexit=0       # Do not log fatal signal exits (e.g. sig 11)
-compat.linux.osname=&os;
-compat.linux.osrelease=4.3-STABLE</programlisting>
+# ×èÖ¹Óû§¿´µ½ÒÔÆäËûÓû§ UID Éí·ÝÖ´ÐеĽø³Ì¡£
+security.bsd.see_other_uids=0</programlisting>
     </sect2>
   </sect1>
 
@@ -1873,10 +1876,10 @@
 	  ÔÚ´óÐÍÉú²ú·þÎñÆ÷ÉÏ£¬ ¿ÉÄÜ»áÇáÒ×µØÓõôÊýǧ¸öÎļþÃèÊö·û£¬
 	  ¾ßÌåÓÃÁ¿È¡¾öÓÚ·þÎñµÄÀàÐͺͲ¢ÐÐÆô¶¯µÄ·þÎñÊýÁ¿¡£</para>
 
-	<para>ÔÚÔçÆÚ°æ±¾µÄ &os; ÖУ¬ <varname>kern.maxfile</varname> µÄĬÈÏÖµ£¬
+	<para>ÔÚÔçÆÚ°æ±¾µÄ &os; ÖУ¬ <varname>kern.maxfiles</varname> µÄĬÈÏÖµ£¬
 	  ÊǸù¾ÝÄúÄÚºËÅäÖÃÎļþÖÐµÄ <option>maxusers</option> Ñ¡Ïî¼ÆËãµÄ¡£
           <varname>kern.maxfiles</varname> Õâ¸öÊýÖµ£¬
-          »áÓë <option>maxusers</option> ³É±ÈÀýÔö¼õ¡£
+          »áËæ <option>maxusers</option> ³É±ÈÀýµØÔö¼õ¡£
           µ±±àÒ붨ÖƵÄÄÚºËʱ£¬ °´ÕÕÄúϵͳµÄÓÃ;À´ÐÞ¸ÄÕâ¸öÖµÊǸöºÃÖ÷Òâ¡£
           Õâ¸öÊý×Öͬʱ»¹¾ö¶¨Äں˵ÄÐí¶àÔ¤ÉèµÄÏÞÖÆÖµ¡£ ÓÐʱ£¬
           ¾¡¹Ü²¢²»»áÕæµÄÓÐ 256 ¸öÓû§Í¬Ê±Á¬½Óһ̨Éú²ú·þÎñÆ÷£¬

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#6 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Project
 
-     Original Revision: 1.66
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml,v 1.7 2006/09/15 05:41:06 delphij Exp $
+     Original Revision: 1.67
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml,v 1.8 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <chapter id="desktop">
@@ -557,7 +557,7 @@
 
       <para>°²×° <application>OpenOffice.org</application> ·½·¨ÈçÏ£º</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r openoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg_add -r openoffice.org</userinput></screen>
 
       <note>
 	<para>Èç¹ûÄúÕýÔÚʹÓà &os; µÄ -RELEASE °æ±¾£¬ Ò»°ãÀ´ËµÕâÑù×öÊÇûÎÊÌâµÄ¡£
@@ -581,7 +581,7 @@
 	package£¬ÄúÈԾɿÉÒÔÑ¡Ôñ±àÒë port¡£È»¶ø£¬
 	Äú±ØÐë¼ÇסËüµÄÒªÇóÒÔ¼°´óÁ¿µÄ´ÅÅÌ¿Õ¼äºÍÏ൱³¤µÄʱ¼ä±àÒë¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2.0</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#12 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.337
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.14 2006/11/17 14:51:01 delphij Exp $
+     Original Revision: 1.338
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.15 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <chapter id="install">
@@ -2016,7 +2016,7 @@
 	  <listitem>
 	    <para>±¾·¶ÀýÖеÄIPµØÖ·ÊôÓÚÒ»¸öCÀàµØÖ·
 	      £¨<hostid role="ipaddr">192.168.0.0</hostid> -
-	      <hostid role="ipaddr">192.168.255.255</hostid>£©¡£Ä¬ÈϵÄ×ÓÍøÑÚÂëΪ
+	      <hostid role="ipaddr">192.168.0.255</hostid>£©¡£Ä¬ÈϵÄ×ÓÍøÑÚÂëΪ
 	      £¨<hostid role="netmask">255.255.255.0</hostid>£©¡£</para>
 	  </listitem>
 	</varlistentry>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#8 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.420
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.10 2006/08/26 13:45:54 delphij Exp $
+     Original Revision: 1.421
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.11 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <appendix id="mirrors">
@@ -2624,6 +2624,14 @@
 
     <variablelist>
       <varlistentry>
+	<term>RELENG_6_2_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 6.2</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_1_0_RELEASE</term>
 
 	<listitem>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#11 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.177
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.16 2006/11/17 14:59:43 delphij Exp $
+     Original Revision: 1.178
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.17 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <chapter id="x11">
@@ -663,7 +663,7 @@
       <filename role="package">x11-fonts/ttmkfdir</filename> ÖÐÕÒµ½¡£</para>
 
     <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/TrueType</userinput>
-&prompt.root; <userinput>ttmkfdir &gt; fonts.dir</userinput></screen>
+&prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
     <para>ÏÖÔÚ°Ñ &truetype; ×ÖÌåĿ¼Ìí¼Óµ½×ÖÌå·¾¶ÖС£
       ÕâºÍÉÏÃæ <link linkend="type1">Type1</link> ×ÖÌåµÄ²½ÖèÊÇÒ»ÑùµÄ£¬

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

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.769
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.19 2006/11/17 15:01:43 delphij Exp $
+     Original Revision: 1.772
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.20 2006/12/05 02:36:13 delphij Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -3674,6 +3674,42 @@
 
       </sect2>
 
+      <sect2>
+	<title>×Ô¶¯¼¤»îµÄÌØÐÔ</title>
+
+	<para>ÔÚʹÓà GNU configure ½Å±¾Ê±£¬ Ò»¶¨ÒªÐ¡ÐÄÓÐЩÌØÐÔ»áÓÉÆä×Ô¶¯¼ì²â¶ø¼¤»î¡£
+	  ÄúӦͨ¹ýÃ÷È·µØÖ¸¶¨ÏàÓ¦µÄ
+	  <literal>--without-xxx</literal> »ò <literal>--disable-xxx</literal>
+	  ²ÎÊýµ½ <makevar>CONFIGURE_ARGS</makevar> À´½ûÓò»Ï£ÍûµÄÌØÐÔ¡£</para>
+
+	<example>
+	  <title>´¦ÀíÑ¡ÏîʱµÄ´íÎó×ö·¨</title>
+	  <programlisting>.if defined(WITH_FOO)
+LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+CONFIGURE_ARGS+=	--enable-foo
+.endif</programlisting>
+	</example>
+
+	<para>ÔÚÇ°ÃæµÄÀý×ÓÖУ¬ ¼ÙÉèϵͳÖÐÒѾ­°²×°ÁË libfoo ¿â¡£ Óû§¿ÉÄܲ¢²»Ï£ÍûÓ¦ÓóÌÐòʹÓà libfoo£¬
+	  Òò´ËËûÔÚ <literal>make config</literal> ¶Ô»°¿òÖйصôÁËÕâ¸öÑ¡Ïî¡£
+	  µ«ÊÇ£¬ Ó¦ÓóÌÐòµÄ configure ½Å±¾¼ì²âµ½ÁËϵͳÖдæÔÚÕâ¸ö¿â£¬
+	  ²¢½«Æä¼ÓÈëµ½ÁË×îÖÕ¿ÉÖ´ÐÐÎļþÖ§³ÖµÄ¹¦ÄÜÖС£ ÏÖÔÚ£¬ Èç¹ûÓû§¾ö¶¨´ÓϵͳÖÐжÔØ libfoo ʱ£¬
+	  ports ϵͳ¾ÍÎÞ·¨±£»¤Õâ¸öÓ¦ÓóÌÐòÃâÔâÆÆ»µÁË (ÒòΪûÓмǼ libfoo µÄÒÀÀµ¹Øϵ)¡£</para>
+
+	<example>
+	  <title>´¦ÀíÑ¡ÏîʱµÄÕýÈ·×ö·¨</title>
+	  <programlisting>.if defined(WITH_FOO)
+LIB_DEPENDS+=		foo.0:${PORTSDIR}/devel/foo
+CONFIGURE_ARGS+=	--enable-foo
+.else
+CONFIGURE_ARGS+=	--disable-foo
+.endif</programlisting>
+	</example>
+
+	<para>ÔÚµÚ¶þ¸öÀý×ÓÖУ¬ libfoo ¿â±»Ã÷È·½ûÓᣠ¼´Ê¹ÏµÍ³ÖÐÒѾ­°²×°ÁËÕâ¸ö¿â£¬
+	  configure ½Å±¾Ò²²»»áÆôÓÃÏàÓ¦µÄ¹¦ÄÜÁË¡£</para>
+      </sect2>
+
     </sect1>
 
     <sect1 id="makefile-wrkdir">
@@ -6436,6 +6472,44 @@
 	    ¶øÎÞÐè <makevar>WX_PREMK</makevar> µÄ²ÎÓë¡£</para>
 	</note>
       </sect2>
+
+      <sect2 id="wx-additional-config-args">
+	<title>¶îÍâµÄ <command>configure</command> ²ÎÊý</title>
+
+	<para>ijЩ GNU <command>configure</command> ½Å±¾ÔÚÖ»ÉèÖÃÁË
+	  <literal>WX_CONFIG</literal> »·¾³±äÁ¿Ê±£¬ ÎÞ·¨×Ô¶¯ÕÒµ½
+	  <application>wxWidgets</application>£¬ ¶øÐèҪʹÓöîÍâµÄ²ÎÊýÀ´¼ÓÒÔÖ¸¶¨¡£
+	  Äú¿ÉÒÔʹÓà <makevar>WX_CONF_ARGS</makevar> ±äÁ¿À´¸ø³öÕâЩ²ÎÊý¡£</para>
+
+	<table frame="none">
+	  <title>¿ÉÓÃÓÚ <makevar>WX_CONF_ARGS</makevar> µÄÖµ</title>
+
+	  <tgroup cols="2">
+	    <thead>
+	      <row>
+		<entry>¿ÉÓÃÖµ</entry>
+
+		<entry>½á¹û</entry>
+	      </row>
+	    </thead>
+
+	    <tbody>
+	      <row>
+		<entry><literal>absolute</literal></entry>
+
+		<entry><literal>--with-wx-config=${WX_CONFIG}</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><literal>relative</literal></entry>
+
+		<entry><literal>--with-wx=${X11BASE}
+		    --with-wx-config=${WX_CONFIG:T}</literal></entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
+      </sect2>
     </sect1>
 
     <sect1 id="using-lua">
@@ -9962,6 +10036,10 @@
 		    <entry>¼ÓÈëÁË libelf Ö®ºóµÄ 7.0-CURRENT¡£</entry>
 		    <entry>700025</entry>
 		  </row>
+		  <row>
+		    <entry>¶ÔÒôЧÏà¹ØµÄ sysctl ½øÐдó·ùµ÷ÕûÖ®ºóµÄ 7.0-CURRENT¡£</entry>
+		    <entry>700026</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

==== //depot/projects/dtrace/src/sys/powerpc/include/pmap.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	$NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $
- * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.19 2005/12/06 21:09:01 jhb Exp $
+ * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.20 2006/12/05 04:01:52 grehan Exp $
  */
 
 #ifndef	_MACHINE_PMAP_H_
@@ -95,7 +95,7 @@
 void		pmap_deactivate(struct thread *);
 vm_offset_t	pmap_kextract(vm_offset_t);
 int		pmap_dev_direct_mapped(vm_offset_t, vm_size_t);
-
+boolean_t	pmap_page_executable(vm_page_t);
 boolean_t	pmap_mmu_install(char *name, int prio);
 
 #define	vtophys(va)	pmap_kextract((vm_offset_t)(va))

==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#6 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.6 2006/08/01 19:06:05 alc Exp $
+# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.7 2006/12/05 04:01:52 grehan Exp $
 #
 
 #include <sys/param.h>
@@ -752,3 +752,17 @@
 	vm_offset_t	_pa;
 	vm_size_t	_size;
 };
+
+
+/**
+ * @brief Evaluate if a physical page has an executable mapping
+ *
+ * @param _pg		physical page
+ *
+ * @retval bool		TRUE if a physical mapping exists for the given page.
+ */
+METHOD boolean_t page_executable {
+	mmu_t		_mmu;
+	vm_page_t	_pg;
+};
+

==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#9 (text+ko) ====

@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.113 2006/11/30 08:13:06 grehan Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.114 2006/12/05 04:01:52 grehan Exp $");
 
 /*
  * Manages physical address maps.
@@ -342,6 +342,7 @@
 vm_offset_t moea_kextract(mmu_t, vm_offset_t);
 void moea_kenter(mmu_t, vm_offset_t, vm_offset_t);
 boolean_t moea_dev_direct_mapped(mmu_t, vm_offset_t, vm_size_t);
+boolean_t moea_page_executable(mmu_t, vm_page_t);
 
 static mmu_method_t moea_methods[] = {
 	MMUMETHOD(mmu_change_wiring,	moea_change_wiring),
@@ -380,6 +381,7 @@
 	MMUMETHOD(mmu_kextract,		moea_kextract),
 	MMUMETHOD(mmu_kenter,		moea_kenter),
 	MMUMETHOD(mmu_dev_direct_mapped,moea_dev_direct_mapped),
+	MMUMETHOD(mmu_page_executable,	moea_page_executable),
 
 	{ 0, 0 }
 };
@@ -2453,6 +2455,12 @@
 	return (EFAULT);
 }
 
+boolean_t
+moea_page_executable(mmu_t mmu, vm_page_t pg)
+{
+	return ((moea_attr_fetch(pg) & PTE_EXEC) == PTE_EXEC);
+}
+
 /*
  * Map a set of physical memory pages into the kernel virtual
  * address space. Return a pointer to where it is mapped. This

==== //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#7 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.8 2006/11/11 20:57:52 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.9 2006/12/05 04:01:52 grehan Exp $");
 
 /*
  * Dispatch MI pmap calls to the appropriate MMU implementation
@@ -345,6 +345,11 @@
 	return (MMU_DEV_DIRECT_MAPPED(mmu_obj, pa, size));
 }
 
+boolean_t
+pmap_page_executable(vm_page_t pg)
+{
+	return (MMU_PAGE_EXECUTABLE(mmu_obj, pg));
+}
 
 /*
  * MMU install routines. Highest priority wins, equal priority also

==== //depot/projects/dtrace/src/sys/powerpc/powerpc/uio_machdep.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.6 2006/12/05 04:01:52 grehan Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -49,6 +49,7 @@
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 
+#include <machine/cpu.h>
 #include <machine/vmparam.h>
 
 /*
@@ -92,10 +93,13 @@
 				uio_yield();
 			if (uio->uio_rw == UIO_READ)
 				error = copyout(cp, iov->iov_base, cnt);
-			else
+			else 
 				error = copyin(iov->iov_base, cp, cnt);
 			if (error)
 				goto out;
+			if (uio->uio_rw == UIO_WRITE &&
+			    pmap_page_executable(ma[offset >> PAGE_SHIFT]))
+				__syncicache(cp, cnt);
 			break;
 		case UIO_SYSSPACE:
 			if (uio->uio_rw == UIO_READ)

==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#9 (text+ko) ====

@@ -1,1433 +1,1850 @@
-/*
- * CDDL HEADER START
+/*-
+ * Copyright (c) 2006 Kip Macy <kmacy at FreeBSD.org>
+ * All rights reserved.
  *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
+ * $FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.17 2006/11/26 04:37:49 kmacy Exp $
  */
-/*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
 
-#pragma ident	"@(#)hcall.s	1.10	05/09/28 SMI"
-
-/*
- * Hypervisor calls
- */
-#define _ASM
-
+#include <sys/cdefs.h>
+	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.3 2006/11/08 22:16:05 kmacy Exp $")				
-
 #include <machine/asi.h>
 #include <machine/asmacros.h>
-#include <machine/hypervisor_api.h>
+#include <machine/hypervisorvar.h>
 #include <machine/pstate.h>
 
 #include "assym.s"
+/*
+ * Section 9 API Versioning
+ *
+ */
 
-#if defined(lint)
-#error lint
-#endif
-#if defined(__lint)
-#error __lint
-#endif	
-#if defined(lint) || defined(__lint)
+/*
+ * request and check for a version of the hypervisor apis
+ * which may be compatible
+ *
+ * arg0 api_group         (%o0)
+ * arg1 major_number      (%o1)
+ * arg2 req_minor_number  (%o2)
+ *	 				
+ * ret0 status            (%o0)
+ * ret1 act_minor_number  (%o1)
+ * 
+ */
+ENTRY(api_set_version)
+	mov     API_SET_VERSION, %o5
+	ta      CORE_TRAP
+	retl
+	  stx   %o1, [%o3]
+END(api_set_version)
 
-/*ARGSUSED*/
-int64_t
-hv_cnputchar(uint8_t ch)
-{ return (0); }
+/*
+ * retrieve the major and minor number of the most recently
+ * successfully negotiated API
+ *
+ * arg0 api_group         (%o0)
+ *	 				
+ * ret0 status            (%o0)
+ * ret1 major_number      (%o1)
+ * ret2 major_number      (%o2)
+ * 
+ */
+ENTRY(api_get_version)
+	mov	%o2, %o4
+	mov	%o1, %o3
+	mov     API_GET_VERSION, %o5
+	ta      CORE_TRAP
+	retl
+	  stx   %o1, [%o4]
+	
+END(api_get_version)
+		
+/*
+ * Section 10 Domain Services
+ *
+ */
 
-/*ARGSUSED*/
-int64_t
-hv_cngetchar(uint8_t *ch)
-{ return (0); }
+/*
+ * stop all CPUs in the virtual machine domain and place them
+ * in the stopped state
+ *
+ * arg0 exit_code      (%o0)
+ *	 				
+ */
+ENTRY(hv_mach_exit)
+	mov	MACH_EXIT, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_mach_exit)
+	
+/*
+ * copy the most current machine description into buffer
+ * upon success or EINVAL the service returns the actual
+ * size of the machine description	
+ *
+ * arg0 buffer         (%o0)
+ * arg1 length         (%o1)
+ *	 				
+ * ret0 status         (%o0)
+ * ret1 length         (%o1)
+ * 
+ */
+ENTRY(hv_mach_desc)
+	mov     %o1, %o2
+	ldx     [%o1], %o1
+	mov     MACH_DESC, %o5
+	ta      FAST_TRAP
+	retl
+	  stx   %o1, [%o2]
+END(hv_mach_desc)
 
-/*ARGSUSED*/
-uint64_t
-hv_tod_get(uint64_t *seconds)
-{ return (0); }
+/*
+ * execute a software initiated reset of a virtual machine domain
+ * 
+ */
+ENTRY(hv_mach_sir)
+	mov	MACH_SIR, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_mach_sir)
+	
+/*
+ * report the guests soft state to the hypervisor
+ *
+ * arg0 soft_state          (%o0)
+ * arg1 soft_state_desc_ptr (%o1)
+ *	 				
+ * ret0 status              (%o0)
+ * 
+ */
+ENTRY(hv_mach_set_soft_state)
+	mov	MACH_SET_SOFT_STATE, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_mach_set_soft_state)
+	
+/*
+ * retrieve the current value of the guest's software state
+ *
+ * arg0 soft_desc_ptr       (%o0)
+ *	 				
+ * ret0 status              (%o0)
+ * arg1 soft_state          (%o1)
+ * 
+ */
+ENTRY(hv_mach_get_soft_state)
+	mov	%o1, %o2
+	mov	MACH_SET_SOFT_STATE, %o5
+	ta	FAST_TRAP
+	retl
+	  stx	%o1, [%o2]
+END(hv_mach_get_soft_state)
+	
+/*
+ * set a watchdog timer, 0 disables, upon success
+ * time_remaining contains the time previously remaining
+ *
+ * arg0 timeout        (%o0)
+ *	 				
+ * ret0 status         (%o0)
+ * ret1 time_remaining (%o1)
+ * 
+ */
+ENTRY(hv_mach_watchdog)
+	mov	%o1, %o2
+	mov	MACH_WATCHDOG, %o5
+	ta	FAST_TRAP
+	brnz,pn %o0, 1f
+	  nop
+	stx	%o1, [%o2]
+1:	retl
+	  nop
+END(hv_mach_watchdog)
+	
+/*
+ * Section 11 CPU Services
+ * 
+ */
 
-/*ARGSUSED*/
-uint64_t
-hv_tod_set(uint64_t seconds)
-{ return (0);}
+/*
+ * start CPU with id cpuid with pc in %pc and real trap base address
+ * of rtba
+ *
+ * arg0 cpuid        (%o0)
+ * arg1 pc           (%o1)
+ * arg2 rtba         (%o2)
+ * arg3 target_arg0  (%o3)
+ *	 				
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_cpu_start)
+	mov	CPU_START, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_cpu_start)
 
-/*ARGSUSED*/
-uint64_t
-hv_mmu_map_perm_addr(void *vaddr, int ctx, uint64_t tte, int flags)
-{ return (0); }
+/*
+ * stop CPU with id cpuid 
+ *
+ * arg0 cpuid        (%o0)
+ *	 				
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_cpu_stop)
+	mov	CPU_STOP, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_cpu_stop)
 
-/*ARGSUSED*/
-uint64_t
-hv_mmu_unmap_perm_addr(void *vaddr, int ctx, int flags)
-{ return (0); }
+/*
+ * set the real trap base address of the local cpu to rtba
+ * upon success the previous_rtba contains the address of the
+ * old rtba
+ *
+ * arg0 rtba         (%o0)
+ *	 				
+ * ret0 status       (%o0)
+ * ret1 previous_rtba(%o1)
+ * 
+ */
+ENTRY(hv_cpu_set_rtba)
+	mov	%o1, %o2
+	mov	CPU_SET_RTBA, %o5
+	ta	FAST_TRAP
+	retl
+	  stx	%o1, [%o2]
+	
+END(hv_cpu_set_rtba)
 
-/*ARGSUSED*/
-uint64_t
-hv_set_ctx0(uint64_t ntsb_descriptor, uint64_t desc_ra)
-{ return (0); }
+/*
+ * return the current real trap base address
+ *
+ * ret0 status       (%o0)
+ * ret1 rtba         (%o1)
+ * 
+ */
+ENTRY(hv_cpu_get_rtba)
+	mov	CPU_GET_RTBA, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_cpu_get_rtba)			
+	
+/*
+ * suspend execution on current cpu
+ *
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_cpu_yield)
+	mov	CPU_YIELD, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_cpu_yield)
 
-/*ARGSUSED*/
-uint64_t
-hv_set_ctxnon0(uint64_t ntsb_descriptor, uint64_t desc_ra)
-{ return (0); }
+/*
+ * configure queue of size nentries to be placed at base raddr 
+ *
+ * arg0 queue        (%o0)
+ * arg1 base raddr   (%o1)
+ * arg2 nentries     (%o2)
+ *
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_cpu_qconf)
+	mov	CPU_QCONF, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_cpu_qconf)
+	
+/*
+ * return configuration of queue queue 
+ *
+ * arg0 queue        (%o0)
+ *
+ * ret0 status       (%o0)
+ * ret1 base raddr   (%o1)
+ * ret2 nentries     (%o2)
+ * 
+ */
+ENTRY(hv_cpu_qinfo)
+END(hv_cpu_qinfo)
+	
+/*
+ * send cpu mondo interrupt to cpulist
+ *
+ * arg0 ncpus        (%o0)
+ * arg1 cpu list ra  (%o1)
+ * arg2 mondo data ra(%o2)
+ *	 				
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_cpu_mondo_send)
+	ldx	[PCPU(MONDO_DATA_RA)], %o2
+	mov	CPU_MONDO_SEND, %o5
+	ta	FAST_TRAP
+	retl
+	  membar	#Sync	
+END(hv_cpu_mondo_send)
 
-#ifdef SET_MMU_STATS
-/*ARGSUSED*/
-uint64_t
-hv_mmu_set_stat_area(uint64_t rstatarea, uint64_t size)
-{ return (0); }
-#endif /* SET_MMU_STATS */
+/*
+ * return the hypervisor id for the current cpu
+ *
+ * ret0 status       (%o0)
+ * ret1 cpuid        (%o1)
+ * 
+ */
+ENTRY(hv_cpu_myid)
+	mov	%o0, %o2
+	mov	CPU_MYID, %o5
+	ta	FAST_TRAP
+	stx	%o1, [%o2]
+	retl
+	  nop
+END(hv_cpu_myid)
 
-/*ARGSUSED*/
-uint64_t
-hv_cpu_qconf(int queue, uint64_t paddr, int size)
-{ return (0); }
+/*
+ * retrieve the current state of cpu cpuid
+ *
+ * arg0 cpuid        (%o0)
+ *		
+ * ret0 status       (%o0)
+ * ret1 state        (%o1)
+ * 
+ */
+ENTRY(hv_cpu_state)
+	mov	%o1, %o2
+	mov	CPU_STATE, %o5
+	ta	FAST_TRAP
+	stx	%o1, [%o2]
+	retl
+	  nop
+END(hv_cpu_state)
+	
+/*
+ * Section 12 MMU Services
+ *
+ */
+	
+/*
+ * set the tsb(s) for the current cpu for context 0
+ *
+ * arg0 ntsb         (%o0)
+ * arg1 tsbdptr      (%o1)
+ *		
+ * ret0 status       (%o0)
+ * 
+ */
+ENTRY(hv_mmu_tsb_ctx0)
+	mov	MMU_TSB_CTX0, %o5
+	ta	FAST_TRAP
+	retl
+	  nop
+END(hv_mmu_tsb_ctx0)
 
-/*ARGSUSED*/
-uint64_t
-hvio_config_get(devhandle_t dev_hdl, pci_device_t bdf,
-    pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data_p)
-{ return (0); }
+/*
+ * set the tsb(s) for the current cpu for non-zero contexts 
+ *
+ * arg0 ntsb         (%o0)
+ * arg1 tsbptr       (%o1)
+ *		
+ * ret0 status       (%o0)
+ * 

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