svn commit: r39721 - head/ja_JP.eucJP/books/porters-handbook

Ryusuke SUZUKI ryusuke at FreeBSD.org
Wed Oct 10 10:42:07 UTC 2012


Author: ryusuke
Date: Wed Oct 10 10:42:07 2012
New Revision: 39721
URL: http://svn.freebsd.org/changeset/doc/39721

Log:
  Merge the following from the English version:
  	r17053 -> r18652	head/ja_JP.eucJP/books/porters-handbook/book.sgml
  Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org>
  Reference:	[doc-jp-work 1764]

Modified:
  head/ja_JP.eucJP/books/porters-handbook/book.xml

Modified: head/ja_JP.eucJP/books/porters-handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/porters-handbook/book.xml	Wed Oct 10 10:36:14 2012	(r39720)
+++ head/ja_JP.eucJP/books/porters-handbook/book.xml	Wed Oct 10 10:42:07 2012	(r39721)
@@ -9,7 +9,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.304
+     Original revision: r18652
      $FreeBSD$
 -->
 
@@ -47,6 +47,8 @@
 	FreeBSD &a.jp.doc-jp; ¤Þ¤ÇÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
     </abstract>
 
+    &trademarks;
+
     &legalnotice;
 
     <releaseinfo>$FreeBSD$</releaseinfo>
@@ -81,7 +83,7 @@
 	¤Ê¤ª¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ÏÈóɸ½à¤Î¥¿¥ÖÀßÄê¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£
 	<application>Emacs</application> ¤ä <application>Vim</application> ¤Ï¡¢
 	¤³¤ÎÀßÄê¤ò¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß»þ¤Ëǧ¼±¤¹¤ë¤Ï¤º¤Ç¤¹¡£
-	<command>vi</command> ¤È <command>ex</command> ¤Ç¤Ï¡¢
+	&man.vi.1; ¤È &man.ex.1; ¤Ç¤Ï¡¢
 	°ìö¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç¤«¤é <command>:set tabstop=4</command> ¤È
 	¥¿¥¤¥×¤¹¤ë¤³¤È¤Ç¡¢Àµ¤·¤¤ÃͤËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
     </note>
@@ -646,7 +648,8 @@ lib/X11/oneko/mouse.xpm
       <title>¥Ñ¥Ã¥Á¤ÎŬÍÑ</title>
 
       <para>port ¤Î½àÈ÷Ãʳ¬¤ÇÄɲ䵤줿¤êÊѹ¹¤µ¤ì¤¿¤ê¤·¤¿¥Õ¥¡¥¤¥ë¤Ï¡¢
-	ºÆµ¢Åª diff ¤Ë¤è¤ê¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë²½¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	ºÆµ¢Åª &man.diff.1; ¤Ë¤è¤ê¸å¤Ç &man.patch.1;
+	¤ËÍ¿¤¨¤é¤ì¤ë·Á¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¥Ñ¥Ã¥Á¤ÏŬÅö¤Ë¤Þ¤È¤á¤Æ
 	<filename>patch-<replaceable>*</replaceable></filename>
 	¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤Æ¤¯¤À¤µ¤¤¡£
@@ -680,7 +683,7 @@ lib/X11/oneko/mouse.xpm
 	<literal>$RCS</literal>
 	¤Ê¤É¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£</para>
 
-      <para><command>diff</command> ¤ÎºÆµ¢ (<option>-r</option>)
+      <para>&man.diff.1; ¤ÎºÆµ¢ (<option>-r</option>)
 	¥Õ¥é¥°¤ò»È¤Ã¤ÆºÆµ¢Åª¤Ê¥Ñ¥Ã¥Á¤òºî¤ë¤Î¤ÏÂçÊÑ·ë¹½¤Ê¤Î¤Ç¤¹¤¬¡¢
 	¤Ç¤­¾å¤¬¤Ã¤¿¥Ñ¥Ã¥Á¤Ïɬ¤ºÌܤǥÁ¥§¥Ã¥¯¤·¤Æ;·×¤Ê¥´¥ß¤¬Æþ¤Ã¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤è¤¯¤¢¤ë¤Î¤Ï¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ëƱ»Î¤ÎÊѹ¹ÅÀ¡¢¤¢¤ë¤¤¤Ï
@@ -814,7 +817,8 @@ lib/X11/oneko/mouse.xpm
 	  Â礭¤Ê±Æ¶Á¤òÍ¿¤¨¤ëÊѹ¹¤ò¹Ô¤Ê¤Ã¤¿»þ¤Ë¤Ï¡¢
 	  <makevar>PORTREVISION</makevar> ¤òÁý¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<para>PORTREVISION ¤ò¾å¤²¤ëɬÍפ¬¤¢¤ëÊѹ¹¤ÎÎã:</para>
+	<para><makevar>PORTREVISION</makevar>
+	  ¤ò¾å¤²¤ëɬÍפ¬¤¢¤ëÊѹ¹¤ÎÎã:</para>
 
 	<itemizedlist>
 	  <listitem>
@@ -824,7 +828,8 @@ lib/X11/oneko/mouse.xpm
 
 	  <listitem>
 	    <para>package ¤Î¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó¤ÎÍ­¸ú²½¤ä
-	      ̵¸ú²½¤Î¤¿¤á¤Î Makefile ¤ÎÊѹ¹¡£</para>
+	      ̵¸ú²½¤Î¤¿¤á¤Î port ¤Î <filename>Makefile</filename>
+	      ¤ÎÊѹ¹¡£</para>
 	  </listitem>
 
 	  <listitem>
@@ -893,7 +898,7 @@ lib/X11/oneko/mouse.xpm
 	  Íø±×¤ò¼õ¤±¤ë¤è¤¦¤Ê²¿¤« ¤«¤É¤¦¤«¼«Ì䤷¤Æ¤ß¤ë¤³¤È¤Ç¤¹¡£
 
 	  ¤â¤·Åú¤¬¥¤¥¨¥¹¤Ç¤¢¤ì¤Ð¡¢¿·¤·¤¤ package ¤¬ÍøÍѲÄǽ¤Ë¤Ê¤Ã¤¿»ö¼Â¤ò
-	  (Î㤨¤Ð <command>pkg_version</command> Åù¤Î) ¼«Æ°²½¥Ä¡¼¥ë¤¬
+	  (Î㤨¤Ð &man.pkg.version.1; Åù¤Î) ¼«Æ°²½¥Ä¡¼¥ë¤¬
 	  ¶¯Ä´¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢<makevar>PORTREVISION</makevar> ¤ò
 	  ¾å¤²¤ë¤Ù¤­¤Ç¤·¤ç¤¦¡£</para>
 	</sect3>
@@ -950,7 +955,8 @@ lib/X11/oneko/mouse.xpm
 	<title><makevar>PORTREVISION</makevar> ¤È
 	  <makevar>PORTEPOCH</makevar> ¤Î»È¤¤Êý¤ÎÎã</title>
 
-	<para>gtkmumble ¤Î port, ¥Ð¡¼¥¸¥ç¥ó 0.10 ¤¬
+	<para><literal>gtkmumble</literal> ¤Î port,
+	  ¥Ð¡¼¥¸¥ç¥ó <literal>0.10</literal> ¤¬
 	  ports collection ¤Ë¥³¥ß¥Ã¥È¤µ¤ì¤Þ¤¹¡£</para>
 
 	<programlisting>PORTNAME=       gtkmumble
@@ -983,7 +989,7 @@ PORTREVISION=   1</programlisting>
 	  <makevar>PORTEPOCH</makevar> ¤òÁý¤ä¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	  ¤³¤ì¤Ï¿·¤·¤¤¥Ù¥ó¥À¡¼¥ê¥ê¡¼¥¹¤Ê¤Î¤Ç¡¢
 	  <makevar>PORTREVISION</makevar> ¤Ï 0 ¤Ë¥ê¥»¥Ã¥È
-	  (¤Þ¤¿¤Ï Makefile ¤«¤éºï½ü) ¤µ¤ì¤Þ¤¹¡£</para>
+	  (¤Þ¤¿¤Ï <filename>Makefile</filename> ¤«¤éºï½ü) ¤µ¤ì¤Þ¤¹¡£</para>
 
 	 <programlisting>PORTNAME=       gtkmumble
 PORTVERSION=    0.2
@@ -1008,9 +1014,10 @@ PORTEPOCH=      1</programlisting>
 	    <makevar>PORTEPOCH</makevar> ¤¬ <literal>0</literal> ¤Ë
 	    ¥ê¥»¥Ã¥È¤µ¤ì¤¿¤È¤¹¤ë¤È¡¢<literal>3</literal> ¤Ï¿ô»ú¤È¤·¤Æ
 	    <literal>10</literal> ¤è¤ê¤â¾®¤µ¤¤¤¿¤á¡¢
