 @@ -1,14 +1,14 @@
-<!-- $NetBSD: fixes.xml,v 1.164 2021/08/23 18:38:16 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.165 2021/11/08 22:21:33 gutteridge Exp $ -->
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
 <sect1 id="general-operation">
   <title>General operation</title>
   <para>One appealing feature of pkgsrc is that it runs on many
   different platforms. As a result, it is important to ensure,
   where possible, that packages in pkgsrc are portable. This
   chapter mentions some particular details you should pay
   attention to while working on pkgsrc.</para>
 @@ -1471,56 +1471,72 @@ pre-configure:
     </orderedlist>
   </sect2>
   <sect2 id="perl-scripts">
     <title>Packages containing Perl scripts</title>
     <para>If your package contains interpreted Perl scripts, add
     <quote>perl</quote> to the <varname>USE_TOOLS</varname> variable
     and set <varname>REPLACE_PERL</varname> to ensure that the proper
     interpreter path is set. <varname>REPLACE_PERL</varname> should
     contain a list of scripts, relative to <varname>WRKSRC</varname>,
     that you want adjusted. Every occurrence of
     <filename>*/bin/perl</filename> in a she-bang line will be
-    replaced with the full path to the perl executable.</para>
+    replaced with the full path to the Perl executable.</para>
-    <para>If a particular version of perl is needed, set the
+    <para>If a particular version of Perl is needed, set the
     <varname>PERL5_REQD</varname> variable to the version number.  The
     default is <quote>5.0</quote>.</para>
     <para>See <xref linkend="perl-modules" /> for information
-    about handling perl modules.</para>
+    about handling Perl modules.</para>
     <para>There is also the <varname>REPLACE_PERL6</varname> variable
     for the language now known as Raku.</para>
   </sect2>
   <sect2 id="shell-scripts">
     <title>Packages containing shell scripts</title>
     <para><varname>REPLACE_SH</varname>,
     <varname>REPLACE_BASH</varname>, <varname>REPLACE_CSH</varname>,
     and <varname>REPLACE_KSH</varname> can be used to replace shell
     hash bangs in files. Please use the appropriate one, preferring
     <varname>REPLACE_SH</varname> in case this shell is sufficient.
     Each should contain a list of scripts, relative to
     <varname>WRKSRC</varname>, that you want adjusted. Every
     occurrence of the matching shell in a she-bang line will be
     replaced with the full path to the shell executable.
     When using <varname>REPLACE_BASH</varname>, don't forget to add
     <filename>bash</filename> to <varname>USE_TOOLS</varname>.</para>
   </sect2>
   <sect2 id="other-programming-languages">
     <title>Other programming languages</title>
-    <para>Currently, there is no special handling for other languages
+    <para>There are further similar REPLACE variables available, e.g.,
     <varname>REPLACE_AWK</varname> for packages containing awk scripts,
     and <varname>REPLACE_R</varname> for R. These two, like the others
     noted above, are defined centrally in
     <filename>mk/configure/replace-interpreter.mk</filename>. Other
     languages define these variables within their own dedicated part of
     the tree, e.g., PHP defines <varname>REPLACE_PHP</varname> in
     <filename>lang/php/phpversion.mk</filename>, and Python defines
     <varname>REPLACE_PYTHON</varname> in
     <filename>lang/python/application.mk</filename>. For other languages,
     consult the mk files found within their specific directories (the
     naming convention varies).</para>
     <para>Currently, special handling for other languages varies
     in pkgsrc.  If a compiler package provides a
     <filename>buildlink3.mk</filename> file, include that, otherwise
     just add a (build) dependency on the appropriate compiler
     package.</para>
   </sect2>
 </sect1>
 <sect1 id="fixes.build">
   <title>The <emphasis>build</emphasis> phase</title>
 	<para>The most common failures when building a package are that
 	some platforms do not provide certain header files, functions or
 	libraries, or they provide the functions in a library that the