pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc/guide/files Removed trailing white-space.
details: https://anonhg.NetBSD.org/pkgsrc/rev/4792517f4260
branches: trunk
changeset: 507997:4792517f4260
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Feb 12 14:44:59 2006 +0000
description:
Removed trailing white-space.
diffstat:
doc/guide/files/binary.xml | 50 ++--
doc/guide/files/build.xml | 20 +-
doc/guide/files/buildlink.xml | 106 +++++-----
doc/guide/files/components.xml | 20 +-
doc/guide/files/configuring.xml | 6 +-
doc/guide/files/debug.xml | 12 +-
doc/guide/files/editing.xml | 44 ++--
doc/guide/files/examples.xml | 6 +-
doc/guide/files/faq.xml | 68 +++---
doc/guide/files/fixes.xml | 394 +++++++++++++++++++-------------------
doc/guide/files/getting.xml | 24 +-
doc/guide/files/introduction.xml | 20 +-
doc/guide/files/logs.xml | 14 +-
doc/guide/files/options.xml | 4 +-
doc/guide/files/pkginstall.xml | 4 +-
doc/guide/files/platforms.xml | 10 +-
doc/guide/files/plist.xml | 82 ++++----
doc/guide/files/submit.xml | 8 +-
doc/guide/files/using.xml | 44 ++--
19 files changed, 468 insertions(+), 468 deletions(-)
diffs (truncated from 2965 to 300 lines):
diff -r cd3e426b79c1 -r 4792517f4260 doc/guide/files/binary.xml
--- a/doc/guide/files/binary.xml Sun Feb 12 14:36:43 2006 +0000
+++ b/doc/guide/files/binary.xml Sun Feb 12 14:44:59 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.20 2006/01/22 21:56:13 rillig Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.21 2006/02/12 14:44:59 rillig Exp $ -->
<chapter id="binary">
<title>Creating binary packages</title>
@@ -31,7 +31,7 @@
it. Binary packages are created by default in
<filename>/usr/pkgsrc/packages</filename>, in the form of a
gzipped tar file. See <xref linkend="logs.package"/> for a
- continuation of the above <filename
+ continuation of the above <filename
role="pkg">misc/figlet</filename> example.</para>
<para>
@@ -148,7 +148,7 @@
<para>It is possible to configure the bulk build to perform
certain site-specific tasks at the end of the pre-build
- stage. If the file
+ stage. If the file
<filename>pre-build.local</filename> exists in
<filename>/usr/pkgsrc/mk/bulk</filename>, it will be executed
(as a &man.sh.1; script) at the end of the usual pre-build
@@ -196,10 +196,10 @@
<para>Make sure you don't need any of the packages still
installed.
- </para>
+ </para>
<warning>
- <para>During the bulk build, <emphasis>all packages will be
+ <para>During the bulk build, <emphasis>all packages will be
removed!</emphasis></para>
</warning>
@@ -212,7 +212,7 @@
<para>If for some reason your last build didn't complete (power
failure, system panic, ...), you can continue it by
- running:</para>
+ running:</para>
<screen>&rprompt; <userinput>sh mk/bulk/build restart</userinput></screen>
@@ -221,7 +221,7 @@
and find build logs in the directory specified by
<varname>FTP</varname> in the <filename>build.conf</filename>
file.
- </para>
+ </para>
</sect2>
<sect2 id="what-it-does">
@@ -279,7 +279,7 @@
broken builds to not waste time trying to rebuild them, and
they can be used to debug these broken package builds
later.
- </para>
+ </para>
</sect2>
<sect2 id="disk-space-requirements">
@@ -315,7 +315,7 @@
space. Afterwards, if the package is needed again, it will
be installed via &man.pkg.add.1; instead of building again, so
there are no cycles wasted by recompiling.
- </para>
+ </para>
</sect2>
<sect2 id="setting-up-a-sandbox">
@@ -327,7 +327,7 @@
is the possibility of doing the package bulk build inside a
chroot environment.
</para>
-
+
<para>
The first step is to set up a chroot sandbox,
e.g. <filename>/usr/sandbox</filename>. This can be done by
@@ -343,7 +343,7 @@
mounts to be activated using the <command>sandbox
mount</command> command and deactivated using the
<command>sandbox umount</command> command.
- </para>
+ </para>
<para>
To set up a sandbox environment by hand, after extracting all
@@ -367,7 +367,7 @@
</step>
<step>
- <para><filename>/etc/resolv.conf</filename> (for <filename
+ <para><filename>/etc/resolv.conf</filename> (for <filename
role="pkg">security/smtpd</filename> and mail):</para>
<screen>&rprompt; <userinput>cp /etc/resolv.conf /usr/sandbox/etc</userinput></screen>
@@ -380,14 +380,14 @@
</step>
<step>
- <para><filename>/etc/localtime</filename> (for <filename
+ <para><filename>/etc/localtime</filename> (for <filename
role="pkg">security/smtpd</filename>):</para>
<screen>&rprompt; <userinput>ln -sf /usr/share/zoneinfo/UTC /usr/sandbox/etc/localtime</userinput></screen>
</step>
<step>
- <para><filename>/usr/src</filename> (system sources, for <filename
+ <para><filename>/usr/src</filename> (system sources, for <filename
role="pkg">sysutils/aperture</filename>,
<filename role="pkg">net/ppp-mppe</filename>):</para>
@@ -416,7 +416,7 @@
<para>Do not mount/link this to the copy of your pkgsrc tree
you do development in, as this will likely cause problems!
- </para>
+ </para>
</step>
<step>
@@ -540,9 +540,9 @@
(assuming that no keys should be present there usually):
</para>
- <screen>&rprompt; <userinput>chroot /usr/sandbox</userinput>
-chroot-&rprompt; <userinput>rm $HOME/.ssh/id-dsa*</userinput>
-chroot-&rprompt; <userinput>ssh-keygen -t dsa</userinput>
+ <screen>&rprompt; <userinput>chroot /usr/sandbox</userinput>
+chroot-&rprompt; <userinput>rm $HOME/.ssh/id-dsa*</userinput>
+chroot-&rprompt; <userinput>ssh-keygen -t dsa</userinput>
chroot-&rprompt; <userinput>cat $HOME/.ssh/id-dsa.pub</userinput> </screen>
<para>
@@ -567,8 +567,8 @@
the upload:
</para>
- <screen>chroot-&rprompt; <userinput>exit</userinput>
-&rprompt; <userinput>cd /usr/sandbox/usr/pkgsrc</userinput>
+ <screen>chroot-&rprompt; <userinput>exit</userinput>
+&rprompt; <userinput>cd /usr/sandbox/usr/pkgsrc</userinput>
&rprompt; <userinput>sh mk/bulk/do-sandbox-upload</userinput> </screen>
<para>
@@ -590,7 +590,7 @@
Use whatever is needed to remove the key you've entered
before! Last, move the uploaded packages out of the
<filename>upload</filename> directory to have them accessible
- to everyone:
+ to everyone:
</para>
<screen>nbftp% <userinput>cd /pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/arch</userinput>
@@ -607,10 +607,10 @@
After your pkgsrc bulk-build has completed, you may wish to
create a CD-ROM set of the resulting binary packages to assist
in installing packages on other machines. The
- <filename role="pkg">pkgtools/cdpack</filename> package provides
- a simple tool for creating the ISO 9660 images.
- <command>cdpack</command> arranges the packages on the CD-ROMs in a
- way that keeps all the dependencies for a given package on the same
+ <filename role="pkg">pkgtools/cdpack</filename> package provides
+ a simple tool for creating the ISO 9660 images.
+ <command>cdpack</command> arranges the packages on the CD-ROMs in a
+ way that keeps all the dependencies for a given package on the same
CD as that package.
</para>
diff -r cd3e426b79c1 -r 4792517f4260 doc/guide/files/build.xml
--- a/doc/guide/files/build.xml Sun Feb 12 14:36:43 2006 +0000
+++ b/doc/guide/files/build.xml Sun Feb 12 14:44:59 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.22 2006/01/27 04:06:25 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.23 2006/02/12 14:44:59 rillig Exp $ -->
<chapter id="build">
<title>The build process</title>
@@ -38,7 +38,7 @@
usually set to <varname>LOCALBASE</varname>
(<filename>/usr/pkg</filename>), or <varname>CROSSBASE</varname>
for pkgs in the <quote>cross</quote> category. The value of
- <varname>PREFIX</varname> needs to be put
+ <varname>PREFIX</varname> needs to be put
into the various places in the program's source where paths to
these files are encoded. See <xref
linkend="components.patches"/> and <xref
@@ -91,8 +91,8 @@
its pkg <filename>Makefile</filename>, you need to look in
<emphasis>both</emphasis> <filename>${X11BASE}</filename> and
<filename>${LOCALBASE}</filename>. To force installation of
- all X11 packages in <varname>LOCALBASE</varname>, the
- <filename role="pkg">pkgtools/xpkgwedge</filename> package
+ all X11 packages in <varname>LOCALBASE</varname>, the
+ <filename role="pkg">pkgtools/xpkgwedge</filename> package
is enabled by default.</para>
</listitem>
@@ -136,12 +136,12 @@
to the first definition in
the <varname>EVAL_PREFIX</varname> pair.</para>
</listitem>
-
+
<listitem>
<para>Within <filename>${PREFIX}</filename>, packages should
install files according to &man.hier.7;, with the exception that
manual pages go into <filename>${PREFIX}/man</filename>, not
- <filename>${PREFIX}/share/man</filename>.</para>
+ <filename>${PREFIX}/share/man</filename>.</para>
</listitem>
</itemizedlist>
</sect1>
@@ -387,7 +387,7 @@
<quote>gmake</quote> if <varname>USE_TOOLS</varname> contains
<quote>gmake</quote>, <quote>make</quote> otherwise. The default value
of <varname>MAKEFILE</varname> is <quote>Makefile</quote>, and
-<varname>BUILD_TARGET</varname> defaults to <quote>all</quote>.</para>
+<varname>BUILD_TARGET</varname> defaults to <quote>all</quote>.</para>
</sect1>
@@ -500,7 +500,7 @@
for the main target's name. These targets are invoked before and
after the main target is called, allowing extra configuration or
installation steps be performed from a package's Makefile, for
- example, which a program's configure script
+ example, which a program's configure script
or install target omitted.</para>
</listitem>
</varlistentry>
@@ -703,9 +703,9 @@
<listitem>
<para>This target generates a <filename>README.html</filename> file, which
- can be viewed using a browser such as
+ can be viewed using a browser such as
<filename role="pkg">www/mozilla</filename> or
- <filename role="pkg">www/links</filename>.
+ <filename role="pkg">www/links</filename>.
The generated files contain references to any
packages which are in the <varname>PACKAGES</varname> directory on
the local host. The generated files can be made to refer to URLs based on
diff -r cd3e426b79c1 -r 4792517f4260 doc/guide/files/buildlink.xml
--- a/doc/guide/files/buildlink.xml Sun Feb 12 14:36:43 2006 +0000
+++ b/doc/guide/files/buildlink.xml Sun Feb 12 14:44:59 2006 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.11 2005/10/23 11:25:58 rillig Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.12 2006/02/12 14:44:59 rillig Exp $ -->
<chapter id="buildlink">
<title>Buildlink methodology</title>
@@ -21,7 +21,7 @@
<varname>BUILDLINK_DIR</varname>. The wrapper scripts also make
native compiler on some operating systems look like GCC, so that
packages that expect GCC won't require modifications to build with
- those native compilers.</para>
+ those native compilers.</para>
</listitem>
</orderedlist>
@@ -29,7 +29,7 @@
package may be built consistently despite what other software may be
installed. Please note that the normal system header and library paths,
e.g. <filename>/usr/include</filename>,
- <filename>/usr/lib</filename>, etc., are always searched -- buildlink3 is
+ <filename>/usr/lib</filename>, etc., are always searched -- buildlink3 is
designed to insulate the package build from non-system-supplied
software. </para>
@@ -48,19 +48,19 @@
<filename>${WRKDIR}/.work.log</filename> to see if the
wrappers are being invoked. </para>
</listitem>
-
+
<listitem>
<para> Don't override <varname>PREFIX</varname> from within
the package Makefile, e.g. Java VMs, standalone shells,
etc., because the code to symlink files into
<filename>${BUILDLINK_DIR}</filename> looks for files
- relative to <quote>pkg_info -qp <replaceable>pkgname</replaceable></quote>.
+ relative to <quote>pkg_info -qp <replaceable>pkgname</replaceable></quote>.
</para>
</listitem>
-
+
<listitem>
<para> Remember that <emphasis>only</emphasis> the
- <filename>buildlink3.mk</filename> files that you list in a
+ <filename>buildlink3.mk</filename> files that you list in a
package's Makefile are added as dependencies for that package.
Home |
Main Index |
Thread Index |
Old Index