-	    gtkmumble-0.10_1 ¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿Ã¯¤«¤Ï
-	    gtkmumble-0.3 ¤Î package ¤ÎÊý¤¬¿·¤·¤¤¤³¤È¤Ë
-	    µ¤¤¬¤Ä¤«¤Ê¤¤¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</para>
+	    <literal>gtkmumble-0.10_1</literal>
+	    ¤Î package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿Ã¯¤«¤Ï
+	    <literal>gtkmumble-0.3</literal> ¤Î package
+	    ¤ÎÊý¤¬¿·¤·¤¤¤³¤È¤Ëµ¤¤¬¤Ä¤«¤Ê¤¤¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</para>
 	</note>
 	</sect3>
       </sect2>
@@ -1032,7 +1039,7 @@ PORTEPOCH=      1</programlisting>
 	¥Ï¥¤¥Õ¥ó (<literal>-</literal>) ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤Þ¤¿¡¢package ̾¤Ë
 	<replaceable>language-</replaceable> ¤â¤·¤¯¤Ï
-	<replaceable>compiled.specifics</replaceable> Éôʬ¤¬
+	<replaceable>-compiled.specifics</replaceable> Éôʬ¤¬
 	´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¤½¤ì¤¾¤ì <makevar>PKGNAMEPREFIX</makevar> ¤È
 	<makevar>PKGNAMESUFFIX</makevar> ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤ì¤é¤ò <makevar>PORTNAME</makevar> ¤Î°ìÉô¤È¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</para>
@@ -1086,7 +1093,7 @@ PORTEPOCH=      1</programlisting>
 	      Âçʸ»ú¤ò´Þ¤ó¤À¥½¥Õ¥È¥¦¥§¥¢Ì¾¤òÊÑ´¹¤¹¤ëºÝ¤Îµ¬Â§¤Ï¡¢
 	      ¤¢¤Ê¤¿¼«¿È¤ÎºÛÎ̤ËǤ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£)
 
-	      Perl 5 ¤Î¥â¥¸¥å¡¼¥ë¤Ç¤ÏÀèƬ¤Ë
+	      <literal>perl 5</literal> ¤Î¥â¥¸¥å¡¼¥ë¤Ç¤ÏÀèƬ¤Ë
 	      <literal>p5-</literal> ¤òÉÕ¤±¡¢
 	      Æó½Å¥³¥í¥ó (<literal>::</literal>)
 	      ¤Î¥»¥Ñ¥ì¡¼¥¿¤ò¥Ï¥¤¥Õ¥ó
@@ -1109,7 +1116,7 @@ PORTEPOCH=      1</programlisting>
 	      (¥Ï¥¤¥Õ¥ó¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó)¡£
 	      ÍÑ»æ¤Î¥µ¥¤¥º¡¢¤¢¤ë¤¤¤Ï¥Õ¥©¥ó¥È¤Î²òÁüÅ٤ʤɤ¬¤³¤ì¤Ë¤¢¤¿¤ê¤Þ¤¹¡£</para>
 
-	    <para><replaceable>compiled.specifics</replaceable> Éôʬ¤Ï¡¢
+	    <para><replaceable>-compiled.specifics</replaceable> Éôʬ¤Ï¡¢
 	      <makevar>PKGNAMESUFFIX</makevar> ÊÑ¿ô¤ËÄêµÁ¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 	  </listitem>
 
@@ -1292,7 +1299,7 @@ PORTEPOCH=      1</programlisting>
 	  ¤Þ¤¿¸¶ºî¼Ô¤¬¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò¥ê¥ê¡¼¥¹¤¹¤ë²ÄǽÀ­¤¬Ä㤤¤È¤­¤Ë¤Ï¡¢
 	  ¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤È¤·¤Æ
 	  <literal>1.0</literal> ¤ò»È¤¨¤Ð¤¤¤¤¤Ç¤·¤ç¤¦
-	  (¾åµ­¤Î piewm ¤ÎÎ㤬¤³¤ì¤Ë¤¢¤¿¤ê¤Þ¤¹)¡£
+	  (¾åµ­¤Î <literal>piewm</literal> ¤ÎÎ㤬¤³¤ì¤Ë¤¢¤¿¤ê¤Þ¤¹)¡£
 	  ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ë¤Ï¸¶ºî¼Ô¤Ëʹ¤¯¤«¡¢ÆüÉÕ
 	  (<literal><replaceable>yyyy</replaceable>.<replaceable>mm</replaceable>.<replaceable>dd</replaceable></literal>)
 	  ¤ò»È¤¦¤Ê¤É¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1432,6 +1439,11 @@ PORTEPOCH=      1</programlisting>
 	      </row>
 
 	      <row>
+		<entry><filename>dns</filename></entry>
+		<entry>DNS ´ØÏ¢¥½¥Õ¥È¥¦¥§¥¢</entry>
+	      </row>
+
+	      <row>
 		<entry><filename>editors</filename></entry>
 		<entry>°ìÈÌŪ¤Ê¥¨¥Ç¥£¥¿¡£
 		  Æüì¤Ê¥¨¥Ç¥£¥¿¤Ï¤½¤ì¤¾¤ì¤Õ¤µ¤ï¤·¤¤¥»¥¯¥·¥ç¥ó¤ËÆþ¤ì¤Þ¤¹
@@ -1608,7 +1620,8 @@ PORTEPOCH=      1</programlisting>
 
 	      <row>
 		<entry><filename>perl5*</filename></entry>
-		<entry>¼Â¹Ô¤Ë perl ¥Ð¡¼¥¸¥ç¥ó 5 ¤òɬÍפȤ¹¤ë ports</entry>
+		<entry>¼Â¹Ô¤Ë <literal>perl</literal>
+		  ¥Ð¡¼¥¸¥ç¥ó 5 ¤òɬÍפȤ¹¤ë ports</entry>
 	      </row>
 
 	      <row>
@@ -1622,6 +1635,11 @@ PORTEPOCH=      1</programlisting>
 	      </row>
 
 	      <row>
+		<entry><filename>polish</filename></entry>
+		<entry>¥Ý¡¼¥é¥ó¥É¸ì¥µ¥Ý¡¼¥È</entry>
+	      </row>
+
+	      <row>
 		<entry><filename>portuguese</filename></entry>
 		<entry>¥Ý¥ë¥È¥¬¥ë¸ì¥µ¥Ý¡¼¥È</entry>
 	      </row>
@@ -2782,6 +2800,9 @@ PATCHFILES=     patch1:test</programlist
 	<ulink url="../developers-handbook/policies.html#POLICIES-MAINTAINER">
 	Makefile Ãæ¤Î MAINTAINER</ulink> ¤Î
 	¥»¥¯¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+ 
+      <para><makevar>MAINTAINER</makevar> ¤ÎÃͤȤ·¤Æ¤Ï¡¢
+	¥³¥á¥ó¥ÈÉô¤Î¤Ê¤¤¥¢¥É¥ì¥¹¤À¤±¤¬¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤¹¡£</para>
     </sect1>
 
     <sect1 id="makefile-comment">
@@ -2851,7 +2872,7 @@ PATCHFILES=     patch1:test</programlist
 	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¥Þ¥·¥ó¤¬°ã¤¦¾ì¹ç¡¢¤É¤Á¤é¤Î¥Þ¥·¥ó¤Ç¤â
 	  ¤½¤Î¥é¥¤¥Ö¥é¥ê¤¬ÍøÍѤǤ­¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ç¤¹¡£)
 	  ƱÍͤˡ¢°Í¸¤¹¤ë¥é¥¤¥Ö¥é¥ê¤Î̾Á°¤Ï package Ãæ¤Ë¤â½ñ¤­¹þ¤Þ¤ì¤Æ¤¤¤Æ¡¢
-	  <command>pkg_add</command> ¼Â¹Ô»þ¤Ë ¤½¤Î¥é¥¤¥Ö¥é¥ê¤¬
+	  &man.pkg.add.1; ¼Â¹Ô»þ¤Ë¤½¤Î¥é¥¤¥Ö¥é¥ê¤¬
 	  ¥æ¡¼¥¶¤Î¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¼«Æ°Åª¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
 	</para>
       </sect2>
@@ -2901,7 +2922,7 @@ PATCHFILES=     patch1:test</programlist
 
 	<para>¤³¤Î°Í¸´Ø·¸¤Ï <maketarget>install</maketarget>
 	  ¥¿¡¼¥²¥Ã¥ÈÃæ¤Ç¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤¹¡£
