summaryrefslogtreecommitdiff
path: root/doc/guide
diff options
context:
space:
mode:
authormartti <martti>2006-12-15 13:22:14 +0000
committermartti <martti>2006-12-15 13:22:14 +0000
commit9f09b96b53f84a7f029ba4d8549f70a942e277c2 (patch)
treebb50508df04a79de978171704420b274ce4c60c2 /doc/guide
parent9e788e905badb3392ba0da555e357f96e8160779 (diff)
downloadpkgsrc-9f09b96b53f84a7f029ba4d8549f70a942e277c2.tar.gz
Remove trailing spaces and tabs.
Diffstat (limited to 'doc/guide')
-rw-r--r--doc/guide/files/Makefile4
-rw-r--r--doc/guide/files/build.xml16
-rw-r--r--doc/guide/files/components.xml10
-rw-r--r--doc/guide/files/creating.xml4
-rw-r--r--doc/guide/files/devfaq.xml4
-rw-r--r--doc/guide/files/fixes.xml14
-rw-r--r--doc/guide/files/gnome.xml12
-rw-r--r--doc/guide/files/introduction.xml4
-rw-r--r--doc/guide/files/pkginstall.xml4
-rw-r--r--doc/guide/files/regression.xml4
-rw-r--r--doc/guide/files/using.xml12
11 files changed, 44 insertions, 44 deletions
diff --git a/doc/guide/files/Makefile b/doc/guide/files/Makefile
index 1f0b650281d..72512003b75 100644
--- a/doc/guide/files/Makefile
+++ b/doc/guide/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/09/19 17:50:38 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 13:22:14 martti Exp $
WEB_PREFIX?= ${.CURDIR}/../htdocs
@@ -38,7 +38,7 @@ SRCS+= using.xml
SRCS+= chapters.ent
# Make deeper TOC:
-XSL_DBX_WITH_TOC_SECTION_DEPTH?= 2
+XSL_DBX_WITH_TOC_SECTION_DEPTH?= 2
# Avoid extra normalization
NO_TIDY?= yes
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 62594690d26..242e94d2f00 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.41 2006/12/08 19:06:41 drochner Exp $ -->
+<!-- $NetBSD: build.xml,v 1.42 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="build">
<title>The build process</title>
@@ -261,7 +261,7 @@
http://www.somewhere.com/somehow/ \
http://www.somewhereelse.com/mirror/somehow/
</programlisting>
-
+
<para>When actually fetching the distfiles, each item from
<varname>MASTER_SITES</varname> or
<varname>SITES.*</varname> gets the name of each distfile
@@ -660,26 +660,26 @@
<varlistentry><term><varname>INSTALL_MAN_DIR</varname></term>
<listitem><para>directories that contain man
pages</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_PROGRAM</varname></term>
<listitem><para>binaries that can be stripped from debugging
symbols</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_SCRIPT</varname></term>
<listitem><para>binaries that cannot be
stripped</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_GAME</varname></term>
<listitem><para>game
binaries</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_LIB</varname></term>
<listitem><para>shared and static
libraries</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_DATA</varname></term>
<listitem><para>data files</para></listitem></varlistentry>
-
+
<varlistentry><term><varname>INSTALL_GAME_DATA</varname></term>
<listitem><para>data files for
games</para></listitem></varlistentry>
diff --git a/doc/guide/files/components.xml b/doc/guide/files/components.xml
index 529491bd18c..6bded973f9c 100644
--- a/doc/guide/files/components.xml
+++ b/doc/guide/files/components.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.31 2006/09/13 23:24:40 wiz Exp $ -->
+<!-- $NetBSD: components.xml,v 1.32 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="components"> <?dbhtml filename="components.html"?>
<title>Package components - files, directories and contents</title>
@@ -155,7 +155,7 @@ sections.</para>
</listitem>
</itemizedlist></para>
-
+
<para>Please pay attention to the following gotchas:</para>
<itemizedlist>
<listitem>
@@ -295,7 +295,7 @@ sections.</para>
preprocessor magic to check for the current operating system nor
platform. Doing so hurts portability to other platforms because
the OS-specific details are not abstracted appropriately.</para>
-
+
<para>The general rule to follow is: instead of checking for the
operating system the application is being built on, check for the
specific <emphasis>features</emphasis> you need. For example,
@@ -307,7 +307,7 @@ sections.</para>
that prevents some OSes from adopting interfaces from other OSes
(e.g. Linux implementing kqueue), something that the above checks
cannot take into account.</para>
-
+
<para>Of course, checking for features generally involves more
work on the developer's side, but the resulting changes are
cleaner and there are chances they will work on many other
@@ -556,7 +556,7 @@ sections.</para>
infrastructure, so you don't need an extra
<literal>.include</literal> line for
it.</para></listitem></varlistentry>
-
+
<varlistentry><term><filename>options.mk</filename></term>
<listitem><para>This file contains the code for the
package-specific options (see <xref linkend="options"/>) that can be
diff --git a/doc/guide/files/creating.xml b/doc/guide/files/creating.xml
index 8f978885fb4..999cbe8ae89 100644
--- a/doc/guide/files/creating.xml
+++ b/doc/guide/files/creating.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: creating.xml,v 1.5 2006/10/21 20:39:24 rillig Exp $ -->
+<!-- $NetBSD: creating.xml,v 1.6 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="creating">
<title>Creating a new pkgsrc package from scratch</title>
@@ -13,7 +13,7 @@ few steps.</para>
<step><para>First, install the packages <filename
role="pkg">pkgtools/url2pkg</filename> and <filename
role="pkg">pkgtools/pkglint</filename>.</para></step>
-
+
<step><para>Then, choose one of the top-level directories as the
category in which you want to place your package. You can also create a
directory of your own (maybe called <filename>local</filename>). In that
diff --git a/doc/guide/files/devfaq.xml b/doc/guide/files/devfaq.xml
index 4f1aa87b828..2909dfc4db1 100644
--- a/doc/guide/files/devfaq.xml
+++ b/doc/guide/files/devfaq.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: devfaq.xml,v 1.8 2006/12/02 13:02:14 kano Exp $ -->
+<!-- $NetBSD: devfaq.xml,v 1.9 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="devfaq"> <?dbhtml filename="devfaq.html"?>
<title>Frequently Asked Questions</title>
@@ -184,7 +184,7 @@
<question><para>I have a little time to kill. What shall I
do?</para></question>
-<answer><para>This is not really an FAQ yet, but here's the answer
+<answer><para>This is not really an FAQ yet, but here's the answer
anyway.</para>
<itemizedlist>
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 7d2bd2a1f99..801608c4640 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.77 2006/12/02 13:02:14 kano Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.78 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -333,7 +333,7 @@
<para>Please note that such dependencies should only be
updated if a package requires a newer pre-requisite, but
- not to denote recommendations such as
+ not to denote recommendations such as
ABI changes that do not prevent a package from building
correctly. Such recommendations can be expressed using
<varname>ABI_DEPENDS</varname>:</para>
@@ -679,7 +679,7 @@
set <varname>DIST_SUBDIR</varname> to a unique directory name,
usually based on <varname>PKGNAME_NOREV</varname>. All
<varname>DISTFILES</varname> and
- <varname>PATCHFILES</varname> for this package will be put in that
+ <varname>PATCHFILES</varname> for this package will be put in that
subdirectory of the local distfiles directory. In case this
happens more often, <varname>PKGNAME</varname> can be used (thus
including the <filename>nbX</filename> suffix) or a date stamp
@@ -960,7 +960,7 @@
<sect2 id="basic-programming-languages">
<title>C, C++, and Fortran</title>
-
+
<para>Compilers for the C, C++, and Fortran languages comes with
the NetBSD base system. By default, pkgsrc assumes that a package
is written in C and will hide all other compilers (via the wrapper
@@ -1170,13 +1170,13 @@ possibility. That compiler cannot handle the following code:</para>
<programlisting>
extern int extern_func(int);
-
+
static inline int
inline_func(int x)
{
return extern_func(x);
}
-
+
int main(void)
{
return 0;
@@ -1819,7 +1819,7 @@ of functions.</para>
<sect1 id="punting">
<title>Marking packages as having problems</title>
-
+
<para>In some cases one does not have the time to solve a problem
immediately. There are currently two ways to declare that one knows
that a package has problems.</para>
diff --git a/doc/guide/files/gnome.xml b/doc/guide/files/gnome.xml
index b8f32d2ed87..e34a6e8ee82 100644
--- a/doc/guide/files/gnome.xml
+++ b/doc/guide/files/gnome.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: gnome.xml,v 1.6 2006/12/03 01:03:38 kano Exp $ -->
+<!-- $NetBSD: gnome.xml,v 1.7 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="gnome"> <?dbhtml filename="gnome.html"?>
<title>GNOME packaging and porting</title>
@@ -126,7 +126,7 @@ USE_TOOLS+=gmake</programlisting>
</listitem>
<listitem>
- <para>If the package uses intltool, be sure to add
+ <para>If the package uses intltool, be sure to add
<literal>intltool</literal> to the <varname>USE_TOOLS</varname>
to handle dependencies and to force the package to use the latest
available version.</para>
@@ -141,7 +141,7 @@ USE_TOOLS+=gmake</programlisting>
the default):</para>
<programlisting>CONFIGURE_ARGS+=--disable-gtk-doc</programlisting>
-
+
<para>The default location of installed HTML files
(<filename>share/gtk-doc/&lt;package-name&gt;</filename>) is correct
and should not be changed unless the package insists on installing
@@ -220,7 +220,7 @@ updates:</para>
<variablelist>
<varlistentry>
<term>Major update</term>
-
+
<listitem>
<para>Given that there is still a very long way for GNOME 3 (if it
ever appears), we consider a major update one that goes from a
@@ -240,7 +240,7 @@ updates:</para>
<varlistentry>
<term>Minor update</term>
-
+
<listitem>
<para>We consider a minor update one that goes from a
<literal>2.A.X</literal> version to a <literal>2.A.Y</literal>
@@ -281,7 +281,7 @@ followed:</para>
Obviously remove any <varname>PKGREVISION</varname>s that might be
in them.</para>
</listitem>
-
+
<listitem>
<para>For each meta package, update all its
<varname>DEPENDS</varname> lines to match the latest versions as
diff --git a/doc/guide/files/introduction.xml b/doc/guide/files/introduction.xml
index 746764f1cb5..58bb28cf051 100644
--- a/doc/guide/files/introduction.xml
+++ b/doc/guide/files/introduction.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: introduction.xml,v 1.20 2006/10/07 09:31:16 rillig Exp $ -->
+<!-- $NetBSD: introduction.xml,v 1.21 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="introduction">
<title>What is pkgsrc?</title>
@@ -194,7 +194,7 @@ minutes!</para>
<link linkend="users-guide" endterm="users-guide.title"/>,
describes how one can use one of the packages in the Package
Collection, either by installing a precompiled binary package,
- or by building one's own copy using the &os; package system.
+ or by building one's own copy using the &os; package system.
The second part, <link linkend="developers-guide"
endterm="developers-guide.title"/>, explains how to prepare a
package so it can be easily built by other &os; users without
diff --git a/doc/guide/files/pkginstall.xml b/doc/guide/files/pkginstall.xml
index cdcc0837c05..af91cab6c46 100644
--- a/doc/guide/files/pkginstall.xml
+++ b/doc/guide/files/pkginstall.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: pkginstall.xml,v 1.12 2006/09/10 19:29:52 wiz Exp $ -->
+<!-- $NetBSD: pkginstall.xml,v 1.13 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="pkginstall"> <?dbhtml filename="pkginstall.html"?>
<title>The pkginstall framework</title>
@@ -468,7 +468,7 @@ not specified.</para>
group
</programlisting>
-<para>The numeric GID of the group may be set by defining
+<para>The numeric GID of the group may be set by defining
<varname>PKG_GID.<replaceable>group</replaceable></varname>.</para>
<para>If a package needs to create the users and groups at an earlier
diff --git a/doc/guide/files/regression.xml b/doc/guide/files/regression.xml
index 48a9b35f0ef..29c667e1eb6 100644
--- a/doc/guide/files/regression.xml
+++ b/doc/guide/files/regression.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: regression.xml,v 1.1 2006/05/10 20:56:00 rillig Exp $ -->
+<!-- $NetBSD: regression.xml,v 1.2 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="regression"> <?dbhtml filename="regression.html"?>
<title>Regression tests</title>
@@ -69,7 +69,7 @@
expected. It can make use of the various helper functions from
the next section.</para></listitem>
</varlistentry>
-
+
<varlistentry><term><varname>do_cleanup()</varname></term>
<listitem><para>This function cleans everything up after the
test has been run. By default it does nothing.</para></listitem>
diff --git a/doc/guide/files/using.xml b/doc/guide/files/using.xml
index 3e26ead75a3..0101e1f75a5 100644
--- a/doc/guide/files/using.xml
+++ b/doc/guide/files/using.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.28 2006/10/09 13:15:07 mishka Exp $ -->
+<!-- $NetBSD: using.xml,v 1.29 2006/12/15 13:22:14 martti Exp $ -->
<chapter id="using"> <?dbhtml filename="using.html"?>
<title>Using pkgsrc</title>
@@ -161,14 +161,14 @@ and you can still use binary packages from someone else.</para>
</para>
<para>
- Through <filename role="pkg">security/audit-packages</filename>,
+ Through <filename role="pkg">security/audit-packages</filename>,
this list can be downloaded
automatically, and a security audit of all packages installed on a system
can take place.
</para>
<para>
- There are two components to
+ There are two components to
<filename role="pkg">security/audit-packages</filename>. The first
component, <quote>download-vulnerability-list</quote>, is for downloading
the list of vulnerabilities from the NetBSD FTP site. The second
@@ -181,7 +181,7 @@ and you can still use binary packages from someone else.</para>
http://www.samba.org/samba/whatsnew/macroexploit.html</screen>
<para>
- One can set up <filename
+ One can set up <filename
role="pkg">security/audit-packages</filename> to download the
<ulink url="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/vulnerabilities">vulnerabilities</ulink>
file daily, and include a package audit in the daily security script.
@@ -194,7 +194,7 @@ and you can still use binary packages from someone else.</para>
<sect2 id="pkg_versions">
<title>Finding if newer versions of your installed packages are in pkgsrc</title>
<para>
- Install <filename role="pkg">pkgtools/pkglint</filename> and run
+ Install <filename role="pkg">pkgtools/pkglint</filename> and run
<command>lintpkgsrc</command> with the <quote>-i</quote>
argument to check if your packages are up-to-date, e.g.
</para>
@@ -312,7 +312,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
<para>
If a package depends on many other packages (such as
- <filename role="pkg">meta-pkgs/kde3</filename>), the build process may
+ <filename role="pkg">meta-pkgs/kde3</filename>), the build process may
alternate between periods of
downloading source, and compiling. To ensure you have all the source
downloaded initially you can run the command: