Sun Feb 9 19:06:12 2020 UTC ()

doc/guide: don't suggest patch files against /dev/null

These patches would be much harder to edit and read than ordinary files.
Also recommend to copy these files in post-extract instead of
pre-configure, since extract is used for putting all files in place.


(rillig)

diff -r1.57 -r1.58 pkgsrc/doc/guide/files/components.xml

--- pkgsrc/doc/guide/files/components.xml 2019/08/18 16:35:16 1.57
+++ pkgsrc/doc/guide/files/components.xml 2020/02/09 19:06:12 1.58

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: components.xml,v 1.57 2019/08/18 16:35:16 rillig Exp $ -->
+<!-- $NetBSD: components.xml,v 1.58 2020/02/09 19:06:12 rillig Exp $ -->
 <chapter id="components"> <?dbhtml filename="components.html"?>
 <title>Package components - files, directories and contents</title>
 <para>Whenever you're preparing a package, there are a number of
 files involved which are described in the following
 sections.</para>
 <sect1 id="components.Makefile">
   <title><filename>Makefile</filename></title>
   <para>Building, installation and creation of a binary package are all
   controlled by the package's <filename>Makefile</filename>.
 @@ -681,30 +681,27 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
     unpacked into the directory denoted by
     <varname>WRKDIR</varname>. It can be removed by running
     <command>make clean</command>. Besides the sources, this
     directory is also used to keep various timestamp files.
     The directory gets <emphasis>removed completely</emphasis> on clean.
     The default is <filename>${.CURDIR}/work</filename>
     or <filename>${.CURDIR}/work.${MACHINE_ARCH}</filename>
     if <varname>OBJMACHINE</varname> is set.</para>
   </sect1>
   <sect1 id="files-dir">
     <title><filename>files/*</filename></title>
-    <para>If you have any files that you wish to be placed in the package prior
+    <para>If you have any files that you wish to be placed in the package
-    to configuration or building, you could place these files here and use
+    prior to configuration or building, you can place these files here
-    a <command>${CP}</command> command in the
+    and use a <command>${CP}</command> command in the
-    <quote>pre-configure</quote> target to achieve
+    <quote>post-extract</quote> target to achieve this.</para>
     this. Alternatively, you could simply diff the file against
     <filename>/dev/null</filename> and use the patch mechanism to manage
     the creation of this file.</para>
     <para>If you want to share files in this way with other
     packages, set the <varname>FILESDIR</varname> variable to point
     to the other package's <filename>files</filename> directory,
     e.g.:</para>
 <programlisting>
 FILESDIR=       ../../editors/xemacs/files
 </programlisting>
   </sect1>
 </chapter>