Index: en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ 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
@@ -69,19 +69,36 @@
     </example>
   </sect1>
 
+  <sect1 xml:id="uses-7z">
+    <title><literal>7z</literal></title>
+
+    <para>Possible arguments: (none), <literal>p7zip</literal>,
+      <literal>partial</literal></para>
+
+    <para>Extract using &man.7z.1; instead of &man.bsdtar.1; and sets
+      <literal>EXTRACT_SUFX=.7z</literal>.  The
+      <literal>p7zip</literal> option forces a dependency on the
+      <command>7z</command> from <package
+	role="port">archivers/p7zip</package> if the one from the base
+      system is not able to extract the files.
+      <varname>EXTRACT_SUFX</varname> is not changed if the
+      <literal>partial</literal> option is used, this can be used if
+      the main distribution file does not have a
+      <filename>.7z</filename> extension.</para>
+  </sect1>
+
   <sect1 xml:id="uses-ada">
     <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">
@@ -94,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">
@@ -435,6 +456,15 @@
       WITH_FAM_SYSTEM to specify their preference.</para>
   </sect1>
 
+  <sect1 xml:id="uses-firebird">
+    <title><literal>firebird</literal></title>
+
+    <para>Possible arguments: (none), <literal>25</literal></para>
+
+    <para>Adds a dependency to the client library of the Firebird
+      database.</para>
+  </sect1>
+
   <sect1 xml:id="uses-fmake">
     <title><literal>fmake</literal></title>
 
@@ -554,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
@@ -576,6 +607,377 @@
       for the build.</para>
   </sect1>
 
+  <sect1 xml:id="uses-gnome">
+    <title><literal>gnome</literal></title>
+
+    <para>Possible arguments: (none)</para>
+
+    <para>Provides an easy way to depend on
+      <application>GNOME</application> components.  The components
+      should be listed in <varname>USE_GNOME</varname>.  The available
+      components are:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>atk</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>atkmm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>atspi</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>cairo</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>cairomm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dconf</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>esound</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>evolutiondataserver3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gal2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gconf2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gconfmm26</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gdkpixbuf</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gdkpixbuf2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>glib12</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>glib20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>glibmm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomecontrolcenter3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomedesktop3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomedocutils</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomemenus3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomemimedata</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomeprefix</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomesharp20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomespeech</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gnomevfs2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gsound</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtk-update-icon-cache</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtk12</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtk20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtk30</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtkhtml3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtkhtml4</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtkmm20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtkmm24</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtkmm30</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksharp10</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksharp20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksourceview</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksourceview2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksourceview3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gtksourceviewmm3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gvfs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>intlhack</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>intltool</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>introspection</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libartlgpl2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libbonobo</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libbonoboui</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgda4</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgda5</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgda5-ui</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgdamm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgdamm5</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libglade2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnome</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnomecanvas</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnomekbd</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnomeprint</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnomeprintui</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgnomeui</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgsf</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgtkhtml</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libgtksourceviewmm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libidl</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>librsvg2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libsigc++12</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libsigc++20</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libwnck</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libwnck3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libxml++26</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libxml2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libxslt</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>metacity</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>nautilus3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>orbit2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pango</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pangomm</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pangox-compat</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>py3gobject3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pygnome2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pygobject</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pygobject3</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pygtk2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pygtksourceview</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>referencehack</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>vte</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>vte3</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The default dependency is build- and run-time, it can be
+      changed with <literal>:build</literal> or
+      <literal>:run</literal>.  For example:</para>
+
+    <programlisting>USES=		gnome
+USE_GNOME=	gnomemenus3:build intlhack</programlisting>
+
+    <para>See <xref linkend="using-gnome"/> for more
+      information.</para>
+  </sect1>
+
   <sect1 xml:id="uses-gperf">
     <title><literal>gperf</literal></title>
 
@@ -864,6 +1266,102 @@
       and sets the appropriate dependencies.</para>
   </sect1>
 
