Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision 5fb26b09960ad70b923a8364742f10a8b2152253)
+++ networking/netprogs/rpcbind.xml	(revision b91aa964b306ebd25ad424988a648628a9aa15bb)
@@ -9,5 +9,5 @@
   <!ENTITY rpcbind-md5sum        "c8875246b2688a1adfbd6ad43480278d">
   <!ENTITY rpcbind-size          "120 KB">
-  <!ENTITY rpcbind-buildsize     "2.0 MB">
+  <!ENTITY rpcbind-buildsize     "2 MB">
   <!ENTITY rpcbind-time          "less than 0.1 SBU">
 ]>
@@ -30,42 +30,38 @@
     <title>Introduction to rpcbind</title>
 
-    <para>
-      The <application>rpcbind</application> program is a replacement for
-      <application>portmap</application>.  It is required for import or
-      export of Network File System (NFS) shared directories.
-    </para>
-
-    &lfs77_checked;
+    <para>The <application>rpcbind</application> program is a replacement for
+    <application>portmap</application>.  It is required for import or export
+    of Network File System (NFS) shared directories. </para>
+
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
+        <para>Download (HTTP): <ulink url="&rpcbind-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rpcbind-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rpcbind-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rpcbind-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rpcbind-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rpcbind-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
         <para>
-          Download (HTTP): <ulink url="&rpcbind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rpcbind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rpcbind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rpcbind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rpcbind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rpcbind-time;
+          Required patch:
+          <ulink url="&patch-root;/rpcbind-&rpcbind-version;-tirpc_fix-1.patch"/>
         </para>
       </listitem>
@@ -80,6 +76,5 @@
 
     <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/rpcbind"/>
-    </para>
+      <ulink url="&blfs-wiki;/rpcbind"/></para>
   </sect2>
 
@@ -99,34 +94,24 @@
 
     <!-- Packages should adapt to standards, not the other way around -->
-    <para>
-      In order to get <application>rpcbind</application> to work
-      properly, first fix the package to use correct service name:
-    </para>
-
-<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c &amp;&amp;
-sed -i "/error = getaddrinfo/s:rpcbind:sunrpc:" src/rpcinfo.c</userinput></screen>
-
-    <para>
-      Install <application>rpcbind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr       \
+    <para>In order to get <application>rpcbind</application> to work
+      properly, first fix the package to use correct service name:</para>
+
+<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c &amp;&amp;</userinput></screen>
+
+    <para>Install <application>rpcbind</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../rpcbind-&rpcbind-version;-tirpc_fix-1.patch &amp;&amp;
+./configure --prefix=/usr       \
             --bindir=/sbin      \
-            --with-rpcuser=rpc  \
-            --enable-warmstarts \
-            --with-statedir=/var/lib/rpcbind &amp;&amp;
+            --with-rpcuser=rpc  &amp;&amp;
 make</userinput></screen>
 
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755 -o rpc -g rpc /var/lib/rpcbind</userinput></screen>
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -140,21 +125,4 @@
       run as an unprivileged user instead of
       <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      <parameter>--enable-warmstarts</parameter>: This switch
-      is used to enable <command>rpcbind</command> to write
-      the current list of registered services to a file when
-      it shuts down so it can resume operation with the
-      registrations found in the file when it is started again.
-    </para>
-
-    <para>
-      <parameter>--with-statedir=/var/lib/rpcbind</parameter>:
-      This switch is used to instruct <command>rpcbind</command>
-      to write current list of registered services to a
-      permanent location of <filename
-      class="directory">/var/lib/rpcbind</filename> instead of
-      <filename class="directory">/tmp</filename>.
     </para>
 
@@ -196,18 +164,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>
-          rpcbind and rpcinfo
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
+        <seg>rpcbind and rpcinfo</seg>
+        <seg>None</seg>
+        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
@@ -221,9 +183,7 @@
         <term><command>rpcbind</command></term>
         <listitem>
-          <para>
-            is a server that converts RPC program numbers into universal
-            addresses. It must be running on the host to be able to make
-            RPC calls on a server on that machine.
-          </para>
+          <para>is a server that converts RPC program numbers into universal
+          addresses.  It must be running on the host to be able to make RPC
+          calls on a server on that machine.  </para>
           <indexterm zone="rpcbind rpcbind-prog">
             <primary sortas="b-rpcbind">rpcbind</primary>
@@ -235,8 +195,6 @@
         <term><command>rpcinfo</command></term>
         <listitem>
-          <para>
-            makes an RPC call to an RPC server and reports data according
-            to the requested options.
-          </para>
+          <para>makes an RPC call to an RPC server and reports data according
+          to the requested options.  </para>
           <indexterm zone="rpcbind rpcinfo">
             <primary sortas="b-rpcinfo">rpcinfo</primary>