-	  ¤Þ¤¿¡¢<command>pkg_add</command> ¤Ë¤è¤ë¥¤¥ó¥¹¥È¡¼¥ë¤ÎºÝ¤Ë¡¢¤½¤Î package
+	  ¤Þ¤¿¡¢&man.pkg.add.1; ¤Ë¤è¤ë¥¤¥ó¥¹¥È¡¼¥ë¤ÎºÝ¤Ë¡¢¤½¤Î package
 	  ¤¬°Í¸¤¹¤ë¤â¤Î¤¬¥æ¡¼¥¶¤Î¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¼«Æ°Åª¤ËÄɲ夥󥹥ȡ¼¥ë¤Ç¤­¤ë¤è¤¦¤Ë¡¢
 	  °Í¸¤¹¤ë¤â¤Î¤Î̾Á°¤â package Ãæ¤Ëµ­Ï¿¤µ¤ì¤Þ¤¹¡£
 	  <replaceable>target</replaceable> ¤ÎÉôʬ¤¬
@@ -3021,8 +3042,10 @@ PATCHFILES=     patch1:test</programlist
 	      <row>
 		<entry><makevar>USE_PERL5</makevar></entry>
 
-		<entry>¤½¤Î port ¤ò¥Ó¥ë¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë Perl 5
-		  ¤¬É¬ÍפǤ¹¡£Perl ¤Ë´ØÏ¢¤·¤ÆÀßÄê²Äǽ¤Ê¾¤ÎÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï
+		<entry>¤½¤Î port ¤ò¥Ó¥ë¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë
+		  <literal>perl 5</literal> ¤¬É¬ÍפǤ¹¡£
+		  <literal>perl</literal>
+		  ¤Ë´ØÏ¢¤·¤ÆÀßÄê²Äǽ¤Ê¾¤ÎÊÑ¿ô¤Ë¤Ä¤¤¤Æ¤Ï
 		  <xref linkend="using-perl"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</entry>
 	      </row>
 
@@ -3097,10 +3120,11 @@ PATCHFILES=     patch1:test</programlist
 	  <literal>USE_AUTOCONF=yes</literal> ¤ò¡¢
 	  ºÇ¿·¤Î qt toolkit ¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï
 	  <literal>USE_QT=yes</literal> ¤ò¡¢
-	  perl ¸À¸ì¤Î¥Ð¡¼¥¸¥ç¥ó 5 ¤òɬÍפȤ¹¤ë¾ì¹ç¤Ë¤Ï
+	  <literal>perl</literal> ¸À¸ì¤Î¥Ð¡¼¥¸¥ç¥ó 5 ¤òɬÍפȤ¹¤ë¾ì¹ç¤Ë¤Ï
 	  <literal>USE_PERL5=yes</literal> ¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤
 	  (Æä˺Ǹå¤Î¤â¤Î¤Ï½ÅÍפǤ¹¡£
-	  FreeBSD ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ê¡¢´ðËÜ¥·¥¹¥Æ¥à¤Ë perl5
+	  FreeBSD ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ê¡¢´ðËÜ¥·¥¹¥Æ¥à¤Ë
+	  <literal>perl5</literal>
 	  ¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¤ê¡¢¤¤¤Ê¤«¤Ã¤¿¤ê¤·¤Þ¤¹)¡£</para>
       </sect2>
 
@@ -3134,7 +3158,7 @@ PATCHFILES=     patch1:test</programlist
 
 	  <programlisting>BUILD_DEPENDS=   ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract</programlisting>
 
-	  ¤È¤¹¤ë¤È¡¢¾ï¤Ë JPEG port
+	  ¤È¤¹¤ë¤È¡¢¾ï¤Ë <literal>jpeg</literal> port
 	  ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¹Ô¤Ã¤Æ¥½¡¼¥¹¤ÎŸ³«¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</para>
 
 	<para>¤¢¤Ê¤¿¤¬¤ä¤ê¤¿¤¤¤³¤È¤¬Â¾¤ÎÊýË¡¤Ç¤Ï¤Ç¤­¤Ê¤¤¾ì¹ç°Ê³°¤Ë¤Ï
@@ -3239,6 +3263,19 @@ PORTVERSION=   1.0</programlisting>
       </sect2>
     </sect1>
 
+    <sect1 id="conflicts">
+      <title><makevar>CONFLICTS</makevar></title>
+
+      <para>¤¢¤Ê¤¿¤¬ºîÀ®¤·¤Æ¤¤¤ë package ¤¬Â¾¤Î package¤È
+	(¥Õ¥¡¥¤¥ë¤Î¾×Æͤä¼Â¹Ô»þ¤ÎÈó¸ß´¹À­¤Ë¤è¤ê)
+	¶¦Â¸¤Ç¤­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢<makevar>CONFLICTS</makevar>
+	ÊÑ¿ô¤Ë¤½¤Î package ¤Î̾¾Î¤òµó¤²¤Æ¤¯¤À¤µ¤¤¡£
+	<literal>*</literal> ¤ä <literal>?</literal>
+	¤Î¤è¤¦¤Ê¥·¥§¥ë¤ÎÊä´°¤¬ÍøÍѤǤ­¤Þ¤¹¡£package ̾¤Ï
+	<filename>/var/db/pkg</filename>
+	¤Ë¤¢¤ë¤Î¤ÈƱ¤¸·Á¼°¤Çʤ٤Ƥ¯¤À¤µ¤¤¡£</para>
+    </sect1>
+
     <sect1 id="makefile-build">
       <title>¥Ó¥ë¥É¤Î¥á¥«¥Ë¥º¥à</title>
 
@@ -3423,10 +3460,10 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PRE
     </sect1>
 
     <sect1 id="using-perl">
-      <title>Perl ¤ÎÍøÍÑ</title>
+      <title><literal>perl</literal> ¤ÎÍøÍÑ</title>
 
       <table frame="none">
-	<title>Perl ¤ò»ÈÍѤ¹¤ë ports ÍѤÎÊÑ¿ô</title>
+	<title><literal>perl</literal> ¤ò»ÈÍѤ¹¤ë ports ÍѤÎÊÑ¿ô</title>
 
 	<tgroup cols="2">
 	  <thead>
@@ -3441,40 +3478,56 @@ LDCONFIG_DIRS=  %%PREFIX%%/lib/foo %%PRE
 	    <row>
 	      <entry><makevar>USE_PERL5</makevar></entry>
 
-	      <entry>¤½¤Î port ¤Î¥Ó¥ë¥É¤È¼Â¹Ô¤Ë Perl 5
+	      <entry>¤½¤Î port ¤Î¥Ó¥ë¥É¤È¼Â¹Ô¤Ë <literal>perl 5</literal>
 		¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</entry>
 	    </row>
 
 	    <row>
-	      <entry><makevar>PERL</makevar></entry>
-	    </row>
-
+ 	      <entry><makevar>PERL_CONFIGURE</makevar></entry>
+ 
+ 	      <entry>Perl ¤Î MakeMaker
+ 		¤ò»È¤Ã¤Æ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤¤¤Þ¤¹¡£°ÅÌۤΤ¦¤Á¤Ë
+ 		<makevar>USE_PERL5</makevar> ¤òÀßÄꤷ¤Þ¤¹¡£</entry>
+	    </row>
+ 	  </tbody>
+ 	</tgroup>
+
+ 	<tgroup cols="2">
+ 	  <thead>
+ 	    <row>
+ 	      <entry>Æɤ߼è¤êÀìÍÑÊÑ¿ô</entry>
+ 	    </row>
+ 	  </thead>
+ 
+ 	  <tbody>
 	    <row>
 	      <entry><makevar>PERL_VERSION</makevar></entry>
 
-	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë Perl ¤Î´°Á´¤Ê¥Ð¡¼¥¸¥ç¥ó
+ 	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë <literal>perl</literal>
+ 		¤Î´°Á´¤Ê¥Ð¡¼¥¸¥ç¥ó
 		(¤¿¤È¤¨¤Ð <literal>5.00503</literal>)¡£</entry>
 	    </row>
 
 	    <row>
 	      <entry><makevar>PERL_VER</makevar></entry>
 
-	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë Perl ¤Î¥Ð¡¼¥¸¥ç¥ó¤Îû½Ì·Á
+ 	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë <literal>perl</literal>
+ 		¤Î¥Ð¡¼¥¸¥ç¥ó¤Îû½Ì·Á
 		(¤¿¤È¤¨¤Ð <literal>5.005</literal>)¡£</entry>
 	    </row>
 
 	    <row>
 	      <entry><makevar>PERL_LEVEL</makevar></entry>
 
-	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë Perl ¤Î
-		MNNNPP ·Á¼°¤ÎÀ°¿ô¤Çɽ¤µ¤ì¤ë¥Ð¡¼¥¸¥ç¥ó
+ 	      <entry>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë <literal>perl</literal> ¤Î
+ 		<literal>MNNNPP</literal> ·Á¼°¤ÎÀ°¿ô¤Çɽ¤µ¤ì¤ë¥Ð¡¼¥¸¥ç¥ó
 		(¤¿¤È¤¨¤Ð <literal>500503</literal>)¡£</entry>
 	    </row>
 
 	    <row>
 	      <entry><makevar>PERL_ARCH</makevar></entry>
 
-	      <entry>Perl
+	      <entry><literal>perl</literal>
 		¤¬¥¢¡¼¥­¥Æ¥¯¥Á¥ã°Í¸¤Î¥é¥¤¥Ö¥é¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì½ê¡£
 		¥Ç¥Õ¥©¥ë¥È¤Ï <literal>${ARCH}-freebsd</literal>¡£</entry>
 	    </row>
@@ -4195,7 +4248,7 @@ MASTERDIR=      ${.CURDIR}/../xdvi300
       °Ê³°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¥Þ¥Ë¥å¥¢¥ë¤òÃÖ¤¯¤è¤¦¤Ê port
       ¤Ç¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò <makevar>MANPREFIX</makevar>
       ¤Ç»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤µ¤é¤Ë¡¢¤¤¤¯¤Ä¤«¤Î Perl ¥â¥¸¥å¡¼¥ë¤Î ports ¤Î¤è¤¦¤Ë¡¢
+      ¤µ¤é¤Ë¡¢¤¤¤¯¤Ä¤«¤Î <literal>perl</literal> ¥â¥¸¥å¡¼¥ë¤Î ports ¤Î¤è¤¦¤Ë¡¢
       ÆÃÄê¤Î¥»¥¯¥·¥ç¥ó¤Î¥Þ¥Ë¥å¥¢¥ë¤À¤±¤òÈóɸ½à¤Î¾ì½ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¡¢
       ¸Ä¡¹¤Î¥Þ¥Ë¥å¥¢¥ë¤Î¥Ñ¥¹¤ò
       <makevar>MAN<replaceable>sect</replaceable>PREFIX</makevar>
@@ -4313,304 +4366,12 @@ ${PREFIX}/man/ja/man4/baz.4.gz</programl
   <chapter id="porting-info">
     <title>Info ¥Õ¥¡¥¤¥ë</title>
 
