From owner-freebsd-x11@FreeBSD.ORG Sun Jun 3 09:31:26 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 7978516A400 for ; Sun, 3 Jun 2007 09:31:26 +0000 (UTC) (envelope-from vytalelementz@yahoo.com) Received: from web60515.mail.yahoo.com (web60515.mail.yahoo.com [209.73.178.178]) by mx1.freebsd.org (Postfix) with SMTP id 2EB5013C43E for ; Sun, 3 Jun 2007 09:31:25 +0000 (UTC) (envelope-from vytalelementz@yahoo.com) Received: (qmail 44262 invoked by uid 60001); 3 Jun 2007 09:04:44 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:Date:From:Subject:To:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-ID; b=nq77wpz+ebNEM1qGqQKlQPqWGEhCdceDnbqpm/jOHl0iUPo3r3vLtJ1nVJwYXTeBSdQf1VfkiUTowabM/cDY2SvIAnON4t8bJZOAKVsAVPaPw4gJ4wRf5D8kjFhdqy6rlchkoAW11EC8Hcia0UzEwogX/67oil2vNOvWSi78Ua4=; X-YMail-OSG: VUc7SO8VM1lPJAB0oqhD4ayWl4AtlHaC671CU5doTVNwqwM4xmyYaCuNDvAVxkzG3eyvvORXlDVPHCsRcBkGJCZorl06WzFEGwEW0KmA0TYcWjD7KA1QYsyrofLjHLk- Received: from [65.2.89.182] by web60515.mail.yahoo.com via HTTP; Sun, 03 Jun 2007 02:04:44 PDT Date: Sun, 3 Jun 2007 02:04:44 -0700 (PDT) From: Ryan Mesa To: x11@FreeBSD.org MIME-Version: 1.0 Message-ID: <556373.43800.qm@web60515.mail.yahoo.com> Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: 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:31:26 -0000 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. Best Regards, Ryan Mesa --------------------------------- Boardwalk for $500? In 2007? Ha! Play Monopoly Here and Now (it's updated for today's economy) at Yahoo! Games.