 @@ -1,14 +1,14 @@
-<!-- $NetBSD: build.xml,v 1.87 2022/05/21 11:42:29 nia Exp $ -->
+<!-- $NetBSD: build.xml,v 1.88 2022/07/25 05:42:22 rillig Exp $ -->
 <chapter id="build">
   <title>The build process</title>
   <sect1 id="build.intro">
     <title>Introduction</title>
     <para>This chapter gives a detailed description on how a package is
     built. Building a package is separated into different
     <emphasis>phases</emphasis> (for example <varname>fetch</varname>,
     <varname>build</varname>, <varname>install</varname>), all of which are
     described in the following sections. Each phase is split into
     so-called <emphasis>stages</emphasis>, which take the name of the
 @@ -112,28 +112,39 @@
     <variablelist>
       <varlistentry><term><varname>PKGSRCDIR</varname></term>
       <listitem><para>This is an absolute pathname that points to the pkgsrc
       root directory. Generally, you don't need
       it.</para></listitem></varlistentry>
       <varlistentry><term><varname>PKGDIR</varname></term>
       <listitem><para>This is an absolute pathname that points to the
       current package.</para></listitem></varlistentry>
       <varlistentry><term><varname>PKGPATH</varname></term>
       <listitem><para>This is a pathname relative to
-      <varname>PKGSRCDIR</varname> that points to the current
+      <varname>PKGSRCDIR</varname> that points to the current package.
-      package.</para></listitem></varlistentry>
+      It is defined after including <filename>bsd.prefs.mk</filename>
       and can be used in makefile fragments that are used by several
       packages to distinguish between these packages. Other variables
       that would serve the same purpose are <varname>PKGBASE</varname>
       and <varname>PKGNAME</varname>, but these are only defined after
       including <filename>bsd.pkg.mk</filename>, which is too
       late.</para>
       <para>In &mk.conf;, the pkgsrc user can use
       <varname>PKGPATH</varname> to tweak variables like
       <varname>MAKE_JOBS</varname> and
       <varname>CFLAGS</varname>.</para></listitem></varlistentry>
       <varlistentry><term><varname>WRKDIR</varname></term>
       <listitem><para>This is an absolute pathname pointing to the directory
       where all work takes place. The distfiles are extracted to this
       directory. It also contains temporary directories and log files used by
       the various pkgsrc frameworks, like <emphasis>buildlink</emphasis> or
       the <emphasis>wrappers</emphasis>.</para></listitem></varlistentry>
       <varlistentry><term><varname>WRKSRC</varname></term>
       <listitem><para>This is an absolute pathname pointing to the directory
       where the distfiles are extracted. It is usually a direct subdirectory
       of <varname>WRKDIR</varname>, and often it's the only directory entry
       that isn't hidden. This variable may be changed by a package
 @@ -145,30 +156,31 @@
     the value <emphasis>yes</emphasis> or <emphasis>no</emphasis> and defaults
     to <emphasis>no</emphasis>. It indicates whether a symbolic link to the
     <varname>WRKDIR</varname> is to be created in the pkgsrc entry's directory.
     If users would like to have their pkgsrc trees behave in a
     read-only manner, then the value of
     <varname>CREATE_WRKDIR_SYMLINK</varname> should be set to
     <emphasis>no</emphasis>.</para>
   </sect1>
   <sect1 id="build.running">
     <title>Running a phase</title>
     <para>You can run a particular phase by typing <command>make
-    phase</command>, where <emphasis>phase</emphasis> is the name of the
+    <replaceable>phase</replaceable></command>, where
-    phase. This will automatically run all phases that are required for this
+    <replaceable>phase</replaceable> is the name of the phase. This will
-    phase. The default phase is <varname>build</varname>, that is, when you
+    automatically run all phases that are required for this phase. The
-    run <command>make</command> without parameters in a package directory,
+    default phase is <varname>build</varname>, that is, when you run
     <command>make</command> without parameters in a package directory,
     the package will be built, but not installed.</para>
   </sect1>
   <sect1 id="build.fetch">
     <title>The <emphasis>fetch</emphasis> phase</title>
     <para>The first step in building a package is to fetch the
     distribution files (distfiles) from the sites that are providing
     them. This is the task of the <emphasis>fetch</emphasis>
     phase.</para>
     <sect2 id="build.fetch.what">