Date: Sun, 20 May 2007 15:07:41 +0400 From: "Andrew Pantyukhin" <infofarmer@FreeBSD.org> To: "Ernst W. Winter" <ewinter@ewinter.org> Cc: freebsd-x11@freebsd.org Subject: Re: now what? Message-ID: <cb5206420705200407g1da38fd6h77a90dc6b600a949@mail.gmail.com> In-Reply-To: <20070520101538.GA18588@lobo.ewinter.org> References: <20070520101538.GA18588@lobo.ewinter.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cb5206420705200407g1da38fd6h77a90dc6b600a949>