Catch up with the different USES.

Reviewed by:	wblock
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D5949

1 files changed, 34 insertions, 18 deletions

diff --git a/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
index 9ac27493e9..e3eb9e31aa 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -8,7 +8,7 @@
 
 <!--
 
-  Document up-to date with r398827 revision of the ports tree.
+  Document up-to date with r413676 revision of the ports tree.
 
   This file documents the values of the USES make variable.  The
   format is easy to grasp from the already-added entries below (or use
@@ -91,15 +91,14 @@
     <title><literal>ada</literal></title>
 
     <para>Possible arguments: (none), <literal>47</literal>,
-      <literal>49</literal>, <literal>5</literal></para>
+      <literal>49</literal>, <literal>5</literal>,
+      <literal>6</literal></para>
 
     <para>Depends on an <application>Ada</application>-capable
       compiler, and sets <varname>CC</varname> accordingly.  Defaults
-      to a <application>gcc</application> 4.9 based compiler, use
-      <literal>:47</literal> to use the older
-      <application>gcc</application> 4.7 based one and
-      <literal>:5</literal> to use the newer
-      <application>gcc</application> 5 based one.</para>
+      to use <application>gcc</application> 5 from ports.  Use the
+      <literal>:<replaceable>X</replaceable></literal> version option
+      to force building with a different version.</para>
   </sect1>
 
   <sect1 xml:id="uses-autoreconf">
@@ -112,15 +111,19 @@
       <command>autoheader</command>, <command>automake</command>,
       <command>autopoint</command>, and <command>libtoolize</command>
       commands.  Each command applies to
-      <filename>${CONFIGURE_WRKSRC}/configure.ac</filename> or its old
-      name, <filename>${CONFIGURE_WRKSRC}/configure.in</filename>.  If
+      <filename>${AUTORECONF_WRKSRC}/configure.ac</filename> or its
+      old name,
+      <filename>${AUTORECONF_WRKSRC}/configure.in</filename>.  If
       <filename>configure.ac</filename> defines subdirectories with
       their own <filename>configure.ac</filename> using
       <literal>AC_CONFIG_SUBDIRS</literal>,
       <command>autoreconf</command> will recursively update those as
       well.  The <literal>:build</literal> argument only adds build
       time dependencies on those tools but does not run
-      <command>autoreconf</command>.</para>
+      <command>autoreconf</command>.  A port can set
+      <varname>AUTORECONF_WRKSRC</varname> if
+      <varname>WRKSRC</varname> does not contain the path to
+      <filename>configure.ac</filename>.</para>
   </sect1>
 
   <sect1 xml:id="uses-blaslapack">
@@ -581,8 +584,9 @@
 
     <para>A specific version <replaceable>X</replaceable> can be used.
       Possible versions are <literal>7</literal>,
-      <literal>8</literal>, <literal>9</literal> (default), and
-      <literal>agpl</literal>.  <literal>nox11</literal> indicates
+      <literal>8</literal>, <literal>9</literal>, and
+      <literal>agpl</literal> (default).  <literal>nox11</literal>
+      indicates
       that the <literal>-nox11</literal> version of the port is
       required.  <literal>build</literal> and <literal>run</literal>
       add build- and run-time dependencies on
@@ -1442,11 +1446,20 @@ USE_MATE=	menus:build intlhack</programlisting>
     <para>Possible arguments: (none)</para>
 
     <para>Look for <filename>Makefile.in</filename> and
-      <filename>configure</filename> in the port's associated sources
+      <filename>configure</filename> in
+      <varname>PATHFIX_WRKSRC</varname> (defaults to
+      <varname>WRKSRC</varname>)
       and fix common paths to make sure they respect the &os;
       hierarchy.  If the port uses <command>automake</command>, set
       <varname>PATHFIX_MAKEFILEIN</varname> to
       <filename>Makefile.am</filename> if needed.</para>
+
+    <para>If the port <link
+	linkend="uses-cmake"><literal>USES=cmake</literal></link> it
+      will look for <filename>CMakeLists.txt</filename> in
+      <varname>PATHFIX_WRKSRC</varname>.  If needed, that default
+      filename can be changed with
+      <varname>PATHFIX_CMAKELISTSTXT</varname>.</para>
   </sect1>
 
   <sect1 xml:id="uses-pear">
@@ -1720,12 +1733,14 @@ USE_PYQT=	core doc_build designer_run</programlisting>
       <literal><replaceable>X.Y+</replaceable></literal>,
       <literal><replaceable>-X.Y</replaceable></literal>,
       <literal><replaceable>X.Y-Z.A</replaceable></literal>,
-      <literal>build</literal>, <literal>run</literal></para>
+      <literal>build</literal>, <literal>run</literal>,
+      <literal>test</literal></para>
 
     <para>Uses <application>Python</application>.  A supported version
       or version range can be specified.  If Python is only needed at
-      build or run time, it can be set as a build or run dependency
-      with <literal>build</literal> or <literal>run</literal>.  See
+      build time, run time or for the tests, it can be set as a build,
+      run or test dependency with <literal>build</literal>,
+      <literal>run</literal>, or <literal>test</literal>.  See
       <xref linkend="using-python"/> for more information.</para>
   </sect1>
 
@@ -2048,8 +2063,9 @@ ksh_CMD=	${LOCALBASE}/bin/ksh</programlisting>
 
     <para>Changes some default behavior (mostly variables) of
       the build system to allow installing this port as a normal
-      user.  Try this in the port before adding
-      <literal>NEED_ROOT=yes</literal></para>
+      user.  Try this in the port before using <link
+	linkend="uses-fakeroot">USES=fakeroot</link> or
+      patching.</para>
   </sect1>
 
   <sect1 xml:id="uses-uniquefiles">