From 86e200080c89b51eba86444b97a73852610682fa Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 14 Sep 2015 13:32:29 +0000
Subject: [PATCH] Catch up with r396872, adding @fc and @fontsdir back, and as
 options to USES=fonts.

Sponsored by:	Absolight
---
 .../books/porters-handbook/plist/chapter.xml  | 31 ++++++++++++++++++-
 .../books/porters-handbook/uses/chapter.xml   | 24 +++++++++-----
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
index 19fed718f9..61a3146f48 100644
--- a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
@@ -326,13 +326,42 @@ etc/orbit.conf-dist
 	after installation and deinstallation.</para>
     </sect2>
 
+    <sect2 xml:id="plist-keywords-fc">
+      <title><literal>@fc</literal>
+	<replaceable>directory</replaceable></title>
+
+      <para>Add a <literal>@dir</literal> entry for the directory
+	passed as an argument, and run <command>fc-cache -fs</command>
+	on that directory after installation and
+	deinstallation.</para>
+    </sect2>
+
     <sect2 xml:id="plist-keywords-fcfontsdir">
       <title><literal>@fcfontsdir</literal>
 	<replaceable>directory</replaceable></title>
 
       <para>Add a <literal>@dir</literal> entry for the
 	directory passed as an argument, and run <command>fc-cache
-	  -s</command>, <command>mkfontscale</command> and
+	  -fs</command>, <command>mkfontscale</command> and
+	<command>mkfontdir</command> on that directory after
+	installation and deinstallation.  Additionally, on
+	deinstallation, it removes the
+	<filename>fonts.scale</filename> and
+	<filename>fonts.dir</filename> cache files if they are
+	empty.  This keyword is equivalent to adding both <link
+	  linkend="plist-keywords-fc"><literal>@fc</literal>
+	  <replaceable>directory</replaceable></link> and <link
+	  linkend="plist-keywords-fontsdir"><literal>@fontsdir</literal>
+	  <replaceable>directory</replaceable></link>.</para>
+    </sect2>
+
+    <sect2 xml:id="plist-keywords-fontsdir">
+      <title><literal>@fontsdir</literal>
+	<replaceable>directory</replaceable></title>
+
+      <para>Add a <literal>@dir</literal> entry for the
+	directory passed as an argument, and run
+	<command>mkfontscale</command> and
 	<command>mkfontdir</command> on that directory after
 	installation and deinstallation.  Additionally, on
 	deinstallation, it removes the
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 1e16c028ca..78b77b522d 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 r381632 revision of the ports tree.
+  Document up-to date with r396872 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
@@ -441,16 +441,24 @@
   <sect1 xml:id="uses-fonts">
     <title><literal>fonts</literal></title>
 
-    <para>Possible arguments: (none)</para>
+    <para>Possible arguments: (none), <literal>fc</literal>,
+      <literal>fcfontsdir</literal> (default),
+      <literal>fontsdir</literal>, <literal>none</literal></para>
 
-    <para>Adds a runtime dependency on tools needed to register fonts,
-      and add an <literal><link
+    <para>Adds a runtime dependency on tools needed to register fonts.
+      Depending on the argument, add a <literal><link
+	  linkend="plist-keywords-fc">@fc</link> ${FONTSDIR}</literal>
+      line, <literal><link
 	  linkend="plist-keywords-fcfontsdir">@fcfontsdir</link>
-	${FONTSDIR}</literal> para to the plist.
+	${FONTSDIR}</literal> line, <literal><link
+	  linkend="plist-keywords-fontsdir">@fontsdir</link>
+	${FONTSDIR}</literal> line, or no line if the argument is
+      <literal>none</literal>, to the plist.
       <varname>FONTSDIR</varname> defaults to
-      <filename>${PREFIX}/lib/X11/fonts/${FONTNAME}</filename> and
-      <varname>FONTNAME</varname> to
-      <literal>${PORTNAME}</literal>.</para>
+      <filename>${PREFIX}/share/fonts/${FONTNAME}</filename> and
+      <varname>FONTNAME</varname> to <literal>${PORTNAME}</literal>.
+      Add <literal>FONTSDIR</literal> to <varname>PLIST_SUB</varname>
+      and <varname>SUB_LIST</varname></para>
   </sect1>
 
   <sect1 xml:id="uses-fortran">