regen

2 files changed, 45 insertions, 35 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index fce52ea3ede..6f83fc6b3fa 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -7658,7 +7658,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="tools.questions"></a>18.4. Questions regarding the tools</h2></div></div></div>
 <div class="qandaset">
-<a name="idm86685616"></a><dl>
+<a name="idm88201136"></a><dl>
 <dt>18.4.1. <a href="#tools.new">How do I add a new tool?</a>
 </dt>
 <dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
@@ -7677,7 +7677,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm86685232"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm88200752"></a><p><b>18.4.1.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I add a new tool?</p></td>
 </tr>
@@ -7687,7 +7687,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm86684208"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm88199728"></a><p><b>18.4.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I get a list of all available
 	tools?</p></td>
@@ -7698,7 +7698,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm86683184"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm88198704"></a><p><b>18.4.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
@@ -8395,8 +8395,8 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
     sure the distfile was really updated on purpose, and that
     no trojan horse or so crept in.
     Please mention that the distfiles were compared and what was found
-    in your commit message.
-    Then, the correct way to work around this is to
+    in your commit message.</p>
+<p>Then, the correct way to work around this is to
     set <code class="varname">DIST_SUBDIR</code> to a unique directory name,
     usually based on <code class="varname">PKGNAME_NOREV</code>. All
     <code class="varname">DISTFILES</code> and
@@ -8406,11 +8406,12 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
     In case this
     happens more often, <code class="varname">PKGNAME</code> can be used (thus
     including the <code class="filename">nbX</code> suffix) or a date stamp
-    can be appended, like <code class="varname">${PKGNAME_NOREV}-YYYYMMDD</code>.
-    Do not forget regenerating the <code class="filename">distinfo</code> file
+    can be appended, like <code class="varname">${PKGNAME_NOREV}-YYYYMMDD</code>.</p>
+<p><code class="varname">DIST_SUBDIR</code> is also used when a distfile's name does not contain a version and the distfile is apt to change. In cases where the likelihood of this is very small, <code class="varname">DIST_SUBDIR</code> might not be required. Additionally, <code class="varname">DIST_SUBDIR</code> must not be removed unless the distfile name changes, even if a package is being moved or renamed.</p>
+<p>Do not forget regenerating the <code class="filename">distinfo</code> file
     after that, since it contains the <code class="varname">DIST_SUBDIR</code>
     path in the filenames.
-    Also increase the PKGREVISION if the installed package is different.
+    Also, increase the PKGREVISION if the installed package is different.
     Furthermore, a mail to the package's authors seems appropriate
     telling them that changing distfiles after releases without
     changing the file names is not good practice.</p>
@@ -9413,8 +9414,8 @@ PERL5_PACKLIST= auto/Pg/.packlist
 <a name="desktop-files"></a>19.6.20. Packages installing desktop files</h3></div></div></div>
 <p>If a package installs <code class="filename">.desktop</code> files
       under <code class="filename">share/applications</code> and these include
-      MIME information, you need to take extra steps to ensure that they
-      are registered into the MIME database:</p>
+      MIME information (MimeType key), you need to take extra steps to
+      ensure that they are registered into the MIME database:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>Include
 	  <code class="filename">../../sysutils/desktop-file-utils/desktopdb.mk</code>.</p></li>
@@ -9747,7 +9748,7 @@ place.</p></li>
 	and if you still don't have the answer, ask on the
 	<code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idm88223536"></a><dl>
+<a name="idm87648304"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9792,7 +9793,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm88223152"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm87647920"></a><p><b>22.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -9808,7 +9809,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm88219056"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm87643824"></a><p><b>22.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -9826,7 +9827,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm88214704"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm87639344"></a><p><b>22.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -9844,7 +9845,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm88210480"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm87635248"></a><p><b>22.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9857,7 +9858,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm88208304"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm87633072"></a><p><b>22.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
 	VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -9873,7 +9874,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm88205232"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm87629872"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9897,7 +9898,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm88197168"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm87613616"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9922,7 +9923,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm88193328"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm87609904"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9970,7 +9971,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm88186800"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm87603376"></a><p><b>22.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index ada7e1a86dc..b841779522c 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -7065,18 +7065,27 @@ checksum will no longer match. The contents of the new distfile should be
 compared against the old one before changing anything, to make sure the
 distfile was really updated on purpose, and that no trojan horse or so crept
 in. Please mention that the distfiles were compared and what was found in your
-commit message. Then, the correct way to work around this is to set DIST_SUBDIR
-to a unique directory name, usually based on PKGNAME_NOREV. All DISTFILES and
-PATCHFILES for this package will be put in that subdirectory of the local
-distfiles directory. (See Section 19.1.11, "How to handle incrementing versions
-when fixing an existing package" for more details.) In case this happens more
-often, PKGNAME can be used (thus including the nbX suffix) or a date stamp can
-be appended, like ${PKGNAME_NOREV}-YYYYMMDD. Do not forget regenerating the
-distinfo file after that, since it contains the DIST_SUBDIR path in the
-filenames. Also increase the PKGREVISION if the installed package is different.
-Furthermore, a mail to the package's authors seems appropriate telling them
-that changing distfiles after releases without changing the file names is not
-good practice.
+commit message.
+
+Then, the correct way to work around this is to set DIST_SUBDIR to a unique
+directory name, usually based on PKGNAME_NOREV. All DISTFILES and PATCHFILES
+for this package will be put in that subdirectory of the local distfiles
+directory. (See Section 19.1.11, "How to handle incrementing versions when
+fixing an existing package" for more details.) In case this happens more often,
+PKGNAME can be used (thus including the nbX suffix) or a date stamp can be
+appended, like ${PKGNAME_NOREV}-YYYYMMDD.
+
+DIST_SUBDIR is also used when a distfile's name does not contain a version and
+the distfile is apt to change. In cases where the likelihood of this is very
+small, DIST_SUBDIR might not be required. Additionally, DIST_SUBDIR must not be
+removed unless the distfile name changes, even if a package is being moved or
+renamed.
+
+Do not forget regenerating the distinfo file after that, since it contains the
+DIST_SUBDIR path in the filenames. Also, increase the PKGREVISION if the
+installed package is different. Furthermore, a mail to the package's authors
+seems appropriate telling them that changing distfiles after releases without
+changing the file names is not good practice.
 
 19.3. Fixing problems in the configure phase
 
@@ -7833,8 +7842,8 @@ points is to regenerate it using make print-PLIST.
 19.6.20. Packages installing desktop files
 
 If a package installs .desktop files under share/applications and these include
-MIME information, you need to take extra steps to ensure that they are
-registered into the MIME database:
+MIME information (MimeType key), you need to take extra steps to ensure that
+they are registered into the MIME database:
 
  1. Include ../../sysutils/desktop-file-utils/desktopdb.mk.