From c047748b136571477a5aca6b8f9f7743fcc97584 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 14 Aug 2014 06:30:44 +0000
Subject: [PATCH] Catch up with last months updates in ports/Mk/Uses.

Reviewed by:	wblock, antoine
Sponsored by:	Absolight
Differential Revision:	https://phabric.freebsd.org/D534
---
 .../porters-handbook/special/chapter.xml      |  28 +--
 .../books/porters-handbook/uses/chapter.xml   | 176 ++++++++++++++----
 2 files changed, 150 insertions(+), 54 deletions(-)

diff --git a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
index 437c08ac5d..1cb8b42764 100644
--- a/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -489,19 +489,13 @@ IGNORE=	may not be redistributed because of licensing reasons. Please visit <rep
 	<command>make</command> implementation expected by the
 	ported software.</para>
 
-      <para>If your port is an X application that creates
-	<filename>Makefile</filename> files from
-	<filename>Imakefile</filename> files using
-	<application>imake</application>, then set
-	<literal>USES= imake</literal>.  This will cause the
-	configure stage to automatically do an
-	<command>xmkmf -a</command>.  If the <option>-a</option>
-	flag is a problem for your port, set
-	<literal>XMKMF=xmkmf</literal>.  If the port uses
-	<application>imake</application> but does not understand the
-	<buildtarget>install.man</buildtarget> target,
-	<literal>NO_INSTALL_MANPAGES=yes</literal> should be
-	set.</para>
+      <para>If the port is an X application that uses
+	<application>imake</application> to create
+	<filename>Makefile</filename>s from
+	<filename>Imakefile</filename>s, set <literal>USES=
+	  imake</literal>..  See the <link
+	  linkend="uses-imake"><literal>USES=imake</literal></link>
+	section of <xref linkend="uses"/> for more details.</para>
 
       <para>If your port's source <filename>Makefile</filename> has
 	something else than <buildtarget>all</buildtarget> as the
@@ -816,13 +810,9 @@ CMAKE_SOURCE_PATH=	&dollar;{WRKSRC}/subproject</programlisting>
 	libtool (search for a file named ltmain.sh) need to have
 	<literal>USES=libtool</literal>.  Also, if a port has
 	<literal>USE_AUTOTOOLS=libtoolize</literal> it probably also
-	needs <literal>USES=libtool</literal>.</para>
+	needs <literal>USES=libtool</literal>.  See the <link linkend="uses-libtool">USES=libtool</link>
+	section in <xref linkend="uses"/> for more details.</para>
 
-      <para>Some ports do not ship with their own copy of libtool and
-	expect libtool to be provided by the build system.  In that
-	case simply add:</para>
-
-      <programlisting>BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool.</programlisting>
     </sect2>
 
     <sect2 xml:id="using-libltdl">
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 3e87756cc3..3ac5ea6987 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -8,6 +8,8 @@
 
 <!--
 
+  Document up-to date with r364718 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
   this scheme below as a skeleton):
@@ -45,11 +47,13 @@
 	<row xml:id="uses-ada">
 	  <entry><literal>ada</literal></entry>
 
-	  <entry>(none)</entry>
+	  <entry>(none), <literal>47</literal></entry>
 
 	  <entry>Depends on an <application>Ada</application>-capable
-	    compiler, and sets <varname>CC</varname>
-	    accordingly.</entry>
+	    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.</entry>
 	</row>
 
 	<row xml:id="uses-bison">
@@ -101,13 +105,16 @@
 
 	  <entry>(none), <literal>c++0x</literal>,
 	    <literal>c++11-lang</literal>,
+	    <literal>gcc-c++11-lib</literal>,
 	    <literal>c++11-lib</literal>, <literal>c11</literal>,
 	    <literal>openmp</literal>, <literal>nestedfct</literal>,
 	    <literal>features</literal></entry>
 
 	  <entry>Determines which compiler to use based on any given
 	    wishes.  Use <literal>c++11-lang</literal> if the port
