From fe6800cf3ba99f9e641206ba2194aea8613ce314 Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Wed, 17 Apr 2002 04:18:32 +0000
Subject: [PATCH] Add some tips to the CVSup documentation to emphasize that
 the cvsup-without-gui port should be used on systems which don't have X11
 installed.

PR:		ports/37089
Submitted by:	Dominic Marks <dominic_marks@btinternet.com>
---
 en_US.ISO8859-1/books/faq/book.sgml           | 28 +++++++++++++++++++
 .../books/handbook/mirrors/chapter.sgml       |  9 ++++++
 2 files changed, 37 insertions(+)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index db94671f90..d2f62b9800 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -8928,6 +8928,34 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
             performance of your FreeBSD machine.</para>
         </answer>
       </qandaentry>
+
+	  <qandaentry>
+	  	<question id="cvsup-missing-libs">
+		  <para>I've just installed CVSup but trying to execute it
+		  produces errors.  What is wrong?</para>
+		</question>
+		<answer>
+		  <para>First, see if the error message you are
+		  receiving is like the one shown below.</para>
+
+		  <programlisting>/usr/libexec/ld-elf.so.1: Shared object "libXaw.so.6" not found</programlisting>
+
+		  <para>Errors like these are caused by installing the
+		  <filename role="package">net/cvsup</filename> port on a
+		  machine which does not have the
+		  <application>XFree86</application> suite. If you  want to
+		  use the <acronym>GUI</acronym> included with
+		  <application>CVSup</application> you will need to install
+		  <application>XFree86</application> now. Alternatively if you
+		  just wish to use <application>CVSup</application> from a
+		  command line you should delete the package previously
+		  installed. Then install the <filename
+		  role="package">net/cvsup-without-gui</filename> port. This is
+		  covered in more detail in the <ulink
+		  url="http://www.freebsd.org/handbook/cvsup.html">CVSup
+		  section</ulink> of the Handbook.</para>
+		</answer>
+	  </qandaentry>
     </qandaset>
   </chapter>
 
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 78f8a3d69b..c46ac49f5a 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -1685,6 +1685,15 @@
 	<filename role="package">net/cvsup</filename> port depends on the Modula-3
 	system, which takes a substantial amount of time and
 	disk space to download and build.</para>
+
+	<note>
+	  <para>If you are going to be using
+	  <application>CVSup</application> on a machine which will not have
+	  <application>XFree86</application> installed, such as a server, be
+	  sure to use the port which does not include the
+	  <application>CVSup</application> <acronym>GUI</acronym>, <filename
+	  role="package">net/cvsup-without-gui</filename>.</para>
+	</note>
       
       <para>If you do not know anything about 
 	<application>CVSup</application> at all and want a