+  <sect1 xml:id="uses-mate">
+    <title><literal>mate</literal></title>
+
+    <para>Possible arguments: (none)</para>
+
+    <para>Provides an easy way to depend on
+      <application>MATE</application> components.  The components
+      should be listed in <varname>USE_MATE</varname>.  The available
+      components are:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>autogen</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>caja</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>common</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>controlcenter</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>desktop</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dialogs</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>docutils</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>icontheme</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>intlhack</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>intltool</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libmatekbd</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>libmateweather</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>marco</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>menus</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>notificationdaemon</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>panel</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>pluma</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>polkit</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>settingsdaemon</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The default dependency is build- and run-time, it can be
+      changed with <literal>:build</literal> or
+      <literal>:run</literal>.  For example:</para>
+
+    <programlisting>USES=		mate
+USE_MATE=	menus:build intlhack</programlisting>
+  </sect1>
+
   <sect1 xml:id="uses-metaport">
     <title><literal>metaport</literal></title>
 
@@ -948,11 +1446,20 @@
     <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 the needed, that default
+      filename can be changed with
+      <varname>PATHFIX_CMAKELISTSTXT</varname>.</para>
   </sect1>
 
   <sect1 xml:id="uses-pear">
@@ -1062,6 +1569,162 @@
       dependency.</para>
   </sect1>
 
+  <sect1 xml:id="uses-pyqt">
+    <title><literal>pyqt</literal></title>
+
+    <para>Possible arguments: (none), <literal>4</literal>,
+      <literal>5</literal></para>
+
+    <para>Uses <application>PyQt</application>.  If the port is part
+      of PyQT itself, set <varname>PYQT_DIST</varname>.  Use
+      <varname>USE_PYQT</varname> to select the components the port
+      needs.  The available components are:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>core</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dbus</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>dbussupport</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>demo</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>designer</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>designerplugin</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>doc</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>gui</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>multimedia</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>network</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>opengl</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>qscintilla2</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sip</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>sql</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>svg</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>test</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>webkit</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>xml</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>xmlpatterns</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>These components are only available with
+      <application>PyQT4</application>:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>assistant</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>declarative</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>help</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>phonon</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>script</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>scripttools</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>These components are only available with
+      <application>PyQT5</application>:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para><literal>multimediawidgets</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>printsupport</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>qml</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>serialport</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>webkitwidgets</literal></para>
+      </listitem>
+
+      <listitem>
+	<para><literal>widgets</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The default dependency for each component is build- and
+      run-time, to select only build or run, add
+      <literal>_build</literal> or <literal>_run</literal> to the
+      component name.  For example:</para>
+
+    <programlisting>USES=		pyqt
+USE_PYQT=	core doc_build designer_run</programlisting>
+  </sect1>
+
   <sect1 xml:id="uses-python">
     <title><literal>python</literal></title>
 
@@ -1070,12 +1733,14 @@
       <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>
 
@@ -1167,16 +1832,48 @@
       <application>Perl</application>, <application>PHP</application>,
       <application>Python</application>,
       <application>Ruby</application>, <application>Tcl</application>,
-      and <application>Tk</application> are supported by default.  To
-      support another interpreter, set
-      <varname>SHEBANG_LANG</varname>,
-      <varname><replaceable>interp</replaceable>_OLD_CMD</varname> and
-      <varname><replaceable>interp</replaceable>_CMD</varname>.  For
-      example:</para>
-
-    <programlisting>SHEBANG_LANG=	lua
-lua_OLD_CMD=	/usr/bin/lua
-lua_CMD=	${LOCALBASE}/bin/lua</programlisting>
+      and <application>Tk</application> are supported by
+      default.</para>
+
+    <para>There are three configuration variables:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><varname>SHEBANG_LANG</varname></term>
+
+	<listitem>
+	  <para>The list of supported interpreters.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname><replaceable>interp</replaceable>_CMD</varname></term>
+
+	<listitem>
+	  <para>The correct path to the command interpreter.  The
+	    default value is
+	    <literal>${LOCALBASE}/bin/<replaceable>interp</replaceable></literal>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname><replaceable>interp</replaceable>_OLD_CMD</varname></term>
+	<listitem>
+	  <para>The list of wrong invocations of interpreters.  They
+	    will be replaced by the correct path in
+	    <varname><replaceable>interp</replaceable>_CMD</varname>.
+	    This list will always be part of it:
+	    <literal>"/usr/bin/env <replaceable>interp</replaceable>"
+	      /bin/<replaceable>interp</replaceable>
+	      /usr/bin/<replaceable>interp</replaceable></literal>.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>To add another interpreter, set
+      <varname>SHEBANG_LANG</varname>.  For example:</para>
+
+    <programlisting>SHEBANG_LANG=	lua</programlisting>
 
     <para><literal><replaceable>interp</replaceable>_OLD_CMD</literal>
       will contain multiple values.  Any entry with spaces must be
