Date: Mon, 4 Jun 2007 04:58:16 +1000 From: Peter Jeremy <peterjeremy@optushome.com.au> To: Ryan Mesa <vytalelementz@yahoo.com> Cc: x11@freebsd.org Subject: Re: merge script Message-ID: <20070603185816.GC18923@turion.vk2pj.dyndns.org> In-Reply-To: <556373.43800.qm@web60515.mail.yahoo.com> References: <556373.43800.qm@web60515.mail.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--liOOAslEiF7prFVr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Please wrap your lines before 80 characters. On 2007-Jun-03 02:04:44 -0700, Ryan Mesa <vytalelementz@yahoo.com> wrote: >I just updated xorg from version 6.9 to 7.2. There is a merge script >the UPDATED file suggests to use, I ran after the update but I >received this error message: > >Files that exist both in /usr/local and /usr/X11R6 have been found as >shown above. Merging will not continue. Typically, the files listed are 'man/whatis' - which is automatically generated and can be safely removed - and any files that you have locally created or modified - in which case you need to manually move the files or patches from /usr/X11R6 to /usr/local and then delete the file in /usr/X11R6. >I was hoping that someone could shed some light on what I could >delete and what needs to be moved to a safe location as directed. Any >help is appreciated. Thank you. If you are uncertain about specific files, please provide the filenames. --=20 Peter Jeremy --liOOAslEiF7prFVr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGYw9H/opHv/APuIcRAjW2AJ4hKtLANr6x7cjsMJ4WM6BWrpIpYgCdGJtQ OWjgHeqNEsRACchBOqvpydA= =bs1j -----END PGP SIGNATURE----- --liOOAslEiF7prFVr--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070603185816.GC18923>