CVS commit: pkgsrc/doc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jun 21 13:01:00 UTC 2020

Modified Files:
        pkgsrc/doc: pkgsrc.html pkgsrc.txt

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.298 -r1.299 pkgsrc/doc/pkgsrc.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.300 pkgsrc/doc/pkgsrc.html:1.301
--- pkgsrc/doc/pkgsrc.html:1.300        Sat Jun 20 09:47:55 2020
+++ pkgsrc/doc/pkgsrc.html      Sun Jun 21 13:01:00 2020
@@ -4459,13 +4459,17 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     invoked by setting <code class="varname">HAS_CONFIGURE</code> to
     <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>. If the configure script is a GNU autoconf
     script, you should set <code class="varname">GNU_CONFIGURE</code> to
-    <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span> instead. What happens in the
-    <span class="emphasis"><em>configure</em></span> phase is roughly:</p>
-<pre class="programlisting">
-.for d in ${CONFIGURE_DIRS}
-        cd ${WRKSRC} \
-        &amp;&amp; cd ${d} \
-        &amp;&amp; env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+    <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span> instead.</p>
+<p>In the <code class="literal">do-configure</code> stage, a rough
+    equivalent of the following command is run. See
+    <code class="filename">mk/configure/configure.mk</code>, target
+    <code class="literal">do-configure-script</code> for the exact
+    definition.</p>
+<pre class="programlisting">
+.for dir in ${CONFIGURE_DIRS}
+        cd ${WRKSRC} &amp;&amp; cd ${dir} \
+        &amp;&amp; env ${CONFIGURE_ENV} \
+            ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 .endfor
 </pre>
 <p><code class="varname">CONFIGURE_DIRS</code> (default:
@@ -4506,14 +4510,14 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="build.build"></a>13.12.�The <span class="emphasis"><em>build</em></span> phase</h2></div></div></div>
-<p>For building a package, a rough equivalent of the
-    following code is executed.</p>
+<p>For building a package, a rough equivalent of the following
+    code is executed; see <code class="filename">mk/build/build.mk</code>, target
+    <code class="literal">do-build</code> for the exact definition.</p>
 <pre class="programlisting">
-.for d in ${BUILD_DIRS}
-        cd ${WRKSRC} \
-        &amp;&amp; cd ${d} \
+.for dir in ${BUILD_DIRS}
+        cd ${WRKSRC} &amp;&amp; cd ${dir} \
         &amp;&amp; env ${MAKE_ENV} \
-            ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+            ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
                 -f ${MAKE_FILE} \
                 ${BUILD_TARGET}
 .endfor
@@ -4549,18 +4553,19 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 <p>Once the build stage has completed, the final step is to
     install the software in public directories, so users can
     access the programs and files.</p>
-<p>In the <span class="emphasis"><em>install</em></span> phase, a rough
-    equivalent of the following code is executed. Additionally,
-    before and after this code, much magic is performed to do
-    consistency checks, registering the package, and so on.</p>
-<pre class="programlisting">
-.for d in ${INSTALL_DIRS}
-        cd ${WRKSRC} \
-        &amp;&amp; cd ${d} \
-        &amp;&amp; env ${MAKE_ENV} \
-            ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \
-                -f ${MAKE_FILE} \
-                ${INSTALL_TARGET}
+<p>In the <span class="emphasis"><em>install</em></span> phase, a rough equivalent
+    of the following code is executed; see
+    <code class="filename">mk/install/install.mk</code>, target
+    <code class="literal">do-install</code> for the exact definition. Additionally,
+    before and after this code, several consistency checks are run
+    against the files-to-be-installed, see
+    <code class="filename">mk/check/*.mk</code> for details.</p>
+<pre class="programlisting">
+.for dir in ${INSTALL_DIRS}
+        cd ${WRKSRC} &amp;&amp; cd ${dir} \
+        &amp;&amp; env ${INSTALL_ENV} ${MAKE_ENV} \
+            ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} \
+                -f ${MAKE_FILE} ${INSTALL_TARGET}
 .endfor
 </pre>
 <p>The variable's meanings are analogous to the ones in the

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.298 pkgsrc/doc/pkgsrc.txt:1.299
--- pkgsrc/doc/pkgsrc.txt:1.298 Sat Jun 20 09:47:55 2020
+++ pkgsrc/doc/pkgsrc.txt       Sun Jun 21 13:01:00 2020
@@ -3702,13 +3702,16 @@ invocation results in generation of head
 
 If the package contains a configure script, this can be invoked by setting
 HAS_CONFIGURE to "yes". If the configure script is a GNU autoconf script, you
-should set GNU_CONFIGURE to "yes" instead. What happens in the configure phase
-is roughly:
+should set GNU_CONFIGURE to "yes" instead.
 
-.for d in ${CONFIGURE_DIRS}
-        cd ${WRKSRC} \
-        && cd ${d} \
-        && env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+In the do-configure stage, a rough equivalent of the following command is run.
+See mk/configure/configure.mk, target do-configure-script for the exact
+definition.
+
+.for dir in ${CONFIGURE_DIRS}
+        cd ${WRKSRC} && cd ${dir} \
+        && env ${CONFIGURE_ENV} \
+            ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 .endfor
 
 CONFIGURE_DIRS (default: ".") is a list of pathnames relative to WRKSRC. In
@@ -3738,13 +3741,13 @@ If there is no configure step at all, se
 
 13.12. The build phase
 
-For building a package, a rough equivalent of the following code is executed.
+For building a package, a rough equivalent of the following code is executed;
+see mk/build/build.mk, target do-build for the exact definition.
 
-.for d in ${BUILD_DIRS}
-        cd ${WRKSRC} \
-        && cd ${d} \
+.for dir in ${BUILD_DIRS}
+        cd ${WRKSRC} && cd ${dir} \
         && env ${MAKE_ENV} \
-            ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+            ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
                 -f ${MAKE_FILE} \
                 ${BUILD_TARGET}
 .endfor
@@ -3769,17 +3772,16 @@ If there is no build step at all, set NO
 Once the build stage has completed, the final step is to install the software
 in public directories, so users can access the programs and files.
 
-In the install phase, a rough equivalent of the following code is executed.
-Additionally, before and after this code, much magic is performed to do
-consistency checks, registering the package, and so on.
-
-.for d in ${INSTALL_DIRS}
-        cd ${WRKSRC} \
-        && cd ${d} \
-        && env ${MAKE_ENV} \
-            ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} \
-                -f ${MAKE_FILE} \
-                ${INSTALL_TARGET}
+In the install phase, a rough equivalent of the following code is executed; see
+mk/install/install.mk, target do-install for the exact definition.
+Additionally, before and after this code, several consistency checks are run
+against the files-to-be-installed, see mk/check/*.mk for details.
+
+.for dir in ${INSTALL_DIRS}
+        cd ${WRKSRC} && cd ${dir} \
+        && env ${INSTALL_ENV} ${MAKE_ENV} \
+            ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} \
+                -f ${MAKE_FILE} ${INSTALL_TARGET}
 .endfor
 
 The variable's meanings are analogous to the ones in the build phase.