-	    needs a C++11-capable compiler, and
+	    needs a C++11-capable compiler,
+	    <literal>gcc-c++11-lib</literal> if the port needs the
+	    <command>g++</command> compiler with a C++11 library, and
 	    <literal>c++11-lib</literal> if the port also needs a
 	    C++11-ready standard library.  If the port needs a
 	    compiler understanding C++0X, C11, OpenMP, or nested
@@ -329,6 +336,33 @@
 	    </itemizedlist></entry>
 	</row>
 
+	<row xml:id="uses-drupal">
+	  <entry><literal>drupal</literal></entry>
+
+	  <entry><literal>6</literal>, <literal>7</literal>,
+	    <literal>module</literal>,
+	    <literal>theme</literal></entry>
+
+	  <entry>Automate installation of a port that is a
+	    <application>Drupal</application>
+	    theme or module.  Use with the version of Drupal that the
+	    port is expecting.  For example,
+	    <literal>USES=drupal:6,module</literal> says that this
+	    port creates a Drupal 6 module.  A Drupal 7 theme can be
+	    specified with
+	    <literal>USES=drupal:7,theme</literal>.</entry>
+	</row>
+
+	<row xml:id="uses-execinfo">
+	  <entry><literal>execinfo</literal></entry>
+
+	  <entry>(none)</entry>
+
+	  <entry>Add a runtime dependency on
+	    <filename>libexecinfo.so</filename> depending on its
+	    presence in the base system.</entry>
+	</row>
+
 	<row xml:id="uses-fam">
 	  <entry><literal>fam</literal></entry>
 
@@ -370,6 +404,28 @@
 	    version of &os;.</entry>
 	</row>
 
+	<row xml:id="uses-gecko">
+	  <entry><literal>gecko</literal></entry>
+
+	  <entry><literal>libxul</literal> (default),
+	    <literal>firefox</literal>, <literal>seamonkey</literal>,
+	    <literal>thunderbird</literal>, <literal>build</literal>,
+	    <literal><replaceable>XY</replaceable></literal>,
+	    <literal><replaceable>XY</replaceable>+</literal></entry>
+
+	  <entry>Add a dependency on different
+	    <application>gecko</application> based applications.  If
+	    <literal>libxul</literal> is used, it is the only argument
+	    allowed.  When the argument is not
+	    <literal>libxul</literal>, the <literal>firefox</literal>,
+	    <literal>seamonkey</literal>, or
+	    <literal>thunderbird</literal> arguments can be used,
+	    along with optional <literal>build</literal> and
+	    <literal><replaceable>XY</replaceable></literal>/<literal><replaceable>XY</replaceable>+</literal>
+	    version
+	    arguments.</entry>
+	</row>
+
 	<row xml:id="uses-gettext">
 	  <entry><literal>gettext</literal></entry>
 
@@ -388,9 +444,11 @@
 	<row xml:id="uses-gmake">
 	  <entry><literal>gmake</literal></entry>
 
-	  <entry>(none)</entry>
+	  <entry>(none), <literal>lite</literal></entry>
 
-	  <entry>Uses <package role="port">devel/gmake</package> as a
+	  <entry>Uses <package role="port">devel/gmake</package>, or
+	    <package role="port">devel/gmake-lite</package> if the
+	    <literal>lite</literal> argument is used, as a
 	    build-time dependency and sets up the environment to use
 	    <command>gmake</command> as the default
 	    <command>make</command> for the build.</entry>
@@ -494,7 +552,8 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 
 	  <entry>(none), <literal>lib</literal>,
 	    <literal>build</literal>,
-	    <literal>patch</literal></entry>
+	    <literal>patch</literal>, <literal>translit</literal>,
+	    <literal>wchar_t</literal></entry>
 
 	  <entry>Uses <command>iconv</command> functions, either from
 	    the port
@@ -507,7 +566,11 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	    implies <command>iconv</command> with build-time and
 	    run-time dependencies.  <literal>build</literal> implies a
 	    build-time dependency, and <literal>patch</literal>