-    <para>¿·¤·¤¤ÈǤΠtexinfo
-      (2.2.2-RELEASE ¤ª¤è¤Ó¤½¤ì°Ê¹ß¤ËÆþ¤Ã¤Æ¤¤¤Þ¤¹) ¤Ë¤Ï
-      <command>install-info</command> ¤È¤¤¤¦¥³¥Þ¥ó¥É¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢
-      <filename>dir</filename>
-      ¥Õ¥¡¥¤¥ë¤Ë¹àÌܤòÄɲä·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤â¤·¡¢¤¢¤Ê¤¿¤Î port ¤¬ info ʸ½ñ¤ò¥¤¥ó¥¹¥È¡¼ ¥ë¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-      °Ê²¼¤Î»Ø¼¨¤Ë½¾¤Ã¤Æ¤½¤Î port ¤ª¤è¤Ó package
-      ¤¬Àµ¤·¤¯¥æ¡¼¥¶¤Î
-      <filename><makevar>PREFIX</makevar>/info/dir</filename>
-      ¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤
-      (¤³¤Î¥»¥¯¥·¥ç¥ó¤Ï¤È¤Æ¤âŤ¯¤Æ¤¹¤¤¤Þ¤»¤ó¡£
-      ¤·¤«¤· info ¥Õ¥¡¥¤¥ë¤òºî¤ê¤¢¤²¤ë¤¿¤á¤Ë¤Ï¤³¤ì¤é¤ÏÉԲķç¤Ç¤¹¡£
-      Àµ¤·¤¯¹Ô¤Ê¤¨¤Ð<emphasis>Èþ¤·¤¤</emphasis>¥ê¥¹¥È¤¬¤Ç¤­¤Þ¤¹¤Î¤Ç¡¢
-      ¿ÉÊú¤·¤Æ¤¯¤À¤µ¤¤!
-      <!-- smiley --><emphasis>:-)</emphasis></para>
-
-    <para>¤Þ¤º¡¢¤³¤ì¤òÃΤäƤª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
-
-    <screen>&prompt.user; <userinput>install-info --help</userinput>
-install-info [OPTION]... [INFO-FILE [DIR-FILE]]
-  Install INFO-FILE in the Info directory file DIR-FILE.
-  (ÌõÃí: Info ¥Ç¥£¥ì¥¯¥È¥ê¤Î INFO-FILE ¤ò DIR-FILE ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë)
-Options:
---delete          Delete existing entries in INFO-FILE;
-                    don't insert any new entries.
-                  (ÌõÃí: INFO-FILE ¤ÎÃæ¤Î¹àÌܤòºï½ü¡¢
-                   ¿·¤·¤¤¹àÌܤϰìÀÚÄɲ䷤ʤ¤¡£)
- :
---entry=TEXT      Insert TEXT as an Info directory entry.
-                  (ÌõÃí: TEXT ¤ò Info ¥Ç¥£¥ì¥¯¥È¥ê¤Î¹àÌܤȤ·¤ÆÄɲ乤롣)
- :
---section=SEC     Put this file's entries in section SEC of the directory.
-                  (ÌõÃí: ¤³¤Î¥Õ¥¡¥¤¥ë¤Î¹àÌܤò Info ¥Ç¥£¥ì¥¯¥È¥ê¤Î SEC
-                   ¤È¤¤¤¦¥»¥¯¥·¥ç¥ó¤ËÃÖ¤¯¡£)
- :</screen>
-
-    <note>
-      <para>¤³¤Î¥×¥í¥°¥é¥à¤Ï¡¢¼ÂºÝ¤Ë¤Ï info
-	¥Õ¥¡¥¤¥ë¤ò<emphasis>¥¤¥ó¥¹¥È¡¼¥ë</emphasis>¤·¤Þ¤»¤ó¡£
-	ñ¤Ë <filename>dir</filename>
-	¥Õ¥¡¥¤¥ë¤Ë¥¨¥ó¥È¥ê¤òÁÞÆþ¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤À¤±¤Ç¤¹¡£</para>
-    </note>
-
-    <para>¤³¤ì¤«¤é¡¢<command>install-info</command>
-      ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¡¢ports ¤òÊÑ´¹¤¹¤ë 7 Ãʳ¬¤Î¹©Äø¤ò¼¨¤·¤Þ¤¹¡£
-      Îã¤È¤·¤Æ
-      <filename role="package">editors/emacs</filename>
-      ¤ò»ÈÍѤ·¤Þ¤¹¡£</para>
-
-    <procedure>
-      <step>
-	<para>¤Þ¤º¡¢texinfo ¤Î¥½¡¼¥¹¤ò¸«¤Æ¡¢
-	  <literal>@dircategory</literal> ¤È
-	  <literal>@direntry</literal> ʸ¤¬¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢
-	  ¤½¤ì¤é¤òÄɲ乤ë¥Ñ¥Ã¥Á¤òºîÀ®¤·¤Þ¤¹¡£°Ê²¼¤Ï¡¢
-	  ¤³¤³¤Ç¤ÎÎã¤Ç¤Î patch¤Î°ìÉô¤Ç¤¹:</para>
-
-	<programlisting>--- ./man/vip.texi.org  Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi      Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
-
- @setfilename ../info/vip
- @settitle VIP
-+ at dircategory The Emacs editor and associated tools
-+ at direntry
-+* VIP: (vip).          A VI-emulation for Emacs.
-+ at end direntry
-
- @iftex
- @finalout
- :</programlisting>
-
-	<para>¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤Ä¤¤¤Æ¤Ï¸«¤ì¤Ð¤ï¤«¤ë¤È»×¤¤¤Þ¤¹¡£
-	  <filename>dir</filename>
-	  ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËɬÍפʹàÌܤò½ñ¤¤¤Æ¤ª¤¤¤Æ¤¯¤ì¤ëºî¼Ô¤â¿¤¤¤Î¤Ç¡¢
-	  ¤Þ¤º¼«Ê¬¤Ç½ñ¤¯Á°¤Ë¤µ¤¬¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤Þ¤¿¡¢´Ø·¸¤¹¤ë ports ¤âÄ´¤Ù¤Æ¡¢
-	  ¥»¥¯¥·¥ç¥ó¤Î̾Á°¤ä¥¤¥ó¥Ç¥ó¥È¤Ê¤É¤¬¤­¤Á¤ó¤È¹ç¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤
-	  (¹àÌܤΥƥ­¥¹¥È ¤Ï¡¢¤¹¤Ù¤Æ 4 ¤Ä¤á¤Î¥¿¥Ö¡¦¥¹¥È¥Ã¥×
-	  (tab stop) ¤«¤é»Ï¤á¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹)¡£</para>
-
-	<note>
-	  <para>°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ°ì¤Ä¤Î info
-	    ¤Î¹àÌܤ·¤«½ñ¤±¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤Ï
-	    <command>install-info --delete</command>
-	    <!-- kuriyama - not email --> ¤Î¥Ð¥°¤Ë¤è¤ê
-	    <email>@direntry</email>
-	    ¥»¥¯¥·¥ç¥ó¤ËÊ£¿ô¤Î¹àÌܤò½ñ¤¤¤Æ¤â½é¤á¤Î°ì¤Ä¤Î¹àÌܤ·¤«ºï½ü¤·¤Æ¤¯¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£</para>
-	</note>
-
-	<para>texinfo ¤Î¥½¡¼¥¹¤Ë¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ëÂå¤ï¤ê¤Ë
-	  <literal>dir</literal> ¤Î¹àÌܤò
-	  <command>install-info</command> ¤Î°ú¿ô
-	  (<option>--section</option>, <option>--entry</option>)
-	  ¤È¤·¤ÆÍ¿¤¨¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢¤¢¤Þ¤êÎɤ¤ÊýË¡¤È¤Ï¸À¤¨¤Þ¤»¤ó¡£
-	  ¤Ê¤¼¤Ê¤éƱ¤¸¾ðÊó¤ò»°¤Ä¤Î¾ì½ê
-	  (<filename>Makefile</filename>,
-	  <filename>pkg-plist</filename> ¤Î
-	  <literal>@exec</literal>/<literal>@unexec</literal>:
-	  °Ê²¼»²¾È)
-	  ¤Ë½ÅÊ£¤·¤Æ½ñ¤¯É¬Íפ¬¤¢¤ë¤«¤é¤Ç¤¹¡£
-	  ¤·¤«¤·¡¢ÆüËܸì (¤¢¤ë¤¤¤Ï¡¢Â¾¤Î¥Þ¥ë¥Á¥Ð¥¤¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°) ¤Î
-	  info ¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï
-	  <command>install-info</command>
-	  ¤ÎÆÃÊ̤ʰú¿ô¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£
-	  ¤Ê¤¼¤Ê¤é <command>makeinfo</command> ¤¬¤³¤Î¤è¤¦¤Ê
-	  texinfo ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò°·¤¨¤Ê¤¤¤«¤é¤Ç¤¹¡£
-	  (¤³¤Î¤è¤¦¤Ê¤â¤Î¤ò¤É¤¦°·¤¦¤«¤ÎÎã¤È¤·¤Æ¤Ï
-	  <filename role="package">japanese/skk</filename> ¤Î
-	  <filename>Makefile</filename> ¤È
-	  <filename>pkg-plist</filename> ¤ò¸«¤Æ¤¯¤À¤µ¤¤)¡£</para>
-      </step>
-
-      <step>
-	<para>port¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤Ã¤Æ
-	  <command>make clean; make</command> ¤ò¼Â¹Ô¤·¡¢info ¥Õ¥¡¥¤¥ë¤¬
-	  texinfo ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤«¤éºÆ¤ÓÀ¸À®¤µ¤ì¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  texinfo ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¤Û¤¦¤¬ info ¥Õ¥¡¥¤¥ë¤è¤ê¤â¿·¤·¤¤¤Î¤Ç
-	  <command>make</command> ¤ÈÆþÎϤ¹¤ì¤Ð
-	  info ¥Õ¥¡¥¤¥ë¤ÏºÆ¹½ÃÛ¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¤¬¡¢Â¿¤¯¤Î
-	  <filename>Makefile</filename>
-	  ¤Ë¤Ï info ¥Õ¥¡¥¤¥ë¤ÎÀµ¤·¤¤°Í¸´Ø·¸¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-	  <application>Emacs</application> ¤Î¾ì¹ç¡¢
-	  info ¥Õ¥¡¥¤¥ë¤ÎºÆ¹½ÃۤκݤˤÏ
-	  <filename>man</filename> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¹ß¤ê¤ë¤è¤¦¤Ë
-	  ¥á¥¤¥ó¤Î <filename>Makefile.in</filename>
-	  ¤Ë¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤·¤¿¡£</para>
-
-	<programlisting>--- ./Makefile.in.org   Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in       Tue Apr 15 00:15:28 1997
-@@ -184,7 +184,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
--SUBDIR = lib-src src
-+SUBDIR = lib-src src man
-
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
---- ./man/Makefile.in.org       Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in   Tue Apr 15 00:29:52 1997
-@@ -66,6 +66,7 @@
-        ${srcdir}/gnu1.texi \
-        ${srcdir}/glossary.texi
-
-+all: info
- info: $(INFO_TARGETS)
-
- dvi: $(DVI_TARGETS)</programlisting>
-
-	<para>¥á¥¤¥ó¤Î <filename>Makefile</filename> ¤«¤é¤Ï¡¢
-	  <maketarget>all</maketarget> ¤È¤·¤Æ¸Æ¤Ó¤¿¤¤¤Î¤Ç¤¹¤¬¡¢
-	  <filename>man</filename>
-	  ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¥¿¡¼¥²¥Ã¥È¤Ï
-	  <maketarget>info</maketarget> ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-	  ¤³¤Î¤¿¤á¡¢Æó¤ÄÌܤΥѥåÁ¤¬É¬Íפˤʤê¤Þ¤¹¡£
-	  ¤Þ¤¿¡¢<filename>info</filename> info
-	  ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥¹¥È¡¼¥ë¤âºï½ü¤·¤Þ¤·¤¿¡£
-	  ¤Ê¤¼¤Ê¤é¡¢¤½¤ì¤ÏƱ¤¸Ì¾Á°¤Ç¤¹¤Ç¤Ë
-	  <filename>/usr/share/info</filename> ¤Ë¤¢¤ë¤«¤é¤Ç¤¹
-	  (¤½¤Î¥Ñ¥Ã¥Á¤Ï¤³¤³¤Ç¤Ï¼¨¤·¤Þ¤»¤ó)¡£</para>
-      </step>
-
-      <step>
-	<para>¤â¤·¡¢<filename>Makefile</filename> ¤Ë
-	  <filename>dir</filename>
-	  ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¸Ä½ê¤¬¤¢¤ì¤Ðºï½ü¤·¤Þ¤¹¡£
-	  ¤¢¤Ê¤¿¤Î port ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-	  ¤Þ¤¿¡¢<filename>dir</filename>
-	  ¥Õ¥¡¥¤¥ë¤ò²õ¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ÎÎà¤âºï½ü¤·¤Þ¤¹¡£</para>
-
-	<programlisting>--- ./Makefile.in.org   Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in       Mon Apr 14 23:38:07 1997
-@@ -368,14 +368,8 @@
-        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
-        then \
-          (cd ${infodir};  \
--          if [ -f dir ]; then \
--            if [ ! -f dir.old ]; then mv -f dir dir.old; \
--            else mv -f dir dir.bak; fi; \
--          fi; \
-           cd ${srcdir}/info ; \
--          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
--          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-           for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-             (cd $${thisdir}; \
-              ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
-              chmod a+r ${infodir}/$$f); \</programlisting>
-      </step>
-
-      <step>
-	<para>(¤³¤ì¤Ï¡¢´û¸¤Îport¤ò½¤Àµ¤¹¤ë¤È¤­¤Î¤ßɬÍפǤ¹¡£)
-	  <filename>pkg-plist</filename> ¤ò¸«¤Æ¡¢
-	  <filename>info/dir</filename>
-	  ¤Ë¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤è¤¦¤È¤¹¤ë¤â¤Î¤¹¤Ù¤Æ¤òºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤Ï
-	  <filename>pkg-install</filename>
-	  ¤ä¤½¤Î¾¤Î¥Õ¥¡¥¤¥ë¤Ë¤â¤¢¤ë¤«¤â¤·¤ì¤Ê¤¤¤Î¤Ç¡¢
-	  ¤¤¤í¤¤¤í¤µ¤¬¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<programlisting>Index: pkg-plist
-===================================================================
-RCS file: /usr/cvs/ports/editors/emacs/pkg/pkg-plist,v
-retrieving revision 1.15
-diff -u -r1.15 pkg-plist
---- pkg-plist   1997/03/04 08:04:00     1.15
-+++ pkg-plist   1997/04/15 06:32:12
-@@ -15,9 +15,6 @@
- man/man1/emacs.1.gz
- man/man1/etags.1.gz
- man/man1/ctags.1.gz
-- at unexec cp %D/info/dir %D/info/dir.bak
--info/dir
-- at unexec cp %D/info/dir.bak %D/info/dir
- info/cl
- info/cl-1
- info/cl-2</programlisting>
-      </step>
-
-      <step>
-	<para><maketarget>post-install</maketarget> ¥¿¡¼¥²¥Ã¥È¤ò
-	  <filename>Makefile</filename>
-	  ¤Ë²Ã¤¨¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿ info ¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	  <maketarget>install-info</maketarget>
-	  ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤·¤Þ¤¹
-	  (<filename>dir</filename>
-	  ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤½¤ì¤òºîÀ®¤¹¤ë¤è¤¦¤Ë¤¹¤ëɬÍפϤʤ¯¤Ê¤ê¤Þ¤·¤¿¡£
-	  <command>install-info</command>
-	  ¤Ï¤³¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤±¤ì¤Ð¼«Æ°Åª¤ËºîÀ®¤·¤Þ¤¹)¡£
-	</para>
-
-	<programlisting>Index: Makefile
-===================================================================
-RCS file: /usr/cvs/ports/editors/emacs/Makefile,v
-retrieving revision 1.26
-diff -u -r1.26 Makefile
---- Makefile    1996/11/19 13:14:40     1.26
-+++ Makefile    1997/05/20 10:25:09     1.28
-@@ -20,5 +20,11 @@
- post-install:
- .for file in emacs-19.34 emacsclient etags ctags b2m
-        strip ${PREFIX}/bin/${file}
- .endfor
-+.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode
-+       install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-+.endfor
-
- .include <bsd.port.mk></programlisting>
-      </step>
-
-      <step>
-	<para><filename>pkg-plist</filename> ¤òÊÔ½¸¤·¤Æ¡¢Æ±¤¸Æ¯¤­¤ò¤¹¤ë
-	  <literal>@exec</literal> ʸ¡¢
-	  ¤½¤ì¤Ë <command>pkg_delete</command> ¤Î¤¿¤á¤Ë
-	  <literal>@unexec</literal> ʸ¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<programlisting>Index: pkg-plist
-===================================================================
-RCS file: /usr/cvs/ports/editors/emacs/pkg-plist,v
-retrieving revision 1.15
-diff -u -r1.15 pkg-plist
---- pkg-plist   1997/03/04 08:04:00     1.15
-+++ pkg-plist   1997/05/20 10:25:12     1.17
-@@ -16,7 +14,14 @@
- man/man1/etags.1.gz
- man/man1/ctags.1.gz
-+ at unexec install-info --delete %D/info/emacs %D/info/dir
- :
-+ at unexec install-info --delete %D/info/ccmode %D/info/dir
- info/cl
- info/cl-1
-@@ -87,6 +94,18 @@
- info/viper-3
- info/viper-4
-+ at exec install-info %D/info/emacs %D/info/dir
- :
-+ at exec install-info %D/info/ccmode %D/info/dir
- libexec/emacs/19.34/i386--freebsd/cvtmail
- libexec/emacs/19.34/i386--freebsd/digest-doc</programlisting>
-
-	<note>
-	  <para><literal>@unexec install-info --delete</literal>
-	    ¥³¥Þ¥ó¥É¤Ï info ¥Õ¥¡¥¤¥ë¼«¿È¤è¤êÀè¤ËÃÖ¤­¡¢
-	    ¥³¥Þ¥ó¥É¤¬¥Õ¥¡¥¤¥ë¤òÆɤá¤ë¤è¤¦¤Ë¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤Þ¤¿ <literal>@exec install-info</literal> ¥³¥Þ¥ó¥É¤Ï¡¢
-	    info ¥Õ¥¡¥¤¥ë¤ª¤è¤Ó <filename>dir</filename>
-	    ¥Õ¥¡¥¤¥ë¤òºî¤ë <literal>@exec</literal>
-	    ¥³¥Þ¥ó¥É¤è¤ê¸å¤Ë¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
-	</note>
-      </step>
-
-      <step>
-	<para><link linkend="porting-testing">¥Æ¥¹¥È</link>
-	  ¤ò¤·¤Æ½ÐÍè±É¤¨¤Ë´¶Éþ¤·¤Þ¤·¤ç¤¦
-	  <!-- smiley --><emphasis>:)</emphasis>
-	  ³ÆÃʳ¬¤ÎÁ°¸å¤Ë <filename>dir</filename>
-	  ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤·¤ç¤¦¡£</para>
-      </step>
-    </procedure>
+     <para>¤¢¤Ê¤¿¤¬ºîÀ®¤·¤Æ¤¤¤ë package ¤Ç GNU info
+       ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ì¤Ð¡¢¤½¤ì¤ò
+       <makevar>INFO</makevar> ÊÑ¿ô¤Ë (¸å¤í¤Î <literal>.info</literal>
+       ¤Ê¤·¤Ç) ½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£package ÅÐÏ¿¤ÎÁ°¤Ë°ì»þŪ¤ËÀ¸À®¤µ¤ì¤¿
+       <filename>pkg-plist</filename> ¤Ë¡¢
+       ŬÀڤʥ¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤Ó¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¥³¡¼¥É¤¬¼«Æ°Åª¤ËÄɲ䵤ì¤Þ¤¹¡£</para>
   </chapter>
 
   <chapter id="pkg-files">
