From owner-freebsd-x11@FreeBSD.ORG Sun Jun 3 18:58:18 2007 Return-Path: X-Original-To: x11@freebsd.org Delivered-To: freebsd-x11@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C65B316A41F for ; Sun, 3 Jun 2007 18:58:18 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from turion.vk2pj.dyndns.org (c220-239-20-82.belrs4.nsw.optusnet.com.au [220.239.20.82]) by mx1.freebsd.org (Postfix) with ESMTP id 53C1313C480 for ; Sun, 3 Jun 2007 18:58:17 +0000 (UTC) (envelope-from peterjeremy@optushome.com.au) Received: from turion.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by turion.vk2pj.dyndns.org (8.14.1/8.13.8) with ESMTP id l53IwGjr021010; Mon, 4 Jun 2007 04:58:16 +1000 (EST) (envelope-from peter@turion.vk2pj.dyndns.org) Received: (from peter@localhost) by turion.vk2pj.dyndns.org (8.14.1/8.13.8/Submit) id l53IwGp4021009; Mon, 4 Jun 2007 04:58:16 +1000 (EST) (envelope-from peter) Date: Mon, 4 Jun 2007 04:58:16 +1000 From: Peter Jeremy To: Ryan Mesa Message-ID: <20070603185816.GC18923@turion.vk2pj.dyndns.org> References: <556373.43800.qm@web60515.mail.yahoo.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="liOOAslEiF7prFVr" Content-Disposition: inline In-Reply-To: <556373.43800.qm@web60515.mail.yahoo.com> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.15 (2007-04-06) Cc: x11@freebsd.org Subject: Re: merge script X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 18:58:18 -0000 --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 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--