Tue Jun 10 15:09:42 2014 UTC ()
Use www/apache24 as example.
(joerg)
diff -r1.175 -r1.176 pkgsrc/doc/pkgsrc.html
diff -r1.180 -r1.181 pkgsrc/doc/pkgsrc.txt
diff -r1.18 -r1.19 pkgsrc/doc/guide/files/pkginstall.xml
--- pkgsrc/doc/pkgsrc.html 2014/06/01 16:44:11 1.175
+++ pkgsrc/doc/pkgsrc.html 2014/06/10 15:09:42 1.176
@@ -5744,7 +5744,7 @@
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
--- pkgsrc/doc/pkgsrc.txt 2014/06/01 16:44:11 1.180
+++ pkgsrc/doc/pkgsrc.txt 2014/06/10 15:09:42 1.181
@@ -4852,7 +4852,7 @@
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.
--- pkgsrc/doc/guide/files/pkginstall.xml 2014/06/01 16:42:45 1.18
+++ pkgsrc/doc/guide/files/pkginstall.xml 2014/06/10 15:09:42 1.19
@@ -1,4 +1,4 @@
-<!-- $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>
@@ -219,7 +219,7 @@
<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