@@ -4625,7 +4386,7 @@ diff -u -r1.15 pkg-plist
       <para>¤â¤·¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¿Í¤Ë¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢
 	¤½¤Î¥á¥Ã¥»¡¼¥¸¤ò
 	<filename>pkg-message</filename> ¤ËÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¤³¤Îµ¡Ç½¤Ï <command>pkg_add</command>
+	¤³¤Îµ¡Ç½¤Ï &man.pkg.add.1;
 	¤Î¸å¤ÎÄɲäΥ¤¥ó¥¹¥È¡¼¥ë¼ê³¤­¤òɽ¼¨¤¹¤ë¤È¤­¤Ê¤É¤Ë½ÅÊõ¤·¤Þ¤¹¡£</para>
 
       <note>
@@ -4642,12 +4403,12 @@ diff -u -r1.15 pkg-plist
     <sect1 id="pkg-install">
       <title><filename>pkg-install</filename></title>
 
-      <para>¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬ <command>pkg_add</command>
+      <para>¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬ &man.pkg.add.1;
 	¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¤È¤­¤Ë¼Â¹Ô¤¹¤ëɬÍפΤ¢¤ë¥³¥Þ¥ó¥É¤¬¤¢¤ì¤Ð¡¢
 	<filename>pkg-install</filename>
 	¥¹¥¯¥ê¥×¥È¤ò»È¤Ã¤Æ¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï¼«Æ°Åª¤Ë package ¤Ë²Ã¤¨¤é¤ì¡¢
-	<command>pkg_add</command> ¤Ë¤è¤Ã¤Æ 2 ²ó¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+	&man.pkg.add.1; ¤Ë¤è¤Ã¤Æ 2 ²ó¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
 	1 ²óÌܤÏ
 	<literal>${SH} pkg-install ${PKGNAME} PRE-INSTALL</literal>
 	¤È¤·¤Æ¡¢2 ²óÌܤˤÏ
@@ -4669,6 +4430,19 @@ diff -u -r1.15 pkg-plist
       </note>
     </sect1>
 
+    <sect1 id="pkg-deinstall">
+      <title><filename>pkg-deinstall</filename></title>
+
+      <para>¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï package ¤¬ºï½ü¤µ¤ì¤ëºÝ¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£</para>
+
+      <para>¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï¡¢&man.pkg.delete.1; ¤«¤é
+	2 ²ó¼Â¹Ô¤µ¤ì¤Þ¤¹¡£1 ²óÌܤÏ
+	<literal>${SH} pkg-install ${PKGNAME} DEINSTALL</literal>
+	¤È¡¢2 ²óÌܤÏ
+	<literal>${SH} pkg-install ${PKGNAME} POST-DEINSTALL</literal>
+	¤È¤¤¤¦·Á¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£ </para>
+    </sect1>
+
     <sect1 id="pkg-req">
       <title><filename>pkg-req</filename></title>
 
@@ -4679,9 +4453,9 @@ diff -u -r1.15 pkg-plist
 	¥¤¥ó¥¹¥È¡¼¥ë¤äºï½ü¤ò¼Â¹Ô¤¹¤Ù¤­¤«¤É¤¦¤«È½ÃǤ¹¤ë¤¿¤á¤Ë¡¢
 	¤³¤Î¥¹¥¯¥ê¥×¥È¤¬¥¤¥ó¥¹¥È¡¼¥ë¤äºï½ü¤ò¼Â¹Ô¤¹¤ëºÝ¤Ë¼«Æ°Åª¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£</para>
 
-      <para>¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¤Ï <command>pkg_add</command> ¤Ë¤è¤ê
+      <para>¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¤Ï &man.pkg.add.1; ¤Ë¤è¤ê
 	<literal>pkg-req ${PKGNAME} INSTALL</literal> ¤È¤·¤Æ¼Â¹Ô¤µ¤ì¡¢
-	ºï½ü»þ¤Ë¤Ï <command>pkg_delete</command> ¤Ë¤è¤ê
+	ºï½ü»þ¤Ë¤Ï &man.pkg.delete.1; ¤Ë¤è¤ê
 	<literal>pkg-req ${PKGNAME} DEINSTALL</literal> ¤È¤·¤Æ
 	¼Â¹Ô¤µ¤ì¤Þ¤¹¡£</para>
     </sect1>
