From 0d83fdc5cd2e2d66ece1d3ee73b0db9aa5e85d86 Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 28 Aug 2013 15:03:52 +0000
Subject: [PATCH] - Add the following from bapt@   - Document new libdepends
 way   - Add motif to the uses list   - USE_DISPLAY is now USES=display

---
 .../books/porters-handbook/book.xml           | 30 +++++--------------
 .../books/porters-handbook/uses.xml           | 11 +++++++
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 8f77c40caa..2499a95b9b 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -3565,35 +3565,19 @@ ALWAYS_KEEP_DISTFILES=	yes
 
 	<para>This variable specifies the shared libraries this port
 	  depends on.  It is a list of
-	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
+	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable>
 	  tuples where <replaceable>lib</replaceable> is the name of
 	  the shared library, <replaceable>dir</replaceable> is the
-	  directory in which to find it in case it is not available,
-	  and <replaceable>target</replaceable> is the target to call
-	  in that directory.  For example,</para>
+	  directory in which to find it in case it is not available.
+	  For example,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>will check for a shared jpeg library with any version,
 	  and descend into the
 	  <filename>graphics/jpeg</filename> subdirectory of your
-	  ports tree to build and install it if it is not found.  The
-	  <replaceable>target</replaceable> part can be omitted if it
-	  is equal to <makevar>DEPENDS_TARGET</makevar> (which
-	  defaults to <literal>install</literal>).</para>
-
-	<note>
-	  <para>The <replaceable>lib</replaceable> part is a regular
-	    expression which is being looked up in the
-	    <command>ldconfig -r</command> output.  Values such as
-	    <literal>intl.9</literal> and
-	    <literal>intl.[5-7]</literal> are allowed.  The first
-	    pattern, <literal>intl.9</literal>, will match only
-	    version 9 of intl, while <literal>intl.[5-7]</literal>,
-	    will match any of: <literal>intl.5</literal>,
-	    <literal>intl.6</literal> or
-	    <literal>intl.7</literal>.</para>
-	</note>
+	  ports tree to build and install it if it is not found.
+	</para>
 
 	<para>The dependency is checked twice, once from within the
 	  <maketarget>extract</maketarget> target and then from within
@@ -6373,7 +6357,7 @@ USE_XORG=	x11 xpm</programlisting>
 	  X server.  The working <envar>DISPLAY</envar> is then passed
 	  to the build.</para>
 
-	<programlisting>USE_DISPLAY=	yes</programlisting>
+	<programlisting>USES=	display</programlisting>
       </sect2>
 
       <sect2 id="desktop-entries">
diff --git a/en_US.ISO8859-1/books/porters-handbook/uses.xml b/en_US.ISO8859-1/books/porters-handbook/uses.xml
index d80b34c450..5020c9517f 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses.xml
@@ -120,6 +120,17 @@
     dependency.</entry>
 </row>
 
+<row>
+  <entry><literal>motif</literal></entry>
+  <entry>(none)</entry>
+  <entry>Implies that the ports uses <filename
+    role="package">devel/open-motif</filename> as a library
+    dependency. End users can set <makevar>WANT_LESSTIF</makevar>
+    for the dependency to be on <filename
+    role="package">devel/lesstif</filename> instead of <filename
+    role="package">devel/open-motif</filename>.</entry>
+</row>
+
 <row>
   <entry><literal>ncurses</literal></entry>
   <entry>(none), <literal>base</literal>,