From owner-freebsd-x11@FreeBSD.ORG Sun Jun 3 09:57:59 2007 Return-Path: X-Original-To: freebsd-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 A9F6E16A46E for ; Sun, 3 Jun 2007 09:57:59 +0000 (UTC) (envelope-from h.nieser@xs4all.nl) Received: from smtp-vbr6.xs4all.nl (smtp-vbr6.xs4all.nl [194.109.24.26]) by mx1.freebsd.org (Postfix) with ESMTP id 4CFD713C458 for ; Sun, 3 Jun 2007 09:57:59 +0000 (UTC) (envelope-from h.nieser@xs4all.nl) Received: from [192.168.1.67] (aphax.nl [82.92.29.227]) by smtp-vbr6.xs4all.nl (8.13.8/8.13.8) with ESMTP id l539vvLQ083443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 3 Jun 2007 11:57:57 +0200 (CEST) (envelope-from h.nieser@xs4all.nl) Message-ID: <4662909F.6050302@xs4all.nl> Date: Sun, 03 Jun 2007 11:57:51 +0200 From: Hans Nieser User-Agent: Thunderbird 2.0.0.0 (X11/20070424) MIME-Version: 1.0 To: Ryan Mesa References: <556373.43800.qm@web60515.mail.yahoo.com> In-Reply-To: <556373.43800.qm@web60515.mail.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Scanned: by XS4ALL Virus Scanner Cc: freebsd-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 09:57:59 -0000 Ryan Mesa wrote: > Hi, > > 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. > While some such files are safe to remove as they will be regenerated (like /usr/X11R6/man/whatis), some you might want to move away somewhere safe, and some might point to conflicts in ports. > For this script to continue, you need to either move these files away from /usr/X11R6 or delete them. If you don't know what to do about a particular file, ask on x11@FreeBSD.org mailing list. > The list is saved in /tmp/mergebase.3HIXDrU8. > > 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. I am not sure if I could help, but I don't think anyone could unless you mention which specific file you are confused about, or perhaps the entire list of files that was saved in /tmp/mergebase.3HIXDrU8 . :)