@@ -4690,8 +4464,10 @@ diff -u -r1.15 pkg-plist
       <title>make ¤ÎÊÑ¿ô¤Ë¤¢¤ï¤»¤¿
 	<filename>pkg-plist</filename> ¤ÎÊѹ¹</title>
 
-      <para>¤¤¤¯¤Ä¤«¤Î port¡¢ÆÃ¤Ë p5-ports ¤Ê¤É¤Ï configure ¤Î¥ª¥×¥·¥ç¥ó
-	(¤¢¤ë¤¤¤Ï¡¢p5-ports ¤Î¾ì¹ç¤Ï perl ¤Î¥Ð¡¼¥¸¥ç¥ó)	¤Ë¤è¤Ã¤Æ
+      <para>¤¤¤¯¤Ä¤«¤Î port¡¢ÆÃ¤Ë <literal>p5-</literal> ports
+	¤Ê¤É¤Ï¡¢configure ¤Î¥ª¥×¥·¥ç¥ó
+	(¤¢¤ë¤¤¤Ï¡¢<literal>p5-</literal>
+	¤Î¾ì¹ç¤Ï <literal>perl</literal> ¤Î¥Ð¡¼¥¸¥ç¥ó) ¤Ë¤è¤Ã¤Æ
 	<filename>pkg-plist</filename> ¤òÊѤ¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤òÍưפ˼¸½¤¹¤ë¤¿¤á¤Ë
 	<filename>pkg-plist</filename> Ãæ¤Î
@@ -4702,11 +4478,11 @@ diff -u -r1.15 pkg-plist
 	<literal>%%OSREL%%</literal>
 	¤ÎÃͤϥª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¿ô»ú¤Çɽ¤µ¤ì¤¿¥ê¥Ó¥¸¥ç¥ó¤Ç¤¹
 	(¤¿¤È¤¨¤Ð <literal>2.2.7</literal>)¡£
-	<literal>%%PERL_VERSION%%</literal> ¤Ï perl
+	<literal>%%PERL_VERSION%%</literal> ¤Ï <literal>perl</literal>
 	¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æÁ´ÂÎ
 	(¤¿¤È¤¨¤Ð <literal>5.00502</literal>)
-	¤Ç¡¢<literal>%%PERL_VER%%</literal>
-	¤Ï¥Ð¡¼¥¸¥ç¥óÈֹ椫¤é¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤ò°ú¤¤¤¿¤â¤Î¤Ç¤¹
+	¤Ç¡¢<literal>%%PERL_VER%%</literal> ¤Ï <literal>perl</literal>
+	¤Î¥Ð¡¼¥¸¥ç¥óÈֹ椫¤é¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤ò°ú¤¤¤¿¤â¤Î¤Ç¤¹
 	(¤¿¤È¤¨¤Ð <literal>5.005</literal>)¡£</para>
 
       <para>¾¤ÎÃÖ¤­´¹¤¨¤¬É¬ÍפǤ¢¤ì¤Ð¡¢<makevar>PLIST_SUB</makevar>
@@ -4733,8 +4509,8 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 
       <para>¤³¤Î½ñ¤­´¹¤¨¤Ï
 	(<link linkend="porting-manpages">¥Þ¥Ë¥å¥¢¥ë</link>¤ÎÄɲäâ)