-	    implies a patch-time dependency.  For more information see
+	    implies a patch-time dependency.  If the port uses the
+	    <literal>WCHAR_T</literal> or
+	    <literal>//TRANSLIT</literal> iconv extensions, add the
+	    relevant arguments so that the correct iconv is used.  For
+	    more information see
 	    <xref linkend="using-iconv"/>.</entry>
 	</row>
 
@@ -515,14 +578,19 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	  <entry><literal>imake</literal></entry>
 
 	  <entry>(none), <literal>env</literal>,
-	    <literal>notall</literal></entry>
+	    <literal>notall</literal>,
+	    <literal>noman</literal></entry>
 
-	  <entry>Uses <package role="port">devel/imake</package> as
-	    build-time dependency.  If the <literal>env</literal>
-	    argument is given, only setup the environment and do not
-	    define any target.  If the <literal>notall</literal>
-	    argument is given does not pass <literal>-a</literal> to
-	    <command>xmkmf</command>.</entry>
+	  <entry>Add <package role="port">devel/imake</package> as a
+	    build-time dependency and run <command>xmkmf -a</command>
+	    during the <buildtarget>configure</buildtarget> stage.  If
+	    the <literal>env</literal> argument is given, the
+	    <buildtarget>configure</buildtarget> target is not set.
+	    If the <option>-a</option> flag is a problem for the port,
+	    add the <literal>notall</literal> argument.  If
+	    <command>xmkmf</command> does not generate a
+	    <buildtarget>install.man</buildtarget> target, add the
+	    <literal>noman</literal> argument.</entry>
 	</row>
 
 	<row xml:id="uses-kmod">
@@ -584,29 +652,49 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	<row xml:id="uses-libtool">
 	  <entry><literal>libtool</literal></entry>
 
-	  <entry>(none)</entry>
+	  <entry>(none), <literal>keepla</literal>,
+	    <literal>build</literal></entry>
 
 	  <entry>Patches <command>libtool</command> scripts.  This
 	    should be added to all ports that use
-	    <command>libtool</command>.</entry>
+	    <command>libtool</command>.  The <literal>keepla</literal>
+	    argument can be used to keep the <filename>.la</filename>
+	    files.  Some ports do not ship with their own copy of
+	    libtool and need a build time dependency on <package
+	      role="port">devel/libtool</package>, use the
+	    <literal>:build</literal> argument to add such
+	    dependency.</entry>
 	</row>
 
 	<row xml:id="uses-lua">
 	  <entry><literal>lua</literal></entry>
 
-	  <entry>(none), <literal>XY+</literal>,
-	    <literal>XY</literal>, <literal>build</literal>,
+	  <entry>(none),
+	    <literal><replaceable>XY</replaceable>+</literal>,
+	    <literal><replaceable>XY</replaceable></literal>,
+	    <literal>build</literal>,
 	    <literal>run</literal></entry>
 
 	  <entry>Adds a dependency on <application>Lua</application>.
 	    By default this is a library undependency, unless
 	    overridden by the <literal>build</literal> or
 	    <literal>run</literal> option.  The default version is
-	    5.2, unless set by the <literal>XY</literal> parameter
+	    5.2, unless set by the
+	    <literal><replaceable>XY</replaceable></literal> parameter
 	    (e.g., <literal>51</literal> or
 	    <literal>52+</literal>).</entry>
 	</row>
 
+	<row xml:id="uses-makeinfo">
+	  <entry><literal>makeinfo</literal></entry>
+
+	  <entry><literal>build</literal> (default),
+	    <literal>run</literal>, <literal>both</literal></entry>
+
+	  <entry>Add the corresponding dependencies on
+	    <command>makeinfo</command>.</entry>
+	</row>
+
 	<row xml:id="uses-makeself">
 	  <entry><literal>makeself</literal></entry>
 
@@ -660,6 +748,15 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	    for verbose output.</entry>
 	</row>
 
