Received: by mail.netbsd.org (Postfix, from userid 605)
	id F1DD184DB6; Sat, 20 Jun 2020 15:25:02 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 62DA584DB6
	for <pkgsrc-changes@NetBSD.org>; Sat, 20 Jun 2020 15:25:02 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id URNR78LeQFoR for <pkgsrc-changes@netbsd.org>;
	Sat, 20 Jun 2020 15:25:01 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id C020784D95
	for <pkgsrc-changes@NetBSD.org>; Sat, 20 Jun 2020 15:25:01 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id AD4C3FB28; Sat, 20 Jun 2020 15:25:01 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1592666701262000"
MIME-Version: 1.0
Date: Sat, 20 Jun 2020 15:25:01 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/doc/guide/files
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
X-Mailer: log_accum
Message-Id: <20200620152501.AD4C3FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1592666701262000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sat Jun 20 15:25:01 UTC 2020

Modified Files:
	pkgsrc/doc/guide/files: build.xml

Log Message:
doc/guide: document the default do-* targets more precisely


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/doc/guide/files/build.xml

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


--_----------=_1592666701262000
Content-Disposition: inline
Content-Length: 3802
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/doc/guide/files/build.xml
diff -u pkgsrc/doc/guide/files/build.xml:1.84 pkgsrc/doc/guide/files/build.xml:1.85
--- pkgsrc/doc/guide/files/build.xml:1.84	Sat Jun 20 04:18:41 2020
+++ pkgsrc/doc/guide/files/build.xml	Sat Jun 20 15:25:01 2020
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.84 2020/06/20 04:18:41 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.85 2020/06/20 15:25:01 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -467,14 +467,19 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     invoked by setting <varname>HAS_CONFIGURE</varname> to
     <quote>yes</quote>. If the configure script is a GNU autoconf
     script, you should set <varname>GNU_CONFIGURE</varname> to
-    <quote>yes</quote> instead. What happens in the
-    <emphasis>configure</emphasis> phase is roughly:</para>
+    <quote>yes</quote> instead.</para>
+
+    <para>In the <literal>do-configure</literal> stage, a rough
+    equivalent of the following command is run. See
+    <filename>mk/configure/configure.mk</filename>, target
+    <literal>do-configure-script</literal> for the exact
+    definition.</para>
 
 <programlisting>
-.for d in ${CONFIGURE_DIRS}
-        cd ${WRKSRC} \
-        &amp;&amp; cd ${d} \
-        &amp;&amp; env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+.for dir in ${CONFIGURE_DIRS}
+        cd ${WRKSRC} &amp;&amp; cd ${dir} \
+        &amp;&amp; env ${CONFIGURE_ENV} \
+            ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 .endfor
 </programlisting>
 
@@ -521,15 +526,15 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
   <sect1 id="build.build">
     <title>The <emphasis>build</emphasis> phase</title>
 
-    <para>For building a package, a rough equivalent of the
-    following code is executed.</para>
+    <para>For building a package, a rough equivalent of the following
+    code is executed; see <filename>mk/build/build.mk</filename>, target
+    <literal>do-build</literal> for the exact definition.</para>
 
 <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
@@ -572,19 +577,20 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     install the software in public directories, so users can
     access the programs and files.</para>
 
-    <para>In the <emphasis>install</emphasis> 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.</para>
+    <para>In the <emphasis>install</emphasis> phase, a rough equivalent
+    of the following code is executed; see
+    <filename>mk/install/install.mk</filename>, target
+    <literal>do-install</literal> for the exact definition. Additionally,
+    before and after this code, several consistency checks are run
+    against the files-to-be-installed, see
+    <filename>mk/check/*.mk</filename> for details.</para>
 
 <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}
+.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
 </programlisting>
 


--_----------=_1592666701262000--