[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Documentation/pkgsrc/debug.xml: 1.1 -> 1.2



以下のページの更新をしました。ツッコミをお願いします。

Documentation/pkgsrc/debug.xml: 1.1 -> 1.2

> revision 1.2
> date: 2004/09/29 13:08:36;  author: hubertf;  state: Exp;  lines: +29 -20
> Sync with pkgsrc/Packages.txt rev. 1.360.
> 
> Changes that were made to the XML version were not added back into
> Packages.txt, as Packages.txt will be deprecated soon.
> 
> Going to update the contents of our new "pkgsrc Guide" a bit more now...

火曜日までに異議がなければ、 commit します。

以下、訳と原文それぞれの新旧の差分です。

--- Documentation/pkgsrc/debug.xml.orig	2006-07-16 22:52:49.000000000 +0900
+++ Documentation/pkgsrc/debug.xml	2006-07-16 22:52:49.000000000 +0900
@@ -1,6 +1,6 @@
-<!-- $NetBSD: debug.xml,v 1.1 2004/06/06 13:31:53 grant Exp $ -->
+<!-- $NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
 <!-- Based on english version: -->
-<!-- NetBSD: debug.xml,v 1.1 2004/06/06 13:31:53 grant Exp   -->
+<!-- NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp   -->
 
 <chapter id="debug">
   <title>デバッグ</title>
@@ -16,9 +16,13 @@
     </listitem>
 
     <listitem>
-      <para><pkg>pkgtools/url2pkg</pkg> をインストールして、以下を実行します</para>
-
-      <screen>&rprompt; <userinput>url2pkg http://www.example.com/path/to/distfile.tar.gz</userinput></screen>
+      <para><pkg>pkgtools/url2pkg</pkg>をインストールし、
+        デバッグ対象のパッケージ用にディレクトリーを作ってそこに移動してから、
+        <command>url2pkg</command> を実行します。</para>  
+
+      <screen>&cprompt; <userinput>mkdir /usr/pkgsrc/<replaceable>category</replaceable>/<replaceable>examplepkg</replaceable></userinput>
+&cprompt; <userinput>cd /usr/pkgsrc/<replaceable>category</replaceable>/<replaceable>examplepkg</replaceable></userinput>
+&cprompt; <userinput>url2pkg http://www.example.com/path/to/distfile.tar.gz</userinput></screen>
     </listitem>
 
     <listitem>
@@ -35,23 +39,27 @@
     </listitem>
 
     <listitem>
-      <para>configureの段階でわかった依存関係をすべて、
+      <para>ドキュメンテーション、
+	およびconfigureの段階でわかった依存関係をすべて、
 	パッケージの<filename>Makefile</filename>に書き加えます。</para>
     </listitem>
 
     <listitem>
       <para>以下を繰り返しおこなって、パッケージを作り上げます</para>
 
-      <screen>&rprompt; <userinput>make</userinput>
-&rprompt; <userinput>pkgvi ${WRKSRC}/some/file/that/does/not/compile</userinput>
-&rprompt; <userinput>mkpatches</userinput>
-&rprompt; <userinput>patchdiff</userinput>
-&rprompt; <userinput>mv ${WRKDIR}/.newpatches/* patches</userinput>
-&rprompt; <userinput>make mps</userinput>
-&rprompt; <userinput>make clean</userinput></screen>
+      <screen>&cprompt; <userinput>make</userinput>
+&cprompt; <userinput>pkgvi ${WRKSRC}/some/file/that/does/not/compile</userinput>
+&cprompt; <userinput>mkpatches</userinput>
+&cprompt; <userinput>patchdiff</userinput>
+&cprompt; <userinput>mv ${WRKDIR}/.newpatches/* patches</userinput>
+&cprompt; <userinput>make mps</userinput>
+&cprompt; <userinput>make clean</userinput></screen>
 
       <para>root以外のユーザーで作業をおこなうと、改変すべきでないファイルは改変され
-	ません。特に、構築の段階以外では。</para>
+	ません。特に、構築の段階以外では。
+	<command>mkpatches</command>, 
+	<command>patchdiff</command> および <command>pkgvi</command>
+	は、<pkg>pkgtools/pkgdiff</pkg> パッケージに入っています。 </para>  
     </listitem>
 
     <listitem>
@@ -63,7 +71,7 @@
       <para><filename>PLIST</filename>を作成します:</para>
 
       <screen>&rprompt; <userinput>make install</userinput>
-&rprompt; <userinput>make print-PLIST &gt; PLIST</userinput>
+&rprompt; <userinput>make print-PLIST &gt;PLIST</userinput>
 &rprompt; <userinput>make deinstall</userinput>
 &rprompt; <userinput>make install</userinput>
 &rprompt; <userinput>make deinstall</userinput></screen>
@@ -81,7 +89,8 @@
       <para>これで<filename>PLIST</filename>の修正ができました。
 	パッケージを再度インストールして、バイナリーパッケージを作ります:</para>
 
-      <screen>&rprompt; <userinput>make reinstall &amp;&amp; make package</userinput></screen>
+      <screen>&rprompt; <userinput>make reinstall</userinput>
+&rprompt; <userinput>make package</userinput></screen>
     </listitem>
 
     <listitem>
@@ -91,7 +100,7 @@
     </listitem>
 
     <listitem>
-      <para>上記のfindコマンドを繰り返します。
+      <para>上記の <command>make print-PLIST</command> コマンドを繰り返します。
 	今度は何も見つからないはずです:</para>
 
       <screen>&rprompt; <userinput>make print-PLIST</userinput></screen>
Index: Documentation/pkgsrc/debug.xml
===================================================================
RCS file: /cvsroot/htdocs/Documentation/pkgsrc/Attic/debug.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Documentation/pkgsrc/debug.xml	6 Jun 2004 13:31:53 -0000	1.1
+++ Documentation/pkgsrc/debug.xml	29 Sep 2004 13:08:36 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- $NetBSD: debug.xml,v 1.1 2004/06/06 13:31:53 grant Exp $ -->
+<!-- $NetBSD: debug.xml,v 1.2 2004/09/29 13:08:36 hubertf Exp $ -->
 
 <chapter id="debug">
   <title>Debugging</title>
@@ -15,9 +15,13 @@
     </listitem>
 
     <listitem>
-      <para>Install <pkg>pkgtools/url2pkg</pkg> and run</para>
-
-      <screen>&rprompt; <userinput>url2pkg http://www.example.com/path/to/distfile.tar.gz</userinput></screen>
+      <para>Install <pkg>pkgtools/url2pkg</pkg>, create a directory
+        for a new package, change into it, then run
+        <command>url2pkg</command>:</para>  
+
+      <screen>&cprompt; <userinput>mkdir /usr/pkgsrc/<replaceable>category</replaceable>/<replaceable>examplepkg</replaceable></userinput>
+&cprompt; <userinput>cd /usr/pkgsrc/<replaceable>category</replaceable>/<replaceable>examplepkg</replaceable></userinput>
+&cprompt; <userinput>url2pkg http://www.example.com/path/to/distfile.tar.gz</userinput></screen>
     </listitem>
 
     <listitem>
@@ -25,7 +29,7 @@
     </listitem>
 
     <listitem>
-      <para>Fill in <filename>DESCR</filename></para>
+      <para>Fill in the <filename>DESCR</filename> file</para>
     </listitem>
 
     <listitem>
@@ -34,27 +38,31 @@
     </listitem>
 
     <listitem>
-      <para>Add any dependencies glimpsed from the configure step to the
-	package's <filename>Makefile</filename>.</para>
+      <para>Add any dependencies glimpsed from documentation and the
+	configure step to the package's
+	<filename>Makefile</filename>.</para> 
     </listitem>
 
     <listitem>
       <para>Make the package compile, doing multiple rounds of</para>
 
-      <screen>&rprompt; <userinput>make</userinput>
-&rprompt; <userinput>pkgvi ${WRKSRC}/some/file/that/does/not/compile</userinput>
-&rprompt; <userinput>mkpatches</userinput>
-&rprompt; <userinput>patchdiff</userinput>
-&rprompt; <userinput>mv ${WRKDIR}/.newpatches/* patches</userinput>
-&rprompt; <userinput>make mps</userinput>
-&rprompt; <userinput>make clean</userinput></screen>
+      <screen>&cprompt; <userinput>make</userinput>
+&cprompt; <userinput>pkgvi ${WRKSRC}/some/file/that/does/not/compile</userinput>
+&cprompt; <userinput>mkpatches</userinput>
+&cprompt; <userinput>patchdiff</userinput>
+&cprompt; <userinput>mv ${WRKDIR}/.newpatches/* patches</userinput>
+&cprompt; <userinput>make mps</userinput>
+&cprompt; <userinput>make clean</userinput></screen>
 
       <para>Doing as non-root user will ensure that no files are modified that
-	shouldn't be, especially during the build phase.</para>
+	shouldn't be, especially during the build
+	phase. <command>mkpatches</command>, 
+	<command>patchdiff</command> and <command>pkgvi</command> are
+	from the <pkg>pkgtools/pkgdiff</pkg> package. </para>  
     </listitem>
 
     <listitem>
-      <para>Look at <filename>Makefile</filename>, fix if necessary;
+      <para>Look at the <filename>Makefile</filename>, fix if necessary;
 	see <xref linkend="components.Makefile"/>.</para>
     </listitem>
 
@@ -62,7 +70,7 @@
       <para>Generate a <filename>PLIST</filename>:</para>
 
       <screen>&rprompt; <userinput>make install</userinput>
-&rprompt; <userinput>make print-PLIST &gt; PLIST</userinput>
+&rprompt; <userinput>make print-PLIST &gt;PLIST</userinput>
 &rprompt; <userinput>make deinstall</userinput>
 &rprompt; <userinput>make install</userinput>
 &rprompt; <userinput>make deinstall</userinput></screen>
@@ -80,7 +88,8 @@
       <para>Now that the <filename>PLIST</filename> is OK,
 	install the package again and make a binary package:</para>
 
-      <screen>&rprompt; <userinput>make reinstall &amp;&amp; make package</userinput></screen>
+      <screen>&rprompt; <userinput>make reinstall</userinput>
+&rprompt; <userinput>make package</userinput></screen>
     </listitem>
 
     <listitem>
@@ -90,7 +99,7 @@
     </listitem>
 
     <listitem>
-      <para>Repeat the above find command,
+      <para>Repeat the above <command>make print-PLIST</command> command,
 	which shouldn't find anything now:</para>
 
       <screen>&rprompt; <userinput>make print-PLIST</userinput></screen>
@@ -108,7 +117,7 @@
 
     <listitem>
       <para>Run <command>pkglint</command> from <pkg>pkgtools/pkglint</pkg>,
-	and fix the problems it reports.</para>
+	and fix the problems it reports:</para>
 
       <screen>&rprompt; <userinput>pkglint</userinput></screen>
     </listitem>