-	<maketarget>do-install</maketarget> ¤È
-	<maketarget>post-install</maketarget> ¥¿¡¼¥²¥Ã¥È¤Î´Ö¤Ë
+	<maketarget>pre-install</maketarget> ¤È
+	<maketarget>do-install</maketarget> ¥¿¡¼¥²¥Ã¥È¤Î´Ö¤Ë
 	<makevar>pkg-plist</makevar> ¤òÆɤß
 	<makevar>TMPPLIST</makevar>
 	(¥Ç¥Õ¥©¥ë¥È¤Ï
@@ -4742,7 +4518,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	¤Ë½ñ¤­¹þ¤à¤³¤È¤Ë¤è¤Ã¤Æ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
 	¤â¤·¡¢¤¢¤Ê¤¿¤Î port ¤¬
 	<makevar>PLIST</makevar> ¤ò¼Â¹Ô»þ¤ËÀ¸À®¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-	<maketarget>do-install</maketarget>
+	<maketarget>pre-install</maketarget>
 	¤Î´Ö¤«¤½¤ÎÁ°¤Ë¹Ô¤Ê¤¦¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤Þ¤¿¡¢½ñ¤­¤«¤¨¤é¤ì¤¿¤¢¤È¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢
 	<maketarget>post-install</maketarget>
@@ -4801,6 +4577,11 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	    </row>
 
 	    <row>
+	      <entry><makevar>PKGDEINSTALL</makevar></entry>
+	      <entry><literal>${PKGDIR}/pkg-deinstall</literal></entry>
+	    </row>
+
+	    <row>
 	      <entry><makevar>PKGREQ</makevar></entry>
 	      <entry><literal>${PKGDIR}/pkg-req</literal></entry>
 	    </row>
@@ -4856,7 +4637,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	<command>imake</command> ¤ò»È¤¦¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 	<!-- kuriyama - imake is command -->
 	¤³¤ì¤ÏÌäÂê¤Ë¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
-	¤½¤ì°Ê³°¤Î¾ì¹ç¤Ë¤Ï¥½¡¼¥¹Ãæ¤Î Makefile ¤ä¥¹¥¯¥ê¥×¥È¤Ç
+ 	¤½¤ì°Ê³°¤Î¾ì¹ç¤Ë¤Ï port ¤Î <filename>scripts/Makefile</filename> ¤Ç
 	<filename>/usr/local</filename>
 	(imake ¤ò»È¤ï¤Ê¤¤ X ¤Î¥×¥í¥°¥é¥à¤Ï <filename>/usr/X11R6</filename>)
 	¤È½ñ¤¤¤Æ¤¢¤ë¤È¤³¤í¤ò
@@ -4906,7 +4687,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	(X Window System ¤ò»È¤¦ port ¤Î¾ì¹ç¤Ë¤Ï
 	<programlisting>-DPAGER=\"${LOCALBASE}/bin/less\"</programlisting>)
 	¤òÅϤ·¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤¦¤·¤Æ¤ª¤±¤Ð¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬ <quote>/usr/local</quote> ¤ò
+	¤³¤¦¤·¤Æ¤ª¤±¤Ð¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬ <filename>/usr/local</filename> ¤ò
 	¤Þ¤ë¤´¤È ¤É¤³¤«Â¾¤Î¾ì½ê¤Ë°Ü¤·¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢¤½¤Î port ¤¬
 	¤½¤Î¤Þ¤Þ»È¤¨¤ë²ÄǽÀ­¤¬¹â¤¯¤Ê¤ê¤Þ¤¹¡£</para>
     </sect1>
@@ -4921,12 +4702,13 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	ÀµÅöÀ­¥Æ¥¹¥È¤Ç¥¨¥é¡¼¤¬µ¯¤­¤ë¤ÈÏ¢Íí¤¬¹Ô¤­¤Þ¤¹¡£</para>
 
       <para>¤³¤Î¥µ¡¼¥Ó¥¹¤òÍøÍѤ·¤¿¤¤¾ì¹ç¡¢É¬Í×¤Ê¤Î¤Ï FreshPorts
-	¤Î¥¢¥«¥¦¥ó¥È¤À¤±¤Ç¤¹¡£ÅÐÏ¿¤·¤¿¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬ @FreeBSD.org
-	¤Î¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
+	¤Î¥¢¥«¥¦¥ó¥È¤À¤±¤Ç¤¹¡£ÅÐÏ¿¤·¤¿¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬
+	<literal>@FreeBSD.org</literal>	¤Î¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
 	¥¦¥§¥Ö¥Ú¡¼¥¸¤Î±¦Â¦¤Ë¥µ¡¼¥Ó¥¹¤òÁªÂò¤¹¤ë¥ê¥ó¥¯¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¡£
-	FreshPorts ¤Ë¥¢¥«¥¦¥ó¥È¤ò»ý¤Ã¤Æ¤¤¤Æ¤â @FreeBSD.org
+	FreshPorts ¤Ë¥¢¥«¥¦¥ó¥È¤ò»ý¤Ã¤Æ¤¤¤Æ¤â
+	<literal>@FreeBSD.org</literal>
 	¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÍøÍѤ·¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò
-	@FreeBSD.org ¤ËÊѤ¨¡¢ÅÐÏ¿¤·¤¿¤¢¤È¤Ç¡¢
+	<literal>@FreeBSD.org</literal> ¤ËÊѤ¨¡¢ÅÐÏ¿¤·¤¿¤¢¤È¤Ç¡¢
 	¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¤Þ¤¿Êѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect1>
   </chapter>
@@ -5796,6 +5578,22 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	    </row>
 
 	    <row>
+	      <entry>realpath(3) ¤¬¥¹¥ì¥Ã¥É¥»¡¼¥Õ¤Ë¤Ê¤Ã¤¿¸å¤Î
+		4.8-STABLE</entry>
+	      <entry>480101</entry>
+	    </row>
+
+	    <row>
+	      <entry>4.8-STABLE ¤Ë¤ª¤±¤ë twe ¤Î 3ware API ¤ÎÊѹ¹</entry>
+	      <entry>480102</entry>
+	    </row>
+
+	    <row>
+	      <entry>4.9-RELEASE</entry>
+	      <entry>490000</entry>
+	    </row>
+
+	    <row>
 	      <entry>5.0-CURRENT</entry>
 	      <entry>500000</entry>
 	    </row>
@@ -6065,7 +5863,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	    </row>
 
 	    <row>
-	      <entry>RELENG_5_0_0 ¤ò¥Ö¥é¥ó¥Á¤·¤¿¸å¤Î 5.0-CURRENT</entry>
+	      <entry>RELENG_5_0 ¤ò¥Ö¥é¥ó¥Á¤·¤¿¸å¤Î 5.0-CURRENT</entry>
 	      <entry>500100</entry>
 	    </row>
 	    <row>
@@ -6132,6 +5930,77 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	      <entry>¸Å¤¤ rc ¥·¥¹¥Æ¥à¤òºï½ü¤·¤¿¸å¤Î 5.0-CURRENT</entry>
 	      <entry>500113</entry>
 	    </row>
+	    <row>
+	      <entry>5.1-RELEASE</entry>
+	      <entry>501000</entry>
+	    </row>
+	    <row>
+	      <entry>RELENG_5_1 ¤ò¥Ö¥é¥ó¥Á¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501100</entry>
+	    </row>
+	    <row>
+	      <entry>sigtimedwait(2) ¤È sigwaitinfo(2)
+		¤ÎÆ°ºî¤ò½¤Àµ¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501101</entry>
+	    </row>
+	    <row>
+	      <entry>bus_dma_tag_create(9) ¤Ë
+		lockfunc ¤È lockfuncarg ¥Õ¥£¡¼¥ë¥É¤òÄɲä·¤¿¸å¤Î
+		5.1-CURRENT</entry>
+	      <entry>501102</entry>
+	    </row>
+	    <row>
+	      <entry>GCC 3.3.1-pre 20030711 snapshot
+		ƳÆþ¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501103</entry>
+	    </row>
+	    <row>
+	      <entry>5.1-CURRENT ¤Ë¤ª¤±¤ë twe ¤Î 3ware API ¤ÎÊѹ¹</entry>
+	      <entry>501104</entry>
+	    </row>
+	    <row>
+	      <entry>/bin ¤È /sbin ¤¬¥À¥¤¥Ê¥ß¥Ã¥¯¥ê¥ó¥¯¤µ¤ì¡¢
+		¥é¥¤¥Ö¥é¥ê¤ò /lib ¤Ë°ÜÆ°¤·¤¿ 5.1-CURRENT</entry>
+	      <entry>501105</entry>
+	    </row>
+	    <row>
+	      <entry>Coda 6.x ¤Î¥«¡¼¥Í¥ë¥µ¥Ý¡¼¥È¤òÄɲä·¤¿¸å¤Î
+		5.1-CURRENT</entry>
+	      <entry>501106</entry>
+	    </row>
+	    <row>
+	      <entry>16550 UART Äê¿ô¤ò
+		<filename><dev/sio/sioreg.h></filename> ¤«¤é
+		<filename><dev/ic/ns16550.h></filename>
+		¤Ë°ÜÆ°¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501107</entry>
+	    </row>
+	    <row>
+	      <entry>PFIL_HOOKS API ¤ò¹¹¿·¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501108</entry>
+	    </row>
+	    <row>
+	      <entry>kiconv(3) ¤òÄɲä·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501109</entry>
+	    </row>
+	    <row>
+	      <entry>cdevsw ¤Î open ¤ª¤è¤Ó close
+		¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÁàºî¤òÊѹ¹¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501110</entry>
+	    </row>
+	    <row>
+	      <entry>cdevsw ¤Î¥ì¥¤¥¢¥¦¥È¤òÊѹ¹¤·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501111</entry>
+	    </row>
+	    <row>
+	      <entry>kobj ¤Î¿½Å·Ñ¾µ¤òÄɲä·¤¿¸å¤Î 5.1-CURRENT</entry>
+	      <entry>501112</entry>
+	    </row>
+	    <row>
+	      <entry>struct ifnet ¤Î if_xname ¤¬Êѹ¹¤µ¤ì¤¿¸å¤Î
+		5.1-CURRENT</entry>
+	      <entry>501113</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -6162,7 +6031,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_
 	¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <note>
-	<para><filename>pre.mk</filename>/<filename>post.mk</filename>
+	<para><filename>bsd.port.pre.mk</filename>/<filename>bsd.port.post.mk</filename>
 	  ¤Î¥Ú¥¢¤« <filename>bsd.port.mk</filename>
 	  ¤À¤±¤Î¤É¤Á¤é¤«¤À¤±¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¡¢Æó¤Ä¤òº®¤¼¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
       </note>
@@ -6307,18 +6176,42 @@ post-install:
 
       <programlisting>post-install:
 .if !defined(NOPORTDOCS)
-        ${MKDIR} ${PREFIX}/share/doc/xv
-        ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
+        ${MKDIR} ${DOCSDIR}
+        ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${DOCSDIR}
 .endif</programlisting>
 
+	<para>¤³¤³¤Ç¤Ï¡¢ÊÑ¿ô¤ò¤¤¤¯¤Ä¤«¤È¡¢¤½¤ì¤ò
+	  <filename>Makefile</filename>
+	  ¤ÇÍøÍѤ·¤¿»þ¤Ë¤É¤¦Å¸³«¤µ¤ì¤ë¤«¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
+
+	<itemizedlist>
+	  <listitem>
+	    <para><literal>${DATADIR}</literal> ¤Ï
+	      <filename>${PREFIX}/share/${PORTNAME}</filename>
+	      ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£</para>
+	  </listitem>
+
+	  <listitem>
+	    <para><literal>${DOCSDIR}</literal> ¤Ï
+	      <filename>${PREFIX}/share/doc/${PORTNAME}</filename>
+	      ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£</para>
+	  </listitem>
+
+	  <listitem>
+	    <para><literal>${EXAMPLESDIR}</literal> ¤Ï
+	      <filename>${PREFIX}/share/examples/${PORTNAME}</filename>
+	      ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£</para>
+	  </listitem>
+	</itemizedlist>
+
 	<para>ʸ½ñ¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¹¤Ù¤Æ
 	  <filename>pkg-plist</filename> ¤ÎÃæ¤Ë
 	  <literal>%%PORTDOCS%%</literal> ¤òƬ¤Ë¤Ä¤±¤Æ½ñ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<programlisting>%%PORTDOCS%%share/doc/pure-ftpd/AUTHORS
-%%PORTDOCS%%share/doc/pure-ftpd/CONTACT
-%%PORTDOCS%%@dirrm share/doc/pure-ftpd</programlisting>
+	<programlisting>%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CONTACT
+%%PORTDOCS%%@dirrm %%DOCSDIR%%</programlisting>
 
       <para>¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë <filename>pkg-message</filename>
 	¥Õ¥¡¥¤¥ë¤òÍøÍѤ·¤Æ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¾ÜºÙ¤Ï
@@ -6354,7 +6247,7 @@ post-install:
 	<filename>info</filename> ¤Ë GNU Info ÍѤÎʸ½ñ¡¢
 	¤½¤·¤Æ <filename>share</filename>
 	¤Ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬Æþ¤ê¤Þ¤¹¡£
-	¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï &man.hier.7; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï &man.hier.7; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 	<filename>/usr</filename> ¤Î¹½À®Êý¿Ë¤Ï¤Û¤È¤ó¤É¤½¤Î¤Þ¤Þ
 	<filename>/usr/local</filename> ¤Ë¤â¤¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
 	USENET <quote>¥Ë¥å¡¼¥¹</quote>¤ò°·¤¦ ports ¤ÏÎã³°¤Ç¤¹¡£
@@ -6399,7 +6292,7 @@ lib/X11/oneko/sounds/cat.au
 	port ¤¬¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Æ
 	<filename><makevar>PREFIX</makevar>/share/doc/gimp</filename>
 	¤¬¶õ¤Ç¤Ê¤¤¾ì¹ç¤Ç¤â¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¤·¡¢
-	<command>pkg_delete</command>
+	&man.pkg.delete.1;
 	¤¬°Û¾ï½ªÎ»¤¹¤ë¤³¤È¤â¤¢¤ê¤Þ¤»¤ó¡£</para>
     </sect1>
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list