[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] doc/guide/files/binary.xml
In message <20061123.210226.26341503.yyamano@kt.rim.or.jp>
Yuji Yamano <yyamano@kt.rim.or.jp> writes:
> 以下のパッチをあててコミットしました。これで全部だと思っているのですが
> 漏れがあれば教えてください。
ありがとうございました。
tech-pkg-ja@ に送ったのは全部ですが、www-changes-ja@ で書いた、
http://www.jp.NetBSD.org/ja/JP/ml/www-changes-ja/200609/msg00231.html
なんてのがあります。
> pkgsrc/doc/files であれば、直接、コミットしてもらってもかまいません。
> というか、そっちのほうが良いと思います:-)
その他の自明なものと合わせ、以下の変更を、
異議がないようなら commit します。
# 自明じゃない問題は相談させてください。
## regen は rillig@ がやってくれる?
Index: build.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/build.xml,v
retrieving revision 1.38
diff -u -r1.38 build.xml
--- build.xml 23 Nov 2006 11:47:54 -0000 1.38
+++ build.xml 25 Nov 2006 14:13:43 -0000
@@ -313,10 +313,10 @@
<para>Some explanations for the less self-explaining ones:
<varname>MASTER_SITE_BACKUP</varname> contains backup sites
for packages that are maintained in <ulink
- url="ftp://ftp.NetBSD.org:/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}"
+ url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}"
/>. <varname>MASTER_SITE_LOCAL</varname> contains local
package source distributions that are maintained in <ulink
- url="ftp://ftp.NetBSD.org:/pub/NetBSD/packages/distfiles/LOCAL_PORTS/"
+ url="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/"
/>.</para>
<para>If you choose one of these predefined sites, you may
@@ -1005,7 +1005,7 @@
<para>Update the installation of the current package. This
differs from update in that it does not replace dependent
packages. You will need to install <filename
- role="pkg">pkgsrc/pkgtools/pkg_tarup</filename> for this
+ role="pkg">pkgtools/pkg_tarup</filename> for this
target to work.</para>
<para><emphasis>Be careful when using this
Index: configuring.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/configuring.xml,v
retrieving revision 1.22
diff -u -r1.22 configuring.xml
--- configuring.xml 18 Sep 2006 13:25:37 -0000 1.22
+++ configuring.xml 25 Nov 2006 14:13:43 -0000
@@ -67,7 +67,10 @@
<filename>ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/</filename>.</para>
</listitem>
<listitem><para><varname>BINPKG_SITES</varname>:
- List of sites carrying binary pkgs.</para>
+ List of sites carrying binary pkgs. <replaceable>rel</replaceable> and
+ <replaceable>arch</replaceable> are replaced with OS
+ release (<quote>2.0</quote>, etc.) and architecture
+ (<quote>mipsel</quote>, etc.).</para>
</listitem>
<listitem><para><varname>ACCEPTABLE_LICENSES</varname>:
List of acceptable licenses. Whenever you try to build a package
@@ -101,10 +104,7 @@
<listitem><para><varname>LOCALPATCHES</varname>:
Directory for local patches that aren't part of pkgsrc.
See <xref linkend="components.patches" /> for more
- information. <replaceable>rel</replaceable> and
- <replaceable>arch</replaceable> are replaced with OS
- release (<quote>2.0</quote>, etc.) and architecture
- (<quote>mipsel</quote>, etc.).</para>
+ information.</para>
</listitem>
<listitem><para><varname>PKGMAKECONF</varname>: Location of
the <filename>mk.conf</filename> file used by a package's
Index: submit.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/submit.xml,v
retrieving revision 1.15
diff -u -r1.15 submit.xml
--- submit.xml 13 Sep 2006 23:34:05 -0000 1.15
+++ submit.xml 25 Nov 2006 14:13:43 -0000
@@ -52,7 +52,7 @@
<title>General notes when adding, updating, or removing packages</title>
<para>Please note all package additions, updates, moves, and
- removals in <filename>pkgsrc/doc/CHANGES</filename>. It's very
+ removals in <filename>pkgsrc/doc/CHANGES-<replaceable>YYYY</replaceable></filename>. It's very
important to keep this file up to date and conforming to the
existing format, because it will be used by scripts to
automatically update pages on <ulink
@@ -64,16 +64,16 @@
<para>When the <varname>PKGREVISION</varname> of a package is
bumped, the change should appear in
- <filename>pkgsrc/doc/CHANGES</filename> if it is security
+ <filename>pkgsrc/doc/CHANGES-<replaceable>YYYY</replaceable></filename> if it is security
related or otherwise relevant. Mass bumps that result from a
dependency being updated should not be mentioned. In all other
cases it's the developer's decision.</para>
<para>There is a make target that helps in creating proper
- <filename>CHANGES</filename> entries: <command>make
+ <filename>CHANGES-<replaceable>YYYY</replaceable></filename> entries: <command>make
changes-entry</command>. It uses the optional <varname>CTYPE</varname>
and <varname>NETBSD_LOGIN_NAME</varname> variables. The general
- usage is to first make sure that your <filename>CHANGES</filename>
+ usage is to first make sure that your <filename>CHANGES-<replaceable>YYYY</replaceable></filename>
file is up-to-date (to avoid having to resolve conflicts later-on)
and then to <command>cd</command> to the package directory. For
package updates, <command>make changes-entry</command> is enough.
@@ -82,7 +82,7 @@
"Moved", or "Removed". You can set <varname>NETBSD_LOGIN_NAME</varname>
in <filename>/etc/mk.conf</filename> if your local login name is
not the same as your NetBSD login name. Don't forget to commit
- the changes to <filename>pkgsrc/doc/CHANGES</filename>!</para>
+ the changes to <filename>pkgsrc/doc/CHANGES-<replaceable>YYYY</replaceable></filename>!</para>
</sect1>
<sect1 id="committing-importing">