From owner-freebsd-x11@FreeBSD.ORG Sun May 20 10:51:50 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 BAA8C16A400 for ; Sun, 20 May 2007 10:51:50 +0000 (UTC) (envelope-from ewinter@west.bsn.com) Received: from west.bsn.com (host-62-245-151-69.customer.m-online.net [62.245.151.69]) by mx1.freebsd.org (Postfix) with ESMTP id 72A0B13C447 for ; Sun, 20 May 2007 10:51:44 +0000 (UTC) (envelope-from ewinter@west.bsn.com) Received: from west.bsn.com (localhost [127.0.0.1]) by west.bsn.com (8.14.1/8.14.1) with ESMTP id l4KAFnNA018631 for ; Sun, 20 May 2007 12:15:59 +0200 (CEST) (envelope-from ewinter@west.bsn.com) Received: (from ewinter@localhost) by west.bsn.com (8.14.1/8.14.1/Submit) id l4KAFhmc018630 for freebsd-x11@freebsd.org; Sun, 20 May 2007 12:15:43 +0200 (CEST) (envelope-from ewinter) Date: Sun, 20 May 2007 12:15:38 +0200 From: "Ernst W. Winter" To: freebsd-x11@freebsd.org Message-ID: <20070520101538.GA18588@lobo.ewinter.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Phone: + 49-89-3075-6800 Organization: FreeBSD Evangelist X-Operating-System: FreeBSD lobo.ewinter.org 6.2-STABLE FreeBSD 6.2-STABLE User-Agent: mutt-ng/devel-r804 (FreeBSD) Subject: now what? X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Ernst W. Winter" List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2007 10:51:50 -0000 Hi, have done all the requested steps in UPGRADE for the upgrade to xorg 7.2 and now the rest is not working? [---------------------------Snip------------------------------------] sh /usr/ports/Tools/scripts/mergebase.sh # some deleted for shortening here ./share/gnome/applications/mimeinfo.cache ./share/locale/bg/LC_MESSAGES/gkrellm.mo ./share/locale/cs/LC_MESSAGES/gkrellm.mo ./share/locale/da/LC_MESSAGES/gkrellm.mo ./share/locale/de/LC_MESSAGES/gkrellm.mo ./share/locale/es/LC_MESSAGES/gkrellm.mo ./share/locale/fr/LC_MESSAGES/gkrellm.mo ./share/locale/it/LC_MESSAGES/gkrellm.mo ./share/locale/ja/LC_MESSAGES/gkrellm.mo ./share/locale/nl/LC_MESSAGES/gkrellm.mo ./share/locale/pl/LC_MESSAGES/gkrellm.mo ./share/locale/ru/LC_MESSAGES/gkrellm.mo ./share/locale/sl/LC_MESSAGES/gkrellm.mo ./share/locale/sv/LC_MESSAGES/gkrellm.mo ./share/mime/XMLnamespaces ./share/mime/aliases ./share/mime/globs ./share/mime/magic ./share/mime/mime.cache ./share/mime/subclasses 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.iAt928hT. [---------------------------Snip------------------------------------] what would be the next step? Ernst -- Ernst Winter ewinter@ewinter.org "Nec scire fas est onmnia" --Horaz FreeBSD provides a "Gates-free PC" - FreeUnix Pioneers "FreeBSD pioneers - every day a new installation" Vista? What Vista? Hasta la vista baby!