 @@ -5734,27 +5734,27 @@ set based upon the following variables:<
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><code class="varname">PKG_SYSCONFBASE</code>: The configuration's root
     directory.  Defaults to <code class="filename">${PREFIX}/etc</code> although it may
     be overridden by the user to point to his preferred location (e.g.,
     <code class="filename">/etc</code>, <code class="filename">/etc/pkg</code>, etc.).
     Packages must not use it directly.</p></li>
 <li class="listitem">
 <p><code class="varname">PKG_SYSCONFSUBDIR</code>: A subdirectory of
     <code class="varname">PKG_SYSCONFBASE</code> under which the configuration files
     for the package being built shall be installed.  The definition of this
     variable only makes sense in the package's
     <code class="filename">Makefile</code> (i.e., it is not user-customizable).</p>
 <p>As an example, consider the Apache package,
-    <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/www/apache2/README.html" target="_top"><code class="filename">www/apache2</code></a>, which places its
+    <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/www/apache2/README.html" target="_top"><code class="filename">www/apache24</code></a>, which places its
     configuration files under the
     <code class="filename">httpd/</code> subdirectory of
     <code class="varname">PKG_SYSCONFBASE</code>.  This should be set in the package
     Makefile.</p>
 </li>
 <li class="listitem"><p><code class="varname">PKG_SYSCONFVAR</code>: Specifies the name of the
     variable that holds this package's configuration directory (if
     different from <code class="varname">PKG_SYSCONFBASE</code>).  It defaults to
     <code class="varname">PKGBASE</code>'s value, and is always prefixed with
     <code class="literal">PKG_SYSCONFDIR</code>.</p></li>
 <li class="listitem"><p><code class="varname">PKG_SYSCONFDIR.${PKG_SYSCONFVAR}</code>: Holds the
     directory where the configuration files for the package identified by
     <code class="varname">PKG_SYSCONFVAR</code>'s shall be placed.</p></li>

 @@ -4842,27 +4842,27 @@ custom changes they may have made.
 As said before, the PKG_SYSCONFDIR variable specifies where configuration files
 shall be installed. Its contents are set based upon the following variables:
   * PKG_SYSCONFBASE: The configuration's root directory. Defaults to ${PREFIX}/
     etc although it may be overridden by the user to point to his preferred
     location (e.g., /etc, /etc/pkg, etc.). Packages must not use it directly.
   * PKG_SYSCONFSUBDIR: A subdirectory of PKG_SYSCONFBASE under which the
     configuration files for the package being built shall be installed. The
     definition of this variable only makes sense in the package's Makefile
     (i.e., it is not user-customizable).
-    As an example, consider the Apache package, www/apache2, which places its
+    As an example, consider the Apache package, www/apache24, which places its
     configuration files under the httpd/ subdirectory of PKG_SYSCONFBASE. This
     should be set in the package Makefile.
   * PKG_SYSCONFVAR: Specifies the name of the variable that holds this
     package's configuration directory (if different from PKG_SYSCONFBASE). It
     defaults to PKGBASE's value, and is always prefixed with PKG_SYSCONFDIR.
   * PKG_SYSCONFDIR.${PKG_SYSCONFVAR}: Holds the directory where the
     configuration files for the package identified by PKG_SYSCONFVAR's shall be
     placed.
 Based on the above variables, pkginstall determines the value of
 PKG_SYSCONFDIR, which is the only variable that can be used within a package to

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: pkginstall.xml,v 1.18 2014/06/01 16:42:45 wiz Exp $ -->
+<!-- $NetBSD: pkginstall.xml,v 1.19 2014/06/10 15:09:42 joerg Exp $ -->
 <chapter id="pkginstall"> <?dbhtml filename="pkginstall.html"?>
 <title>The pkginstall framework</title>
 <para>This chapter describes the framework known as
 <literal>pkginstall</literal>, whose key features are:</para>
 <itemizedlist>
   <listitem>
     <para>Generic installation and manipulation of directories and files
     outside the pkgsrc-handled tree, <varname>LOCALBASE</varname>.</para>
   </listitem>
 @@ -209,27 +209,27 @@ set based upon the following variables:<
     be overridden by the user to point to his preferred location (e.g.,
     <filename>/etc</filename>, <filename>/etc/pkg</filename>, etc.).
     Packages must not use it directly.</para>
   </listitem>
   <listitem>
     <para><varname>PKG_SYSCONFSUBDIR</varname>: A subdirectory of
     <varname>PKG_SYSCONFBASE</varname> under which the configuration files
     for the package being built shall be installed.  The definition of this
     variable only makes sense in the package's
     <filename>Makefile</filename> (i.e., it is not user-customizable).</para>
     <para>As an example, consider the Apache package,
-    <filename role="pkg">www/apache2</filename>, which places its
+    <filename role="pkg">www/apache24</filename>, which places its
     configuration files under the
     <filename>httpd/</filename> subdirectory of
     <varname>PKG_SYSCONFBASE</varname>.  This should be set in the package
     Makefile.</para>
   </listitem>
   <listitem>
     <para><varname>PKG_SYSCONFVAR</varname>: Specifies the name of the
     variable that holds this package's configuration directory (if
     different from <varname>PKG_SYSCONFBASE</varname>).  It defaults to
     <varname>PKGBASE</varname>'s value, and is always prefixed with
     <literal>PKG_SYSCONFDIR</literal>.</para>
   </listitem>