From owner-freebsd-x11@FreeBSD.ORG Thu Nov 22 15:34:25 2007 Return-Path: Delivered-To: freebsd-x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49CAC16A500 for ; Thu, 22 Nov 2007 15:34:25 +0000 (UTC) (envelope-from jgalache@tlmat.unican.es) Received: from ccserver2.unican.es (ccserver2.unican.es [130.206.5.101]) by mx1.freebsd.org (Postfix) with ESMTP id ED17213C4F8 for ; Thu, 22 Nov 2007 15:34:24 +0000 (UTC) (envelope-from jgalache@tlmat.unican.es) Received: from ccserver2.unican.es (ccserver2.unican.es [127.0.0.1]) by ccserver2.unican.es (Postfix) with ESMTP id 017481651A9 for ; Thu, 22 Nov 2007 16:02:13 +0100 (CET) Received: from luna.tlmat.unican.es (luna.tlmat.unican.es [193.144.186.2])by ccserver2.unican.es (Postfix) with ESMTP id EA75DE4898for ; Thu, 22 Nov 2007 16:02:12 +0100 (CET) Received: from [193.144.186.34] (deneb.tlmat.unican.es [193.144.186.34])(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))(No client certificate requested)by luna.tlmat.unican.es (Postfix) with ESMTP id 73F2B14025Ffor ; Thu, 22 Nov 2007 16:02:24 +0100 (CET) Message-ID: <474599FD.40102@tlmat.unican.es> Date: Thu, 22 Nov 2007 16:02:21 +0100 From: Jose Antonio Galache User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: freebsd-x11@FreeBSD.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-imss-version: 2.049 X-imss-result: Passed X-imss-scanInfo: M:P L:E SM:0 X-imss-tmaseResult: TT:0 TS:0.0000 TC:00 TRN:0 TV:5.0.1023(15562.000) X-imss-scores: Clean:0.15867 C:2 M:3 S:5 R:5 X-imss-settings: Baseline:1 C:1 M:2 S:2 R:2 (0.0000 0.0000) Cc: Subject: Updating from Xorg 6.9 to Xorg 7.2 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: Thu, 22 Nov 2007 15:34:25 -0000 Hi all, I'm updating the Xorg from 6.9 to 7.2 in freebsd 6.2 Releas and when I was in the last step, when running mergebase.sh script, I have been displayed the following 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.qo7TBWmH Looking at the list in the /tmp/mergebase.qo7TBWmH file, too many files are included (877 files) within bin, etc, include, lib, man and share folders. Have I to remove them manually? or is it another way to do it in an automated way?. Thanks a lot in advance for your help. Regards, Jose.