@@ -1209,6 +1906,17 @@
     </note>
   </sect1>
 
+  <sect1 xml:id="uses-sqlite">
+    <title><literal>sqlite</literal></title>
+
+    <para>Possible arguments: (none), <literal>2</literal>,
+      <literal>3</literal></para>
+
+    <para>Add a dependency on <application>SQLite</application>.  The
+      default version used is 3, but version 2 is also possible using
+      the <literal>:2</literal> modifier.</para>
+  </sect1>
+
   <sect1 xml:id="uses-tar">
     <title><literal>tar</literal></title>
 
@@ -1231,22 +1939,25 @@
   <sect1 xml:id="uses-tcl">
     <title><literal>tcl</literal></title>
 
-    <para>Possible arguments: <literal>PORT</literal></para>
-
-    <para>Add a dependency on <application>Tcl</application>.  The
-      <literal>PORT</literal> parameter can be either
-      <literal>tcl</literal> or <literal>tk</literal>.  Either a
-      version or wrapper dependency can be appended using
-      <literal>PORT:version</literal> or
-      <literal>PORT:wrapper</literal>.  The version can be empty, one
-      or more exact version numbers (currently <literal>84</literal>,
-      <literal>85</literal>, or <literal>86</literal>), or a minimal
-      version number (currently <literal>84+</literal>,
-      <literal>85+</literal> or <literal>86+</literal>).  A build- or
-      run-time only dependency can be specified using
-      <literal>PORT,build</literal> or <literal>PORT,run</literal>.
-      After including <filename>bsd.port.pre.mk</filename> the port
-      can inspect the results using these variables:</para>
+    <para>Possible arguments: <replaceable>version</replaceable>,
+      <literal>wrapper</literal>, <literal>build</literal>,
+      <literal>run</literal>, <literal>tea</literal></para>
+
+    <para>Add a dependency on <application>Tcl</application>.  A
+      specific version can be requested using
+      <replaceable>version</replaceable>.  The version can be empty,
+      one or more exact version numbers (currently
+      <literal>84</literal>, <literal>85</literal>, or
+      <literal>86</literal>), or a minimal version number (currently
+      <literal>84+</literal>, <literal>85+</literal> or
+      <literal>86+</literal>).  To only request a non version specific
+      wrapper, use <literal>wrapper</literal>.  A build- or run-time
+      only dependency can be specified using <literal>build</literal>
+      or <literal>run</literal>.  To build the port using the
+      <application>Tcl Extension Architecture</application>, use
+      <literal>tea</literal>.  After including
+      <filename>bsd.port.pre.mk</filename> the port can inspect the
+      results using these variables:</para>
 
     <itemizedlist>
       <listitem>
@@ -1349,8 +2060,9 @@
 
     <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">
Index: share/xml/man-refs.ent
===================================================================
--- share/xml/man-refs.ent
+++ share/xml/man-refs.ent
@@ -25,6 +25,7 @@
 -->
 
 <!ENTITY man...1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>[</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.7z.1 "<citerefentry xmlns='http://docbook.org/ns/docbook' vendor='ports'><refentrytitle>7z</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.CC.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>CC</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.Mail.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>Mail</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!-- man.X.1 no longer exists in XFree86 4.3.0; the content looks to have moved