From owner-freebsd-x11@FreeBSD.ORG  Sun May 20 11:07:42 2007
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
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 6CC3D16A468
	for <freebsd-x11@freebsd.org>; Sun, 20 May 2007 11:07:42 +0000 (UTC)
	(envelope-from infofarmer@gmail.com)
Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.228])
	by mx1.freebsd.org (Postfix) with ESMTP id 188E313C465
	for <freebsd-x11@freebsd.org>; Sun, 20 May 2007 11:07:41 +0000 (UTC)
	(envelope-from infofarmer@gmail.com)
Received: by nz-out-0506.google.com with SMTP id s1so1924037nze
	for <freebsd-x11@freebsd.org>; Sun, 20 May 2007 04:07:41 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=lLULCpVGEnp4lTv4EZOIkL8EElGOb9w+4UGMC3x+B8v8eL3gy3r4Hth4Q3e3iUOo6qBrqCjCP/GSN1VGD1ja78XsWCJyFAUBbl1UlWk4i2+fOs21TzJWIB/B3CNaZcZZ0AoH7eMuzzB8z48Ot3+cEsRllXFnrr1BXL7PSSsb4tM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=dFK/ZrZMJDYO7nkWnRevevb+SueGmSIzgOWeTNGC9mNu3At02g/MnlaXlrXkhFHCBKN/SjUZ9eaTIEL+WCPeGCd8UoWTgktOl0jd2fIWiV71azXVN642jnGdLoUexwJK3/8kDSxJ2pzGp71c4B/PMCaAxD1ojOAz0tAyzbaVPm8=
Received: by 10.115.16.1 with SMTP id t1mr1933003wai.1179659261247;
	Sun, 20 May 2007 04:07:41 -0700 (PDT)
Received: by 10.114.194.5 with HTTP; Sun, 20 May 2007 04:07:41 -0700 (PDT)
Message-ID: <cb5206420705200407g1da38fd6h77a90dc6b600a949@mail.gmail.com>
Date: Sun, 20 May 2007 15:07:41 +0400
From: "Andrew Pantyukhin" <infofarmer@FreeBSD.org>
Sender: infofarmer@gmail.com
To: "Ernst W. Winter" <ewinter@ewinter.org>
In-Reply-To: <20070520101538.GA18588@lobo.ewinter.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <20070520101538.GA18588@lobo.ewinter.org>
X-Google-Sender-Auth: 7eced3ba0af1fca0
Cc: freebsd-x11@freebsd.org
Subject: Re: now what?
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 May 2007 11:07:42 -0000

On 5/20/07, Ernst W. Winter <ewinter@ewinter.org> wrote:
> 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?

What I actually did was this:

# cat /tmp/mergebase.iAt928hT|xargs rm -rf
# sh mergebase.sh
...something failed...
# rm -rf /usr/X11R6
# cd /usr
# ln -s local X11R6
...you can now grep /etc and other places for "X11R6"
and correct the files to your liking...