+	<row xml:id="uses-objc">
+	  <entry><literal>objc</literal></entry>
+
+	  <entry>(none)</entry>
+
+	  <entry>Add objective C dependencies (compiler, runtime
+	    library) if the base system does not support it.</entry>
+	</row>
+
 	<row xml:id="uses-openal">
 	  <entry><literal>openal</literal></entry>
 
@@ -683,7 +780,10 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	  <entry>Look for the <filename>Makefile.in</filename> and
 	    <filename>configure</filename> files in the port's
 	    associated sources and fix common paths to make sure they
-	    respect the &os; hierarchy.</entry>
+	    respect the &os; hierarchy.  If the port uses
+	    <command>automake</command>, set
+	    <varname>PATHFIX_MAKEFILEIN</varname> to
+	    <filename>Makefile.am</filename> if needed.</entry>
 	</row>
 
 	<row xml:id="uses-perl5">
@@ -746,9 +846,10 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	<row xml:id="uses-pgsql">
 	  <entry><literal>pgsql</literal></entry>
 
-	  <entry>(none), <literal>X.Y</literal>,
-	    <literal>X.Y+</literal>,
-	    <literal>X.Y-</literal></entry>
+	  <entry>(none),
+	    <literal><replaceable>X.Y</replaceable></literal>,
+	    <literal><replaceable>X.Y</replaceable>+</literal>,
+	    <literal><replaceable>X.Y</replaceable>-</literal></entry>
 
 	  <entry>
 	    <para>Provide support for PostgreSQL.  Maintainer can
@@ -864,30 +965,35 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	    <filename>/usr/bin/perl</filename> and
 	    <filename>/bin/bash</filename>.  This fixes shebang lines
 	    in scripts listed in <varname>SHEBANG_FILES</varname>.
-	    Currently <application>Perl</application>,
+	    Currently <application>Bash</application>,
+	    <application>Java</application>,
+	    <application>Perl</application>,
+	    <application>PHP</application>,
 	    <application>Python</application>,
-	    <application>Bash</application>,
-	    <application>Ruby</application>, and
-	    <application>PHP</application> are supported by default.
+	    <application>Ruby</application>,
+	    <application>Tcl</application>, and
+	    <application>Tk</application> are supported by default.
 	    To support another interpreter, set
-	    <varname>SHEBANG_LANG</varname> (for example
-	    <literal>SHEBANG_LANG=lua</literal>), then
+	    <varname>SHEBANG_LANG</varname>,
 	    <varname>lua_OLD_CMD</varname> and
-	    <varname>lua_CMD</varname>.</entry>
+	    <varname>lua_CMD</varname>.  For example
+	    <literal>SHEBANG_LANG=lua</literal>, then
+	    <varname>lua_OLD_CMD=/usr/bin/lua</varname> and
+	    <varname>lua_CMD=${LOCALBASE}/bin/lua</varname>.</entry>
 	</row>
 
 	<row xml:id="uses-tar">
 	  <entry><literal>tar</literal></entry>
 
-	  <entry>(none), <literal>Z</literal>,
+	  <entry>(none), <literal>Z</literal>, <literal>bz2</literal>,
 	    <literal>bzip2</literal>, <literal>lzma</literal>,
-	    <literal>tbz</literal>, <literal>tgz</literal>,
+	    <literal>tbz</literal>, <literal>tgz</literal>, <literal>txz</literal>,
 	    <literal>xz</literal></entry>
 
 	  <entry>Set <varname>EXTRACT_SUFX</varname> to
 	    <literal>.tar</literal>, <literal>.tar.Z</literal>,
-	    <literal>.tar.bz2</literal>, <literal>.tar.lzma</literal>,
-	    <literal>.tbz</literal>, <literal>.tgz</literal> or
+	    <literal>.tar.bz2</literal>, <literal>.tar.bz2</literal>, <literal>.tar.lzma</literal>,
+	    <literal>.tbz</literal>, <literal>.tgz</literal>, <literal>.txz</literal> or
 	    <literal>.tar.xz</literal> respectively.</entry>
 	</row>