[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] doc/guide/files/{binary.xml,ftp-layout.xml,getting.xml}
The pkgsrc guide
に古い内容があるので、修正していただけませんか。
Index: binary.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/binary.xml,v
retrieving revision 1.28
diff -u -r1.28 binary.xml
--- binary.xml 13 Oct 2006 21:21:11 -0000 1.28
+++ binary.xml 18 Nov 2006 16:22:30 -0000
@@ -493,21 +493,21 @@
set properly in your <filename>mk/bulk/build.conf</filename>
file, i.e. adjust it to something like one of the following:</para>
- <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload </screen>
+ <screen>RSYNC_DST=ftp.NetBSD.org:/pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload </screen>
- <para>Please use appropriate values for "pkgsrc-200xQy",
+ <para>Please use appropriate values for "packages-200xQy",
"NetBSD-a.b.c" and "arch" here. If your login on ftp.NetBSD.org
is different from your local login, write your login directly
into the variable, e.g. my local account is "feyrer", but for my
login "hubertf", I use:</para>
- <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload</screen>
+ <screen>RSYNC_DST=hubertf@ftp.NetBSD.org:/pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload</screen>
<para>A separate <filename>upload</filename> directory is used
here to allow "closing" the directory during upload. To do
so, run the following command on ftp.NetBSD.org next:</para>
- <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch/upload</userinput></screen>
+ <screen>nbftp% <userinput>mkdir -p -m 750 /pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch/upload</userinput></screen>
<para>Please note that <filename>/pub/NetBSD/packages</filename> is
only appropriate for packages for the NetBSD operating
@@ -563,7 +563,7 @@
to everyone:</para>
<screen>
-nbftp% <userinput>cd /pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch</userinput>
+nbftp% <userinput>cd /pub/NetBSD/packages/packages-200xQy/NetBSD-a.b.c/arch</userinput>
nbftp% <userinput>mv upload/* .</userinput>
nbftp% <userinput>rmdir upload</userinput>
nbftp% <userinput>chmod 755 .</userinput>
Index: ftp-layout.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/ftp-layout.xml,v
retrieving revision 1.6
diff -u -r1.6 ftp-layout.xml
--- ftp-layout.xml 18 Sep 2006 12:16:25 -0000 1.6
+++ ftp-layout.xml 18 Nov 2006 16:22:30 -0000
@@ -70,7 +70,7 @@
</sect1>
<sect1 id="ftp-source">
<title><filename>current</filename>,
-<filename>200<replaceable>x</replaceable>Q<replaceable>y</replaceable></filename>:
+<filename>pkgsrc-200<replaceable>x</replaceable>Q<replaceable>y</replaceable></filename>:
source packages</title>
<para>These directories contain the <quote>real</quote> pkgsrc,
Index: getting.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/getting.xml,v
retrieving revision 1.14
diff -u -r1.14 getting.xml
--- getting.xml 21 Oct 2006 11:57:11 -0000 1.14
+++ getting.xml 18 Nov 2006 16:22:30 -0000
@@ -21,7 +21,7 @@
quarterly basis from the current branch and only gets modified
for security updates. The names of the stable branches are built
from the year and the quarter, for example
- <literal>2006Q1</literal>.</para>
+ <literal>2006Q3</literal>.</para>
<para>The second step is to decide <emphasis>how</emphasis> you
want to download pkgsrc. You can get it as a tar file, via SUP,
@@ -40,9 +40,9 @@
url="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz"><filename>pkgsrc.tar.gz</filename></ulink>.
It is autogenerated daily.</para>
- <para>The tar file for the stable branch 2006Q1 is in the
- directory <filename>2006Q1</filename> and is also called <ulink
- url="ftp://ftp.NetBSD.org/pub/pkgsrc/2006Q1/pkgsrc.tar.gz"><filename>pkgsrc.tar.gz</filename></ulink>.</para>
+ <para>The tar file for the stable branch 2006Q3 is in the
+ directory <filename>pkgsrc-2006Q3</filename> and is also called <ulink
+ url="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2006Q3/pkgsrc-2006Q3.tar.gz"><filename>pkgsrc-2006Q3.tar.gz</filename></ulink>.</para>
<para>After downloading the tar file, change to the directory
where you want to have pkgsrc. This is usually
@@ -94,7 +94,7 @@
<filename>/usr</filename>. In that directory you run the
checkout command, which is <command>cvs -q checkout -P
pkgsrc</command> for the current branch and <command>cvs -q
- checkout -rpkgsrc-2006Q1 -P pkgsrc</command> for the stable
+ checkout -rpkgsrc-2006Q3 -P pkgsrc</command> for the stable
branch. This command will create a directory called
<filename>pkgsrc</filename> with all the pkgsrc files in
it.</para>
@@ -151,7 +151,7 @@
by adding the option <quote>-A</quote> after the
<quote>update</quote> keyword. To switch from the current branch
back to the stable branch, add the
- <quote>-rpkgsrc-2006Q1</quote> option.</para>
+ <quote>-rpkgsrc-2006Q3</quote> option.</para>
</sect3>
<sect3 id="uptodate-cvs-changes">